Release v1.0.0-alpha.75

package.json

@@ -47,8 +47,8 @@
     "@commitlint/cli": "^17.8.1",
     "@commitlint/config-conventional": "^17.8.1",
     "@types/prettier": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
+    "@typescript-eslint/parser": "^6.9.1",
     "@vitest/coverage-v8": "^0.34.6",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
@@ -64,7 +64,7 @@
     "lint-staged": "^14.0.1",
     "pm2": "^5.3.0",
     "prettier": "^3.0.3",
-    "terser": "^5.22.0",
+    "terser": "^5.23.0",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6",
     "webpack": "^5.89.0"

packages/@liexp/backend/src/providers/tg/tg.provider.ts

@@ -10,16 +10,16 @@ export interface TGBotProvider {
   upsertPinnedMessage: (
     text: string,
   ) => TE.TaskEither<Error, TelegramBot.Message>;
-  post: (text: string) => TE.TaskEither<Error, any>;
+  post: (text: string, replyToMessageId?: number) => TE.TaskEither<Error, TelegramBot.Message>;
   postPhoto: (
     imageUrl: string | Stream,
     caption: string,
-  ) => TE.TaskEither<Error, any>;
+  ) => TE.TaskEither<Error, TelegramBot.Message>;
   postVideo: (
     videoUrl: string | Stream,
     caption: string,
     opts?: TelegramBot.SendVideoOptions,
-  ) => TE.TaskEither<Error, any>;
+  ) => TE.TaskEither<Error, TelegramBot.Message>;
   postMediaGroup: (
     text: string,
     media: readonly TelegramBot.InputMedia[],
@@ -99,9 +99,10 @@ export const TGBotProvider = (
         }),
       );
     },
