IDA Madoc Develop

.github/workflows/madoc-ts-docker.yaml

@@ -5,7 +5,7 @@ on:
     branches: ['main']
     tags: ['v*']
   pull_request:
-    branches: ['main', 'feature/v2.1', 'feature/IDA-893-enrichment-integration']
+    branches: ['main', 'feature/v2.1', 'feature/IDA-893-enrichment-integration', 'feature/IDA-madoc-develop']
     paths:
       - ".github/workflows/madoc-ts-docker.yaml"
       - "services/madoc-ts/src/**"

.gitignore

@@ -11,8 +11,8 @@ var_backup
 e2e/cypress/fixtures/madoc-test-fixtures
 services/enrichment
 services/search
-services/enrichment
 services/madoc-remix
 services/madoc-ts/service-jwts/madoc-remix.json
 e2e/test-fixtures/postgres/default/default.sql
 .DS_Store
+/spotlight-model

docker-compose.yml

@@ -205,7 +205,7 @@ services:
         condition: service_healthy
 
   search:
-    image: digirati/madoc-enrichment:qa-deploy
+    image: digirati/madoc-enrichment:latest
 #    build:
 #      context: services/enrichment
 #      dockerfile: Dockerfile
@@ -231,9 +231,11 @@ services:
       - INLINE_WORKER=True
       - GOOGLE_APPLICATION_CREDENTIALS=/app/starsky_google_credentials
       - OCR_ENGINE=Google
+      - DEFAULT_DBPEDIA_URL=http://dbpedia-spotlight/rest
     links:
       - shared-postgres
       - gateway-redis
+      - spotlight.en
 #    volumes:
 #      - ./services/enrichment/app:/app:delegated
     ports:
@@ -243,3 +245,13 @@ services:
     sysctls:
       - net.core.somaxconn=1024
       - net.ipv4.tcp_syncookies=0
+
+  spotlight.en:
+    image: digirati/spotlight-alpine:multi-platform
+    container_name: dbpedia-spotlight
+    volumes:
+      - ./spotlight-model:/opt/spotlight/models
+    restart: unless-stopped
+    ports:
+      - "2222:80"
+    command: spotlight.sh en

services/madoc-ts/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18 as build
+FROM node:18-bullseye as build
 
 WORKDIR /home/node/app
 
@@ -29,7 +29,7 @@ RUN yarn build:vite-scheduler
 RUN yarn build:frontend
 RUN yarn build:vite-server
 
-FROM node:18 as modules
+FROM node:18-bullseye as modules
 
 WORKDIR /home/node/app
 
@@ -39,7 +39,7 @@ COPY --from=build /home/node/app/npm /home/node/app/npm
 
 RUN yarn install --no-interactive --frozen-lockfile --production=true
 
-FROM node:18
+FROM node:18-bullseye
 
 WORKDIR /home/node/app
 

services/madoc-ts/package.json

@@ -36,46 +36,46 @@
   },
   "browserslist": "> 0.25%, not dead",
   "resolutions": {
-    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
+    "@atlas-viewer/atlas": "^2.1.0",
     "@babel/core": "^7.20.12",
-    "@babel/runtime": "7.20.13",
+    "@babel/runtime": "^7.20.13",
     "@babel/generator": "^7.20.14",
     "@babel/types": "7.20.7",
     "@iiif/vocabulary": "1.0.17",
     "@iiif/presentation-3": "^1.1.3",
     "immutable": "3.8.2",
     "react-i18next": "11.18.4",
     "scheduler": "0.19.1",
-    "styled-components": "5.3.3",
+    "styled-components": "^5.3.5",
     "slonik-sql-tag-raw": "1.0.2",
-    "@atlas-viewer/iiif-image-api": "2.0.5",
-    "@iiif/parser": "^1.0.13",
+    "@atlas-viewer/iiif-image-api": "^2.0.5",
+    "@iiif/parser": "1.*",
     "@iiif/vault": "^0.9.19",
-    "@iiif/vault-helpers": "^0.9.8",
+    "@iiif/vault-helpers": "^0.9.11",
     "@types/styled-components": "^5.1.0",
     "deepmerge": "4.2.2",
     "react-dnd": "^11.1.3",
     "react-dnd-multi-backend": "^6.0.2",
     "dnd-multi-backend": "6.0.0",
     "html-entities": "1.4.0",
     "formik": "^2.2.9",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "@types/react": "^17.0.50",
     "@types/react-dom": "^17.0.17",
     "ws": "^8.8.0",
     "popmotion": "^8.7.6",
-    "immer": "^9"
+    "immer": "^9.0.6"
   },
   "dependencies": {
-    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
+    "@atlas-viewer/atlas": "^2.1.0",
     "@atlas-viewer/iiif-image-api": "^2.0.5",
     "@babel/runtime": "^7.20.13",
-    "@iiif/parser": "^1.0.13",
+    "@iiif/parser": "^2.0.2",
     "@iiif/presentation-2": "^1.0.2",
     "@iiif/presentation-3": "^1.1.3",
-    "@iiif/vault": "^0.9.19",
-    "@iiif/vault-helpers": "^0.9.8",
+    "@iiif/vault": "^0.9.22",
+    "@iiif/vault-helpers": "^0.10.0",
     "@koa/router": "^10.1.1",
     "@madoc.io/types": "./npm/madoc-types",
     "@slonik/migrator": "^0.2.0",
@@ -162,7 +162,7 @@
     "react-functional-select": "^3.3.3",
     "react-helmet": "^6.1.0",
     "react-i18next": "^11.18.4",
-    "react-iiif-vault": "https://pkg.csb.dev/digirati-co-uk/react-iiif-vault/commit/548ec37f/react-iiif-vault",
+    "react-iiif-vault": "^1.0.9",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
     "react-query": "^2.26.4",
@@ -320,4 +320,4 @@
       "lib/"
     ]
   }
