fix(admin): display social posts count for sharable resources

lies-exposed · Nov 15, 2023 · c8ea4d5 · c8ea4d5
1 parent 03da357
commit c8ea4d5
Show file tree

Hide file tree

Showing 53 changed files with 307 additions and 77 deletions.
diff --git a/packages/@liexp/core/src/fp/index.ts b/packages/@liexp/core/src/fp/index.ts
@@ -13,6 +13,7 @@ import * as TE from "fp-ts/TaskEither";
 import { pipe, flow } from "fp-ts/function";
 import * as N from "fp-ts/number";
 import * as S from "fp-ts/string";
+import * as Void from 'fp-ts/void'
 
 export const fp = {
   A,
@@ -28,7 +29,8 @@ export const fp = {
   N,
   Ord,
   Json,
-  Eq
+  Eq,
+  Void
 };
 
 export { pipe, flow };
diff --git a/packages/@liexp/shared/src/helpers/event-suggestion.ts b/packages/@liexp/shared/src/helpers/event-suggestion.ts
@@ -59,6 +59,7 @@ export const getSuggestions = (
     ),
     links: [],
     keywords: relations.keywords,
+    socialPosts: [],
     createdAt: new Date(),
     updatedAt: new Date(),
     deletedAt: undefined,
@@ -80,7 +81,7 @@ export const getSuggestions = (
                 actors: [],
                 groups: [],
               } as any,
-            },
+            }
           },
         },
         {
@@ -132,17 +133,6 @@ export const getSuggestions = (
         },
       },
     },
-    // {
-    //   type: http.EventSuggestion.EventSuggestionType.types[0].value,
-    //   event: {
-    //     ...commonSuggestion,
-    //     type: http.Events.EventTypes.DEATH.value,
-    //     payload: {
-    //       victim: uuid() as any,
-    //       location: undefined as any,
-    //     },
-    //   },
-    // },
     {
       type: http.EventSuggestion.EventSuggestionType.types[0].value,
       event: {

diff --git a/packages/@liexp/shared/src/helpers/event/event.ts b/packages/@liexp/shared/src/helpers/event/event.ts
@@ -165,6 +165,7 @@ export const getRelationIds = (e: Events.Event): Events.EventRelationIds => {
     keywords: e.keywords,
     links: e.links,
     areas: [],
+    socialPosts: []
   };
 
   switch (e.type) {

diff --git a/packages/@liexp/shared/src/helpers/event/search-event.ts b/packages/@liexp/shared/src/helpers/event/search-event.ts
@@ -82,6 +82,7 @@ export const getNewRelationIds = (
         media: acc.media.concat(newMediaIds),
         keywords: acc.keywords.concat(newKeywordIds),
         links: acc.links.concat(newLinkIds),
+        socialPosts: []
       };
     }),
   );

diff --git a/packages/@liexp/shared/src/io/http/Events/BaseEvent.ts b/packages/@liexp/shared/src/io/http/Events/BaseEvent.ts
@@ -52,6 +52,7 @@ export const EventCommon = t.strict(
     id: UUID,
     media: t.array(UUID, "media"),
     links: t.array(UUID, "links"),
+    socialPosts: t.union([t.array(UUID), t.undefined]),
     createdAt: DateFromISOString,
     updatedAt: DateFromISOString,
     deletedAt: t.union([DateFromISOString, t.undefined], "deletedAt"),

diff --git a/packages/@liexp/shared/src/io/http/Events/SearchEventsQuery.ts b/packages/@liexp/shared/src/io/http/Events/SearchEventsQuery.ts
@@ -2,6 +2,7 @@ import * as t from "io-ts";
 import { BooleanFromString } from "io-ts-types/BooleanFromString";
 import { DateFromISOString } from "io-ts-types/DateFromISOString";
 import { UUID } from "io-ts-types/UUID";
+import { NumberFromString } from 'io-ts-types/lib/NumberFromString';
 import { optionFromUndefined } from "../../Common/optionFromUndefined";
 import { GetListQuery } from "../Query";
 import { EventType } from "./EventType";
@@ -30,6 +31,8 @@ export const GetSearchEventsQuery = t.strict(
     emptyGroups: optionFromUndefined(BooleanFromString),
     emptyMedia: optionFromUndefined(BooleanFromString),
     emptyLinks: optionFromUndefined(BooleanFromString),
+    spCount: optionFromUndefined(NumberFromString),
+    onlyUnshared: optionFromUndefined(BooleanFromString)
   },
   "GetEventsQueryFilter",
 );