-    post: (text) => {
+    post: (text, replyToMessageId) => {
       return liftTGTE(() =>
         api.sendMessage(opts.chat, text, {
+          reply_to_message_id: replyToMessageId,
           parse_mode: "HTML",
           disable_web_page_preview: false,
         }),

packages/@liexp/core/package.json

@@ -39,14 +39,14 @@
     "express": "^4.18.2",
     "file-loader": "^6.2.0",
     "filemanager-webpack-plugin": "^8.0.0",
-    "fork-ts-checker-webpack-plugin": "^9.0.0",
+    "fork-ts-checker-webpack-plugin": "^9.0.2",
     "html-replace-webpack-plugin": "^2.6.0",
     "html-webpack-plugin": "^5.5.3",
     "mini-css-extract-plugin": "^2.7.6",
     "prettier": "^3.0.3",
     "react-refresh": "^0.14.0",
     "react-refresh-typescript": "^2.0.9",
-    "sass": "^1.69.3",
+    "sass": "^1.69.5",
     "speed-measure-webpack-plugin": "^1.5.0",
     "style-loader": "^3.3.3",
     "ts-loader": "^9.5.0",

packages/@liexp/shared/package.json

@@ -24,7 +24,7 @@
     "@databases/escape-identifier": "^1.0.3",
     "@databases/sql": "^3.3.0",
     "@liexp/core": "0.1.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "bs58": "^5.0.0",
     "cheerio": "^1.0.0-rc.12",
     "date-fns": "^2.30.0",

packages/@liexp/ui/package.json

@@ -65,15 +65,15 @@
     "@visx/tooltip": "^3.3.0",
     "@visx/wordcloud": "^3.3.0",
     "@visx/zoom": "^3.3.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
     "d3": "^7.8.5",
     "d3-sankey": "^0.12.3",
     "d3-sankey-circular": "^0.34.0",
     "date-fns": "^2.30.0",
     "fp-ts": "^2.16.1",
-    "geotiff": "^2.0.7",
+    "geotiff": "^2.1.0",
     "io-ts": "^2.2.20",
     "io-ts-types": "^0.5.19",
     "is-plain-object": "^5.0.0",

packages/@liexp/ui/src/components/Common/Icons/EventIcon.tsx

@@ -114,6 +114,35 @@ export const EventIcon: React.FC<EventIconProps> = ({ type, ...props }) => {
   }
 };
 
+export const QuoteEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Quote" {...props} />
+);
+
+export const ScientificStudyEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="ScientificStudy" {...props} />
+);
+
+export const DeathEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Death" {...props} />
+);
+
+export const PatentEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Patent" {...props} />
+);
+
+export const DocumentaryEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Documentary" {...props} />
+);
+
+export const UncategorizedEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Uncategorized" {...props} />
+);
+
+export const TransactionEventIcon: React.FC<Omit<EventIconProps, "type">> = (props) => (
+  <EventIcon type="Transaction" {...props} />
+);
+
+
 export const EventIconInSVG: React.FC<
   EventIconProps & React.SVGProps<SVGTextElement>
 > = ({ type, ...props }) => {

packages/@liexp/ui/src/components/EventPageContent.tsx

@@ -80,7 +80,7 @@ export const EventPageContent: React.FC<EventPageContentProps> = ({
             >
               <Box style={{ marginBottom: theme.spacing(3) }}>
                 {link ? (
-                  <Link href={link.url} target="_blank">
+                  <Link href={`/links/${link.id}`}>
                     {link.title}
                   </Link>
                 ) : null}

packages/@liexp/ui/src/components/admin/links/AdminLinks.tsx

@@ -245,7 +245,7 @@ export const LinkEdit: React.FC = () => {
               {isAdmin && <DangerZoneField />}
             </Grid>
             <Grid item md={6}>
-              <ReferenceArrayKeywordInput source="keywords" showAdd={false} />
+              <ReferenceArrayKeywordInput source="keywords" showAdd={true} />
               {isAdmin && <ReferenceUserInput source="creator" />}
             </Grid>
           </Grid>

packages/@liexp/ui/src/components/admin/media/MediaList.tsx

@@ -74,6 +74,16 @@ export const MediaList: React.FC<ListProps> = (props) => {
             return (
               <Box>
                 <Box>
+                  <Typography variant="h5" style={{ fontSize: 16 }}>{r.label}</Typography>
+                  <Typography variant="body1">{r.description}</Typography>
+                </Box>
+                <Box>
+                  <Typography variant="subtitle1">
+                    {r.type}
+                    {r.type === MP4Type.value &&
+                      r.extra?.duration &&
+                      ` - ${toFormattedDuration(r.extra.duration)}`}
+                  </Typography>
                   <Typography
                     variant="h6"
                     style={{
@@ -82,16 +92,6 @@ export const MediaList: React.FC<ListProps> = (props) => {
                   >
                     {url.hostname}
                   </Typography>
-                  <Typography variant="subtitle1">
-                    {r.type}
-                    {r.type === MP4Type.value &&
-                      r.extra?.duration &&
-                      ` - ${toFormattedDuration(r.extra.duration)}`}
-                  </Typography>
-                </Box>
-                <Box>
-                  <Typography variant="subtitle1">{r.label}</Typography>
-                  <Typography variant="body1">{r.description}</Typography>
                 </Box>
               </Box>
             );

packages/@liexp/ui/src/templates/EventTemplate.tsx

@@ -75,6 +75,7 @@ export const EventTemplateUI: React.FC<EventTemplateProps> = ({
   onGroupMemberClick,
   onKeywordClick,
   onEventClick,
+  onLinkClick,
   filters,
 }) => {
   const theme = useTheme();
@@ -333,7 +334,7 @@ export const EventTemplateUI: React.FC<EventTemplateProps> = ({
                     filter={{ ids: event.links }}
                     defaultExpanded={true}
                     column={2}
-                    onItemClick={() => {}}
+                    onItemClick={onLinkClick}
                   />
                 </Box>
               </SplitPageTemplate>

packages/@liexp/ui/src/templates/links/LinkTemplateUI.tsx

@@ -1,18 +1,17 @@
-import { type Keyword, type Link } from "@liexp/shared/lib/io/http";
-import { type SearchEvent } from "@liexp/shared/lib/io/http/Events/SearchEvent";
+import type * as http from "@liexp/shared/lib/io/http";
 import * as React from "react";
 import { KeywordsBox } from "../../components/KeywordsBox";
 import MediaElement from "../../components/Media/MediaElement";
-import { Box, Typography } from "../../components/mui";
+import { Box, Typography, Link } from "../../components/mui";
 import { EventsPanelBox } from "../../containers/EventsPanel";
 import { SplitPageTemplate } from "../SplitPageTemplate";
 
 export interface LinkTemplateUIProps {
-  link: Link.Link;
+  link: http.Link.Link;
   tab: number;
   onTabChange: (t: number) => void;
-  onEventClick: (e: SearchEvent) => void;
-  onKeywordClick: (k: Keyword.Keyword) => void;
+  onEventClick: (e: http.Events.SearchEvent.SearchEvent) => void;
+  onKeywordClick: (k: http.Keyword.Keyword) => void;
 }
 
 export const LinkTemplateUI: React.FC<LinkTemplateUIProps> = ({
@@ -64,6 +63,12 @@ export const LinkTemplateUI: React.FC<LinkTemplateUIProps> = ({
       ]}
     >
       <Box style={{ padding: 10 }}>
+        <Box style={{ paddingBottom: 10 }}>
+          <Link href={link.url} target="_blank">
+            {link.title}
+          </Link>
+        </Box>
+
         <Typography style={{ marginBottom: 20 }}>{link.description}</Typography>
       </Box>
       <EventsPanelBox

services/admin-web/package.json

@@ -62,8 +62,8 @@
     "@types/react": "^18.2.33",
     "@types/react-dom": "^18.2.14",
     "@types/webpack-bundle-analyzer": "^4.6.2",
-    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
+    "@typescript-eslint/parser": "^6.9.1",
     "dotenv": "^16.3.1",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",

services/admin-web/src/AdminPage.tsx

@@ -1,4 +1,5 @@
 import { apiProvider, authProvider } from "@liexp/ui/lib/client/api";
+import { DeathEventIcon, DocumentaryEventIcon, PatentEventIcon, QuoteEventIcon, ScientificStudyEventIcon, TransactionEventIcon, UncategorizedEventIcon } from '@liexp/ui/lib/components/Common/Icons';
 import {
   EventSuggestionEdit,
   EventSuggestionList,
@@ -26,7 +27,6 @@ import {
 } from "@liexp/ui/lib/components/admin/stories/AdminStories";
 import { i18nProvider } from "@liexp/ui/lib/i18n/i18n.provider";
 import AssignmentIcon from "@mui/icons-material/Assignment";
-import EventIcon from "@mui/icons-material/Event";
 import GroupIcon from "@mui/icons-material/Group";
 import LinkIcon from "@mui/icons-material/Link";
 import MapIcon from "@mui/icons-material/Map";
@@ -169,46 +169,52 @@ const AdminPage: React.FC = () => {
         list={EventList}
         edit={EventEdit}
         create={UncategorizedEventCreate}
-        icon={EventIcon}
+        icon={UncategorizedEventIcon}
       />
 
       <Resource
         name="deaths"
         list={DeathList}
         edit={DeathEdit}
         create={DeathCreate}
+        icon={DeathEventIcon}
       />
 
       <Resource
         name="scientific-studies"
         list={ScientificStudiesList}
         edit={ScientificStudyEdit}
         create={ScientificStudyCreate}
+        icon={ScientificStudyEventIcon}
       />
       <Resource
         name="patents"
         list={PatentList}
         edit={PatentEdit}
         create={PatentCreate}
+        icon={PatentEventIcon}
       />
       <Resource
         name="documentaries"
         list={DocumentaryList}
         edit={DocumentaryEdit}
         create={DocumentaryCreate}
+        icon={DocumentaryEventIcon}
       />
       <Resource
         name="transactions"
         list={TransactionList}
         edit={TransactionEdit}
         create={TransactionCreate}
+        icon={TransactionEventIcon}
       />
 
       <Resource
         name="quotes"
         list={QuoteList}
         edit={QuoteEdit}
         create={QuoteCreate}
+        icon={QuoteEventIcon}
       />
       <Resource
         name="links"

services/api/package.json

@@ -47,7 +47,7 @@
     "@liexp/backend": "0.1.0",
     "@liexp/core": "0.1.0",
     "@liexp/shared": "0.1.0",
-    "axios": "^1.5.1",
+    "axios": "^1.6.0",
     "canvas": "^2.11.2",
     "cors": "2.8.5",
     "debug": "^4.3.4",