-}
+}

services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx

@@ -20,6 +20,7 @@ export type TopicExplorerProps = {
   value: {
     slug?: string;
     id?: string;
+    type: string;
   } | null;
 };
 
@@ -34,7 +35,6 @@ export const TopicExplorer: FieldComponent<TopicExplorerProps> = ({ value, updat
       return api.enrichment.entityAutoComplete(topicType, '', page);
     },
     {
-      enabled: !!topicType,
       getFetchMore: lastPage => {
         if (lastPage.pagination.totalPages === lastPage.pagination.page) {
           return undefined;
@@ -69,19 +69,21 @@ export const TopicExplorer: FieldComponent<TopicExplorerProps> = ({ value, updat
           {pages?.map((page, key) => {
             return (
               <React.Fragment key={key}>
-                {page.results.map(item => (
-                  <RoundedCard
-                    key={item.id}
-                    size="small"
-                    interactive
-                    onClick={() => {
-                      updateValue({ slug: item.slug, id: item.id });
-                    }}
-                  >
-                    <LocaleString as={Subheading1}>{item.title}</LocaleString>
-                    <LocaleString as={Subheading3}>{item.label}</LocaleString>
-                  </RoundedCard>
-                ))}
+                {page.results.map(item => {
+                  return (
+                    <RoundedCard
+                      key={item.id}
+                      size="small"
+                      interactive
+                      onClick={() => {
+                        updateValue({ slug: item.slug, id: item.id, type: item.type_slug });
+                      }}
+                    >
+                      <LocaleString as={Subheading1}>{item.title}</LocaleString>
+                      <LocaleString as={Subheading3}>{item.label}</LocaleString>
+                    </RoundedCard>
+                  );
+                })}
               </React.Fragment>
             );
           })}
@@ -98,16 +100,19 @@ export const GetTopic: React.FC<{
   value:
     | {
         slug?: string;
+        type?: string;
         id?: string;
       }
     | string;
 }> = ({ value }) => {
   const { topicType } = useParams<Record<'topicType', any>>();
-
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   const slug = !value.slug && typeof value === 'string' ? value : value.slug;
-  const { data } = useApiTopic(topicType, slug);
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const type = !value.type && typeof value === 'string' ? topicType : value.type;
+  const { data } = useApiTopic(type, slug);
 
   if (data) {
     return <TopicSnippetCard topic={data} cardBorder="black" size={'small'} />;

services/madoc-ts/src/extensions/capture-models/TopicItemExplorer/TopicItemExplorer.tsx

@@ -29,7 +29,7 @@ export const TopicItemExplorer: FieldComponent<TopicItemExplorerProps> = ({ valu
     ['topic-items', {}],
     async (key, _, page?: number) => {
       return api.getSearchQuery(
-        { facets: [{ type: 'entity', group_id: data?.id }], resource_type: 'manifest' } as any,
+        { facets: [{ type: 'entity', group_id: topic }], resource_type: 'manifest' } as any,
         page
       );
     },

services/madoc-ts/src/extensions/enrichment/extension.ts

@@ -148,13 +148,13 @@ export class EnrichmentExtension extends BaseDjangoExtension {
   }
 
   // Entity - List, filtered by chosen Entity Type
-  getEntities(slug: string, page?: number) {
-    return this.api.request<EntitiesListResponse>(`/api/enrichment/entity/${slug}/?page=${page}`);
+  getEntities(slug: string, page?: number, order_by?: string) {
+    return this.api.request<any>(`/api/enrichment/entity/${slug}/?page=${page}&order_by=${order_by}`);
   }
 
   // Entity - Retrieve
   getEntity(entity_type_slug: string, slug: string) {
-    return this.api.request<EntityFull>(`/api/enrichment/entity/${entity_type_slug}/${slug}/`);
+    return this.api.request<any>(`/api/enrichment/entity/${entity_type_slug}/${slug}/`);
   }
 
   // Entity - Upsert
@@ -175,7 +175,7 @@ export class EnrichmentExtension extends BaseDjangoExtension {
   }
 
   // Entity - Autocomplete Search
-  entityAutoComplete(type: string, fullText: string, page = 1) {
+  entityAutoComplete(type?: string, fullText?: string, page = 1) {
     return this.api.request<EntityAutoCompleteResponse>(`/api/enrichment/entity_autocomplete/?${stringify({ page })}`, {
       method: 'POST',
       body: {

services/madoc-ts/src/extensions/enrichment/models.ts

@@ -11,17 +11,13 @@ export const entityTypeModel: CaptureModelShorthand<EntityTypeQuery> = {
       label: 'Featured topic',
       pluralLabel: 'Featured topics',
     },
-    other_data: {
-      allowMultiple: false,
-      label: 'Images',
-      labelledBy: 'id',
-    },
   },
+
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
+  thumbnail: { type: 'madoc-media-explorer', label: 'Thumbnail' },
+  hero: { type: 'madoc-media-explorer', label: 'Hero image' },
   'featured_topics.slug': { type: 'topic-explorer', label: 'featured topics' },
-  'other_data.main_image': { type: 'madoc-media-explorer', label: 'Hero image' },
-  'other_data.thumbnail': { type: 'madoc-media-explorer', label: 'Thumbnail' },
 };
 
 export const entityModel: CaptureModelShorthand<EntityQuery> = {
@@ -51,10 +47,10 @@ export const entityModel: CaptureModelShorthand<EntityQuery> = {
 
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
+  thumbnail: { type: 'madoc-media-explorer', label: 'Thumbnail' },
+  hero: { type: 'madoc-media-explorer', label: 'Hero image' },
   'featured_resources.madoc_id': { type: 'topic-item-explorer', label: 'featured resources' },
   'other_data.topic_summary': { type: 'international-field', label: 'Summary' },
   'other_data.secondary_heading': { type: 'international-field', label: 'Secondary heading' },
   'other_data.aliases': { type: 'international-field', label: 'Aliases', allowMultiple: true },
-  'other_data.main_image': { type: 'madoc-media-explorer', label: 'Hero image' },
-  'other_data.thumbnail': { type: 'madoc-media-explorer', label: 'Thumbnail' },
 };

services/madoc-ts/src/extensions/page-blocks/default-definitions.ts

@@ -11,6 +11,7 @@ import simpleMarkdownBlock from './simple-markdown-block/simple-markdown-block';
 import { EmbedItem } from '../../frontend/site/features/EmbedItem';
 import { SiteLogoNavItem } from '../../frontend/shared/components/SiteLogoNavItem';
 import { DropDownMenu } from '../../frontend/site/features/DropdownMenu';
+import { SingleTopic } from '../../frontend/shared/components/SingleTopic';
 
 export function getDefaultPageBlockDefinitions(): PageBlockDefinition<any, any, any, any>[] {
   return [
@@ -27,5 +28,6 @@ export function getDefaultPageBlockDefinitions(): PageBlockDefinition<any, any,
     // todo remove when plugin is updated
     (DropDownMenu as any)[Symbol.for('slot-model')] as any,
     simpleMarkdownBlock,
+    (SingleTopic as any)[Symbol.for('slot-model')] as any,
   ];
 }

services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.ts → services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.tsx

@@ -1,7 +1,7 @@
 import { captureModelShorthand } from '../../../frontend/shared/capture-models/helpers/capture-model-shorthand';
 import { HTMLPageBlockDefinition } from '../extension';
 
-const definition: HTMLPageBlockDefinition<{ html: string }> = {
+const definition: HTMLPageBlockDefinition<{ html: string; maxWidth?: string }> = {
   label: 'Simple HTML block',
   type: 'simple-html-block',
   renderType: 'html',
@@ -14,6 +14,7 @@ const definition: HTMLPageBlockDefinition<{ html: string }> = {
   defaultData: {
     html: '',
   },
+
   render: data => {
     return data.html;
   },

services/madoc-ts/src/extensions/page-blocks/simple-markdown-block/simple-markdown-block.tsx

@@ -8,6 +8,7 @@ import { ModalFooter } from '../../../frontend/shared/layout/Modal';
 import { blockEditorFor } from '../block-editor-for';
 import { PageBlockEditor, ReactPageBlockDefinition } from '../extension';
 import { StaticMarkdownBlock } from './static-markdown-block';
+import { maxWidth } from '../../../frontend/site/variables/global';
 
 const MarkdownEditorWrapper = styled.div`
   padding: 0.6em 0.6em 0.6em 2em;

services/madoc-ts/src/frontend/admin/pages/topics/tags/ListManifestTags.tsx

@@ -27,8 +27,8 @@ export function ListManifestTags() {
   }>();
   const [selectedId, setSelectedId] = useState<string | undefined>(undefined);
 
-  const onSelect = (id: string | undefined) => {
-    setSelectedId(id);
+  const onSelect = (i: string | undefined) => {
+    setSelectedId(i);
   };
 
   const [createTag, createTagStatus] = useMutation(async (entityId: string) => {