diff --git a/packages/@liexp/shared/src/io/http/Link.ts b/packages/@liexp/shared/src/io/http/Link.ts
@@ -18,6 +18,7 @@ export const GetListLinkQuery = t.type(
     creator: optionFromNullable(UUID),
     emptyEvents: optionFromNullable(BooleanFromString),
     onlyDeleted: optionFromNullable(BooleanFromString),
+    onlyUnshared: optionFromNullable(BooleanFromString),
   },
   "GetListLinkQuery",
 );
@@ -76,6 +77,7 @@ export const Link = t.strict(
     provider: t.union([UUID, t.undefined]),
     creator: t.union([UUID, t.undefined]),
     events: t.array(UUID),
+    socialPosts: t.array(UUID),
     createdAt: DateFromISOString,
     updatedAt: DateFromISOString,
     deletedAt: t.union([DateFromISOString, t.undefined]),

diff --git a/packages/@liexp/shared/src/io/http/Media.ts b/packages/@liexp/shared/src/io/http/Media.ts
@@ -1,6 +1,7 @@
 import * as t from "io-ts";
 import { BooleanFromString } from "io-ts-types/lib/BooleanFromString";
 import { DateFromISOString } from "io-ts-types/lib/DateFromISOString";
+import { NumberFromString } from 'io-ts-types/lib/NumberFromString';
 import { optionFromNullable } from "io-ts-types/lib/optionFromNullable";
 import { UUID } from "./Common/UUID";
 import { GetListQuery } from "./Query";
@@ -69,6 +70,8 @@ export const GetListMediaQuery = t.type(
     deletedOnly: optionFromNullable(BooleanFromString),
     creator: optionFromNullable(UUID),
     keywords: optionFromNullable(t.array(UUID)),
+    spCount: optionFromNullable(NumberFromString),
+    onlyUnshared: optionFromNullable(BooleanFromString),
   },
   "MediaListQuery",
 );
@@ -102,6 +105,7 @@ export const Media = t.strict(
     type: MediaType,
     creator: t.union([UUID, t.undefined]),
     featuredIn: t.union([t.array(UUID), t.undefined]),
+    socialPosts: t.union([t.array(UUID), t.undefined]),
     createdAt: DateFromISOString,
     updatedAt: DateFromISOString,
     deletedAt: t.union([DateFromISOString, t.undefined]),

diff --git a/packages/@liexp/shared/src/tests/arbitrary/Event.arbitrary.ts b/packages/@liexp/shared/src/tests/arbitrary/Event.arbitrary.ts
@@ -82,6 +82,7 @@ const uncategorizedProps = propsOmit(http.Events.Uncategorized.Uncategorized, [
   "media",
   "links",
   "keywords",
+  "socialPosts",
   "createdAt",
   "updatedAt",
   "deletedAt",
@@ -109,4 +110,5 @@ export const UncategorizedArb: fc.Arbitrary<http.Events.Uncategorized.Uncategori
       groupsMembers: fc.sample(fc.uuid(), 5) as any[],
       endDate: undefined,
     },
+    socialPosts: undefined
   }));
diff --git a/packages/@liexp/shared/src/tests/arbitrary/Link.arbitrary.ts b/packages/@liexp/shared/src/tests/arbitrary/Link.arbitrary.ts
@@ -16,6 +16,7 @@ const linksProps = propsOmit(http.Link.Link, [
   "provider",
   "keywords",
   "events",
+  "socialPosts",
   "createdAt",
   "updatedAt",
   "deletedAt",
@@ -40,6 +41,7 @@ export const LinkArb: tests.fc.Arbitrary<http.Link.Link> = tests
     keywords: [],
     provider: undefined,
     creator: undefined,
+    socialPosts: [],
     createdAt: tests.fc.sample(DateArb, 1)[0],
     updatedAt: tests.fc.sample(DateArb, 1)[0],
     deletedAt: undefined,

diff --git a/packages/@liexp/shared/src/tests/arbitrary/Media.arbitrary.ts b/packages/@liexp/shared/src/tests/arbitrary/Media.arbitrary.ts
@@ -17,6 +17,7 @@ const mediaProps = propsOmit(http.Media.Media, [
   "keywords",
   "areas",
   "featuredIn",
+  "socialPosts"
 ]);
 
 export const placeKitten = (): string => {
@@ -43,6 +44,7 @@ export const MediaArb: tests.fc.Arbitrary<http.Media.Media> = tests
           type: "image/png",
           creator: undefined,
           extra: undefined,
+          socialPosts: undefined,
           location,
           thumbnail,
           id: tests.fc.sample(tests.fc.uuid(), 1)[0] as any,

diff --git a/packages/@liexp/ui/src/components/admin/Modal/ShareModal.tsx b/packages/@liexp/ui/src/components/admin/Modal/ShareModal.tsx
@@ -376,6 +376,7 @@ export const ShareModalContent: React.FC<ShareModalContentProps> = ({
               keywords: [],
               areas: [],
               featuredIn: [],
+              socialPosts: undefined,
               deletedAt: undefined,
               label: m.media,
               description: m.type,

diff --git a/packages/@liexp/ui/src/components/admin/SocialPost/SocialPostFormTabContent.tsx b/packages/@liexp/ui/src/components/admin/SocialPost/SocialPostFormTabContent.tsx
@@ -5,9 +5,9 @@ import { SocialPostDataGrid } from "./SocialPostDatagrid";
 
 export const SocialPostFormTabContent: React.FC<{
   source: string;
-  target: string;
+  target?: string;
   type?: string;
-}> = ({ source, target, type }) => {
+}> = ({ source, target = 'entity', type }) => {
   const record = useRecordContext();
   if (!record) {
     return null;

diff --git a/packages/@liexp/ui/src/components/admin/events/EditEventForm.tsx b/packages/@liexp/ui/src/components/admin/events/EditEventForm.tsx
@@ -48,7 +48,7 @@ export const EditEventForm: React.FC<React.PropsWithChildren<EditProps>> = ({
           <ReferenceLinkTab source="links" />
         </FormTab>
         <FormTab label="SocialPosts">
-          <SocialPostFormTabContent type="events" source="id" target="entity" />
+          <SocialPostFormTabContent type="events" source="id" />
         </FormTab>
         <FormTab label="Flow">
           <LazyFormTabContent tab={5}>

diff --git a/packages/@liexp/ui/src/components/admin/links/AdminLinks.tsx b/packages/@liexp/ui/src/components/admin/links/AdminLinks.tsx
@@ -30,6 +30,7 @@ import {
   type RaRecord,
 } from "react-admin";
 import { Box, Grid, Toolbar } from "../../mui";
+import { SocialPostFormTabContent } from '../SocialPost/SocialPostFormTabContent';
 import { DangerZoneField } from "../common/DangerZoneField";
 import { EditForm } from "../common/EditForm";
 import URLMetadataInput from "../common/URLMetadataInput";
@@ -55,6 +56,7 @@ const linksFilter = [
   // </ReferenceArrayInput>,
   <BooleanInput key="emptyEvents" source="emptyEvents" alwaysOn />,
   <BooleanInput key="onlyDeleted" source="onlyDeleted" alwaysOn />,
+  <BooleanInput key="onlyUnshared" source="onlyUnshared" alwaysOn />,
 ];
 
 export const LinkListActions: React.FC = () => {
@@ -110,6 +112,10 @@ export const LinkDatagrid: React.FC<DatagridProps> = (props) => {
         label="resources.links.fields.events_length"
         render={(r: any | undefined) => r?.events?.length ?? "-"}
       />
+      <FunctionField
+        label="resources.links.fields.social_posts_length"
+        render={(r: any | undefined) => r?.socialPosts?.length ?? "-"}
+      />
       <DateField source="updatedAt" />
       <DateField source="createdAt" />
     </Datagrid>
@@ -270,6 +276,9 @@ export const LinkEdit: React.FC = () => {
             </Datagrid>
           </ReferenceManyField>
         </FormTab>
+        <FormTab label="Social Posts">
+          <SocialPostFormTabContent type='links' source="id" />
+        </FormTab>
       </TabbedForm>
     </EditForm>
   );

diff --git a/packages/@liexp/ui/src/components/admin/media/MediaEdit.tsx b/packages/@liexp/ui/src/components/admin/media/MediaEdit.tsx
@@ -17,7 +17,7 @@ import {
   useRecordContext,
   useRefresh,
   type EditProps,
-  type FieldProps
+  type FieldProps,
 } from "react-admin";
 import { transformMedia } from "../../../client/admin/MediaAPI";
 import { Box, Button, Grid, alpha } from "../../mui";
@@ -180,7 +180,7 @@ export const MediaEdit: React.FC<EditProps> = (props: EditProps) => {
       <TabbedForm
         toolbar={<MediaEditToolbar />}
         style={{
-          background: record?.deletedAt ? alpha("#ff0000", .3) : undefined,
+          background: record?.deletedAt ? alpha("#ff0000", 0.3) : undefined,
         }}
       >
         <FormTab label="general">
@@ -202,12 +202,24 @@ export const MediaEdit: React.FC<EditProps> = (props: EditProps) => {
               <TextInput source="description" fullWidth multiline />
               <Box>
                 <Box>
-                  <DateField label="Updated At" source="updatedAt" showTime={true} />
+                  <DateField
+                    label="Updated At"
+                    source="updatedAt"
+                    showTime={true}
+                  />
                 </Box>
                 <Box>
-                <DateField label="Created At" source="createdAt" showTime={true} />
+                  <DateField
+                    label="Created At"
+                    source="createdAt"
+                    showTime={true}
+                  />
                 </Box>
-                <DateField label="Deleted At" source="deletedAt" showTime={true} />
+                <DateField
+                  label="Deleted At"
+                  source="deletedAt"
+                  showTime={true}
+                />
               </Box>
             </Grid>
           </Grid>
@@ -224,11 +236,7 @@ export const MediaEdit: React.FC<EditProps> = (props: EditProps) => {
           <ReferenceLinkTab source="links" />
         </FormTab>
         <FormTab label="social posts">
-          <SocialPostFormTabContent
-            target="entity"
-            source="id"
-            type={"media"}
-          />
+          <SocialPostFormTabContent type="media" source="id" />
         </FormTab>
       </TabbedForm>
     </EditForm>

diff --git a/packages/@liexp/ui/src/components/admin/media/MediaList.tsx b/packages/@liexp/ui/src/components/admin/media/MediaList.tsx
@@ -13,6 +13,7 @@ import {
   useGetIdentity,
   usePermissions,
   type ListProps,
+  NumberInput,
 } from "react-admin";
 import { Box, Typography, amber } from "../../mui";
 import { toFormattedDuration } from "./DurationField";
@@ -25,6 +26,8 @@ const mediaFilters = [
   <TextInput key="description" source="description" alwaysOn size="small" />,
   <BooleanInput key="emptyEvents" source="emptyEvents" alwaysOn size="small" />,
   <BooleanInput key="emptyLinks" source="emptyLinks" alwaysOn size="small" />,
+  <BooleanInput key="onlyUnshared" source="onlyUnshared" alwaysOn size="small" />,
+  <NumberInput key="spCount" label="Social Post Count" source="spCount" size="small" />,
   <MediaTypeInput key="type" source="type" alwaysOn size="small" />,
   <BooleanInput key="deletedOnly" source="deletedOnly" alwaysOn size="small" />,
 ];
@@ -108,6 +111,12 @@ export const MediaDataGrid: React.FC = () => {
           return r.links.length;
         }}
       />
+      <FunctionField
+        label="social_posts"
+        render={(r: any) => {
+          return r.socialPosts?.length ?? 0;
+        }}
+      />
 
       <DateField source="updatedAt" />
       <DateField source="createdAt" />

diff --git a/packages/@liexp/ui/src/components/admin/stories/AdminStories.tsx b/packages/@liexp/ui/src/components/admin/stories/AdminStories.tsx
@@ -35,6 +35,7 @@ import {
 import { uploadImages } from "../../../client/admin/MediaAPI";
 import { Box, Grid } from "../../mui";
 import ReactPageInput from "../ReactPageInput";
+import { SocialPostFormTabContent } from '../SocialPost/SocialPostFormTabContent';
 import { EditForm } from "../common/EditForm";
 import ReferenceArrayKeywordInput from "../keywords/ReferenceArrayKeywordInput";
 import ReferenceMediaInput from "../media/input/ReferenceMediaInput";
@@ -166,6 +167,9 @@ export const StoryEdit: React.FC<EditProps> = (props) => {
         <FormTab label="Relations">
           <StoryRelationsBox />
         </FormTab>
+        <FormTab label="Social Posts">
+          <SocialPostFormTabContent type="stories" source='id' />
+        </FormTab>
       </TabbedForm>
     </EditForm>
   );

diff --git a/packages/@liexp/ui/src/i18n/en-US.ts b/packages/@liexp/ui/src/i18n/en-US.ts
@@ -40,6 +40,7 @@ export default {
       name: "Link |||| Links",
       fields: {
         events_length: "N of events",
+        social_posts_length: "N of social posts"
       },
       actions: {
         update_metadata: "Update URL Metadata",

diff --git a/packages/@liexp/ui/src/templates/links/LinkTemplateUI.tsx b/packages/@liexp/ui/src/templates/links/LinkTemplateUI.tsx
@@ -40,6 +40,7 @@ export const LinkTemplateUI: React.FC<LinkTemplateUIProps> = ({
                 updatedAt: new Date(),
                 deletedAt: undefined,
                 extra: undefined,
+                socialPosts: undefined,
               }}
               itemStyle={{ maxHeight: 200, minHeight: 200, width: "100%" }}
               disableZoom

diff --git a/services/admin-web/src/pages/AdminEvents.tsx b/services/admin-web/src/pages/AdminEvents.tsx
@@ -32,6 +32,7 @@ import {
   SavedQueriesList,
   TextField,
   type RaRecord as Record,
+  NumberInput,
 } from "@liexp/ui/lib/components/admin/react-admin";
 import {
   Box,
@@ -63,6 +64,8 @@ const eventsFilter = [
     size="small"
   />,
   <BooleanInput key="withDeleted" source="withDeleted" alwaysOn size="small" />,
+  <BooleanInput key="onlyUnshared" source="onlyUnshared" alwaysOn size="small" />,
+  <NumberInput key="spCount" label="Social Post Count" source="spCount" size="small" />,
   <ReferenceArrayGroupInput key="groups" source="groups" size="small" />,
   <ReferenceArrayActorInput key="actors" source="actors" />,
   <ReferenceArrayGroupMemberInput key="groupsMembers" source="groupsMembers" />,
@@ -211,6 +214,7 @@ export const EventList: React.FC = () => (
           return 0;
         }}
       />
+      <FunctionField source="socialPosts" render={(r: any) => r.socialPosts?.length ?? 0} />
       <FunctionField
         label="groupsMembers"
         source="payload"