From f6849bd4a2e863963432d5ade43fa2e7070c0e09 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 16 Feb 2024 10:38:02 +0000
Subject: [PATCH 01/55] innit

---
 .github/workflows/madoc-ts-docker.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/madoc-ts-docker.yaml b/.github/workflows/madoc-ts-docker.yaml
index 8416f366b..434e8b424 100644
--- a/.github/workflows/madoc-ts-docker.yaml
+++ b/.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/**"

From c35346775e36a4082d3cf51051db1c2a89585c4d Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 23 Feb 2024 12:13:12 +0000
Subject: [PATCH 02/55] use topic from slug for search

---
 .../site/features/SearchPageResults.tsx        |  1 -
 .../src/frontend/site/hooks/use-search.ts      | 18 +++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
index 75ea8400b..ff80987c7 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
@@ -11,7 +11,6 @@ import { SimpleDropdown } from '../../shared/atoms/SimpleDropdown';
 import { Button, ButtonIcon } from '../../shared/navigation/Button';
 import { GridIcon } from '../../shared/icons/GridIcon';
 import { ListIcon } from '../../shared/icons/ListIcon';
-import useDropdownMenu from 'react-accessible-dropdown-menu-hook';
 
 interface SearchPageResultsProps {
   background?: string;
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 42fb93863..5d11d014c 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -5,17 +5,13 @@ import { apiHooks, paginatedApiHooks } from '../../shared/hooks/use-api-query';
 import { useSiteConfiguration } from '../features/SiteConfigurationContext';
 import { useRouteContext } from './use-route-context';
 import { useSearchQuery } from './use-search-query';
-import { useBreadcrumbs } from '../../shared/components/Breadcrumbs';
 
 function normalizeDotKey(key: string) {
   return key.startsWith('metadata.') ? key.slice('metadata.'.length).toLowerCase() : key.toLowerCase();
 }
 
 export function useSearch() {
-  const { topic } = useBreadcrumbs();
-  const topicId = topic?.id;
-
-  const { projectId, collectionId, manifestId } = useRouteContext();
+  const { projectId, collectionId, manifestId, topic } = useRouteContext();
   const { fulltext, appliedFacets, page, rscType } = useSearchQuery();
   const {
     project: { searchStrategy, claimGranularity, searchOptions },
@@ -24,14 +20,14 @@ export function useSearch() {
   const searchFacetConfig = apiHooks.getSiteSearchFacetConfiguration(() => []);
 
   useEffect(() => {
-    if (topicId) {
-      appliedFacets.push({ k: 'entity', v: topicId, t: 'entity' });
+    if (topic) {
+      appliedFacets.push({ k: 'entity', v: topic, t: 'entity' });
     }
     return;
-  }, [appliedFacets, topicId, topic]);
+  }, [appliedFacets, topic]);
 
   const [facetsToRequest, facetDisplayOrder, facetIdMap] = useMemo(() => {
-    const facets = !topicId && searchFacetConfig.data ? searchFacetConfig.data.facets : [];
+    const facets = !topic && searchFacetConfig.data ? searchFacetConfig.data.facets : [];
     const returnList: string[] = [];
     const idMap: { [id: string]: { config: FacetConfig; keys: string[] } } = {};
     const displayOrder: string[] = [];
@@ -50,7 +46,7 @@ export function useSearch() {
       }
     }
     return [returnList, displayOrder, idMap];
-  }, [searchFacetConfig.data, topicId]);
+  }, [searchFacetConfig.data, topic]);
 
   const topicFacets = appliedFacets.map(facet => {
     return facet.k === 'entity'
@@ -103,7 +99,7 @@ export function useSearch() {
           collectionId ||
           manifestId ||
           projectId ||
-          topicId),
+          topic),
     }
   );
 

From 960fef766ad8b3e1771350e1001ee3f2bdb7840c Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 23 Feb 2024 13:07:38 +0000
Subject: [PATCH 03/55] 0 resources instead of 0

---
 .../src/frontend/shared/components/TopicCard.tsx         | 9 ++++-----
 .../src/frontend/site/features/SearchPageFilters.tsx     | 2 +-
 services/madoc-ts/translations/en/madoc.json             | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx b/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
index 6ce78d0af..70de2d52a 100644
--- a/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
@@ -54,11 +54,10 @@ export const TopicCard: React.FC<{
           {topic.title}
         </LocaleString>
 
-        {topic.tagged_resource_count && (
-          <Subheading3>
-            {topic.tagged_resource_count} {t('Resources')}
-          </Subheading3>
-        )}
+        <Subheading3>
+          {topic.tagged_resource_count || 0} {t('Resources')}
+        </Subheading3>
+
         <Heading5 style={{ padding: 0 }}>{t('PART OF')}</Heading5>
         {topic.type_title.length ? (
           <TypePill as={LocaleString}>{topic.type_title}</TypePill>
diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
index 03856862f..b58ac9e39 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
@@ -113,7 +113,7 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
                       onChange={(e: { target: { checked: any } }) =>
                         e.target.checked
                           ? queueSingleFacet(item.key, item.values, item.type)
-                          : dequeueSingleFacet(item.key, item.values)
+                          : dequeueSingleFacet(item.key, item.values, item.type)
                       }
                     />
                     <SearchFilterLabel htmlFor={itemHash}>
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index e03e3732c..9299e83ee 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -633,6 +633,7 @@
   "Override the hero title": "Override the hero title",
   "Overview": "Overview",
   "PART OF": "PART OF",
+  "PART OFs": "PART OFs",
   "Padding around logo": "Padding around logo",
   "Padding size": "Padding size",
   "Page blocks": "Page blocks",

From 7ab78cd43e04096d86b7ae9a7bc83b4c6905cf6d Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 26 Feb 2024 16:48:53 +0000
Subject: [PATCH 04/55] fix errors when editing and images hasnt changed

---
 .../madoc-ts/src/extensions/enrichment/models.ts |  8 ++++++--
 .../pages/topics/topic-type/edit-topic-type.tsx  | 16 ++++++++++++----
 services/madoc-ts/translations/en/madoc.json     |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/services/madoc-ts/src/extensions/enrichment/models.ts b/services/madoc-ts/src/extensions/enrichment/models.ts
index 1c68a31cb..6bdba9c8a 100644
--- a/services/madoc-ts/src/extensions/enrichment/models.ts
+++ b/services/madoc-ts/src/extensions/enrichment/models.ts
@@ -19,9 +19,13 @@ export const entityTypeModel: CaptureModelShorthand<EntityTypeQuery> = {
   },
   // 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' },
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   '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' },
+  // '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> = {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
index f52ce23cd..0d19eba17 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
@@ -19,8 +19,12 @@ export function EditTopicType() {
   const [createNewEntityType, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    updatedData.other_data.main_image = ParseEntityMedia(updatedData.other_data.main_image);
-    updatedData.other_data.thumbnail = ParseEntityMedia(updatedData.other_data.thumbnail);
+    if (data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
+      updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
+    }
+    if (data.other_data?.main_image?.id !== updatedData.hero.id) {
+      updatedData.hero = ParseEntityMedia(updatedData.hero);
+    }
 
     if (data.topic_count > 0) {
       if (updatedData.featured_topics) {
@@ -41,6 +45,10 @@ export function EditTopicType() {
     const resp = api.enrichment.upsertEntityType({
       id: data.id,
       label: data.label,
+      other_data: {
+        thumbnail: updatedData.thumbnail,
+        main_image: updatedData.hero,
+      },
       ...updatedData,
     });
 
@@ -56,7 +64,7 @@ export function EditTopicType() {
     // dont allow editing featured if not enough to chose from
     // backend automatically picks first 3
     if (data && data.topic_count < 4) {
-      delete copy.featured_topics;
+      delete copy['featured_topics.slug'];
     }
     return copy;
   }, [data]);
@@ -83,7 +91,7 @@ export function EditTopicType() {
       <CustomEditorTypes>
         <EditShorthandCaptureModel
           template={model}
-          data={{ ...data }}
+          data={{ ...data, thumbnail: data.other_data?.thumbnail, hero: data.other_data?.main_image }}
           onSave={async d => {
             await createNewEntityType(d);
           }}
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 9299e83ee..d42bcfe5c 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -1063,6 +1063,7 @@
   "migrate-capture-model-task": "migrate-capture-model-task",
   "not found": "not found",
   "not started": "not started",
+  "other_data": "other_data",
   "paused": "paused",
   "pending": "pending",
   "preview": "preview",

From adcbf32a0ed845e93aa63bd0899c303e0485bf2b Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 26 Feb 2024 17:00:44 +0000
Subject: [PATCH 05/55] admin header use title not label

---
 .../frontend/admin/pages/topics/topic-type/edit-topic-type.tsx  | 2 +-
 .../src/frontend/admin/pages/topics/topic-type/manage-type.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
index 0d19eba17..c59de206d 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
@@ -60,7 +60,7 @@ export function EditTopicType() {
     const copy: any = {
       ...entityTypeModel,
     };
-    delete copy.label;
+    // delete copy.label;
     // dont allow editing featured if not enough to chose from
     // backend automatically picks first 3
     if (data && data.topic_count < 4) {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/manage-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/manage-type.tsx
index 375d6b69d..b69c124fc 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/manage-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/manage-type.tsx
@@ -17,7 +17,7 @@ export function ManageType() {
   const site = useSite();
   const { deleted } = useLocationQuery();
 
-  const label = <LocaleString>{data?.label || { none: ['...'] }}</LocaleString>;
+  const label = <LocaleString>{data?.title || { none: ['...'] }}</LocaleString>;
 
   return (
     <>

From baedd923c62355177df3568edf026dc5ca52cf46 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 26 Feb 2024 17:30:25 +0000
Subject: [PATCH 06/55] reflect same changed on topic editing

---
 .../src/extensions/enrichment/models.ts       | 14 +++--------
 .../topics/topic-type/edit-topic-type.tsx     |  2 +-
 .../admin/pages/topics/topic/edit-topic.tsx   | 25 +++++++++++++++----
 .../admin/pages/topics/topic/manage-topic.tsx |  4 +--
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/services/madoc-ts/src/extensions/enrichment/models.ts b/services/madoc-ts/src/extensions/enrichment/models.ts
index 6bdba9c8a..e7e2b9b5b 100644
--- a/services/madoc-ts/src/extensions/enrichment/models.ts
+++ b/services/madoc-ts/src/extensions/enrichment/models.ts
@@ -11,21 +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' },
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
   '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> = {
@@ -55,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' },
 };
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
index c59de206d..0d19eba17 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
@@ -60,7 +60,7 @@ export function EditTopicType() {
     const copy: any = {
       ...entityTypeModel,
     };
-    // delete copy.label;
+    delete copy.label;
     // dont allow editing featured if not enough to chose from
     // backend automatically picks first 3
     if (data && data.topic_count < 4) {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index 622dee0f1..be91115bd 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -18,8 +18,16 @@ export function EditTopic() {
   const [createNewEntity, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    updatedData.other_data.main_image = ParseEntityMedia(updatedData.other_data.main_image);
-    updatedData.other_data.thumbnail = ParseEntityMedia(updatedData.other_data.thumbnail);
+    console.log(data.other_data);
+
+    if (updatedData.thumbnail.id && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
+      console.log('1');
+      updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
+    }
+    if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
+      console.log('2');
+      updatedData.hero = ParseEntityMedia(updatedData.hero);
+    }
 
     if (updatedData.featured_resources) {
       const ftRes = updatedData.featured_resources;
@@ -34,12 +42,18 @@ export function EditTopic() {
         updatedData.featured_resources = Object.values(ftRes);
       }
     }
-    const resp = api.enrichment.upsertEntity({ id: data.id, ...updatedData });
 
-    await refetch();
+    updatedData.other_data.thumbnail = updatedData.thumbnail;
+    updatedData.other_data.main_image = updatedData.hero;
+    const resp = api.enrichment.upsertEntity({
+      id: data.id,
+      ...updatedData,
+    });
 
+    await refetch();
     return resp;
   });
+
   const model = useMemo(() => {
     const copy: any = {
       ...entityModel,
@@ -54,6 +68,7 @@ export function EditTopic() {
 
     return copy;
   }, [data]);
+
   if (!data) {
     return <div>{t('Loading...')}</div>;
   }
@@ -76,7 +91,7 @@ export function EditTopic() {
       <CustomEditorTypes>
         <EditShorthandCaptureModel
           template={model}
-          data={data}
+          data={{ ...data, thumbnail: data.other_data?.thumbnail, hero: data.other_data?.main_image }}
           onSave={async input => {
             await createNewEntity(input);
           }}
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/manage-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/manage-topic.tsx
index 2a5db0276..80df54d2b 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/manage-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/manage-topic.tsx
@@ -16,8 +16,8 @@ export function ManageTopic() {
   const { data: topicTypeData } = useTopicType();
   const site = useSite();
 
-  const label = <LocaleString>{data?.label || { none: ['...'] }}</LocaleString>;
-  const topicTypeLabel = <LocaleString>{topicTypeData?.label || { none: ['...'] }}</LocaleString>;
+  const label = <LocaleString>{data?.title || { none: ['...'] }}</LocaleString>;
+  const topicTypeLabel = <LocaleString>{topicTypeData?.title || { none: ['...'] }}</LocaleString>;
 
   return (
     <>

From 370ed03b44a22f12d13ab3c1999121f8601cd834 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 26 Feb 2024 17:36:13 +0000
Subject: [PATCH 07/55] fix console log

---
 .../admin/pages/topics/topic-type/edit-topic-type.tsx         | 4 ++--
 .../src/frontend/admin/pages/topics/topic/edit-topic.tsx      | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
index 0d19eba17..1f54d4200 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
@@ -19,10 +19,10 @@ export function EditTopicType() {
   const [createNewEntityType, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    if (data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
+    if (updatedData.thumbnail.id && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
       updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
     }
-    if (data.other_data?.main_image?.id !== updatedData.hero.id) {
+    if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index be91115bd..99b0fe2ee 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -18,14 +18,10 @@ export function EditTopic() {
   const [createNewEntity, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    console.log(data.other_data);
-
     if (updatedData.thumbnail.id && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
-      console.log('1');
       updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
     }
     if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
-      console.log('2');
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 

From fd2ea207dcb191c29daacd1383423d718d157300 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Tue, 27 Feb 2024 12:51:42 +0000
Subject: [PATCH 08/55] update search pages to reflect new designs

---
 .../src/frontend/shared/atoms/SearchBox.tsx   | 19 +++--
 .../shared/components/SearchFilters.tsx       |  2 +-
 .../site/features/SearchPageFilters.tsx       | 40 ++--------
 .../site/features/SearchPageSearch.tsx        | 73 +++++++++++++++++++
 .../src/frontend/site/pages/search.tsx        |  7 +-
 .../src/frontend/site/pages/view-topic.tsx    |  2 +
 services/madoc-ts/translations/en/madoc.json  |  5 ++
 7 files changed, 107 insertions(+), 41 deletions(-)
 create mode 100644 services/madoc-ts/src/frontend/site/features/SearchPageSearch.tsx

diff --git a/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx b/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
index 1748e687f..252e544df 100644
--- a/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
+++ b/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
@@ -1,9 +1,11 @@
 import React, { useState } from 'react';
 import styled, { css } from 'styled-components';
-
 import { InputBorderless } from '../form/Input';
-import { LinkButton } from '../navigation/Button';
-import { SearchIcon } from '../icons/SearchIcon';
+import { Button, LinkButton } from '../navigation/Button';
+import { CloseIcon } from '../icons/CloseIcon';
+import { useTranslation } from 'react-i18next';
+import { Simulate } from 'react-dom/test-utils';
+import submit = Simulate.submit;
 
 const SearchContainer = styled.div<{ $isFocus?: boolean; $isAdmin?: boolean }>`
   padding: 0.2em 0.4em;
@@ -15,6 +17,7 @@ const SearchContainer = styled.div<{ $isFocus?: boolean; $isAdmin?: boolean }>`
   line-height: 1.3em;
   width: 100%;
   max-width: 700px;
+  min-width: 500px;
   box-shadow: none;
   &:focus {
     border-color: #333;
@@ -56,9 +59,10 @@ export const SearchBox: React.FC<{
 }> = ({ isAdmin, onSearch, placeholder = 'Search', large = false, value = '' }) => {
   const [isFocus, setIsFocus] = useState(false);
   const [searchValue, setSearchValue] = useState(value);
+  const { t } = useTranslation();
   return (
     <form
-      style={{ marginRight: '20px' }}
+      style={{ marginRight: '20px', display: 'flex' }}
       onSubmit={ev => {
         ev.preventDefault();
         onSearch(searchValue);
@@ -74,10 +78,13 @@ export const SearchBox: React.FC<{
           onChange={(e: any) => setSearchValue(e.target.value)}
           placeholder={placeholder}
         />
-        <LinkButton>
-          <SearchIcon />
+        <LinkButton onClick={() => setSearchValue('')} style={{ display: 'flex', alignItems: 'center' }}>
+          <CloseIcon style={{ fill: '#333', height: '18px' }} />
         </LinkButton>
       </SearchContainer>
+      <Button $primary type={'submit'}>
+        {t('Search')}
+      </Button>
     </form>
   );
 };
diff --git a/services/madoc-ts/src/frontend/shared/components/SearchFilters.tsx b/services/madoc-ts/src/frontend/shared/components/SearchFilters.tsx
index ba72462d2..fa226fbf2 100644
--- a/services/madoc-ts/src/frontend/shared/components/SearchFilters.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/SearchFilters.tsx
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
 
 export const SearchFilterContainer = styled.div`
   width: 100%;
-  padding-right: 1em;
+  padding-right: 2em;
 `;
 
 export const SearchFilterCheckbox = styled.div`
diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
index b58ac9e39..8b6829bae 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
@@ -9,7 +9,7 @@ import {
   SearchFilterLabel,
   SearchFilterTitle,
 } from '../../shared/components/SearchFilters';
-import { ButtonRow, TinyButton } from '../../shared/navigation/Button';
+import { Button, ButtonRow, TextButton, TinyButton } from '../../shared/navigation/Button';
 import { LocaleString } from '../../shared/components/LocaleString';
 import { useSearchQuery } from '../hooks/use-search-query';
 import { useSearchFacets } from '../hooks/use-search-facets';
@@ -58,39 +58,13 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
     <SearchFilterContainer>
       <SearchFilterTitle>{filterHeader}</SearchFilterTitle>
 
-      <SearchBox onSearch={setFullTextQuery} placeholder="Keywords" value={fulltext} key={fulltext} />
-
-      <DropdownContainer>
-        <Dropdown
-          key={fulltext}
-          placeholder={t('Type')}
-          value={rscType}
-          onChange={val => {
-            setResourceType(val || '');
-          }}
-          options={[
-            {
-              value: '',
-              text: 'All',
-            },
-            {
-              value: 'manifest',
-              text: 'Documents',
-            },
-            {
-              value: 'canvas',
-              text: 'Pages',
-            },
-          ]}
-        />
-      </DropdownContainer>
-      <ButtonRow>
-        <TinyButton disabled={!inQueue} onClick={() => applyAllFacets()}>
-          {t('Apply')}
-        </TinyButton>
-        <TinyButton disabled={!appliedFacets.length} onClick={() => clearAllFacets()}>
+      <ButtonRow $noMargin>
+        <Button $primary disabled={!inQueue} onClick={() => applyAllFacets()}>
+          {t('Apply filters')}
+        </Button>
+        <Button disabled={!appliedFacets.length} onClick={() => clearAllFacets()}>
           {t('Clear')}
-        </TinyButton>
+        </Button>
       </ButtonRow>
 
       {displayFacets?.map(facet => {
diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageSearch.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageSearch.tsx
new file mode 100644
index 000000000..a96c63289
--- /dev/null
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageSearch.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import styled from 'styled-components';
+import { useTranslation } from 'react-i18next';
+import { useSearchQuery } from '../hooks/use-search-query';
+import { useSearchFacets } from '../hooks/use-search-facets';
+import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
+import { SearchBox } from '../../shared/atoms/SearchBox';
+import { Dropdown } from '../../shared/capture-models/editor/atoms/Dropdown';
+
+const SearchBoxContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
+
+const DropdownContainer = styled.div`
+  margin: 1em 1em 1em 0;
+  font-size: 0.9em;
+  font-weight: 400;
+  min-width: 250px;
+
+  & strong {
+    font-size: 0.9em;
+    font-weight: 400;
+  }
+`;
+
+export const SearchPageSearch: React.FC = () => {
+  const { t } = useTranslation();
+  const { fulltext, rscType } = useSearchQuery();
+
+  const { setFullTextQuery, setResourceType } = useSearchFacets();
+
+  return (
+    <SearchBoxContainer>
+      <SearchBox onSearch={setFullTextQuery} placeholder="Keywords" value={fulltext} key={fulltext} />
+
+      <DropdownContainer>
+        <Dropdown
+          key={fulltext}
+          placeholder={t('Type')}
+          value={rscType}
+          onChange={val => {
+            setResourceType(val || '');
+          }}
+          options={[
+            {
+              value: '',
+              text: 'All results',
+            },
+            {
+              value: 'manifest',
+              text: 'Documents',
+            },
+            {
+              value: 'canvas',
+              text: 'Pages',
+            },
+          ]}
+        />
+      </DropdownContainer>
+    </SearchBoxContainer>
+  );
+};
+
+blockEditorFor(SearchPageSearch, {
+  label: 'Search Page Search',
+  type: 'default.SearchPageSearch',
+  anyContext: ['collection', 'manifest', 'canvas', 'project', 'topic', 'topicType'],
+  requiredContext: ['page'],
+  defaultProps: {},
+  editor: {},
+});
diff --git a/services/madoc-ts/src/frontend/site/pages/search.tsx b/services/madoc-ts/src/frontend/site/pages/search.tsx
index 5bd77bb16..f4d764b0d 100644
--- a/services/madoc-ts/src/frontend/site/pages/search.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/search.tsx
@@ -7,6 +7,7 @@ import { SearchPageResults } from '../features/SearchPageResults';
 import { DisplayBreadcrumbs } from '../../shared/components/Breadcrumbs';
 import { SearchHeading } from '../features/SearchPageHeading';
 import { AutoSlotLoader } from '../../shared/page-blocks/auto-slot-loader';
+import { SearchPageSearch } from '../features/SearchPageSearch';
 
 export const Search = () => {
   return (
@@ -27,12 +28,16 @@ export const Search = () => {
         </div>
 
         <div style={{ width: '100%' }}>
+          <Slot name="search-page-top">
+            <SearchPageSearch />
+            <AppliedFacets />
+          </Slot>
+
           <Slot name="search-page-pagination">
             <SearchPagination />
           </Slot>
 
           <Slot name="search-page-results">
-            <AppliedFacets />
             <SearchPageResults />
           </Slot>
 
diff --git a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
index edc9e76a9..2c8b6b5aa 100644
--- a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
@@ -11,6 +11,7 @@ import { TopicActions } from '../features/TopicActions';
 import { TopicAuthorities } from '../features/TopicAuthorities';
 import { TopicHeroImage } from '../features/TopicHeroImage';
 import { SearchPageResults } from '../features/SearchPageResults';
+import { SearchPageSearch } from '../features/SearchPageSearch';
 import { useTopic } from './loaders/topic-loader';
 export const ViewTopic = () => {
   const { data } = useTopic();
@@ -52,6 +53,7 @@ export const ViewTopic = () => {
 
           <div style={{ width: '100%' }}>
             <Slot name="topic-item-results">
+              <SearchPageSearch />
               <AppliedFacets />
               <SearchPageResults />
             </Slot>
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index d42bcfe5c..767fa193b 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -80,6 +80,7 @@
   "Annotations": "Annotations",
   "Appearance of the container": "Appearance of the container",
   "Apply": "Apply",
+  "Apply filters": "Apply filters",
   "Approvals required": "Approvals required",
   "Approve": "Approve",
   "Approve submission": "Approve submission",
@@ -155,6 +156,7 @@
   "Change the background of the deep zoom viewer": "Change the background of the deep zoom viewer",
   "Changes requested on your submission": "Changes requested on your submission",
   "Changes saved": "Changes saved",
+  "Check box color": "Check box color",
   "Checkbox options (value,label one per line)": "Checkbox options (value,label one per line)",
   "Choice": "Choice",
   "Choose": "Choose",
@@ -643,6 +645,7 @@
   "Page {{page}} of {{count}}": "Page {{page}} of {{count}}",
   "Page {{page}} of {{count}}_plural": "Page {{page}} of {{count}}",
   "Pagination Numbered": "Pagination Numbered",
+  "Pagination as Numbered?": "Pagination as Numbered?",
   "Panel alignment": "Panel alignment",
   "Part of this page crashed": "Part of this page crashed",
   "Password": "Password",
@@ -1029,6 +1032,7 @@
   "featured resource": "featured resource",
   "featured resources": "featured resources",
   "featured topics": "featured topics",
+  "filter header": "filter header",
   "generate pdf": "generate pdf",
   "height (px)": "height (px)",
   "help__flat_collection": "This shows all of the collections and manifests in your project. When you add a collection you will see all off the manifests inside of the collection are added to this view. When you remove a collection you will have to also manually remove any manifests you want to remove.",
@@ -1072,6 +1076,7 @@
   "remove": "remove",
   "requiredStatement": "requiredStatement",
   "resources tagged": "resources tagged",
+  "s": "s",
   "search index": "search index",
   "size": "size",
   "slug": "slug",

From 6460c65a3550e48e2d97288ea10fef352a1df495 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Thu, 29 Feb 2024 11:43:55 +0000
Subject: [PATCH 09/55] use title plurals for listing

---
 .../madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index 9c8fba4b1..145b267d2 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -79,7 +79,7 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
           <TypeText style={{ color: props.textColor }}>
             <LocaleString as={Heading3}>{type.label || { en: ['...'] }}</LocaleString>
             <CountText>
-              <span>{type.topic_count}</span> {t('Objects')}
+              <span>{type.topic_count}</span> {type.title}
             </CountText>
             <Button $primary as={Link} to={createLink({ topicType: type.slug })}>
               {t('Go to topic type')}

From 8a5aed8f535b0782d3a895633017d870266c55a1 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Thu, 29 Feb 2024 11:44:44 +0000
Subject: [PATCH 10/55] change CTA text

---
 .../madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index 145b267d2..8e707f20a 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -82,7 +82,7 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
               <span>{type.topic_count}</span> {type.title}
             </CountText>
             <Button $primary as={Link} to={createLink({ topicType: type.slug })}>
-              {t('Go to topic type')}
+              {t('Explore documents by language')}
             </Button>
           </TypeText>
 

From b3d229f7ec2225ab2b5481ac04dec8f010440db1 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Thu, 29 Feb 2024 13:28:33 +0000
Subject: [PATCH 11/55] 2 types in a row

---
 .../frontend/site/features/AllTopicTypeItems.tsx   | 14 +++++++++++---
 .../site/pages/loaders/topic-type-list-loader.tsx  |  4 ++--
 services/madoc-ts/translations/en/madoc.json       |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index 8e707f20a..d37e4e7d3 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -10,6 +10,13 @@ import { useRelativeLinks } from '../hooks/use-relative-links';
 import styled from 'styled-components';
 import { CroppedImage } from '../../shared/atoms/Images';
 
+const ListWrapper = styled.div`
+  padding-top: 1em;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 2em;
+`;
+
 const TypeCard = styled.div`
   display: flex;
   border: 1px solid #002d4b;
@@ -17,6 +24,7 @@ const TypeCard = styled.div`
   margin-bottom: 20px;
   justify-content: space-evenly;
   max-height: 250px;
+  min-width: 45%;
 `;
 
 const TypeText = styled.div`
@@ -73,13 +81,13 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
   const createLink = useRelativeLinks();
 
   return (
-    <div style={{ paddingTop: '1em' }}>
+    <ListWrapper>
       {data?.results.map(type => (
         <TypeCard key={type.id} style={{ borderColor: props.borderColor, background: props.cardBackground }}>
           <TypeText style={{ color: props.textColor }}>
             <LocaleString as={Heading3}>{type.label || { en: ['...'] }}</LocaleString>
             <CountText>
-              <span>{type.topic_count}</span> {type.title}
+              <span>{type.topic_count}</span> <LocaleString>{type.label || { en: ['...'] }}</LocaleString>
             </CountText>
             <Button $primary as={Link} to={createLink({ topicType: type.slug })}>
               {t('Explore documents by language')}
@@ -95,7 +103,7 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
           </TypeImage>
         </TypeCard>
       ))}
-    </div>
+    </ListWrapper>
   );
 }
 
diff --git a/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-list-loader.tsx b/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-list-loader.tsx
index d3baaeace..c742e9772 100644
--- a/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-list-loader.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-list-loader.tsx
@@ -28,8 +28,8 @@ export const TopicTypeListLoader: UniversalComponent<TopicTypeListLoaderType> =
     getKey: (params, query) => {
       return ['site-topic-types-list', { page: Number(query.page) || 1 }];
     },
-    getData: async (key, vars, api) => {
-      return await api.getSiteTopicTypes(vars.page);
+    getData: (key, vars, api) => {
+      return api.getSiteTopicTypes(vars.page);
     },
   }
 );
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 767fa193b..f9f7db07b 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -348,6 +348,7 @@
   "Exit edit": "Exit edit",
   "Exit edit mode": "Exit edit mode",
   "Explore all resources": "Explore all resources",
+  "Explore documents by language": "Explore documents by language",
   "Export": "Export",
   "Extra Nav item display text": "Extra Nav item display text",
   "Extra Nav item slug": "Extra Nav item slug",

From 40bb4cc9a7448f05ef83a4f095277339503b1f59 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:16:49 +0000
Subject: [PATCH 12/55] single topic block

---
 .gitignore                                    |   1 +
 docker-compose.yml                            |  14 +-
 .../TopicExplorer/TopicExplorer.tsx           |  38 ++--
 .../src/extensions/enrichment/extension.ts    |   6 +-
 .../page-blocks/default-definitions.ts        |   2 +
 .../pages/topics/tags/ListManifestTags.tsx    |   4 +-
 .../pages/topics/topic/create-new-topic.tsx   |   2 +-
 .../admin/pages/topics/topic/edit-topic.tsx   |   2 +-
 .../topics/topic/list-topic-resources.tsx     |   2 +-
 .../shared/components/SingleCollection.tsx    |   1 -
 .../shared/components/SingleTopic.tsx         | 203 ++++++++++++++++++
 .../shared/components/TopicSnippet.tsx        |   1 +
 .../frontend/shared/hooks/use-api-topic.ts    |   1 +
 .../frontend/shared/hooks/use-topic-items.ts  |   2 +-
 .../plugins/external/block-config-for.ts      |   4 +-
 .../site/features/AllTopicTypeItems.tsx       |   2 +-
 services/madoc-ts/translations/en/madoc.json  |   4 +
 17 files changed, 259 insertions(+), 30 deletions(-)
 create mode 100644 services/madoc-ts/src/frontend/shared/components/SingleTopic.tsx

diff --git a/.gitignore b/.gitignore
index 5c9bc915e..06687b84c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ services/madoc-remix
 services/madoc-ts/service-jwts/madoc-remix.json
 e2e/test-fixtures/postgres/default/default.sql
 .DS_Store
+/spotlight-model
diff --git a/docker-compose.yml b/docker-compose.yml
index 1dab915e8..873b6662e 100755
--- a/docker-compose.yml
+++ b/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
\ No newline at end of file
diff --git a/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx b/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx
index e33995a43..c55c821b3 100644
--- a/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx
+++ b/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,18 @@ 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' ? value : value.type;
+  const { data } = useApiTopic(type, slug);
 
   if (data) {
     return <TopicSnippetCard topic={data} cardBorder="black" size={'small'} />;
diff --git a/services/madoc-ts/src/extensions/enrichment/extension.ts b/services/madoc-ts/src/extensions/enrichment/extension.ts
index e3e76e1b0..512e99ced 100644
--- a/services/madoc-ts/src/extensions/enrichment/extension.ts
+++ b/services/madoc-ts/src/extensions/enrichment/extension.ts
@@ -149,12 +149,12 @@ 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}`);
+    return this.api.request<any>(`/api/enrichment/entity/${slug}/?page=${page}`);
   }
 
   // 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: {
diff --git a/services/madoc-ts/src/extensions/page-blocks/default-definitions.ts b/services/madoc-ts/src/extensions/page-blocks/default-definitions.ts
index 424dfe98c..6fe84c5ed 100644
--- a/services/madoc-ts/src/extensions/page-blocks/default-definitions.ts
+++ b/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,
   ];
 }
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/tags/ListManifestTags.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/tags/ListManifestTags.tsx
index 6f05118a0..d00f1f3c8 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/tags/ListManifestTags.tsx
+++ b/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) => {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
index 08eda1bf9..725080fd9 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
@@ -94,7 +94,7 @@ export function CreateNewTopic() {
   }
 
   return (
-    <div>
+    <div style={{ paddingBottom: '3em' }}>
       <Heading2>{t('Create new Topic')}</Heading2>
       {status.isError && <ErrorMessage>{t('Error...')}</ErrorMessage>}
       <CustomEditorTypes>
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index 99b0fe2ee..c5341b7ea 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -82,7 +82,7 @@ export function EditTopic() {
   }
 
   return (
-    <div style={{ padding: '1em 0' }}>
+    <div style={{ paddingBottom: '3em' }}>
       {status.isError && <ErrorMessage>{t('Error...')}</ErrorMessage>}
       <CustomEditorTypes>
         <EditShorthandCaptureModel
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-topic-resources.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-topic-resources.tsx
index da72c32a4..e6dc88b07 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-topic-resources.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-topic-resources.tsx
@@ -12,7 +12,7 @@ import { useTranslation } from 'react-i18next';
 import { parseUrn } from '../../../../../utility/parse-urn';
 export function ListTopicResources() {
   const { data: topic } = useTopic();
-  const [{ data, isLoading, latestData }, { query, page }] = useTopicItems(topic?.id);
+  const [{ data, isLoading, latestData }, { query, page }] = useTopicItems(topic?.slug);
   const { t } = useTranslation();
 
   const link = (id: string) => {
diff --git a/services/madoc-ts/src/frontend/shared/components/SingleCollection.tsx b/services/madoc-ts/src/frontend/shared/components/SingleCollection.tsx
index c53c3d75e..fbf82a812 100644
--- a/services/madoc-ts/src/frontend/shared/components/SingleCollection.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/SingleCollection.tsx
@@ -2,7 +2,6 @@ import { InternationalString } from '@iiif/presentation-3';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import styled from 'styled-components';
 import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
 import { CollectionFull } from '../../../types/schemas/collection-full';
 import { useRelativeLinks } from '../../site/hooks/use-relative-links';
diff --git a/services/madoc-ts/src/frontend/shared/components/SingleTopic.tsx b/services/madoc-ts/src/frontend/shared/components/SingleTopic.tsx
new file mode 100644
index 000000000..65d02424b
--- /dev/null
+++ b/services/madoc-ts/src/frontend/shared/components/SingleTopic.tsx
@@ -0,0 +1,203 @@
+import { InternationalString } from '@iiif/presentation-3';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
+import { useRelativeLinks } from '../../site/hooks/use-relative-links';
+import { CroppedImage } from '../atoms/Images';
+import { ImageStrip, ImageStripBox } from '../atoms/ImageStrip';
+import { ObjectContainer } from '../atoms/ObjectContainer';
+import { SnippetLarge } from '../atoms/SnippetLarge';
+import { useAccessibleColor } from '../hooks/use-accessible-color';
+import { Button, ButtonRow } from '../navigation/Button';
+import { MoreContainer, MoreDot, MoreIconContainer, MoreLabel } from '../navigation/MoreButton';
+import { Heading3, Subheading3 } from '../typography/Heading3';
+import { SingleLineHeading5, Subheading5 } from '../typography/Heading5';
+import { HrefLink } from '../utility/href-link';
+import { LocaleString, useCreateLocaleString } from './LocaleString';
+import { Topic } from '../../../types/schemas/topics';
+import { useTopicItems } from '../hooks/use-topic-items';
+import { extractIdFromUrn } from '../../../utility/parse-urn';
+
+interface SingleTopicProps {
+  customButtonLabel?: InternationalString;
+  topic?: { id: string; slug: string; type: string };
+  background?: string;
+  data?: Topic;
+  radius?: string;
+  snippet?: boolean;
+  imageStyle?: string;
+  cardBackground?: string;
+  textColor?: string;
+  cardBorder?: string;
+}
+export function SingleTopic(props: SingleTopicProps) {
+  const { t } = useTranslation();
+  const createLink = useRelativeLinks();
+  const createLocaleString = useCreateLocaleString();
+  const { data, customButtonLabel } = props;
+  const accessibleTextColor = useAccessibleColor(props.background || '#eeeeee');
+  const radius = props.radius ? parseInt(props.radius, 10) : undefined;
+  const [{ data: topicItems, isLoading }] = useTopicItems(props.topic?.slug);
+
+  if (!props.topic || !data || !topicItems) {
+    return null;
+  }
+
+  if (!props.snippet) {
+    return (
+      <ObjectContainer $background={props.background} $color={accessibleTextColor} $radius={radius}>
+        <Heading3>
+          <LocaleString
+            as={Link}
+            to={createLink({
+              topic: data.slug,
+              topicType: data.type_slug,
+            })}
+          >
+            {data.title}
+          </LocaleString>
+        </Heading3>
+        <Subheading3>{t('{{count}} items', { count: data.tagged_resource_count })}</Subheading3>
+        {topicItems.pagination.totalResults === 0 ? null : (
+          <ImageStrip>
+            {topicItems.results.slice(0, 6).map((item: any) => {
+              return (
+                <Link
+                  to={createLink({
+                    topic: data.slug,
+                    topicType: data.type_slug,
+                    canvasId: extractIdFromUrn(item.contexts.find((e: string) => e.includes('canvas'))),
+                    manifestId: extractIdFromUrn(item.contexts.find((e: string) => e.includes('manifest'))),
+                  })}
+                  key={item.id}
+                >
+                  <ImageStripBox
+                    $size="small"
+                    $bgColor={props.cardBackground}
+                    $color={props.textColor}
+                    $border={props.cardBorder}
+                  >
+                    <CroppedImage $size="small" $covered={props.imageStyle === 'covered'}>
+                      {item.madoc_thumbnail ? (
+                        <img alt={createLocaleString(item.label, t('Manifest thumbnail'))} src={item.madoc_thumbnail} />
+                      ) : null}
+                    </CroppedImage>
+                    <LocaleString as={SingleLineHeading5}>{item.label}</LocaleString>
+                    {item.canvasCount && (
+                      <Subheading5>{t('{{count}} images', { count: item.canvasCount })}</Subheading5>
+                    )}
+                  </ImageStripBox>
+                </Link>
+              );
+            })}
+            {topicItems.results.length > 6 ? (
+              <div>
+                <Link
+                  to={createLink({
+                    topic: data.slug,
+                    topicType: data.type_slug,
+                  })}
+                >
+                  <MoreContainer>
+                    <MoreIconContainer>
+                      <MoreDot />
+                      <MoreDot />
+                      <MoreDot />
+                    </MoreIconContainer>
+                    <MoreLabel>
+                      {t('{{count}} more', {
+                        count: topicItems.pagination.totalResults - 6,
+                      })}
+                    </MoreLabel>
+                  </MoreContainer>
+                </Link>
+              </div>
+            ) : null}
+          </ImageStrip>
+        )}
+        <ButtonRow>
+          <Button
+            $primary
+            as={HrefLink}
+            href={createLink({
+              topic: data.slug,
+              topicType: data.type_slug,
+            })}
+          >
+            {customButtonLabel ? <LocaleString>{customButtonLabel}</LocaleString> : t('view topic')}
+          </Button>
+        </ButtonRow>
+      </ObjectContainer>
+    );
+  }
+
+  const thumbnail = data.other_data?.thumbnail?.url
+    ? data.other_data?.thumbnail?.url
+    : data.other_data?.main_image?.url;
+
+  return (
+    <SnippetLarge
+      margin
+      label={<LocaleString>{data.label}</LocaleString>}
+      subtitle={t('topic with {{count}} ', { count: data.tagged_resource_count })}
+      summary={<LocaleString>{data.description}</LocaleString>}
+      linkAs={HrefLink}
+      thumbnail={thumbnail}
+      buttonText={customButtonLabel ? <LocaleString>{customButtonLabel}</LocaleString> : t('view topic')}
+      link={createLink({ topic: data.id })}
+      {...props}
+    />
+  );
+}
+
+// @ts-ignore
+blockEditorFor(SingleTopic, {
+  label: 'Single topic',
+  type: 'SingleTopic',
+  defaultProps: {
+    customButtonLabel: '',
+    topic: null,
+    background: null,
+    radius: null,
+    snippet: false,
+    cardBackground: '',
+    textColor: '',
+    cardBorder: '',
+    imageStyle: 'fit',
+  },
+  hooks: [
+    {
+      name: 'getSiteTopic',
+      creator: props => {
+        return props.topic ? [props.topic.type, props.topic.slug] : undefined;
+      },
+      mapToProps: (props, data) => {
+        return { ...props, data };
+      },
+    },
+  ],
+  editor: {
+    customButtonLabel: { type: 'text-field', label: 'Custom button label' },
+    background: { type: 'color-field', label: 'Background color', defaultValue: '#eeeeee' },
+    radius: { type: 'text-field', label: 'Border radius', defaultValue: '' },
+    topic: {
+      label: 'Topic',
+      type: 'topic-explorer',
+    },
+    snippet: { type: 'checkbox-field', label: 'Layout', inlineLabel: 'Show as snippet' },
+    cardBackground: { label: 'Card background color', type: 'color-field' },
+    textColor: { label: 'Card text color', type: 'color-field' },
+    cardBorder: { label: 'Card border', type: 'color-field' },
+    imageStyle: {
+      label: 'Image Style',
+      type: 'dropdown-field',
+      options: [
+        { value: 'covered', text: 'covered' },
+        { value: 'fit', text: 'fit' },
+      ],
+    },
+  },
+  requiredContext: [],
+  anyContext: [],
+});
diff --git a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
index 2e305238b..46b8c58a1 100644
--- a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
@@ -52,6 +52,7 @@ export const TopicSnippetCard: React.FC<{
   const createLocaleString = useCreateLocaleString();
   const { t } = useTranslation();
 
+  console.log('hello?');
   return (
     <TopicSnippetContainer
       data-is-small={size === 'small'}
diff --git a/services/madoc-ts/src/frontend/shared/hooks/use-api-topic.ts b/services/madoc-ts/src/frontend/shared/hooks/use-api-topic.ts
index 0fd2d82b7..71d7d68cc 100644
--- a/services/madoc-ts/src/frontend/shared/hooks/use-api-topic.ts
+++ b/services/madoc-ts/src/frontend/shared/hooks/use-api-topic.ts
@@ -2,6 +2,7 @@ import { useQuery } from 'react-query';
 import { useApi } from './use-api';
 
 export function useApiTopic(type?: string, slug?: string | null) {
+  console.log('hi', type, slug);
   const api = useApi();
   return useQuery(
     ['api-topic', { type: type, slug: slug }],
diff --git a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
index 07c467928..e5e3de618 100644
--- a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
+++ b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
@@ -8,7 +8,7 @@ export function useTopicItems(slug?: string) {
   const query = { fulltext: fulltext, facets: appliedFacets, page: page };
 
   const resp = usePaginatedQuery(
-    ['topic-items', { id: slug, page }],
+    ['topic-resource-items', { id: slug, page }],
     async () => {
       return api.getSearchQuery(
         {
diff --git a/services/madoc-ts/src/frontend/shared/plugins/external/block-config-for.ts b/services/madoc-ts/src/frontend/shared/plugins/external/block-config-for.ts
index 9608efa3f..cfd05cdd8 100644
--- a/services/madoc-ts/src/frontend/shared/plugins/external/block-config-for.ts
+++ b/services/madoc-ts/src/frontend/shared/plugins/external/block-config-for.ts
@@ -22,7 +22,9 @@ export function blockConfigFor(Component: any, model: any) {
           const query = useQuery(
             [hook.name, args],
             async () => {
-              return (api as any)[hook.name](args) as any;
+              if (typeof args !== 'undefined') {
+                return (api as any)[hook.name](...args) as any;
+              }
             },
             {
               enabled: typeof args !== 'undefined',
diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index d37e4e7d3..8c661a991 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -90,7 +90,7 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
               <span>{type.topic_count}</span> <LocaleString>{type.label || { en: ['...'] }}</LocaleString>
             </CountText>
             <Button $primary as={Link} to={createLink({ topicType: type.slug })}>
-              {t('Explore documents by language')}
+              {t('Explore')}
             </Button>
           </TypeText>
 
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index f9f7db07b..c9fa84f32 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -347,6 +347,7 @@
   "Errored / Rejected": "Errored / Rejected",
   "Exit edit": "Exit edit",
   "Exit edit mode": "Exit edit mode",
+  "Explore": "Explore",
   "Explore all resources": "Explore all resources",
   "Explore documents by language": "Explore documents by language",
   "Export": "Export",
@@ -1091,6 +1092,8 @@
   "to make changes": "to make changes",
   "topic": "topic",
   "topic types": "topic types",
+  "topic with {{count}} ": "topic with {{count}} ",
+  "topic with {{count}} _plural": "topic with {{count}} ",
   "topics": "topics",
   "total topic types": "total topic types",
   "total topics": "total topics",
@@ -1102,6 +1105,7 @@
   "view canvas": "view canvas",
   "view collection": "view collection",
   "view manifest": "view manifest",
+  "view topic": "view topic",
   "waiting": "waiting",
   "waiting for canvases": "waiting for canvases",
   "width (px)": "width (px)",

From 3450589298bd4422db32cd206cce29467824fc04 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:28:35 +0000
Subject: [PATCH 13/55] add opacity option to crowdsourcing banner

---
 .../frontend/shared/components/CrowdSourcingBanner.tsx   | 9 +++++++--
 services/madoc-ts/translations/en/madoc.json             | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx b/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
index 637cec198..1920ea0ae 100644
--- a/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
@@ -9,6 +9,7 @@ export type CrowdSourcingBannerProps = {
   buttonLink?: string;
   buttonLabel?: string;
   height?: number;
+  shadowOpacity: string;
   image: {
     id: string;
     image: string;
@@ -31,8 +32,9 @@ const MastheadMain = styled.div`
   position: relative;
 `;
 
-const MastheadIntro = styled.div<{ $right?: boolean; $height?: string }>`
-  background-color: rgba(51, 51, 51, 0.8);
+const MastheadIntro = styled.div<{ $right?: boolean; $height?: string; $opacity?: string; $width?: string }>`
+  //background-color: rgba(51, 51, 51, 0.8);
+  background-color: ${props => (props.$opacity ? ` rgba(0,0,0, ${props.$opacity});` : 'rgba(51, 51, 51,0.8)')};
   padding: 20px;
   width: 33.3333333333%;
   min-height: ${props => props.$height || '550px'};
@@ -74,6 +76,7 @@ export const CrowdSourcingBanner: React.FC<CrowdSourcingBannerProps> = props =>
       {props.title || props.description || props.buttonLink ? (
         <MastheadMain>
           <MastheadIntro
+            $opacity={props.shadowOpacity}
             $height={props.height ? `${props.height}px` : undefined}
             $right={props.panelAlignment === 'right'}
           >
@@ -102,6 +105,7 @@ blockEditorFor(CrowdSourcingBanner, {
     panelAlignment: 'left',
     buttonLabel: '',
     buttonLink: '',
+    shadowOpacity: '',
   },
   svgIcon: props => (
     <svg width="1em" height="1em" viewBox="0 0 151 84" xmlns="http://www.w3.org/2000/svg" {...props}>
@@ -124,6 +128,7 @@ blockEditorFor(CrowdSourcingBanner, {
         { value: 'right', text: 'Right aligned' },
       ],
     },
+    shadowOpacity: { type: 'text-field', label: 'Shadow opacity', description: 'as decimal eg 0.5 is 50% opacity' },
     image: {
       label: 'Image',
       type: 'madoc-media-explorer',
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index c9fa84f32..9b2cabd37 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -759,6 +759,7 @@
   "Select project": "Select project",
   "Select user": "Select user",
   "Selector is required": "Selector is required",
+  "Shadow opacity": "Shadow opacity",
   "Short expiry time (minutes)": "Short expiry time (minutes)",
   "Show IIIF drag and drop logo": "Show IIIF drag and drop logo",
   "Show all locales": "Show all locales",
@@ -984,6 +985,7 @@
   "alignment": "alignment",
   "alt": "alt",
   "alt text": "alt text",
+  "as decimal eg 0.5 is 50% opacity": "as decimal eg 0.5 is 50% opacity",
   "assigned": "assigned",
   "assigned to": "assigned to",
   "atlas__annotations": "Annotations",

From 72fa027b9f7b957ae6a273aa221b5858ce5f4490 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:33:03 +0000
Subject: [PATCH 14/55] change label to title on item list

---
 .../src/frontend/site/features/AllTopicTypeItems.tsx        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index 8c661a991..ad8682abd 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -39,8 +39,8 @@ const TypeText = styled.div`
     border: 1px solid #002d4b;
     background-color: white;
     color: #002d4b;
-    border-radius: 50px;
-    padding: 1em;
+    border-radius: 20px;
+    padding: 0.8em;
     margin-top: 1em;
 
     &:hover {
@@ -87,7 +87,7 @@ export function AllTopicTypeItems(props: AllTopicTypeItemsProps) {
           <TypeText style={{ color: props.textColor }}>
             <LocaleString as={Heading3}>{type.label || { en: ['...'] }}</LocaleString>
             <CountText>
-              <span>{type.topic_count}</span> <LocaleString>{type.label || { en: ['...'] }}</LocaleString>
+              <span>{type.topic_count}</span> <LocaleString>{type.title || { en: ['...'] }}</LocaleString>
             </CountText>
             <Button $primary as={Link} to={createLink({ topicType: type.slug })}>
               {t('Explore')}

From 68f26d81c6a22a630046f7b640d7da0e33cd8a5a Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:39:43 +0000
Subject: [PATCH 15/55] update docker build

---
 services/madoc-ts/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/madoc-ts/Dockerfile b/services/madoc-ts/Dockerfile
index f4e240e22..7533860e1 100644
--- a/services/madoc-ts/Dockerfile
+++ b/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
 

From 298841382a0e7380ade571a70d2920ac4500de99 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:48:15 +0000
Subject: [PATCH 16/55] update atlas viewer

---
 services/madoc-ts/package.json |  8 ++--
 services/madoc-ts/yarn.lock    | 81 ++++++++++++++++++++++++++++------
 2 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index e3d16438c..e649323e0 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -36,7 +36,7 @@
   },
   "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.0.6",
     "@babel/core": "^7.20.12",
     "@babel/runtime": "7.20.13",
     "@babel/generator": "^7.20.14",
@@ -48,7 +48,7 @@
     "scheduler": "0.19.1",
     "styled-components": "5.3.3",
     "slonik-sql-tag-raw": "1.0.2",
-    "@atlas-viewer/iiif-image-api": "2.0.5",
+    "@atlas-viewer/iiif-image-api": "2.1.1",
     "@iiif/parser": "^1.0.13",
     "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
@@ -68,8 +68,8 @@
     "immer": "^9"
   },
   "dependencies": {
-    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
-    "@atlas-viewer/iiif-image-api": "^2.0.5",
+    "@atlas-viewer/atlas": "^2.0.6",
+    "@atlas-viewer/iiif-image-api": "^2.1.1",
     "@babel/runtime": "^7.20.13",
     "@iiif/parser": "^1.0.13",
     "@iiif/presentation-2": "^1.0.2",
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 75bbe1d9b..88b73efee 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -15,15 +15,17 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@atlas-viewer/atlas@^2.0.0-alpha.19", "@atlas-viewer/atlas@https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas":
-  version "2.0.0-alpha.20"
-  resolved "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas#a813557e7befc31fcff2204f72e6501fa158762b"
+"@atlas-viewer/atlas@^2.0.0-alpha.19", "@atlas-viewer/atlas@^2.0.6":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@atlas-viewer/atlas/-/atlas-2.0.7.tgz#01d7296984cc2ae102bea22577e86b09e35f9756"
+  integrity sha512-vVjvPOb/N+l2psd9gqA7K0mlv10wQ9J+FVKm3sbhe/rDsHFFGBQllbY1uBVGKixtZid10d0accbnknknY58XYQ==
   dependencies:
     "@atlas-viewer/dna" "^0.5.0"
     "@atlas-viewer/iiif-image-api" "^2.0.5"
-    "@iiif/presentation-3" ">=1"
-    "@iiif/vault" "^0.9.18"
-    "@iiif/vault-helpers" "^0.9.7"
+    "@iiif/helpers" "^1.0.3"
+    "@iiif/parser" "2.0.1"
+    "@iiif/presentation-3" ">=2"
+    lru-cache "^7.17.0"
     nanoid "^3.1.9"
     normalize-wheel "^1.0.1"
     react-reconciler "^0.26.2"
@@ -35,10 +37,10 @@
   resolved "https://registry.yarnpkg.com/@atlas-viewer/dna/-/dna-0.5.0.tgz#aab824540b59dc3897e2ba4cdb51a53e47ed3311"
   integrity sha512-vHyMwXoCFq6ymk+wOVIkMphUo+I+wBRoA2tBf1AIUZWJMsk51cBtO2qzOaZQUh/TmrzrqEY5aEAtgBj52LVRUg==
 
-"@atlas-viewer/iiif-image-api@2.*", "@atlas-viewer/iiif-image-api@2.0.5", "@atlas-viewer/iiif-image-api@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.0.5.tgz#ccb38185d4e582471098ded8ea8615118b6ae0bf"
-  integrity sha512-dUqBH2UBYALZ7rVNsCQieuLDyBXNNg0W7GJqjEiVjLKvxVGfaxpQdsqIGL+aianGK1797oT4B57opxLp75ghHw==
+"@atlas-viewer/iiif-image-api@2.*", "@atlas-viewer/iiif-image-api@2.1.1", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.1.1.tgz#da01b09e7d29c21f6524b6f632368f48e8eb9d5a"
+  integrity sha512-g7gleRz0Guxwj/JqtppiqloabUTCew61GBzon+ZZ7mXpnMQ+zMupLaI1jHfGxM1Xy9a1+zMwPuUTXqTFkEyueA==
   dependencies:
     "@iiif/presentation-3" "*"
     node-fetch "^3.2.0"
@@ -2761,6 +2763,20 @@
   dependencies:
     "@types/node" "8.10.52"
 
+"@iiif/helpers@^1.0.3":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@iiif/helpers/-/helpers-1.0.6.tgz#d9b8971d4db27ee7cce5d0e4e71964d055f16928"
+  integrity sha512-sI+6Ed9WBoh66Rk+z2oFY2vSZ2t4VIw3SJWKBFGLQbjeB6gHfsf7mlncXAEtscX1ZCr6S2w+RfcMXu/fOUo5PA==
+  dependencies:
+    "@iiif/presentation-2" "1.0.4"
+    "@iiif/presentation-3" "2.1.3"
+    "@iiif/presentation-3-normalized" "0.9.7"
+    "@types/geojson" "7946.0.13"
+  optionalDependencies:
+    abs-svg-path "^0.1.1"
+    parse-svg-path "^0.1.2"
+    svg-arc-to-cubic-bezier "^3.2.0"
+
 "@iiif/iiif-av-component@^1.1.7":
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/@iiif/iiif-av-component/-/iiif-av-component-1.1.7.tgz#3cc0c73c655129bb238d00041d918753480a70ea"
@@ -2843,7 +2859,7 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13":
+"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13":
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.0.13.tgz#1170f46b687e941b23dbf07f7f5478b6046c2a17"
   integrity sha512-iw2zyBaG/z+jUmgDBJQzbWvLTTfiYORn3owd8qPQWoyY6ttQExacz22cTELDJILJqEMc6G+ZDuitFiAxh2Mo5A==
@@ -2857,19 +2873,31 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
   integrity sha512-iWF6rgAi9ksSwbH/4uJW1/49DOL1wN2mLKovu0qy1GYtCTg42bryAxYtnBsw6LrJZWykTStv7R3DynChfECmnA==
 
+"@iiif/presentation-2@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.4.tgz#1664aee995462fdf66ec8dfbae54fc22b4f79c97"
+  integrity sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==
+
 "@iiif/presentation-2@1.x", "@iiif/presentation-2@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@>=1", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^1.1.3":
+"@iiif/presentation-3-normalized@0.9.7":
+  version "0.9.7"
+  resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
+  integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
+  dependencies:
+    "@iiif/presentation-3" "^2.0.5"
+
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
   integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
   dependencies:
     "@types/geojson" "^7946.0.7"
 
-"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.7", "@iiif/vault-helpers@^0.9.8":
+"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.8":
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.8.tgz#6570073ff73bc5638255fca2f845ae484d7d208d"
   integrity sha512-73rUenQUnrd+WIoJwlcL4X/Q1bEwABdr53IZMB7QukecyvTyYr2TsreEzKU56T/Wx1mSLPISPM4AX520bOe6SA==
@@ -2879,7 +2907,7 @@
   optionalDependencies:
     react-i18next "^11.18.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.18", "@iiif/vault@^0.9.19":
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.19":
   version "0.9.19"
   resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.19.tgz#e5b6c72e18e8a6e5bf882578cd6b113dff3e3e4d"
   integrity sha512-YoRp4waV1mGMOJaaTpzn/YnZKRnHZdbXwCt2LbCA89CZhtlTh6QUhs04KWNrGxrxnk/Wtt67/U4SyZgD10g0NQ==
@@ -5800,6 +5828,11 @@
     "@types/events" "*"
     "@types/node" "*"
 
+"@types/geojson@7946.0.13":
+  version "7946.0.13"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
+  integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
+
 "@types/geojson@^7946.0.7":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
@@ -6998,6 +7031,11 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abs-svg-path@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
+  integrity sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==
+
 accepts@^1.3.5, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -16435,6 +16473,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.17.0:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 luxon@^1.26.0:
   version "1.26.0"
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.26.0.tgz#d3692361fda51473948252061d0f8561df02b578"
@@ -18487,6 +18530,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
+parse-svg-path@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
+  integrity sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==
+
 parse5-htmlparser2-tree-adapter@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
@@ -22590,6 +22638,11 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+svg-arc-to-cubic-bezier@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6"
+  integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==
+
 svgo@^2.2.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"

From 164b049a860123fdc4e1cad60a85fccfb884ec31 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:52:00 +0000
Subject: [PATCH 17/55] update iif vault

---
 services/madoc-ts/package.json |  2 +-
 services/madoc-ts/yarn.lock    | 77 ++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index e649323e0..219f39880 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -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",
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 88b73efee..883f0ae22 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -15,7 +15,7 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@atlas-viewer/atlas@^2.0.0-alpha.19", "@atlas-viewer/atlas@^2.0.6":
+"@atlas-viewer/atlas@>=2.0.6", "@atlas-viewer/atlas@^2.0.6":
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/@atlas-viewer/atlas/-/atlas-2.0.7.tgz#01d7296984cc2ae102bea22577e86b09e35f9756"
   integrity sha512-vVjvPOb/N+l2psd9gqA7K0mlv10wQ9J+FVKm3sbhe/rDsHFFGBQllbY1uBVGKixtZid10d0accbnknknY58XYQ==
@@ -37,7 +37,7 @@
   resolved "https://registry.yarnpkg.com/@atlas-viewer/dna/-/dna-0.5.0.tgz#aab824540b59dc3897e2ba4cdb51a53e47ed3311"
   integrity sha512-vHyMwXoCFq6ymk+wOVIkMphUo+I+wBRoA2tBf1AIUZWJMsk51cBtO2qzOaZQUh/TmrzrqEY5aEAtgBj52LVRUg==
 
-"@atlas-viewer/iiif-image-api@2.*", "@atlas-viewer/iiif-image-api@2.1.1", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
+"@atlas-viewer/iiif-image-api@2.1.1", "@atlas-viewer/iiif-image-api@>=2.1.1", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.1.1.tgz#da01b09e7d29c21f6524b6f632368f48e8eb9d5a"
   integrity sha512-g7gleRz0Guxwj/JqtppiqloabUTCew61GBzon+ZZ7mXpnMQ+zMupLaI1jHfGxM1Xy9a1+zMwPuUTXqTFkEyueA==
@@ -2763,7 +2763,7 @@
   dependencies:
     "@types/node" "8.10.52"
 
-"@iiif/helpers@^1.0.3":
+"@iiif/helpers@>=1.0.6", "@iiif/helpers@^1.0.3":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@iiif/helpers/-/helpers-1.0.6.tgz#d9b8971d4db27ee7cce5d0e4e71964d055f16928"
   integrity sha512-sI+6Ed9WBoh66Rk+z2oFY2vSZ2t4VIw3SJWKBFGLQbjeB6gHfsf7mlncXAEtscX1ZCr6S2w+RfcMXu/fOUo5PA==
@@ -2859,7 +2859,7 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13":
+"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^1.0.13":
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.0.13.tgz#1170f46b687e941b23dbf07f7f5478b6046c2a17"
   integrity sha512-iw2zyBaG/z+jUmgDBJQzbWvLTTfiYORn3owd8qPQWoyY6ttQExacz22cTELDJILJqEMc6G+ZDuitFiAxh2Mo5A==
@@ -2873,7 +2873,7 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
   integrity sha512-iWF6rgAi9ksSwbH/4uJW1/49DOL1wN2mLKovu0qy1GYtCTg42bryAxYtnBsw6LrJZWykTStv7R3DynChfECmnA==
 
-"@iiif/presentation-2@1.0.4":
+"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@>=1.*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.4.tgz#1664aee995462fdf66ec8dfbae54fc22b4f79c97"
   integrity sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==
@@ -2883,21 +2883,21 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3-normalized@0.9.7":
+"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7":
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
   integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
   dependencies:
     "@iiif/presentation-3" "^2.0.5"
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@>=2.1.3", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
   integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
   dependencies:
     "@types/geojson" "^7946.0.7"
 
-"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.8":
+"@iiif/vault-helpers@^0.9.8":
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.8.tgz#6570073ff73bc5638255fca2f845ae484d7d208d"
   integrity sha512-73rUenQUnrd+WIoJwlcL4X/Q1bEwABdr53IZMB7QukecyvTyYr2TsreEzKU56T/Wx1mSLPISPM4AX520bOe6SA==
@@ -2907,7 +2907,7 @@
   optionalDependencies:
     react-i18next "^11.18.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.19":
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@^0.9.19":
   version "0.9.19"
   resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.19.tgz#e5b6c72e18e8a6e5bf882578cd6b113dff3e3e4d"
   integrity sha512-YoRp4waV1mGMOJaaTpzn/YnZKRnHZdbXwCt2LbCA89CZhtlTh6QUhs04KWNrGxrxnk/Wtt67/U4SyZgD10g0NQ==
@@ -16362,6 +16362,11 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -20074,10 +20079,10 @@ react-error-boundary@^2.3.1:
   dependencies:
     "@babel/runtime" "^7.11.2"
 
-react-error-boundary@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
-  integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
+react-error-boundary@^4.0.12:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
+  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -20122,23 +20127,22 @@ react-i18next@11.18.4, react-i18next@^11.18.0, react-i18next@^11.18.4, react-i18
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
 
-"react-iiif-vault@https://pkg.csb.dev/digirati-co-uk/react-iiif-vault/commit/548ec37f/react-iiif-vault":
-  version "0.9.20"
-  resolved "https://pkg.csb.dev/digirati-co-uk/react-iiif-vault/commit/548ec37f/react-iiif-vault#60489220ce1aba6f745ea00253764ee80b077468"
-  dependencies:
-    "@atlas-viewer/atlas" "^2.0.0-alpha.19"
-    "@atlas-viewer/iiif-image-api" "2.*"
-    "@iiif/parser" ">=v1.0.13"
-    "@iiif/presentation-2" "1.*"
-    "@iiif/presentation-3" "^1.1.2"
-    "@iiif/vault" ">=0.9.19"
-    "@iiif/vault-helpers" ">=0.9.7"
+react-iiif-vault@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/react-iiif-vault/-/react-iiif-vault-1.0.9.tgz#50cb3893fc92d05f53794c5d58a3a707cc0255ab"
+  integrity sha512-+mc7i6n9aLGvuhf5Mpx79a8NwD5GDZJpbttlO6M9YL/H42SIpdjyCSIAc2Cc2qjvKhWkBg7EoluKHjKLGSUCVQ==
+  dependencies:
+    "@atlas-viewer/atlas" ">=2.0.6"
+    "@atlas-viewer/iiif-image-api" ">=2.1.1"
+    "@iiif/helpers" ">=1.0.6"
+    "@iiif/parser" ">=2.0.2"
+    "@iiif/presentation-2" ">=1.*"
+    "@iiif/presentation-3" ">=2.1.3"
+    "@iiif/presentation-3-normalized" ">=0.9.7"
     react "^16.10.2 || ^17.0.2 || ^18.2.0"
     react-dom "^16.10.2 || ^17.0.2 || ^18.2.0"
-    react-error-boundary "^3.1.4"
-    redux "^4.2.0"
-    typescript "^4.7.4"
-    use-sync-external-store "^1.2.0"
+    react-error-boundary "^4.0.12"
+    react-lazy-load-image-component "^1.6.0"
 
 react-image@^4.0.1:
   version "4.0.3"
@@ -20180,6 +20184,14 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
+react-lazy-load-image-component@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.0.tgz#f262c2f163052d71011e282031fd60aafa6494ac"
+  integrity sha512-8KFkDTgjh+0+PVbH+cx0AgxLGbdTsxWMnxXzU5HEUztqewk9ufQAu8cstjZhyvtMIPsdMcPZfA0WAa7HtjQbBQ==
+  dependencies:
+    lodash.debounce "^4.0.8"
+    lodash.throttle "^4.1.1"
+
 react-medium-image-zoom@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-3.1.3.tgz#b1470abc5a342d65c23021c01bafa8c731821478"
@@ -20643,7 +20655,7 @@ redux@^4.0.4, redux@^4.0.5:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
-redux@^4.1.2, redux@^4.2.0:
+redux@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
@@ -23482,11 +23494,6 @@ typescript-tuple@^2.2.1:
   dependencies:
     typescript-compare "^0.0.2"
 
-typescript@^4.7.4:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790"
-  integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==
-
 typescript@^4.9.4:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
@@ -23917,7 +23924,7 @@ use-resize-observer@^9.1.0:
   dependencies:
     "@juggle/resize-observer" "^3.3.1"
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==

From 8d948a626cf0cae6a9df8bc296714cc77183759f Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 13:55:51 +0000
Subject: [PATCH 18/55] console log

---
 .../madoc-ts/src/frontend/shared/components/TopicSnippet.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
index 46b8c58a1..2e305238b 100644
--- a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
@@ -52,7 +52,6 @@ export const TopicSnippetCard: React.FC<{
   const createLocaleString = useCreateLocaleString();
   const { t } = useTranslation();
 
-  console.log('hello?');
   return (
     <TopicSnippetContainer
       data-is-small={size === 'small'}

From 326b360947db566d6712f646644aac774743a9ae Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 14:01:05 +0000
Subject: [PATCH 19/55] update more pkg

---
 services/madoc-ts/package.json | 12 ++++++---
 services/madoc-ts/yarn.lock    | 48 +++++++++++++++++++++++-----------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index 219f39880..bb187e1a8 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -43,13 +43,14 @@
     "@babel/types": "7.20.7",
     "@iiif/vocabulary": "1.0.17",
     "@iiif/presentation-3": "^1.1.3",
+    "@iiif/helpers": "^1.0.6",
     "immutable": "3.8.2",
     "react-i18next": "11.18.4",
     "scheduler": "0.19.1",
     "styled-components": "5.3.3",
     "slonik-sql-tag-raw": "1.0.2",
     "@atlas-viewer/iiif-image-api": "2.1.1",
-    "@iiif/parser": "^1.0.13",
+    "@iiif/parser": "^2.0.2",
     "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
     "@types/styled-components": "^5.1.0",
@@ -71,11 +72,14 @@
     "@atlas-viewer/atlas": "^2.0.6",
     "@atlas-viewer/iiif-image-api": "^2.1.1",
     "@babel/runtime": "^7.20.13",
-    "@iiif/parser": "^1.0.13",
-    "@iiif/presentation-2": "^1.0.2",
-    "@iiif/presentation-3": "^1.1.3",
     "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
+    "@iiif/builder": "^2.0.0",
+    "@iiif/parser": "^2.0.2",
+    "@iiif/presentation-2": "^1.0.2",
+    "@iiif/presentation-3": "^2.1.3",
+    "@iiif/presentation-3-normalized": "^0.9.7",
+    "@iiif/helpers": "^1.0.6",
     "@koa/router": "^10.1.1",
     "@madoc.io/types": "./npm/madoc-types",
     "@slonik/migrator": "^0.2.0",
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 883f0ae22..0afac0448 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -2763,7 +2763,17 @@
   dependencies:
     "@types/node" "8.10.52"
 
-"@iiif/helpers@>=1.0.6", "@iiif/helpers@^1.0.3":
+"@iiif/builder@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@iiif/builder/-/builder-2.0.1.tgz#cf20f82c047f6c32292ec485b6e30ef63dedf6a8"
+  integrity sha512-9Wlxi1qn0GfvkFWxlZEuMkFGOKpZtcN/1t1zzYnOMy7OOssBNTQvao7zDZlCmtdimZ4QtQ/MMiC0z+oKI2Ax/Q==
+  dependencies:
+    "@iiif/helpers" "^1.0.5"
+    "@iiif/parser" "^2.0.2"
+    "@iiif/presentation-3" "^2.1.3"
+    "@iiif/presentation-3-normalized" "^0.9.7"
+
+"@iiif/helpers@>=1.0.6", "@iiif/helpers@^1.0.3", "@iiif/helpers@^1.0.5", "@iiif/helpers@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@iiif/helpers/-/helpers-1.0.6.tgz#d9b8971d4db27ee7cce5d0e4e71964d055f16928"
   integrity sha512-sI+6Ed9WBoh66Rk+z2oFY2vSZ2t4VIw3SJWKBFGLQbjeB6gHfsf7mlncXAEtscX1ZCr6S2w+RfcMXu/fOUo5PA==
@@ -2859,21 +2869,22 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^1.0.13":
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.0.13.tgz#1170f46b687e941b23dbf07f7f5478b6046c2a17"
-  integrity sha512-iw2zyBaG/z+jUmgDBJQzbWvLTTfiYORn3owd8qPQWoyY6ttQExacz22cTELDJILJqEMc6G+ZDuitFiAxh2Mo5A==
+"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-2.0.2.tgz#0bd054429d635b197c7875cc45ad173658b7b834"
+  integrity sha512-ffqki1eJVVbWp1A+ulRgiojeCJH8eGyRIrAkyT60tHNXBWfYlkLTadFjFfyHlwWavT5BFI4nZtFTrwQXDtylQA==
   dependencies:
-    "@iiif/presentation-2" "^1.0.2"
-    "@iiif/presentation-3" "^1.1.3"
-    "@types/geojson" "^7946.0.8"
+    "@iiif/presentation-2" "^1.0.4"
+    "@iiif/presentation-3" "^2.1.3"
+    "@iiif/presentation-3-normalized" "^0.9.7"
+    "@types/geojson" "^7946.0.10"
 
 "@iiif/presentation-2@1.*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
   integrity sha512-iWF6rgAi9ksSwbH/4uJW1/49DOL1wN2mLKovu0qy1GYtCTg42bryAxYtnBsw6LrJZWykTStv7R3DynChfECmnA==
 
-"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@>=1.*":
+"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@>=1.*", "@iiif/presentation-2@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.4.tgz#1664aee995462fdf66ec8dfbae54fc22b4f79c97"
   integrity sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==
@@ -2883,7 +2894,7 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7":
+"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7", "@iiif/presentation-3-normalized@^0.9.7":
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
   integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
@@ -2897,6 +2908,13 @@
   dependencies:
     "@types/geojson" "^7946.0.7"
 
+"@iiif/presentation-3@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-2.1.3.tgz#745cf3ec1f8d828b1e3aba88c3f15e6dc8e80710"
+  integrity sha512-0V9LL+UPGknn4vdEJuJnuK0BsOL93dmr4PrdXg9fSE9HUq/2P0jkp4yGJR13f7N9OpmcRsEQjqWqVceWHB8Bow==
+  dependencies:
+    "@types/geojson" "^7946.0.10"
+
 "@iiif/vault-helpers@^0.9.8":
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.8.tgz#6570073ff73bc5638255fca2f845ae484d7d208d"
@@ -5833,16 +5851,16 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
   integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
 
+"@types/geojson@^7946.0.10":
+  version "7946.0.14"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
+  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
+
 "@types/geojson@^7946.0.7":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
-"@types/geojson@^7946.0.8":
-  version "7946.0.8"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
-  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
-
 "@types/glob@*", "@types/glob@^7.1.3":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"

From 631d1ad44bb40146655375486aa28aa710f8edf1 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 14:20:41 +0000
Subject: [PATCH 20/55] revert package.json changes

---
 .gitignore                     |  1 -
 services/madoc-ts/package.json | 22 +++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06687b84c..092a1374f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ 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
diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index bb187e1a8..e3d16438c 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -36,21 +36,20 @@
   },
   "browserslist": "> 0.25%, not dead",
   "resolutions": {
-    "@atlas-viewer/atlas": "^2.0.6",
+    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
     "@babel/core": "^7.20.12",
     "@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",
-    "@iiif/helpers": "^1.0.6",
     "immutable": "3.8.2",
     "react-i18next": "11.18.4",
     "scheduler": "0.19.1",
     "styled-components": "5.3.3",
     "slonik-sql-tag-raw": "1.0.2",
-    "@atlas-viewer/iiif-image-api": "2.1.1",
-    "@iiif/parser": "^2.0.2",
+    "@atlas-viewer/iiif-image-api": "2.0.5",
+    "@iiif/parser": "^1.0.13",
     "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
     "@types/styled-components": "^5.1.0",
@@ -69,17 +68,14 @@
     "immer": "^9"
   },
   "dependencies": {
-    "@atlas-viewer/atlas": "^2.0.6",
-    "@atlas-viewer/iiif-image-api": "^2.1.1",
+    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
+    "@atlas-viewer/iiif-image-api": "^2.0.5",
     "@babel/runtime": "^7.20.13",
+    "@iiif/parser": "^1.0.13",
+    "@iiif/presentation-2": "^1.0.2",
+    "@iiif/presentation-3": "^1.1.3",
     "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
-    "@iiif/builder": "^2.0.0",
-    "@iiif/parser": "^2.0.2",
-    "@iiif/presentation-2": "^1.0.2",
-    "@iiif/presentation-3": "^2.1.3",
-    "@iiif/presentation-3-normalized": "^0.9.7",
-    "@iiif/helpers": "^1.0.6",
     "@koa/router": "^10.1.1",
     "@madoc.io/types": "./npm/madoc-types",
     "@slonik/migrator": "^0.2.0",
@@ -166,7 +162,7 @@
     "react-functional-select": "^3.3.3",
     "react-helmet": "^6.1.0",
     "react-i18next": "^11.18.4",
-    "react-iiif-vault": "^1.0.9",
+    "react-iiif-vault": "https://pkg.csb.dev/digirati-co-uk/react-iiif-vault/commit/548ec37f/react-iiif-vault",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
     "react-query": "^2.26.4",

From 68984f78d210e546b77f775e7ff211c570174504 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 15:26:45 +0000
Subject: [PATCH 21/55] search results not updating on laod sometimes

---
 services/madoc-ts/src/frontend/shared/layout/Surface.tsx | 4 ++--
 services/madoc-ts/src/frontend/site/hooks/use-search.ts  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
index 310863fdc..8359f8bac 100644
--- a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
+++ b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
@@ -61,8 +61,8 @@ const SurfaceStyled = styled.div<{
   font-family: ${props => (props.$font ? `${props.$font}, sans-serif` : 'inherit')};
   text-align: ${props => (props.$textAlign ? props.$textAlign : 'left')};
   margin-bottom: ${parseProp('$marginBottom', '0')};
-  margin-left: ${props => (props.$fullWidth ? '-2em' : '')};
-  margin-right: ${props => (props.$fullWidth ? '-2em' : '')};
+  margin-left: ${props => (props.$fullWidth ? '-3em' : '')};
+  margin-right: ${props => (props.$fullWidth ? '-3em' : '')};
 `;
 
 export type SurfaceProps = {
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 5d11d014c..18c1c6346 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -99,7 +99,9 @@ export function useSearch() {
           collectionId ||
           manifestId ||
           projectId ||
-          topic),
+          !!topic),
+      cacheTime: 1000 * 60 * 60,
+      staleTime: 0,
     }
   );
 
@@ -264,6 +266,6 @@ export function useSearch() {
     }
 
     return displayList;
-  }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData]);
+  }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData, searchFacetConfig.isLoading, searchResults.isLoading]);
   return [searchResults, displayFacets, searchFacetConfig.isLoading || searchResults.isLoading] as const;
 }

From 6e054a4b5e9116b9ab0908ffd0cb80b8c4cecd8f Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 16:36:44 +0000
Subject: [PATCH 22/55] latest version of atlas

---
 services/madoc-ts/package.json                |  28 +--
 .../TopicItemExplorer/TopicItemExplorer.tsx   |   2 +-
 services/madoc-ts/yarn.lock                   | 177 ++++++++++--------
 3 files changed, 112 insertions(+), 95 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index e3d16438c..0d5d01389 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -36,21 +36,22 @@
   },
   "browserslist": "> 0.25%, not dead",
   "resolutions": {
-    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
+    "@atlas-viewer/iiif-image-api": "^2.1.1",
+    "@iiif/presentation-3": ">=1.0.6",
+    "@iiif/vault": "^0.9.18",
+    "@iiif/parser": "1.*",
+    "nanoid": "3.1.25",
+    "@atlas-viewer/atlas": "^2.0.6",
     "@babel/core": "^7.20.12",
     "@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",
     "slonik-sql-tag-raw": "1.0.2",
-    "@atlas-viewer/iiif-image-api": "2.0.5",
-    "@iiif/parser": "^1.0.13",
-    "@iiif/vault": "^0.9.19",
     "@iiif/vault-helpers": "^0.9.8",
     "@types/styled-components": "^5.1.0",
     "deepmerge": "4.2.2",
@@ -68,14 +69,17 @@
     "immer": "^9"
   },
   "dependencies": {
-    "@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
-    "@atlas-viewer/iiif-image-api": "^2.0.5",
+    "@atlas-viewer/atlas": "^2.0.6",
+    "@atlas-viewer/iiif-image-api": "^2.1.1",
+    "@iiif/presentation-2": "^1.0.4",
+    "@iiif/presentation-3": "^1.1.3",
+    "@iiif/vault": "^0.9.22",
+    "@iiif/vault-helpers": "^0.9.11",
+    "@preact/compat": "17.*",
+    "@react-hook/media-query": "^1.1.1",
+    "preact": "^10.*",
     "@babel/runtime": "^7.20.13",
     "@iiif/parser": "^1.0.13",
-    "@iiif/presentation-2": "^1.0.2",
-    "@iiif/presentation-3": "^1.1.3",
-    "@iiif/vault": "^0.9.19",
-    "@iiif/vault-helpers": "^0.9.8",
     "@koa/router": "^10.1.1",
     "@madoc.io/types": "./npm/madoc-types",
     "@slonik/migrator": "^0.2.0",
@@ -162,7 +166,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": "^0.9.21",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
     "react-query": "^2.26.4",
diff --git a/services/madoc-ts/src/extensions/capture-models/TopicItemExplorer/TopicItemExplorer.tsx b/services/madoc-ts/src/extensions/capture-models/TopicItemExplorer/TopicItemExplorer.tsx
index 9e9bdb27a..248a4a39b 100644
--- a/services/madoc-ts/src/extensions/capture-models/TopicItemExplorer/TopicItemExplorer.tsx
+++ b/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
       );
     },
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 0afac0448..6fc64ec81 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -15,7 +15,7 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@atlas-viewer/atlas@>=2.0.6", "@atlas-viewer/atlas@^2.0.6":
+"@atlas-viewer/atlas@^2.0.0-alpha.19", "@atlas-viewer/atlas@^2.0.6":
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/@atlas-viewer/atlas/-/atlas-2.0.7.tgz#01d7296984cc2ae102bea22577e86b09e35f9756"
   integrity sha512-vVjvPOb/N+l2psd9gqA7K0mlv10wQ9J+FVKm3sbhe/rDsHFFGBQllbY1uBVGKixtZid10d0accbnknknY58XYQ==
@@ -37,7 +37,7 @@
   resolved "https://registry.yarnpkg.com/@atlas-viewer/dna/-/dna-0.5.0.tgz#aab824540b59dc3897e2ba4cdb51a53e47ed3311"
   integrity sha512-vHyMwXoCFq6ymk+wOVIkMphUo+I+wBRoA2tBf1AIUZWJMsk51cBtO2qzOaZQUh/TmrzrqEY5aEAtgBj52LVRUg==
 
-"@atlas-viewer/iiif-image-api@2.1.1", "@atlas-viewer/iiif-image-api@>=2.1.1", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
+"@atlas-viewer/iiif-image-api@2.*", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.1.1.tgz#da01b09e7d29c21f6524b6f632368f48e8eb9d5a"
   integrity sha512-g7gleRz0Guxwj/JqtppiqloabUTCew61GBzon+ZZ7mXpnMQ+zMupLaI1jHfGxM1Xy9a1+zMwPuUTXqTFkEyueA==
@@ -2763,17 +2763,7 @@
   dependencies:
     "@types/node" "8.10.52"
 
-"@iiif/builder@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@iiif/builder/-/builder-2.0.1.tgz#cf20f82c047f6c32292ec485b6e30ef63dedf6a8"
-  integrity sha512-9Wlxi1qn0GfvkFWxlZEuMkFGOKpZtcN/1t1zzYnOMy7OOssBNTQvao7zDZlCmtdimZ4QtQ/MMiC0z+oKI2Ax/Q==
-  dependencies:
-    "@iiif/helpers" "^1.0.5"
-    "@iiif/parser" "^2.0.2"
-    "@iiif/presentation-3" "^2.1.3"
-    "@iiif/presentation-3-normalized" "^0.9.7"
-
-"@iiif/helpers@>=1.0.6", "@iiif/helpers@^1.0.3", "@iiif/helpers@^1.0.5", "@iiif/helpers@^1.0.6":
+"@iiif/helpers@^1.0.3":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@iiif/helpers/-/helpers-1.0.6.tgz#d9b8971d4db27ee7cce5d0e4e71964d055f16928"
   integrity sha512-sI+6Ed9WBoh66Rk+z2oFY2vSZ2t4VIw3SJWKBFGLQbjeB6gHfsf7mlncXAEtscX1ZCr6S2w+RfcMXu/fOUo5PA==
@@ -2869,53 +2859,52 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-2.0.2.tgz#0bd054429d635b197c7875cc45ad173658b7b834"
-  integrity sha512-ffqki1eJVVbWp1A+ulRgiojeCJH8eGyRIrAkyT60tHNXBWfYlkLTadFjFfyHlwWavT5BFI4nZtFTrwQXDtylQA==
+"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.1.2.tgz#20bb2b0b74756ee6f35db4e9b0b0b54173ae6b0e"
+  integrity sha512-yjbhSWBB+cWHjAgeWlMYgNydMxDGU1BO3JnmgxCclMcfi59JDsKHMXpgZpCNw+svcirBtIMD2u70KPFinr2pUA==
   dependencies:
     "@iiif/presentation-2" "^1.0.4"
-    "@iiif/presentation-3" "^2.1.3"
-    "@iiif/presentation-3-normalized" "^0.9.7"
-    "@types/geojson" "^7946.0.10"
+    "@iiif/presentation-3" "^1.1.3"
+    "@types/geojson" "^7946.0.8"
 
 "@iiif/presentation-2@1.*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
   integrity sha512-iWF6rgAi9ksSwbH/4uJW1/49DOL1wN2mLKovu0qy1GYtCTg42bryAxYtnBsw6LrJZWykTStv7R3DynChfECmnA==
 
-"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@>=1.*", "@iiif/presentation-2@^1.0.4":
+"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.4.tgz#1664aee995462fdf66ec8dfbae54fc22b4f79c97"
   integrity sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==
 
-"@iiif/presentation-2@1.x", "@iiif/presentation-2@^1.0.2":
+"@iiif/presentation-2@1.x":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7", "@iiif/presentation-3-normalized@^0.9.7":
+"@iiif/presentation-3-normalized@0.9.7":
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
   integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
   dependencies:
     "@iiif/presentation-3" "^2.0.5"
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@>=2.1.3", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
-  integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
-  dependencies:
-    "@types/geojson" "^7946.0.7"
-
-"@iiif/presentation-3@^2.1.3":
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=1.0.6", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^2.0.5":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-2.1.3.tgz#745cf3ec1f8d828b1e3aba88c3f15e6dc8e80710"
   integrity sha512-0V9LL+UPGknn4vdEJuJnuK0BsOL93dmr4PrdXg9fSE9HUq/2P0jkp4yGJR13f7N9OpmcRsEQjqWqVceWHB8Bow==
   dependencies:
     "@types/geojson" "^7946.0.10"
 
-"@iiif/vault-helpers@^0.9.8":
+"@iiif/presentation-3@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
+  integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
+  dependencies:
+    "@types/geojson" "^7946.0.7"
+
+"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.8":
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.8.tgz#6570073ff73bc5638255fca2f845ae484d7d208d"
   integrity sha512-73rUenQUnrd+WIoJwlcL4X/Q1bEwABdr53IZMB7QukecyvTyYr2TsreEzKU56T/Wx1mSLPISPM4AX520bOe6SA==
@@ -2925,14 +2914,27 @@
   optionalDependencies:
     react-i18next "^11.18.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@^0.9.19":
-  version "0.9.19"
-  resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.19.tgz#e5b6c72e18e8a6e5bf882578cd6b113dff3e3e4d"
-  integrity sha512-YoRp4waV1mGMOJaaTpzn/YnZKRnHZdbXwCt2LbCA89CZhtlTh6QUhs04KWNrGxrxnk/Wtt67/U4SyZgD10g0NQ==
+"@iiif/vault-helpers@^0.9.11":
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.11.tgz#43a28e4600d41990997a2225e9272491bddc7d57"
+  integrity sha512-4XuFPvu233mMzfU/mMpAqFY5aCTzwhJ0u7MzPcpN8nSfMwbV5Dyvv0PppjcocvbWMUUXScqerRoB1MAfSFas6w==
   dependencies:
-    "@iiif/parser" "1.*"
+    "@iiif/presentation-2" "1.x"
+    "@iiif/presentation-3" "1.x"
+  optionalDependencies:
+    abs-svg-path "^0.1.0"
+    parse-svg-path "^0.1.0"
+    react-i18next "^11.18.0"
+    svg-arc-to-cubic-bezier "^3.2.0"
+
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.18", "@iiif/vault@^0.9.22":
+  version "0.9.22"
+  resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.22.tgz#299bd3e6df1e4c3ae941d272b298ae65280b69d0"
+  integrity sha512-HaFX1u9TSZha0i/esZR5sZzydZgjZgITeO0JrT1qXm+qSaB1Oc0PRNzatXW48Xa0q3PPYbBB71zCL1/D1i1i1A==
+  dependencies:
+    "@iiif/parser" "^1.1.2"
     "@iiif/presentation-2" "1.*"
-    "@iiif/presentation-3" "1.*"
+    "@iiif/presentation-3" "^1.1.3"
     mitt "^3.0.0"
     node-fetch "^3.1.1"
     redux "^4.1.2"
@@ -3860,6 +3862,11 @@
     style-value-types "^3.1.7"
     tslib "^1.10.0"
 
+"@preact/compat@17.*":
+  version "17.1.2"
+  resolved "https://registry.yarnpkg.com/@preact/compat/-/compat-17.1.2.tgz#928756713b07af6faf7812f6a56840d8ce6fed37"
+  integrity sha512-7pOZN9lMDDRQ+6aWvjwTp483KR8/zOpfS83wmOo3zfuLKdngS8/5RLbsFWzFZMGdYlotAhX980hJ75bjOHTwWg==
+
 "@react-dnd/asap@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651"
@@ -3875,6 +3882,11 @@
   resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
   integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
 
+"@react-hook/media-query@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@react-hook/media-query/-/media-query-1.1.1.tgz#7fc4e52591784a39be924b62b4270ae3e18ec578"
+  integrity sha512-VM14wDOX5CW5Dn6b2lTiMd79BFMTut9AZj2+vIRT3LCKgMCYmdqruTtzDPSnIVDQdtxdPgtOzvU9oK20LopuOw==
+
 "@redux-saga/core@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
@@ -5851,7 +5863,7 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
   integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
 
-"@types/geojson@^7946.0.10":
+"@types/geojson@^7946.0.10", "@types/geojson@^7946.0.8":
   version "7946.0.14"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
   integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
@@ -7049,7 +7061,7 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abs-svg-path@^0.1.1:
+abs-svg-path@^0.1.0, abs-svg-path@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
   integrity sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==
@@ -16380,11 +16392,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.throttle@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
-
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -17587,15 +17594,10 @@ nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nanoid@^3.1.30, nanoid@^3.1.9:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
-
-nanoid@^3.3.1, nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@3.1.25, nanoid@^3.1.30, nanoid@^3.1.9, nanoid@^3.3.1, nanoid@^3.3.4:
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -18553,7 +18555,7 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
-parse-svg-path@^0.1.2:
+parse-svg-path@^0.1.0, parse-svg-path@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
   integrity sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ==
@@ -19294,6 +19296,11 @@ postgres-interval@^3.0.0:
   resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-3.0.0.tgz#baf7a8b3ebab19b7f38f07566c7aab0962f0c86a"
   integrity sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==
 
+preact@^10.*:
+  version "10.19.6"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.6.tgz#66007b67aad4d11899f583df1b0116d94a89b8f5"
+  integrity sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==
+
 prebuild-install@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870"
@@ -20097,10 +20104,10 @@ react-error-boundary@^2.3.1:
   dependencies:
     "@babel/runtime" "^7.11.2"
 
-react-error-boundary@^4.0.12:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
-  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
+react-error-boundary@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
+  integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -20145,22 +20152,24 @@ react-i18next@11.18.4, react-i18next@^11.18.0, react-i18next@^11.18.4, react-i18
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
 
-react-iiif-vault@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/react-iiif-vault/-/react-iiif-vault-1.0.9.tgz#50cb3893fc92d05f53794c5d58a3a707cc0255ab"
-  integrity sha512-+mc7i6n9aLGvuhf5Mpx79a8NwD5GDZJpbttlO6M9YL/H42SIpdjyCSIAc2Cc2qjvKhWkBg7EoluKHjKLGSUCVQ==
-  dependencies:
-    "@atlas-viewer/atlas" ">=2.0.6"
-    "@atlas-viewer/iiif-image-api" ">=2.1.1"
-    "@iiif/helpers" ">=1.0.6"
-    "@iiif/parser" ">=2.0.2"
-    "@iiif/presentation-2" ">=1.*"
-    "@iiif/presentation-3" ">=2.1.3"
-    "@iiif/presentation-3-normalized" ">=0.9.7"
+react-iiif-vault@^0.9.21:
+  version "0.9.21"
+  resolved "https://registry.yarnpkg.com/react-iiif-vault/-/react-iiif-vault-0.9.21.tgz#613526e9d05f84dc5506e154942e71e9e7f389d8"
+  integrity sha512-sYwbUBwTI3lxV5x6SyHszTWnNw44fafZcV5ltwvuF+8cmlOcDLeeoj0B2f3tW+UNkRIaRVjc1xcNOPPixP/mkA==
+  dependencies:
+    "@atlas-viewer/atlas" "^2.0.0-alpha.19"
+    "@atlas-viewer/iiif-image-api" "2.*"
+    "@iiif/parser" ">=v1.0.13"
+    "@iiif/presentation-2" "1.*"
+    "@iiif/presentation-3" "^1.1.2"
+    "@iiif/vault" ">=0.9.19"
+    "@iiif/vault-helpers" ">=0.9.7"
     react "^16.10.2 || ^17.0.2 || ^18.2.0"
     react-dom "^16.10.2 || ^17.0.2 || ^18.2.0"
-    react-error-boundary "^4.0.12"
-    react-lazy-load-image-component "^1.6.0"
+    react-error-boundary "^3.1.4"
+    redux "^4.2.0"
+    typescript "^4.7.4"
+    use-sync-external-store "^1.2.0"
 
 react-image@^4.0.1:
   version "4.0.3"
@@ -20202,14 +20211,6 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-lazy-load-image-component@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.0.tgz#f262c2f163052d71011e282031fd60aafa6494ac"
-  integrity sha512-8KFkDTgjh+0+PVbH+cx0AgxLGbdTsxWMnxXzU5HEUztqewk9ufQAu8cstjZhyvtMIPsdMcPZfA0WAa7HtjQbBQ==
-  dependencies:
-    lodash.debounce "^4.0.8"
-    lodash.throttle "^4.1.1"
-
 react-medium-image-zoom@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-3.1.3.tgz#b1470abc5a342d65c23021c01bafa8c731821478"
@@ -20680,6 +20681,13 @@ redux@^4.1.2:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
+redux@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 refractor@^3.2.0, refractor@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
@@ -23512,6 +23520,11 @@ typescript-tuple@^2.2.1:
   dependencies:
     typescript-compare "^0.0.2"
 
+typescript@^4.7.4:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 typescript@^4.9.4:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
@@ -23942,7 +23955,7 @@ use-resize-observer@^9.1.0:
   dependencies:
     "@juggle/resize-observer" "^3.3.1"
 
-use-sync-external-store@1.2.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==

From 11e0eee68607456d8515fd107f77a979d6500d00 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 16:41:22 +0000
Subject: [PATCH 23/55] updated versions

---
 services/madoc-ts/package.json                | 10 +++---
 .../admin/pages/topics/topic/edit-topic.tsx   |  2 ++
 services/madoc-ts/yarn.lock                   | 35 +++++--------------
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index 0d5d01389..efbbb6c3d 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -36,12 +36,13 @@
   },
   "browserslist": "> 0.25%, not dead",
   "resolutions": {
+    "@atlas-viewer/atlas": "^2.0.6",
     "@atlas-viewer/iiif-image-api": "^2.1.1",
-    "@iiif/presentation-3": ">=1.0.6",
-    "@iiif/vault": "^0.9.18",
-    "@iiif/parser": "1.*",
+    "@iiif/presentation-3": "^1.1.3",
+    "@iiif/vault": "^0.9.22",
+    "@iiif/vault-helpers": "^0.9.11",
+    "@iiif/parser": "^1.0.13",
     "nanoid": "3.1.25",
-    "@atlas-viewer/atlas": "^2.0.6",
     "@babel/core": "^7.20.12",
     "@babel/runtime": "7.20.13",
     "@babel/generator": "^7.20.14",
@@ -52,7 +53,6 @@
     "scheduler": "0.19.1",
     "styled-components": "5.3.3",
     "slonik-sql-tag-raw": "1.0.2",
-    "@iiif/vault-helpers": "^0.9.8",
     "@types/styled-components": "^5.1.0",
     "deepmerge": "4.2.2",
     "react-dnd": "^11.1.3",
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index c5341b7ea..629659334 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -25,6 +25,8 @@ export function EditTopic() {
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 
+    console.log(updatedData);
+
     if (updatedData.featured_resources) {
       const ftRes = updatedData.featured_resources;
       if (Array.isArray(ftRes)) {
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 6fc64ec81..81d7dc1ec 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -2859,7 +2859,7 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
+"@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.1.2.tgz#20bb2b0b74756ee6f35db4e9b0b0b54173ae6b0e"
   integrity sha512-yjbhSWBB+cWHjAgeWlMYgNydMxDGU1BO3JnmgxCclMcfi59JDsKHMXpgZpCNw+svcirBtIMD2u70KPFinr2pUA==
@@ -2890,31 +2890,14 @@
   dependencies:
     "@iiif/presentation-3" "^2.0.5"
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=1.0.6", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^2.0.5":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-2.1.3.tgz#745cf3ec1f8d828b1e3aba88c3f15e6dc8e80710"
-  integrity sha512-0V9LL+UPGknn4vdEJuJnuK0BsOL93dmr4PrdXg9fSE9HUq/2P0jkp4yGJR13f7N9OpmcRsEQjqWqVceWHB8Bow==
-  dependencies:
-    "@types/geojson" "^7946.0.10"
-
-"@iiif/presentation-3@^1.1.3":
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
   integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
   dependencies:
     "@types/geojson" "^7946.0.7"
 
-"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.8":
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.8.tgz#6570073ff73bc5638255fca2f845ae484d7d208d"
-  integrity sha512-73rUenQUnrd+WIoJwlcL4X/Q1bEwABdr53IZMB7QukecyvTyYr2TsreEzKU56T/Wx1mSLPISPM4AX520bOe6SA==
-  dependencies:
-    "@iiif/presentation-2" "1.x"
-    "@iiif/presentation-3" "1.x"
-  optionalDependencies:
-    react-i18next "^11.18.0"
-
-"@iiif/vault-helpers@^0.9.11":
+"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.11":
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.11.tgz#43a28e4600d41990997a2225e9272491bddc7d57"
   integrity sha512-4XuFPvu233mMzfU/mMpAqFY5aCTzwhJ0u7MzPcpN8nSfMwbV5Dyvv0PppjcocvbWMUUXScqerRoB1MAfSFas6w==
@@ -2927,7 +2910,7 @@
     react-i18next "^11.18.0"
     svg-arc-to-cubic-bezier "^3.2.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.18", "@iiif/vault@^0.9.22":
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.22":
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.22.tgz#299bd3e6df1e4c3ae941d272b298ae65280b69d0"
   integrity sha512-HaFX1u9TSZha0i/esZR5sZzydZgjZgITeO0JrT1qXm+qSaB1Oc0PRNzatXW48Xa0q3PPYbBB71zCL1/D1i1i1A==
@@ -5863,16 +5846,16 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
   integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
 
-"@types/geojson@^7946.0.10", "@types/geojson@^7946.0.8":
-  version "7946.0.14"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
-  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
-
 "@types/geojson@^7946.0.7":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/geojson@^7946.0.8":
+  version "7946.0.14"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
+  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
+
 "@types/glob@*", "@types/glob@^7.1.3":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"

From ebe94841bd09217b43708a4170f3072a9eff7aee Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 1 Mar 2024 17:03:11 +0000
Subject: [PATCH 24/55] fix error when editing topic

---
 .../src/frontend/admin/pages/topics/topic/edit-topic.tsx      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index 629659334..1f92694f9 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -18,15 +18,13 @@ export function EditTopic() {
   const [createNewEntity, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    if (updatedData.thumbnail.id && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
+    if (updatedData.thumbnail && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
       updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
     }
     if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 
-    console.log(updatedData);
-
     if (updatedData.featured_resources) {
       const ftRes = updatedData.featured_resources;
       if (Array.isArray(ftRes)) {

From 41fbf7f26dbbf208df76e90b0a43ad610d7b8197 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 10:13:34 +0000
Subject: [PATCH 25/55] get correct dependancies and resolutions for atlas and
 pass tests

---
 services/madoc-ts/package.json                |  42 ++---
 .../src/extensions/enrichment/extension.ts    |   2 +-
 services/madoc-ts/yarn.lock                   | 166 ++++++++----------
 3 files changed, 91 insertions(+), 119 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index efbbb6c3d..2373e19a8 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -36,23 +36,22 @@
   },
   "browserslist": "> 0.25%, not dead",
   "resolutions": {
-    "@atlas-viewer/atlas": "^2.0.6",
-    "@atlas-viewer/iiif-image-api": "^2.1.1",
-    "@iiif/presentation-3": "^1.1.3",
-    "@iiif/vault": "^0.9.22",
-    "@iiif/vault-helpers": "^0.9.11",
-    "@iiif/parser": "^1.0.13",
-    "nanoid": "3.1.25",
+    "@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",
+    "@iiif/vault": "^0.9.19",
+    "@iiif/vault-helpers": "^0.9.8",
     "@types/styled-components": "^5.1.0",
     "deepmerge": "4.2.2",
     "react-dnd": "^11.1.3",
@@ -60,26 +59,23 @@
     "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": "^2.0.6",
-    "@atlas-viewer/iiif-image-api": "^2.1.1",
-    "@iiif/presentation-2": "^1.0.4",
-    "@iiif/presentation-3": "^1.1.3",
-    "@iiif/vault": "^0.9.22",
-    "@iiif/vault-helpers": "^0.9.11",
-    "@preact/compat": "17.*",
-    "@react-hook/media-query": "^1.1.1",
-    "preact": "^10.*",
+    "@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/presentation-2": "^1.0.2",
+    "@iiif/presentation-3": "^1.1.3",
+    "@iiif/vault": "^0.9.19",
+    "@iiif/vault-helpers": "^0.9.8",
     "@koa/router": "^10.1.1",
     "@madoc.io/types": "./npm/madoc-types",
     "@slonik/migrator": "^0.2.0",
@@ -166,7 +162,7 @@
     "react-functional-select": "^3.3.3",
     "react-helmet": "^6.1.0",
     "react-i18next": "^11.18.4",
-    "react-iiif-vault": "^0.9.21",
+    "react-iiif-vault": "^1.0.9",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
     "react-query": "^2.26.4",
@@ -324,4 +320,4 @@
       "lib/"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/services/madoc-ts/src/extensions/enrichment/extension.ts b/services/madoc-ts/src/extensions/enrichment/extension.ts
index 512e99ced..dd12f82d4 100644
--- a/services/madoc-ts/src/extensions/enrichment/extension.ts
+++ b/services/madoc-ts/src/extensions/enrichment/extension.ts
@@ -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: {
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 81d7dc1ec..ec9c07541 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -15,10 +15,10 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@atlas-viewer/atlas@^2.0.0-alpha.19", "@atlas-viewer/atlas@^2.0.6":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@atlas-viewer/atlas/-/atlas-2.0.7.tgz#01d7296984cc2ae102bea22577e86b09e35f9756"
-  integrity sha512-vVjvPOb/N+l2psd9gqA7K0mlv10wQ9J+FVKm3sbhe/rDsHFFGBQllbY1uBVGKixtZid10d0accbnknknY58XYQ==
+"@atlas-viewer/atlas@>=2.0.6", "@atlas-viewer/atlas@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@atlas-viewer/atlas/-/atlas-2.1.0.tgz#37b3274750dcdcccc4026bf3aecb56e84291b36e"
+  integrity sha512-ZOQiFnB/jOUiHDA4BEHBizMc48Z1QxjY8fi1TkMGyJmCxoWpmNWh9u4/AKh4dY+uIp+V6h+/wc4rCC6DyLu9PQ==
   dependencies:
     "@atlas-viewer/dna" "^0.5.0"
     "@atlas-viewer/iiif-image-api" "^2.0.5"
@@ -28,7 +28,7 @@
     lru-cache "^7.17.0"
     nanoid "^3.1.9"
     normalize-wheel "^1.0.1"
-    react-reconciler "^0.26.2"
+    react-reconciler "^0.29.0"
     react-use-measure "^2.0.1"
     scheduler "^0.21.0"
 
@@ -37,10 +37,10 @@
   resolved "https://registry.yarnpkg.com/@atlas-viewer/dna/-/dna-0.5.0.tgz#aab824540b59dc3897e2ba4cdb51a53e47ed3311"
   integrity sha512-vHyMwXoCFq6ymk+wOVIkMphUo+I+wBRoA2tBf1AIUZWJMsk51cBtO2qzOaZQUh/TmrzrqEY5aEAtgBj52LVRUg==
 
-"@atlas-viewer/iiif-image-api@2.*", "@atlas-viewer/iiif-image-api@^2.0.5", "@atlas-viewer/iiif-image-api@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.1.1.tgz#da01b09e7d29c21f6524b6f632368f48e8eb9d5a"
-  integrity sha512-g7gleRz0Guxwj/JqtppiqloabUTCew61GBzon+ZZ7mXpnMQ+zMupLaI1jHfGxM1Xy9a1+zMwPuUTXqTFkEyueA==
+"@atlas-viewer/iiif-image-api@>=2.1.1", "@atlas-viewer/iiif-image-api@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@atlas-viewer/iiif-image-api/-/iiif-image-api-2.0.5.tgz#ccb38185d4e582471098ded8ea8615118b6ae0bf"
+  integrity sha512-dUqBH2UBYALZ7rVNsCQieuLDyBXNNg0W7GJqjEiVjLKvxVGfaxpQdsqIGL+aianGK1797oT4B57opxLp75ghHw==
   dependencies:
     "@iiif/presentation-3" "*"
     node-fetch "^3.2.0"
@@ -2320,7 +2320,7 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime@7.20.13", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.20.13"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
   integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
@@ -2565,7 +2565,7 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@emotion/is-prop-valid@^0.8.2", "@emotion/is-prop-valid@^0.8.7", "@emotion/is-prop-valid@^0.8.8":
+"@emotion/is-prop-valid@^0.8.2", "@emotion/is-prop-valid@^0.8.7":
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
   integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
@@ -2763,7 +2763,7 @@
   dependencies:
     "@types/node" "8.10.52"
 
-"@iiif/helpers@^1.0.3":
+"@iiif/helpers@>=1.0.6", "@iiif/helpers@^1.0.3":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@iiif/helpers/-/helpers-1.0.6.tgz#d9b8971d4db27ee7cce5d0e4e71964d055f16928"
   integrity sha512-sI+6Ed9WBoh66Rk+z2oFY2vSZ2t4VIw3SJWKBFGLQbjeB6gHfsf7mlncXAEtscX1ZCr6S2w+RfcMXu/fOUo5PA==
@@ -2859,7 +2859,7 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=v1.0.13", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
+"@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.1.2.tgz#20bb2b0b74756ee6f35db4e9b0b0b54173ae6b0e"
   integrity sha512-yjbhSWBB+cWHjAgeWlMYgNydMxDGU1BO3JnmgxCclMcfi59JDsKHMXpgZpCNw+svcirBtIMD2u70KPFinr2pUA==
@@ -2873,7 +2873,7 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
   integrity sha512-iWF6rgAi9ksSwbH/4uJW1/49DOL1wN2mLKovu0qy1GYtCTg42bryAxYtnBsw6LrJZWykTStv7R3DynChfECmnA==
 
-"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@^1.0.4":
+"@iiif/presentation-2@1.0.4", "@iiif/presentation-2@>=1.*", "@iiif/presentation-2@^1.0.2", "@iiif/presentation-2@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.4.tgz#1664aee995462fdf66ec8dfbae54fc22b4f79c97"
   integrity sha512-hJakpq62VBajesLJrYPtFm6hcn6c/HkKP7CmKZ5atuzu40m0nifWYsqigR1l9sZGvhhHb/DRshPmiW/0GNrJoA==
@@ -2883,21 +2883,21 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3-normalized@0.9.7":
+"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7":
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
   integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
   dependencies:
     "@iiif/presentation-3" "^2.0.5"
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@^1.1.2", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@>=2.1.3", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
   integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
   dependencies:
     "@types/geojson" "^7946.0.7"
 
-"@iiif/vault-helpers@>=0.9.7", "@iiif/vault-helpers@^0.9.11":
+"@iiif/vault-helpers@^0.9.8":
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.11.tgz#43a28e4600d41990997a2225e9272491bddc7d57"
   integrity sha512-4XuFPvu233mMzfU/mMpAqFY5aCTzwhJ0u7MzPcpN8nSfMwbV5Dyvv0PppjcocvbWMUUXScqerRoB1MAfSFas6w==
@@ -2910,7 +2910,7 @@
     react-i18next "^11.18.0"
     svg-arc-to-cubic-bezier "^3.2.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@>=0.9.19", "@iiif/vault@^0.9.22":
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@^0.9.19":
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.22.tgz#299bd3e6df1e4c3ae941d272b298ae65280b69d0"
   integrity sha512-HaFX1u9TSZha0i/esZR5sZzydZgjZgITeO0JrT1qXm+qSaB1Oc0PRNzatXW48Xa0q3PPYbBB71zCL1/D1i1i1A==
@@ -3845,11 +3845,6 @@
     style-value-types "^3.1.7"
     tslib "^1.10.0"
 
-"@preact/compat@17.*":
-  version "17.1.2"
-  resolved "https://registry.yarnpkg.com/@preact/compat/-/compat-17.1.2.tgz#928756713b07af6faf7812f6a56840d8ce6fed37"
-  integrity sha512-7pOZN9lMDDRQ+6aWvjwTp483KR8/zOpfS83wmOo3zfuLKdngS8/5RLbsFWzFZMGdYlotAhX980hJ75bjOHTwWg==
-
 "@react-dnd/asap@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651"
@@ -3865,11 +3860,6 @@
   resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
   integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
 
-"@react-hook/media-query@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@react-hook/media-query/-/media-query-1.1.1.tgz#7fc4e52591784a39be924b62b4270ae3e18ec578"
-  integrity sha512-VM14wDOX5CW5Dn6b2lTiMd79BFMTut9AZj2+vIRT3LCKgMCYmdqruTtzDPSnIVDQdtxdPgtOzvU9oK20LopuOw==
-
 "@redux-saga/core@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
@@ -5846,12 +5836,7 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
   integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
 
-"@types/geojson@^7946.0.7":
-  version "7946.0.7"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
-  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
-
-"@types/geojson@^7946.0.8":
+"@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8":
   version "7946.0.14"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
   integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
@@ -13654,7 +13639,7 @@ immer-peasy@3.1.3:
   resolved "https://registry.yarnpkg.com/immer-peasy/-/immer-peasy-3.1.3.tgz#d0ea8d388f47ec6b15ab2ca19ffb9f0bf4310110"
   integrity sha512-WzoZ96A93jOmcDOLNChMWAqy+ZU8vEYQx2DcKjgo7P5SToiJs+GL+5yQbWzH8X02Lhvv6xrGgVNa1xbki66Eow==
 
-immer@^9, immer@^9.0.6:
+immer@^9.0.6:
   version "9.0.6"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
   integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ==
@@ -13667,7 +13652,7 @@ immutability-helper@^3.0.1:
 immutable@3.8.2, immutable@^3.8.1, immutable@~3.7.4:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
 
 import-fresh@^3.0.0, import-fresh@^3.1.0:
   version "3.2.1"
@@ -16375,6 +16360,11 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
+lodash.throttle@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
+
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -17577,7 +17567,12 @@ nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nanoid@3.1.25, nanoid@^3.1.30, nanoid@^3.1.9, nanoid@^3.3.1, nanoid@^3.3.4:
+nanoid@^3.1.30, nanoid@^3.3.1, nanoid@^3.3.4:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+
+nanoid@^3.1.9:
   version "3.1.25"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
   integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
@@ -19279,11 +19274,6 @@ postgres-interval@^3.0.0:
   resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-3.0.0.tgz#baf7a8b3ebab19b7f38f07566c7aab0962f0c86a"
   integrity sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==
 
-preact@^10.*:
-  version "10.19.6"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.6.tgz#66007b67aad4d11899f583df1b0116d94a89b8f5"
-  integrity sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==
-
 prebuild-install@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870"
@@ -20045,7 +20035,7 @@ react-docgen@6.0.0-alpha.3:
     resolve "^1.17.0"
     strip-indent "^3.0.0"
 
-react-dom@17.0.2, react-dom@^16.10.2, "react-dom@^16.10.2 || ^17.0.2 || ^18.2.0", react-dom@^17.0.2:
+react-dom@^16.10.2, "react-dom@^16.10.2 || ^17.0.2 || ^18.2.0", react-dom@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
   integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
@@ -20087,10 +20077,10 @@ react-error-boundary@^2.3.1:
   dependencies:
     "@babel/runtime" "^7.11.2"
 
-react-error-boundary@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
-  integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
+react-error-boundary@^4.0.12:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
+  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -20135,24 +20125,22 @@ react-i18next@11.18.4, react-i18next@^11.18.0, react-i18next@^11.18.4, react-i18
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
 
-react-iiif-vault@^0.9.21:
-  version "0.9.21"
-  resolved "https://registry.yarnpkg.com/react-iiif-vault/-/react-iiif-vault-0.9.21.tgz#613526e9d05f84dc5506e154942e71e9e7f389d8"
-  integrity sha512-sYwbUBwTI3lxV5x6SyHszTWnNw44fafZcV5ltwvuF+8cmlOcDLeeoj0B2f3tW+UNkRIaRVjc1xcNOPPixP/mkA==
-  dependencies:
-    "@atlas-viewer/atlas" "^2.0.0-alpha.19"
-    "@atlas-viewer/iiif-image-api" "2.*"
-    "@iiif/parser" ">=v1.0.13"
-    "@iiif/presentation-2" "1.*"
-    "@iiif/presentation-3" "^1.1.2"
-    "@iiif/vault" ">=0.9.19"
-    "@iiif/vault-helpers" ">=0.9.7"
+react-iiif-vault@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/react-iiif-vault/-/react-iiif-vault-1.0.9.tgz#50cb3893fc92d05f53794c5d58a3a707cc0255ab"
+  integrity sha512-+mc7i6n9aLGvuhf5Mpx79a8NwD5GDZJpbttlO6M9YL/H42SIpdjyCSIAc2Cc2qjvKhWkBg7EoluKHjKLGSUCVQ==
+  dependencies:
+    "@atlas-viewer/atlas" ">=2.0.6"
+    "@atlas-viewer/iiif-image-api" ">=2.1.1"
+    "@iiif/helpers" ">=1.0.6"
+    "@iiif/parser" ">=2.0.2"
+    "@iiif/presentation-2" ">=1.*"
+    "@iiif/presentation-3" ">=2.1.3"
+    "@iiif/presentation-3-normalized" ">=0.9.7"
     react "^16.10.2 || ^17.0.2 || ^18.2.0"
     react-dom "^16.10.2 || ^17.0.2 || ^18.2.0"
-    react-error-boundary "^3.1.4"
-    redux "^4.2.0"
-    typescript "^4.7.4"
-    use-sync-external-store "^1.2.0"
+    react-error-boundary "^4.0.12"
+    react-lazy-load-image-component "^1.6.0"
 
 react-image@^4.0.1:
   version "4.0.3"
@@ -20194,6 +20182,14 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
+react-lazy-load-image-component@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/react-lazy-load-image-component/-/react-lazy-load-image-component-1.6.0.tgz#f262c2f163052d71011e282031fd60aafa6494ac"
+  integrity sha512-8KFkDTgjh+0+PVbH+cx0AgxLGbdTsxWMnxXzU5HEUztqewk9ufQAu8cstjZhyvtMIPsdMcPZfA0WAa7HtjQbBQ==
+  dependencies:
+    lodash.debounce "^4.0.8"
+    lodash.throttle "^4.1.1"
+
 react-medium-image-zoom@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-3.1.3.tgz#b1470abc5a342d65c23021c01bafa8c731821478"
@@ -20235,7 +20231,7 @@ react-query@^2.26.4:
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-react-reconciler@^0.26.1, react-reconciler@^0.26.2:
+react-reconciler@^0.26.1:
   version "0.26.2"
   resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.26.2.tgz#bbad0e2d1309423f76cf3c3309ac6c96e05e9d91"
   integrity sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==
@@ -20244,6 +20240,14 @@ react-reconciler@^0.26.1, react-reconciler@^0.26.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
+react-reconciler@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.29.0.tgz#ee769bd362915076753f3845822f2d1046603de7"
+  integrity sha512-wa0fGj7Zht1EYMRhKWwoo1H9GApxYLBuhoAuXN0TlltESAjDssB+Apf0T/DngVqaMyPypDmabL37vw/2aRM98Q==
+  dependencies:
+    loose-envify "^1.1.0"
+    scheduler "^0.23.0"
+
 react-redux@^7.1.0, react-redux@^7.1.1:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz#03862e803a30b6b9ef8582dadcc810947f74b736"
@@ -20436,7 +20440,7 @@ react-window@^1.8.5:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
-react@17.0.2, react@^16.10.2, "react@^16.10.2 || ^17.0.2 || ^18.2.0", react@^17.0.2:
+react@^16.10.2, "react@^16.10.2 || ^17.0.2 || ^18.2.0", react@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
   integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
@@ -20664,13 +20668,6 @@ redux@^4.1.2:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-redux@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
-  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 refractor@^3.2.0, refractor@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
@@ -21325,7 +21322,7 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@0.19.1, scheduler@^0.20.2, scheduler@^0.21.0:
+scheduler@0.19.1, scheduler@^0.20.2, scheduler@^0.21.0, scheduler@^0.23.0:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
   integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
@@ -22577,22 +22574,6 @@ style-value-types@^3.1.6, style-value-types@^3.1.7:
     hey-listen "^1.0.8"
     tslib "^1.10.0"
 
-styled-components@5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743"
-  integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.8"
-    "@emotion/stylis" "^0.8.4"
-    "@emotion/unitless" "^0.7.4"
-    babel-plugin-styled-components ">= 1.12.0"
-    css-to-react-native "^3.0.0"
-    hoist-non-react-statics "^3.0.0"
-    shallowequal "^1.1.0"
-    supports-color "^5.5.0"
-
 styled-components@^5.3.5:
   version "5.3.5"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4"
@@ -23503,11 +23484,6 @@ typescript-tuple@^2.2.1:
   dependencies:
     typescript-compare "^0.0.2"
 
-typescript@^4.7.4:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
 typescript@^4.9.4:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
@@ -23938,7 +23914,7 @@ use-resize-observer@^9.1.0:
   dependencies:
     "@juggle/resize-observer" "^3.3.1"
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==

From 4209225c11371bab1d95f1249789da822b938004 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 10:33:10 +0000
Subject: [PATCH 26/55] update iiif-parser & vault-helpers to fix build

---
 services/madoc-ts/package.json | 10 +++++-----
 services/madoc-ts/yarn.lock    | 35 ++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index 2373e19a8..200d82bf3 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -49,9 +49,9 @@
     "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",
+    "@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",
@@ -71,11 +71,11 @@
     "@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",
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index ec9c07541..1d9b1de3a 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -2859,7 +2859,7 @@
     "@iiif/vocabulary" "^1.0.20"
     manifesto.js "^4.2.4"
 
-"@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^1.0.13", "@iiif/parser@^1.1.2":
+"@iiif/parser@1.*", "@iiif/parser@1.x", "@iiif/parser@2.0.1", "@iiif/parser@>=2.0.2", "@iiif/parser@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-1.1.2.tgz#20bb2b0b74756ee6f35db4e9b0b0b54173ae6b0e"
   integrity sha512-yjbhSWBB+cWHjAgeWlMYgNydMxDGU1BO3JnmgxCclMcfi59JDsKHMXpgZpCNw+svcirBtIMD2u70KPFinr2pUA==
@@ -2868,6 +2868,16 @@
     "@iiif/presentation-3" "^1.1.3"
     "@types/geojson" "^7946.0.8"
 
+"@iiif/parser@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@iiif/parser/-/parser-2.0.2.tgz#0bd054429d635b197c7875cc45ad173658b7b834"
+  integrity sha512-ffqki1eJVVbWp1A+ulRgiojeCJH8eGyRIrAkyT60tHNXBWfYlkLTadFjFfyHlwWavT5BFI4nZtFTrwQXDtylQA==
+  dependencies:
+    "@iiif/presentation-2" "^1.0.4"
+    "@iiif/presentation-3" "^2.1.3"
+    "@iiif/presentation-3-normalized" "^0.9.7"
+    "@types/geojson" "^7946.0.10"
+
 "@iiif/presentation-2@1.*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.1.tgz#0d76fedfeac65b31afcc30d9a8dc17f2e57041e4"
@@ -2883,21 +2893,34 @@
   resolved "https://registry.yarnpkg.com/@iiif/presentation-2/-/presentation-2-1.0.2.tgz#c712c4a40cc5b7291b8d92646b0ec8b8215b9b3d"
   integrity sha512-EN/p+td5VrHvUsQXV26VkaDFW0HG2GPRaibPlxJRip8au8ABBrOYPIcBH69Hyk3I0UnW3xzK2VsZ9TcuQEn0Mw==
 
-"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7":
+"@iiif/presentation-3-normalized@0.9.7", "@iiif/presentation-3-normalized@>=0.9.7", "@iiif/presentation-3-normalized@^0.9.7":
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3-normalized/-/presentation-3-normalized-0.9.7.tgz#19386234e07c91c996d15ac5e1d86d1e1882e128"
   integrity sha512-Aqk0sYBFIH5W3wmVxW02tnAFbNzUU5oPygGQjvszB3PP2nSkFQ1skVjqJhQPPZTyi/de1qcJUrgSy0vp6s+c5A==
   dependencies:
     "@iiif/presentation-3" "^2.0.5"
 
-"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@>=2.1.3", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5":
+"@iiif/presentation-3@*", "@iiif/presentation-3@1.x", "@iiif/presentation-3@2.1.3", "@iiif/presentation-3@>=2", "@iiif/presentation-3@>=2.1.3", "@iiif/presentation-3@^1.1.3", "@iiif/presentation-3@^2.0.5", "@iiif/presentation-3@^2.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@iiif/presentation-3/-/presentation-3-1.1.3.tgz#7f5ea909ae22aa9ce2e9d91cec79f5f1cd0fd6fb"
   integrity sha512-Ek+25nkQouo0pXAqCsWYbAeS4jLDEBQA7iul2jzgnvoJrucxDQN2lXyNLgOUDRqpTdSqJ69iz5lm6DLaxil+Nw==
   dependencies:
     "@types/geojson" "^7946.0.7"
 
-"@iiif/vault-helpers@^0.9.8":
+"@iiif/vault-helpers@^0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.10.0.tgz#0797dc2a79b3f99bdbb65f16db88358dc4c22593"
+  integrity sha512-gnjTPcZJMIDjwU5K8HYNU8Iix49Awmsr7IhIyxA5ZCqugnLjHvJUOmOvT7q1NRd6ia4+09wxx+EMH0D9mt4cxQ==
+  dependencies:
+    "@iiif/presentation-2" "1.x"
+    "@iiif/presentation-3" "1.x"
+  optionalDependencies:
+    abs-svg-path "^0.1.0"
+    parse-svg-path "^0.1.0"
+    react-i18next "^11.18.0"
+    svg-arc-to-cubic-bezier "^3.2.0"
+
+"@iiif/vault-helpers@^0.9.11":
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/@iiif/vault-helpers/-/vault-helpers-0.9.11.tgz#43a28e4600d41990997a2225e9272491bddc7d57"
   integrity sha512-4XuFPvu233mMzfU/mMpAqFY5aCTzwhJ0u7MzPcpN8nSfMwbV5Dyvv0PppjcocvbWMUUXScqerRoB1MAfSFas6w==
@@ -2910,7 +2933,7 @@
     react-i18next "^11.18.0"
     svg-arc-to-cubic-bezier "^3.2.0"
 
-"@iiif/vault@0.9.x || 1.x", "@iiif/vault@^0.9.19":
+"@iiif/vault@0.9.x || 1.x", "@iiif/vault@^0.9.19", "@iiif/vault@^0.9.22":
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/@iiif/vault/-/vault-0.9.22.tgz#299bd3e6df1e4c3ae941d272b298ae65280b69d0"
   integrity sha512-HaFX1u9TSZha0i/esZR5sZzydZgjZgITeO0JrT1qXm+qSaB1Oc0PRNzatXW48Xa0q3PPYbBB71zCL1/D1i1i1A==
@@ -5836,7 +5859,7 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e"
   integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==
 
-"@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8":
+"@types/geojson@^7946.0.10", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8":
   version "7946.0.14"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
   integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==

From fbaa18f290ee56c85bd4f6bfd90bcd20fb77f31f Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 12:30:28 +0000
Subject: [PATCH 27/55] update react query change some config on search

---
 services/madoc-ts/package.json                |  2 +-
 .../src/frontend/site/hooks/use-search.ts     |  2 +-
 services/madoc-ts/yarn.lock                   | 93 ++++++++++++++++---
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index 200d82bf3..f1e879db0 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -165,7 +165,7 @@
     "react-iiif-vault": "^1.0.9",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
-    "react-query": "^2.26.4",
+    "react-query": "^3.6.1",
     "react-router": "^6.4.0-pre.13",
     "react-router-dom": "^6.4.0-pre.13",
     "react-rte": "0.16.1",
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 18c1c6346..0deaaaf69 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -95,12 +95,12 @@ export function useSearch() {
         (!!facetsToRequest.length ||
           !!fulltext ||
           fulltext === '' ||
+          facets ||
           !!rscType ||
           collectionId ||
           manifestId ||
           projectId ||
           !!topic),
-      cacheTime: 1000 * 60 * 60,
       staleTime: 0,
     }
   );
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 1d9b1de3a..4408a0ac1 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -2320,7 +2320,7 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.23.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.20.13"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
   integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
@@ -8078,6 +8078,11 @@ better-opn@^2.1.1:
   dependencies:
     open "^7.0.3"
 
+big-integer@^1.6.16:
+  version "1.6.52"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85"
+  integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
+
 big-integer@^1.6.44, big-integer@^1.6.7:
   version "1.6.51"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
@@ -8254,6 +8259,20 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+broadcast-channel@^3.4.1:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
+  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    detect-node "^2.1.0"
+    js-sha3 "0.8.0"
+    microseconds "0.2.0"
+    nano-time "1.0.0"
+    oblivious-set "1.0.0"
+    rimraf "3.0.2"
+    unload "2.2.0"
+
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -10266,6 +10285,11 @@ detect-node@2.0.4, detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+detect-node@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
+
 detect-package-manager@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/detect-package-manager/-/detect-package-manager-2.0.1.tgz#6b182e3ae5e1826752bfef1de9a7b828cffa50d8"
@@ -15606,6 +15630,11 @@ js-git@^0.7.8:
     git-sha1 "^0.1.2"
     pako "^0.2.5"
 
+js-sha3@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
+  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
+
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -16648,6 +16677,14 @@ match-sorter@^4.1.0:
     "@babel/runtime" "^7.10.5"
     remove-accents "0.4.2"
 
+match-sorter@^6.0.2:
+  version "6.3.4"
+  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.4.tgz#afa779d8e922c81971fbcb4781c7003ace781be7"
+  integrity sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==
+  dependencies:
+    "@babel/runtime" "^7.23.8"
+    remove-accents "0.5.0"
+
 mathjs@^9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-9.2.0.tgz#247f204c6d0151ee01d1a2696b90d30e25f82a7e"
@@ -16862,6 +16899,11 @@ micromatch@^4.0.4:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
+microseconds@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
+  integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -17590,6 +17632,13 @@ nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nano-time@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/nano-time/-/nano-time-1.0.0.tgz#b0554f69ad89e22d0907f7a12b0993a5d96137ef"
+  integrity sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==
+  dependencies:
+    big-integer "^1.6.16"
+
 nanoid@^3.1.30, nanoid@^3.3.1, nanoid@^3.3.4:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
@@ -18201,6 +18250,11 @@ objectid-js@1.0.2:
   resolved "https://registry.yarnpkg.com/objectid-js/-/objectid-js-1.0.2.tgz#67c753f5a799808525cbd932905886edb32e089f"
   integrity sha1-Z8dT9aeZgIUly9kykFiG7bMuCJ8=
 
+oblivious-set@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
+  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
+
 obuf@^1.1.2, obuf@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -20247,12 +20301,14 @@ react-query-devtools@^2.4.7:
   dependencies:
     match-sorter "^4.1.0"
 
-react-query@^2.26.4:
-  version "2.26.4"
-  resolved "https://registry.yarnpkg.com/react-query/-/react-query-2.26.4.tgz#18239b4c0b61d0b744f0d4a91f566b294fa9f752"
-  integrity sha512-sXGG0gh1ah11AcfptYOCRpGDoYMnssq6riQUpQaLSM2EOodVkexp3zNLk1MFDgfRGuXQst40Tnu17oNwni66aA==
+react-query@^3.6.1:
+  version "3.39.3"
+  resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.39.3.tgz#4cea7127c6c26bdea2de5fb63e51044330b03f35"
+  integrity sha512-nLfLz7GiohKTJDuT4us4X3h/8unOh+00MLb2yJoGTPjxKs2bc1iDhkNx2bd5MKklXnOD3NrVZ+J2UXujA5In4g==
   dependencies:
     "@babel/runtime" "^7.5.5"
+    broadcast-channel "^3.4.1"
+    match-sorter "^6.0.2"
 
 react-reconciler@^0.26.1:
   version "0.26.2"
@@ -20951,6 +21007,11 @@ remove-accents@0.4.2:
   resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
   integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
 
+remove-accents@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.5.0.tgz#77991f37ba212afba162e375b627631315bed687"
+  integrity sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -21184,6 +21245,13 @@ rich-markdown-editor@11.17.8:
     slugify "^1.4.0"
     smooth-scroll-into-view-if-needed "^1.1.29"
 
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -21191,13 +21259,6 @@ rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -23791,6 +23852,14 @@ universalviewer@next:
     slideatlas-viewer "4.4.1"
     xss "1.0.3"
 
+unload@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"
+  integrity sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==
+  dependencies:
+    "@babel/runtime" "^7.6.2"
+    detect-node "^2.0.4"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

From 23cf86ba47f2162bebbb3592b976bee82ae3d0f4 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 13:55:53 +0000
Subject: [PATCH 28/55] roll back

---
 services/madoc-ts/package.json                |  2 +-
 .../src/frontend/site/hooks/use-search.ts     |  2 +-
 services/madoc-ts/yarn.lock                   | 93 +++----------------
 3 files changed, 14 insertions(+), 83 deletions(-)

diff --git a/services/madoc-ts/package.json b/services/madoc-ts/package.json
index f1e879db0..200d82bf3 100644
--- a/services/madoc-ts/package.json
+++ b/services/madoc-ts/package.json
@@ -165,7 +165,7 @@
     "react-iiif-vault": "^1.0.9",
     "react-intersection-observer": "^8.26.2",
     "react-mosaic-component": "^4.1.1",
-    "react-query": "^3.6.1",
+    "react-query": "^2.26.4",
     "react-router": "^6.4.0-pre.13",
     "react-router-dom": "^6.4.0-pre.13",
     "react-rte": "0.16.1",
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 0deaaaf69..97f1dd0a2 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -95,7 +95,7 @@ export function useSearch() {
         (!!facetsToRequest.length ||
           !!fulltext ||
           fulltext === '' ||
-          facets ||
+          !!facets ||
           !!rscType ||
           collectionId ||
           manifestId ||
diff --git a/services/madoc-ts/yarn.lock b/services/madoc-ts/yarn.lock
index 4408a0ac1..1d9b1de3a 100644
--- a/services/madoc-ts/yarn.lock
+++ b/services/madoc-ts/yarn.lock
@@ -2320,7 +2320,7 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.23.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.8", "@babel/runtime@^7.20.13", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.20.13"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
   integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
@@ -8078,11 +8078,6 @@ better-opn@^2.1.1:
   dependencies:
     open "^7.0.3"
 
-big-integer@^1.6.16:
-  version "1.6.52"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85"
-  integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
-
 big-integer@^1.6.44, big-integer@^1.6.7:
   version "1.6.51"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
@@ -8259,20 +8254,6 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-broadcast-channel@^3.4.1:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
-  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    detect-node "^2.1.0"
-    js-sha3 "0.8.0"
-    microseconds "0.2.0"
-    nano-time "1.0.0"
-    oblivious-set "1.0.0"
-    rimraf "3.0.2"
-    unload "2.2.0"
-
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -10285,11 +10266,6 @@ detect-node@2.0.4, detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-detect-node@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
-  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-
 detect-package-manager@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/detect-package-manager/-/detect-package-manager-2.0.1.tgz#6b182e3ae5e1826752bfef1de9a7b828cffa50d8"
@@ -15630,11 +15606,6 @@ js-git@^0.7.8:
     git-sha1 "^0.1.2"
     pako "^0.2.5"
 
-js-sha3@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
-  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
-
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -16677,14 +16648,6 @@ match-sorter@^4.1.0:
     "@babel/runtime" "^7.10.5"
     remove-accents "0.4.2"
 
-match-sorter@^6.0.2:
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.4.tgz#afa779d8e922c81971fbcb4781c7003ace781be7"
-  integrity sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==
-  dependencies:
-    "@babel/runtime" "^7.23.8"
-    remove-accents "0.5.0"
-
 mathjs@^9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-9.2.0.tgz#247f204c6d0151ee01d1a2696b90d30e25f82a7e"
@@ -16899,11 +16862,6 @@ micromatch@^4.0.4:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
-microseconds@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/microseconds/-/microseconds-0.2.0.tgz#233b25f50c62a65d861f978a4a4f8ec18797dc39"
-  integrity sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==
-
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -17632,13 +17590,6 @@ nan@^2.14.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nano-time@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/nano-time/-/nano-time-1.0.0.tgz#b0554f69ad89e22d0907f7a12b0993a5d96137ef"
-  integrity sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==
-  dependencies:
-    big-integer "^1.6.16"
-
 nanoid@^3.1.30, nanoid@^3.3.1, nanoid@^3.3.4:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
@@ -18250,11 +18201,6 @@ objectid-js@1.0.2:
   resolved "https://registry.yarnpkg.com/objectid-js/-/objectid-js-1.0.2.tgz#67c753f5a799808525cbd932905886edb32e089f"
   integrity sha1-Z8dT9aeZgIUly9kykFiG7bMuCJ8=
 
-oblivious-set@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
-  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
-
 obuf@^1.1.2, obuf@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -20301,14 +20247,12 @@ react-query-devtools@^2.4.7:
   dependencies:
     match-sorter "^4.1.0"
 
-react-query@^3.6.1:
-  version "3.39.3"
-  resolved "https://registry.yarnpkg.com/react-query/-/react-query-3.39.3.tgz#4cea7127c6c26bdea2de5fb63e51044330b03f35"
-  integrity sha512-nLfLz7GiohKTJDuT4us4X3h/8unOh+00MLb2yJoGTPjxKs2bc1iDhkNx2bd5MKklXnOD3NrVZ+J2UXujA5In4g==
+react-query@^2.26.4:
+  version "2.26.4"
+  resolved "https://registry.yarnpkg.com/react-query/-/react-query-2.26.4.tgz#18239b4c0b61d0b744f0d4a91f566b294fa9f752"
+  integrity sha512-sXGG0gh1ah11AcfptYOCRpGDoYMnssq6riQUpQaLSM2EOodVkexp3zNLk1MFDgfRGuXQst40Tnu17oNwni66aA==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    broadcast-channel "^3.4.1"
-    match-sorter "^6.0.2"
 
 react-reconciler@^0.26.1:
   version "0.26.2"
@@ -21007,11 +20951,6 @@ remove-accents@0.4.2:
   resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.4.2.tgz#0a43d3aaae1e80db919e07ae254b285d9e1c7bb5"
   integrity sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=
 
-remove-accents@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.5.0.tgz#77991f37ba212afba162e375b627631315bed687"
-  integrity sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -21245,13 +21184,6 @@ rich-markdown-editor@11.17.8:
     slugify "^1.4.0"
     smooth-scroll-into-view-if-needed "^1.1.29"
 
-rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -21259,6 +21191,13 @@ rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -23852,14 +23791,6 @@ universalviewer@next:
     slideatlas-viewer "4.4.1"
     xss "1.0.3"
 
-unload@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/unload/-/unload-2.2.0.tgz#ccc88fdcad345faa06a92039ec0f80b488880ef7"
-  integrity sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==
-  dependencies:
-    "@babel/runtime" "^7.6.2"
-    detect-node "^2.0.4"
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

From 22d4be105e9b03daa1f3fe51773de9591a54b97e Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 15:05:22 +0000
Subject: [PATCH 29/55] wait for topic

---
 services/madoc-ts/src/frontend/site/hooks/use-search.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 97f1dd0a2..6d0d17604 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -68,6 +68,7 @@ export function useSearch() {
   }));
 
   const facets = topic ? topicFacets : searchQFacets;
+  const waitForTopic = topic ? !!topicFacets : true;
 
   const searchResults = paginatedApiHooks.getSiteSearchQuery(
     () => [
@@ -92,6 +93,7 @@ export function useSearch() {
     {
       enabled:
         !searchFacetConfig.isLoading &&
+        waitForTopic &&
         (!!facetsToRequest.length ||
           !!fulltext ||
           fulltext === '' ||

From 6df6334ac2d0be962d0d70baedd1b89801bb4239 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 15:07:46 +0000
Subject: [PATCH 30/55] wait for topic -wait for facets

---
 services/madoc-ts/src/frontend/site/hooks/use-search.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 6d0d17604..9761ee706 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -68,8 +68,7 @@ export function useSearch() {
   }));
 
   const facets = topic ? topicFacets : searchQFacets;
-  const waitForTopic = topic ? !!topicFacets : true;
-
+  const waitForTopic = topic ? !!facets.length : true;
   const searchResults = paginatedApiHooks.getSiteSearchQuery(
     () => [
       {

From 69523112d9fee4d1a1e30cf1dd96b213ba2910a3 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 15:31:02 +0000
Subject: [PATCH 31/55] console logs and change loading block condition

---
 .../src/frontend/site/features/SearchPageResults.tsx         | 2 +-
 services/madoc-ts/src/frontend/site/hooks/use-search.ts      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
index ff80987c7..26242a1c4 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
@@ -37,7 +37,7 @@ export const SearchPageResults: React.FC<SearchPageResultsProps> = ({
   if (!searchResults) {
     return null;
   }
-  return isLoading && !searchResponse ? (
+  return isLoading || !searchResponse ? (
     <LoadingBlock />
   ) : (
     <>
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 9761ee706..6be0454a5 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -19,6 +19,9 @@ export function useSearch() {
   const { searchMultipleFields, nonLatinFulltext, onlyShowManifests } = searchOptions || {};
   const searchFacetConfig = apiHooks.getSiteSearchFacetConfiguration(() => []);
 
+  console.log('topic:', topic);
+  console.log('isLoading', searchFacetConfig.isLoading);
+
   useEffect(() => {
     if (topic) {
       appliedFacets.push({ k: 'entity', v: topic, t: 'entity' });
@@ -267,6 +270,6 @@ export function useSearch() {
     }
 
     return displayList;
-  }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData, searchFacetConfig.isLoading, searchResults.isLoading]);
+  }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData]);
   return [searchResults, displayFacets, searchFacetConfig.isLoading || searchResults.isLoading] as const;
 }

From 4922f39cc4309740e0a70ed9b1d8211e90716287 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 16:53:24 +0000
Subject: [PATCH 32/55] create topic-search

---
 .../frontend/shared/hooks/use-topic-items.ts  |   1 +
 .../site/features/TopicPageResults.tsx        | 130 +++++++++++
 .../src/frontend/site/hooks/use-search.ts     |   5 +-
 .../frontend/site/hooks/use-topic-search.ts   | 220 ++++++++++++++++++
 .../src/frontend/site/pages/view-topic.tsx    |   3 +-
 5 files changed, 354 insertions(+), 5 deletions(-)
 create mode 100644 services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
 create mode 100644 services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts

diff --git a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
index e5e3de618..0fff86bed 100644
--- a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
+++ b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
@@ -1,6 +1,7 @@
 import { usePaginatedQuery } from 'react-query';
 import { useApi } from './use-api';
 import { useSearchQuery } from '../../site/hooks/use-search-query';
+import { apiHooks } from './use-api-query';
 
 export function useTopicItems(slug?: string) {
   const api = useApi();
diff --git a/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx b/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
new file mode 100644
index 000000000..bf0585ab1
--- /dev/null
+++ b/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
@@ -0,0 +1,130 @@
+import React, { useState } from 'react';
+import { useSearchQuery } from '../hooks/use-search-query';
+import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
+import { SearchResult } from '../../../types/search';
+import { useSearch } from '../hooks/use-search';
+import { ResultsContainer, SearchItem, TotalResults } from '../../shared/components/SearchResults';
+import { ImageGrid } from '../../shared/atoms/ImageGrid';
+import { LoadingBlock } from '../../shared/callouts/LoadingBlock';
+import { useTranslation } from 'react-i18next';
+import { SimpleDropdown } from '../../shared/atoms/SimpleDropdown';
+import { Button, ButtonIcon } from '../../shared/navigation/Button';
+import { GridIcon } from '../../shared/icons/GridIcon';
+import { ListIcon } from '../../shared/icons/ListIcon';
+import { useTopicSearch } from '../hooks/use-topic-search';
+import { useRouteContext } from '../hooks/use-route-context';
+
+interface TopicPageResultsProps {
+  background?: string;
+  grid?: boolean;
+  snippet?: boolean;
+  textColor?: string;
+  cardBorder?: string;
+  imageStyle?: string;
+}
+
+export const TopicPageResults: React.FC<TopicPageResultsProps> = ({
+  snippet,
+  cardBorder,
+  textColor,
+  background,
+  imageStyle,
+}) => {
+  const { t } = useTranslation();
+  const [{ resolvedData: searchResponse, latestData }, displayFacets, isLoading] = useTopicSearch();
+  const { rawQuery, page, fulltext } = useSearchQuery();
+  const searchResults = searchResponse ? searchResponse.results : [];
+
+  const [resultsView, setResultsView] = useState('list');
+  if (!searchResults) {
+    return null;
+  }
+  return isLoading || !searchResponse ? (
+    <LoadingBlock />
+  ) : (
+    <>
+      <div style={{ justifyContent: 'space-between', display: 'flex' }}>
+        <TotalResults>
+          {t('Found {{count}} results', {
+            count: searchResponse && searchResponse.pagination ? searchResponse.pagination.totalResults : 0,
+          })}
+        </TotalResults>
+
+        <SimpleDropdown buttonText={<ButtonIcon>{resultsView === 'list' ? <ListIcon /> : <GridIcon />}</ButtonIcon>}>
+          <Button
+            $link
+            style={{ display: 'flex', justifyContent: 'space-evenly' }}
+            onClick={() => {
+              setResultsView('list');
+            }}
+          >
+            List
+            <ButtonIcon>
+              <ListIcon />
+            </ButtonIcon>
+          </Button>
+
+          <Button
+            $link
+            style={{ display: 'flex', justifyContent: 'space-evenly' }}
+            onClick={() => {
+              setResultsView('grid');
+            }}
+          >
+            Grid
+            <ButtonIcon>
+              <GridIcon />
+            </ButtonIcon>
+          </Button>
+        </SimpleDropdown>
+      </div>
+      <ResultsContainer $isFetching={isLoading}>
+        <ImageGrid data-view-list={resultsView === 'list'} $size={'small'}>
+          {searchResults.map((result: SearchResult, index: number) => {
+            return result ? (
+              <SearchItem
+                result={result}
+                key={`${index}__${result.resource_id}`}
+                search={fulltext}
+                background={background}
+                border={cardBorder}
+                textColor={textColor}
+                list={resultsView === 'list'}
+                hideSnippet={snippet}
+                imageStyle={imageStyle}
+              />
+            ) : null;
+          })}
+        </ImageGrid>
+      </ResultsContainer>
+    </>
+  );
+};
+
+blockEditorFor(TopicPageResults, {
+  label: 'topic Page Results',
+  type: 'default.TopicPageResults',
+  anyContext: ['topic', 'topicType'],
+  requiredContext: ['page'],
+  defaultProps: {
+    background: '',
+    snippet: '',
+    textColor: '',
+    cardBorder: '',
+    imageStyle: 'fit',
+  },
+  editor: {
+    snippet: { type: 'checkbox-field', label: 'Snippet', inlineLabel: 'Hide snippet?' },
+    background: { label: 'Card background color', type: 'color-field' },
+    textColor: { label: 'Card text color', type: 'color-field' },
+    cardBorder: { label: 'Card border', type: 'color-field' },
+    imageStyle: {
+      label: 'Image Style',
+      type: 'dropdown-field',
+      options: [
+        { value: 'covered', text: 'covered' },
+        { value: 'fit', text: 'fit' },
+      ],
+    },
+  },
+});
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index 6be0454a5..e36cb5fc8 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -19,11 +19,8 @@ export function useSearch() {
   const { searchMultipleFields, nonLatinFulltext, onlyShowManifests } = searchOptions || {};
   const searchFacetConfig = apiHooks.getSiteSearchFacetConfiguration(() => []);
 
-  console.log('topic:', topic);
-  console.log('isLoading', searchFacetConfig.isLoading);
-
   useEffect(() => {
-    if (topic) {
+    if ((topic && !appliedFacets.length) || topic) {
       appliedFacets.push({ k: 'entity', v: topic, t: 'entity' });
     }
     return;
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
new file mode 100644
index 000000000..f0fff8a89
--- /dev/null
+++ b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -0,0 +1,220 @@
+import { InternationalString } from '@iiif/presentation-3';
+import { useMemo } from 'react';
+import { FacetConfig } from '../../shared/components/MetadataFacetEditor';
+import { apiHooks, paginatedApiHooks } from '../../shared/hooks/use-api-query';
+import { useSiteConfiguration } from '../features/SiteConfigurationContext';
+import { useRouteContext } from './use-route-context';
+import { useSearchQuery } from './use-search-query';
+
+function normalizeDotKey(key: string) {
+  return key.startsWith('metadata.') ? key.slice('metadata.'.length).toLowerCase() : key.toLowerCase();
+}
+
+export function useTopicSearch() {
+  const { topic } = useRouteContext();
+  const { fulltext, appliedFacets, page, rscType } = useSearchQuery();
+  const {
+    project: { searchStrategy, claimGranularity, searchOptions },
+  } = useSiteConfiguration();
+  const { searchMultipleFields, nonLatinFulltext, onlyShowManifests } = searchOptions || {};
+  const searchFacetConfig = apiHooks.getSiteSearchFacetConfiguration(() => []);
+
+  const [facetsToRequest, facetDisplayOrder, facetIdMap] = useMemo(() => {
+    const facets = !topic && searchFacetConfig.data ? searchFacetConfig.data.facets : [];
+    const returnList: string[] = [];
+    const idMap: { [id: string]: { config: FacetConfig; keys: string[] } } = {};
+    const displayOrder: string[] = [];
+
+    for (const facet of facets) {
+      displayOrder.push(facet.id);
+      idMap[facet.id] = { config: facet, keys: [] };
+      if (facet.keys) {
+        for (const key of facet.keys) {
+          const keyToAdd = normalizeDotKey(key);
+          idMap[facet.id].keys.push(keyToAdd);
+          if (returnList.indexOf(keyToAdd) === -1) {
+            returnList.push(keyToAdd);
+          }
+        }
+      }
+    }
+    return [returnList, displayOrder, idMap];
+  }, [searchFacetConfig.data, topic]);
+
+  const topicFacets = appliedFacets.map(facet => {
+    return facet.k === 'entity'
+      ? {
+          type: 'entity',
+          group_id: facet.v,
+        }
+      : {
+          type: facet.t,
+          subtype: facet.k,
+          value: facet.v,
+        };
+  });
+
+  const searchResults = paginatedApiHooks.getSiteSearchQuery(
+    () => [
+      {
+        fulltext: fulltext,
+        facet_fields: facetsToRequest.length ? facetsToRequest : undefined,
+        //  @todo stringify facets.
+        facets: [...topicFacets, { type: 'entity', group_id: topic || '' }],
+        resource_type: rscType,
+        facet_on_manifests: true,
+        search_type: searchStrategy as any,
+        number_of_facets: searchFacetConfig.data?.facets.length ? 100 : undefined,
+        iiif_type: claimGranularity === 'manifest' || onlyShowManifests ? 'Manifest' : undefined,
+        non_latin_fulltext: nonLatinFulltext,
+        search_multiple_fields: searchMultipleFields,
+      },
+      page,
+    ],
+    {
+      enabled:
+        !searchFacetConfig.isLoading &&
+        (!!facetsToRequest.length || !!fulltext || fulltext === '' || !!topicFacets || !!rscType || !!topic),
+      staleTime: 0,
+    }
+  );
+
+  const displayFacets = useMemo(() => {
+    const mappedSearchResponseMetadata: {
+      [key: string]: Array<{ key: string; value: string; count: number; configuration?: FacetConfig }>;
+    } = {};
+
+    const metadataFacets = searchResults.resolvedData?.facets?.metadata || {};
+    const entityFacets = searchResults.resolvedData?.facets?.entity || {};
+
+    for (const mfacet of Object.keys(metadataFacets)) {
+      const values = Object.keys(metadataFacets[mfacet]);
+      const normalisedKey = mfacet.toLowerCase();
+
+      if (metadataFacets) {
+        facetIdMap[mfacet] = {
+          config: {
+            keys: [mfacet],
+            values: [],
+            label: { none: [mfacet] },
+            id: mfacet,
+            type: 'metadata',
+          },
+          keys: [mfacet],
+        };
+        facetDisplayOrder.push(mfacet);
+      }
+      for (const value of values) {
+        mappedSearchResponseMetadata[normalisedKey] = mappedSearchResponseMetadata[normalisedKey]
+          ? mappedSearchResponseMetadata[normalisedKey]
+          : [];
+        mappedSearchResponseMetadata[normalisedKey].push({
+          value,
+          count: metadataFacets[mfacet] ? (metadataFacets[mfacet] as any)[value] || 0 : 0,
+          key: normalisedKey,
+        });
+      }
+    }
+
+    for (const efacet of Object.keys(entityFacets)) {
+      const values = Object.keys(entityFacets[efacet]);
+      const normalisedKey = efacet.toLowerCase();
+
+      if (entityFacets) {
+        facetIdMap[efacet] = {
+          config: {
+            keys: [efacet],
+            values: [],
+            label: { none: [efacet] },
+            id: efacet,
+            type: 'entity',
+          },
+          keys: [efacet],
+        };
+        facetDisplayOrder.push(efacet);
+      }
+      for (const value of values) {
+        mappedSearchResponseMetadata[normalisedKey] = mappedSearchResponseMetadata[normalisedKey]
+          ? mappedSearchResponseMetadata[normalisedKey]
+          : [];
+        mappedSearchResponseMetadata[normalisedKey].push({
+          value,
+          count: entityFacets[efacet] ? (entityFacets[efacet] as any)[value] || 0 : 0,
+          key: normalisedKey,
+        });
+      }
+    }
+
+    // Compile the final list.
+    const displayList: Array<{
+      id: string;
+      label: InternationalString;
+      items: Array<{
+        type?: string;
+        key: string;
+        label: InternationalString;
+        values: string[];
+        count: number;
+      }>;
+    }> = [];
+
+    for (const id of facetDisplayOrder) {
+      const fieldsToMap = facetIdMap[id];
+      const displayItem: {
+        id: string;
+        label: InternationalString;
+        items: Array<{
+          key: string;
+          label: InternationalString;
+          values: string[];
+          count: number;
+          type?: string;
+        }>;
+      } = {
+        id: id,
+        label: fieldsToMap.config.label,
+        items: [],
+      };
+
+      if (fieldsToMap.config.values && fieldsToMap.config.values.length) {
+        for (const value of fieldsToMap.config.values) {
+          const key = fieldsToMap.keys[0];
+          const mappedCount = (mappedSearchResponseMetadata[key] || []).reduce((count: number, next) => {
+            if (next.key === key && value.values.indexOf(next.value) !== -1) {
+              return count + next.count;
+            }
+            return count;
+          }, 0);
+          displayItem.items.push({
+            values: value.values,
+            key: normalizeDotKey(fieldsToMap.keys[0]),
+            count: mappedCount,
+            label: value.label,
+            type: fieldsToMap.config.type,
+          });
+        }
+      } else {
+        for (const field of fieldsToMap.keys) {
+          const normalisedField = field.toLowerCase();
+          const searchResultFacetValues = mappedSearchResponseMetadata[normalisedField];
+          if (searchResultFacetValues) {
+            displayItem.items.push(
+              ...searchResultFacetValues.map(fieldValue => ({
+                label: { none: [fieldValue.value] },
+                key: fieldValue.key,
+                values: [fieldValue.value],
+                count: fieldValue.count,
+                type: fieldsToMap.config.type,
+              }))
+            );
+          }
+        }
+      }
+      // @todo fieldsToMap.config.value
+      displayList.push(displayItem);
+    }
+
+    return displayList;
+  }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData]);
+  return [searchResults, displayFacets, searchFacetConfig.isLoading || searchResults.isLoading] as const;
+}
diff --git a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
index 2c8b6b5aa..e74e2d289 100644
--- a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
@@ -13,6 +13,7 @@ import { TopicHeroImage } from '../features/TopicHeroImage';
 import { SearchPageResults } from '../features/SearchPageResults';
 import { SearchPageSearch } from '../features/SearchPageSearch';
 import { useTopic } from './loaders/topic-loader';
+import { TopicPageResults } from '../features/TopicPageResults';
 export const ViewTopic = () => {
   const { data } = useTopic();
   return (
@@ -55,7 +56,7 @@ export const ViewTopic = () => {
             <Slot name="topic-item-results">
               <SearchPageSearch />
               <AppliedFacets />
-              <SearchPageResults />
+              <TopicPageResults />
             </Slot>
 
             <Slot name="topic-items-pagination">

From 77d6e806f81f50d41daeec8a5e51080c35c80685 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Mon, 4 Mar 2024 17:22:58 +0000
Subject: [PATCH 33/55] padding option crowdsourcing banner

---
 .../shared/components/CrowdSourcingBanner.tsx      | 14 ++++++++++++--
 services/madoc-ts/translations/en/madoc.json       |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx b/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
index 1920ea0ae..f23b9a387 100644
--- a/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/CrowdSourcingBanner.tsx
@@ -10,6 +10,7 @@ export type CrowdSourcingBannerProps = {
   buttonLabel?: string;
   height?: number;
   shadowOpacity: string;
+  padding?: string;
   image: {
     id: string;
     image: string;
@@ -32,10 +33,16 @@ const MastheadMain = styled.div`
   position: relative;
 `;
 
-const MastheadIntro = styled.div<{ $right?: boolean; $height?: string; $opacity?: string; $width?: string }>`
+const MastheadIntro = styled.div<{
+  $right?: boolean;
+  $height?: string;
+  $opacity?: string;
+  $width?: string;
+  $padding?: string;
+}>`
   //background-color: rgba(51, 51, 51, 0.8);
   background-color: ${props => (props.$opacity ? ` rgba(0,0,0, ${props.$opacity});` : 'rgba(51, 51, 51,0.8)')};
-  padding: 20px;
+  padding: ${props => (props.$padding ? props.$padding : '20px')};
   width: 33.3333333333%;
   min-height: ${props => props.$height || '550px'};
   ${props =>
@@ -79,6 +86,7 @@ export const CrowdSourcingBanner: React.FC<CrowdSourcingBannerProps> = props =>
             $opacity={props.shadowOpacity}
             $height={props.height ? `${props.height}px` : undefined}
             $right={props.panelAlignment === 'right'}
+            $padding={props.padding ? `${props.padding}px` : undefined}
           >
             <MastheadTitle>{props.title}</MastheadTitle>
             <MastheadDescription>{props.description}</MastheadDescription>
@@ -106,6 +114,7 @@ blockEditorFor(CrowdSourcingBanner, {
     buttonLabel: '',
     buttonLink: '',
     shadowOpacity: '',
+    padding: '',
   },
   svgIcon: props => (
     <svg width="1em" height="1em" viewBox="0 0 151 84" xmlns="http://www.w3.org/2000/svg" {...props}>
@@ -134,6 +143,7 @@ blockEditorFor(CrowdSourcingBanner, {
       type: 'madoc-media-explorer',
     },
     height: { type: 'text-field', label: 'Height (number)' },
+    padding: { type: 'text-field', label: 'Padding (number)' },
     buttonLabel: { type: 'text-field', label: 'Button label' },
     buttonLink: { type: 'text-field', label: 'Button link' },
   },
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 9b2cabd37..d5b29473f 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -638,6 +638,7 @@
   "Overview": "Overview",
   "PART OF": "PART OF",
   "PART OFs": "PART OFs",
+  "Padding (number)": "Padding (number)",
   "Padding around logo": "Padding around logo",
   "Padding size": "Padding size",
   "Page blocks": "Page blocks",

From cb17aa608391b0f9dc6d040cab8d35f36c1bdfa9 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Tue, 5 Mar 2024 11:25:48 +0000
Subject: [PATCH 34/55] tidy up and fix view in search

---
 .../frontend/shared/hooks/use-topic-items.ts  |  1 -
 .../frontend/site/features/TopicActions.tsx   |  6 ++--
 .../src/frontend/site/hooks/use-search.ts     | 30 ++-----------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
index 0fff86bed..e5e3de618 100644
--- a/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
+++ b/services/madoc-ts/src/frontend/shared/hooks/use-topic-items.ts
@@ -1,7 +1,6 @@
 import { usePaginatedQuery } from 'react-query';
 import { useApi } from './use-api';
 import { useSearchQuery } from '../../site/hooks/use-search-query';
-import { apiHooks } from './use-api-query';
 
 export function useTopicItems(slug?: string) {
   const api = useApi();
diff --git a/services/madoc-ts/src/frontend/site/features/TopicActions.tsx b/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
index f1ec21a08..4ab9e309d 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router-dom';
 import { createLink } from '../../shared/utility/create-link';
 import styled from 'styled-components';
 import { useTopic } from '../pages/loaders/topic-loader';
+import { useSearchQuery } from '../hooks/use-search-query';
 
 const TopicActionWrapper = styled.div`
   display: flex;
@@ -21,12 +22,14 @@ export const TopicActions: React.FC<props> = ({ alignment }) => {
   const { t } = useTranslation();
   const router = useRouteContext();
   const query = useLocationQuery();
+  const { appliedFacets } = useSearchQuery();
   const { data } = useTopic();
 
+  query.facets = !appliedFacets.length ? JSON.stringify([{ k: 'entity', v: router.topic, t: 'entity' }]) : query.facets;
+
   return (
     <TopicActionWrapper>
       <h3 style={{ fontSize: '1.5em' }}>{t('Explore all resources')}</h3>
-      {/*might be more to add here in the future */}
       <ButtonRow $center={alignment === 'center'} $right={alignment === 'right'}>
         {data && (
           <Button
@@ -39,7 +42,6 @@ export const TopicActions: React.FC<props> = ({ alignment }) => {
               hash: data.id,
             })}
           >
-            {/*  todo - better language here ???*/}
             {t('View in search')}
           </Button>
         )}
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index e36cb5fc8..c67e72649 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -1,5 +1,5 @@
 import { InternationalString } from '@iiif/presentation-3';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { FacetConfig } from '../../shared/components/MetadataFacetEditor';
 import { apiHooks, paginatedApiHooks } from '../../shared/hooks/use-api-query';
 import { useSiteConfiguration } from '../features/SiteConfigurationContext';
@@ -19,13 +19,6 @@ export function useSearch() {
   const { searchMultipleFields, nonLatinFulltext, onlyShowManifests } = searchOptions || {};
   const searchFacetConfig = apiHooks.getSiteSearchFacetConfiguration(() => []);
 
-  useEffect(() => {
-    if ((topic && !appliedFacets.length) || topic) {
-      appliedFacets.push({ k: 'entity', v: topic, t: 'entity' });
-    }
-    return;
-  }, [appliedFacets, topic]);
-
   const [facetsToRequest, facetDisplayOrder, facetIdMap] = useMemo(() => {
     const facets = !topic && searchFacetConfig.data ? searchFacetConfig.data.facets : [];
     const returnList: string[] = [];
@@ -48,7 +41,7 @@ export function useSearch() {
     return [returnList, displayOrder, idMap];
   }, [searchFacetConfig.data, topic]);
 
-  const topicFacets = appliedFacets.map(facet => {
+  const facets = appliedFacets.map(facet => {
     return facet.k === 'entity'
       ? {
           type: 'entity',
@@ -61,14 +54,6 @@ export function useSearch() {
         };
   });
 
-  const searchQFacets = appliedFacets.map(facet => ({
-    type: facet.t,
-    subtype: facet.k,
-    value: facet.v,
-  }));
-
-  const facets = topic ? topicFacets : searchQFacets;
-  const waitForTopic = topic ? !!facets.length : true;
   const searchResults = paginatedApiHooks.getSiteSearchQuery(
     () => [
       {
@@ -92,7 +77,6 @@ export function useSearch() {
     {
       enabled:
         !searchFacetConfig.isLoading &&
-        waitForTopic &&
         (!!facetsToRequest.length ||
           !!fulltext ||
           fulltext === '' ||
@@ -100,9 +84,7 @@ export function useSearch() {
           !!rscType ||
           collectionId ||
           manifestId ||
-          projectId ||
-          !!topic),
-      staleTime: 0,
+          projectId),
     }
   );
 
@@ -133,12 +115,6 @@ export function useSearch() {
     const metadataFacets = searchResults.resolvedData?.facets?.metadata || {};
     const entityFacets = searchResults.resolvedData?.facets?.entity || {};
 
-    // const facetType = { ...metadataFacets, ...entityFacets };
-    const showAllFacets = facetDisplayOrder.length === 0;
-    // for (const facet of Object.keys(facetType)) {
-    //   const values = Object.keys(facetType[facet]);
-    //   const normalisedKey = facet.toLowerCase();
-
     for (const mfacet of Object.keys(metadataFacets)) {
       const values = Object.keys(metadataFacets[mfacet]);
       const normalisedKey = mfacet.toLowerCase();

From af3f440ea1cf72cbaafe2e68a29e27ff2b6c7bfa Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Tue, 5 Mar 2024 11:50:10 +0000
Subject: [PATCH 35/55] fix cant edit featured topics and cant create topic

---
 .../capture-models/TopicExplorer/TopicExplorer.tsx       | 3 ++-
 .../admin/pages/topics/topic-type/edit-topic-type.tsx    | 9 +++++++--
 .../admin/pages/topics/topic/create-new-topic.tsx        | 2 +-
 .../src/frontend/admin/pages/topics/topic/edit-topic.tsx | 2 +-
 services/madoc-ts/translations/en/madoc.json             | 3 +++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx b/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx
index c55c821b3..cc26a0d9f 100644
--- a/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx
+++ b/services/madoc-ts/src/extensions/capture-models/TopicExplorer/TopicExplorer.tsx
@@ -105,12 +105,13 @@ export const GetTopic: React.FC<{
       }
     | 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;
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  const type = !value.type && typeof value === 'string' ? value : value.type;
+  const type = !value.type && typeof value === 'string' ? topicType : value.type;
   const { data } = useApiTopic(type, slug);
 
   if (data) {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
index 1f54d4200..381c70ebb 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic-type/edit-topic-type.tsx
@@ -19,10 +19,14 @@ export function EditTopicType() {
   const [createNewEntityType, status] = useMutation(async (updatedData: any) => {
     if (!data) return;
 
-    if (updatedData.thumbnail.id && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
+    if (
+      updatedData.thumbnail &&
+      updatedData.thumbnail.id &&
+      data.other_data?.thumbnail?.id !== updatedData.thumbnail.id
+    ) {
       updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
     }
-    if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
+    if (updatedData.hero && updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 
@@ -39,6 +43,7 @@ export function EditTopicType() {
           .filter((f: string) => f !== undefined);
 
         updatedData.featured_topics = ogIds?.concat(newIds);
+        return;
       }
       updatedData.featured_topics = [];
     }
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
index 725080fd9..c6f289159 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/create-new-topic.tsx
@@ -58,7 +58,7 @@ export function CreateNewTopic() {
 
     if (!hasTopic) {
       // input.type_slug = type?.slug;
-      input.type_slug = input.type_slug.label;
+      input.type_slug = input.type_slug.label.toLowerCase();
       console.log(input.type_slug);
     }
     return {
diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
index 1f92694f9..c273a0b67 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/edit-topic.tsx
@@ -21,7 +21,7 @@ export function EditTopic() {
     if (updatedData.thumbnail && data.other_data?.thumbnail?.id !== updatedData.thumbnail.id) {
       updatedData.thumbnail = ParseEntityMedia(updatedData.thumbnail);
     }
-    if (updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
+    if (updatedData.hero && updatedData.hero.id && data.other_data?.main_image?.id !== updatedData.hero.id) {
       updatedData.hero = ParseEntityMedia(updatedData.hero);
     }
 
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index d5b29473f..04402e364 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -1008,6 +1008,7 @@
   "breadcrumbs__Projects": "Projects",
   "breadcrumbs__Topics": "Topics",
   "button background color": "button background color",
+  "c": "c",
   "cancel": "cancel",
   "choose": "choose",
   "collections": "collections",
@@ -1039,6 +1040,7 @@
   "featured topics": "featured topics",
   "filter header": "filter header",
   "generate pdf": "generate pdf",
+  "great_depression": "great_depression",
   "height (px)": "height (px)",
   "help__flat_collection": "This shows all of the collections and manifests in your project. When you add a collection you will see all off the manifests inside of the collection are added to this view. When you remove a collection you will have to also manually remove any manifests you want to remove.",
   "help__metadata_facet_editor": "When searching for this, search the above fields with all of these values",
@@ -1070,6 +1072,7 @@
   "manifests": "manifests",
   "max contributors": "max contributors",
   "migrate-capture-model-task": "migrate-capture-model-task",
+  "navajo_people": "navajo_people",
   "not found": "not found",
   "not started": "not started",
   "other_data": "other_data",

From a7327d819e5ec433b31cf919ed0da86a6d97eb7f Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Tue, 5 Mar 2024 12:06:33 +0000
Subject: [PATCH 36/55] add subtype topicType to search

---
 .../madoc-ts/src/frontend/site/features/TopicActions.tsx     | 4 +++-
 .../madoc-ts/src/frontend/site/features/TopicPageResults.tsx | 1 -
 .../madoc-ts/src/frontend/site/hooks/use-topic-search.ts     | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/TopicActions.tsx b/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
index 4ab9e309d..fe181e9fa 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicActions.tsx
@@ -25,7 +25,9 @@ export const TopicActions: React.FC<props> = ({ alignment }) => {
   const { appliedFacets } = useSearchQuery();
   const { data } = useTopic();
 
-  query.facets = !appliedFacets.length ? JSON.stringify([{ k: 'entity', v: router.topic, t: 'entity' }]) : query.facets;
+  query.facets = !appliedFacets.length
+    ? JSON.stringify([{ k: router.topicType, v: router.topic, t: 'entity' }])
+    : query.facets;
 
   return (
     <TopicActionWrapper>
diff --git a/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx b/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
index bf0585ab1..61fad7811 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicPageResults.tsx
@@ -12,7 +12,6 @@ import { Button, ButtonIcon } from '../../shared/navigation/Button';
 import { GridIcon } from '../../shared/icons/GridIcon';
 import { ListIcon } from '../../shared/icons/ListIcon';
 import { useTopicSearch } from '../hooks/use-topic-search';
-import { useRouteContext } from '../hooks/use-route-context';
 
 interface TopicPageResultsProps {
   background?: string;
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
index f0fff8a89..00c21127e 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -11,7 +11,7 @@ function normalizeDotKey(key: string) {
 }
 
 export function useTopicSearch() {
-  const { topic } = useRouteContext();
+  const { topic, topicType } = useRouteContext();
   const { fulltext, appliedFacets, page, rscType } = useSearchQuery();
   const {
     project: { searchStrategy, claimGranularity, searchOptions },
@@ -46,6 +46,7 @@ export function useTopicSearch() {
       ? {
           type: 'entity',
           group_id: facet.v,
+          subtype: topicType,
         }
       : {
           type: facet.t,
@@ -60,7 +61,7 @@ export function useTopicSearch() {
         fulltext: fulltext,
         facet_fields: facetsToRequest.length ? facetsToRequest : undefined,
         //  @todo stringify facets.
-        facets: [...topicFacets, { type: 'entity', group_id: topic || '' }],
+        facets: [...topicFacets, { type: 'entity', group_id: topic || '', subtype: topicType || '' }],
         resource_type: rscType,
         facet_on_manifests: true,
         search_type: searchStrategy as any,

From 5f32e28257d715d34629edbf8c11e5e7d67737a9 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Tue, 5 Mar 2024 12:11:16 +0000
Subject: [PATCH 37/55] fix query enable

---
 services/madoc-ts/src/frontend/site/hooks/use-search.ts   | 6 +++++-
 .../madoc-ts/src/frontend/site/hooks/use-topic-search.ts  | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
index c67e72649..2f2d26061 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -11,7 +11,7 @@ function normalizeDotKey(key: string) {
 }
 
 export function useSearch() {
-  const { projectId, collectionId, manifestId, topic } = useRouteContext();
+  const { projectId, collectionId, manifestId, topic, topicType } = useRouteContext();
   const { fulltext, appliedFacets, page, rscType } = useSearchQuery();
   const {
     project: { searchStrategy, claimGranularity, searchOptions },
@@ -46,6 +46,7 @@ export function useSearch() {
       ? {
           type: 'entity',
           group_id: facet.v,
+          subtype: topicType,
         }
       : {
           type: facet.t,
@@ -84,7 +85,10 @@ export function useSearch() {
           !!rscType ||
           collectionId ||
           manifestId ||
+          topic ||
+          topicType ||
           projectId),
+      staleTime: 0,
     }
   );
 
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
index 00c21127e..fd0bc21b5 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -75,7 +75,13 @@ export function useTopicSearch() {
     {
       enabled:
         !searchFacetConfig.isLoading &&
-        (!!facetsToRequest.length || !!fulltext || fulltext === '' || !!topicFacets || !!rscType || !!topic),
+        (!!facetsToRequest.length ||
+          !!fulltext ||
+          fulltext === '' ||
+          !!topicFacets ||
+          !!rscType ||
+          !!topic ||
+          topicType),
       staleTime: 0,
     }
   );

From a43d69ad7630d3198a82c200b9979bf5df4ef7c6 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 8 Mar 2024 12:10:36 +0000
Subject: [PATCH 38/55] change resources to apprerances for couns

---
 .../src/frontend/admin/pages/topics/topic/list-all-topics.tsx   | 2 +-
 services/madoc-ts/src/frontend/shared/components/TopicCard.tsx  | 2 +-
 .../madoc-ts/src/frontend/shared/components/TopicSnippet.tsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-all-topics.tsx b/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-all-topics.tsx
index db35b5584..a058cceb6 100644
--- a/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-all-topics.tsx
+++ b/services/madoc-ts/src/frontend/admin/pages/topics/topic/list-all-topics.tsx
@@ -23,7 +23,7 @@ export function ListAllTopics() {
             link={`${topic.type_slug}/${topic.slug}`}
             buttonText={t('View Topic')}
             hideButton={!topic.type}
-            subtitle={`${topic.tagged_resource_count} ${t('resources tagged')}`}
+            subtitle={`${topic.tagged_resource_count} ${t('appearances')}`}
             thumbnail={topic.other_data?.thumbnail?.url}
             margin
             fluid
diff --git a/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx b/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
index 70de2d52a..1c648fd51 100644
--- a/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/TopicCard.tsx
@@ -55,7 +55,7 @@ export const TopicCard: React.FC<{
         </LocaleString>
 
         <Subheading3>
-          {topic.tagged_resource_count || 0} {t('Resources')}
+          {topic.tagged_resource_count || 0} {t('appearances')}
         </Subheading3>
 
         <Heading5 style={{ padding: 0 }}>{t('PART OF')}</Heading5>
diff --git a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
index 2e305238b..8307508c2 100644
--- a/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/TopicSnippet.tsx
@@ -81,7 +81,7 @@ export const TopicSnippetCard: React.FC<{
           )}
           {topic.tagged_resource_count && (
             <Subheading3>
-              {topic.tagged_resource_count} {t('Resources')}
+              {topic.tagged_resource_count} {t('appearances')}
             </Subheading3>
           )}
         </div>

From b66c5c7de059795ae26286c82fd6c8fac2233653 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 15 Mar 2024 16:26:16 +0000
Subject: [PATCH 39/55] IDA-1139 enter clears search

---
 .../madoc-ts/src/frontend/shared/atoms/SearchBox.tsx   | 10 ++++++++++
 services/madoc-ts/translations/en/madoc.json           |  1 +
 2 files changed, 11 insertions(+)

diff --git a/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx b/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
index 252e544df..c5b8e11a7 100644
--- a/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
+++ b/services/madoc-ts/src/frontend/shared/atoms/SearchBox.tsx
@@ -60,6 +60,15 @@ export const SearchBox: React.FC<{
   const [isFocus, setIsFocus] = useState(false);
   const [searchValue, setSearchValue] = useState(value);
   const { t } = useTranslation();
+
+  const handleEnter = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      onSearch(searchValue);
+    }
+    return;
+  };
+
   return (
     <form
       style={{ marginRight: '20px', display: 'flex' }}
@@ -72,6 +81,7 @@ export const SearchBox: React.FC<{
         <InputBorderless
           onFocus={() => setIsFocus(true)}
           onBlur={() => setIsFocus(false)}
+          onKeyDown={e => handleEnter(e)}
           type="text"
           id={!large ? 'search' : `searchLarge`}
           value={searchValue}
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 04402e364..636f1d5ce 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -986,6 +986,7 @@
   "alignment": "alignment",
   "alt": "alt",
   "alt text": "alt text",
+  "appearances": "appearances",
   "as decimal eg 0.5 is 50% opacity": "as decimal eg 0.5 is 50% opacity",
   "assigned": "assigned",
   "assigned to": "assigned to",

From 3dd42140c4deee4cd34b6767d6b9b0f280a155d7 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 15 Mar 2024 17:04:07 +0000
Subject: [PATCH 40/55] IDA-1160 fix duplicating facets

---
 .../src/frontend/site/features/SearchPageFilters.tsx      | 8 ++++----
 .../madoc-ts/src/frontend/site/hooks/use-topic-search.ts  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
index 8b6829bae..200f7838a 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
@@ -16,9 +16,7 @@ import { useSearchFacets } from '../hooks/use-search-facets';
 import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
 import { CheckboxBtn } from '../../shared/atoms/CheckboxBtn';
 import { useSearch } from '../hooks/use-search';
-import { SearchBox } from '../../shared/atoms/SearchBox';
 import { Accordion } from '../../shared/atoms/Accordion';
-import { Dropdown } from '../../shared/capture-models/editor/atoms/Dropdown';
 
 const DropdownContainer = styled.div`
   margin: 1em 1em 1em 0;
@@ -51,7 +49,9 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
     setResourceType,
   } = useSearchFacets();
 
-  if (!displayFacets) {
+  const uniqueFacets = [...new Map(displayFacets.map(v => [v.id, v])).values()];
+
+  if (!uniqueFacets) {
     return null;
   }
   return (
@@ -67,7 +67,7 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
         </Button>
       </ButtonRow>
 
-      {displayFacets?.map(facet => {
+      {uniqueFacets?.map(facet => {
         if (facet.items.length === 0) {
           return null;
         }
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
index fd0bc21b5..79c4fe7dd 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -223,5 +223,6 @@ export function useTopicSearch() {
 
     return displayList;
   }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData]);
+  console.log(displayFacets);
   return [searchResults, displayFacets, searchFacetConfig.isLoading || searchResults.isLoading] as const;
 }

From 47c6e758f321c6cb70b0b37d596e98d20b7197dd Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 15 Mar 2024 17:28:16 +0000
Subject: [PATCH 41/55] IDA-1152 change reset to home icon

---
 .../src/frontend/site/features/CanvasPlaintext.tsx        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/CanvasPlaintext.tsx b/services/madoc-ts/src/frontend/site/features/CanvasPlaintext.tsx
index fbc4ba4a8..6e3b29692 100644
--- a/services/madoc-ts/src/frontend/site/features/CanvasPlaintext.tsx
+++ b/services/madoc-ts/src/frontend/site/features/CanvasPlaintext.tsx
@@ -5,6 +5,7 @@ import { Button, ButtonRow } from '../../shared/navigation/Button';
 import { useData } from '../../shared/hooks/use-data';
 import { useLocalStorage } from '../../shared/hooks/use-local-storage';
 import { CanvasLoader } from '../pages/loaders/canvas-loader';
+import { HomeIcon } from '../../shared/icons/HomeIcon';
 
 const PlaintextContainer = styled.div``;
 
@@ -53,8 +54,11 @@ export const CanvasPlaintext: React.FC<{ onSwitch?: () => void; switchLabel?: st
     <PlaintextContainer>
       <PlaintextActions>
         <ButtonRow $noMargin>
-          <Button onClick={() => setFontMultiplier(0.9)}>
-            {t('atlas__zoom_home_text', { defaultValue: 'Reset' })}
+          <Button
+            onClick={() => setFontMultiplier(0.9)}
+            aria-label={t('atlas__zoom_home_text', { defaultValue: 'Reset' })}
+          >
+            <HomeIcon />
           </Button>
           <Button disabled={fontMultiplier < 0.3} onClick={() => setFontMultiplier(m => m * 0.9)}>
             {t('atlas__zoom_out_text', { defaultValue: '-' })}

From 845fc60f2dda1e182e724cec67bfac92d2e90a1d Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 15 Mar 2024 17:32:46 +0000
Subject: [PATCH 42/55] IDA-1141 add load spinner to facets

---
 .../src/frontend/site/features/SearchPageFilters.tsx     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
index 200f7838a..9de8e12b2 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
@@ -17,6 +17,8 @@ import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for
 import { CheckboxBtn } from '../../shared/atoms/CheckboxBtn';
 import { useSearch } from '../hooks/use-search';
 import { Accordion } from '../../shared/atoms/Accordion';
+import { Spinner } from '../../shared/icons/Spinner';
+import { EmptyState } from '../../shared/layout/EmptyState';
 
 const DropdownContainer = styled.div`
   margin: 1em 1em 1em 0;
@@ -54,6 +56,13 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
   if (!uniqueFacets) {
     return null;
   }
+  if (isLoading) {
+    return (
+      <EmptyState style={{ width: '200px' }}>
+        <Spinner stroke="#000" />
+      </EmptyState>
+    );
+  }
   return (
     <SearchFilterContainer>
       <SearchFilterTitle>{filterHeader}</SearchFilterTitle>

From 84786c47cb07eb1236096572acef8a0ac5457f9d Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 12:46:43 +0000
Subject: [PATCH 43/55] IDA-1149/add-apply-button-to-bottom

---
 .../src/frontend/site/features/SearchPageFilters.tsx      | 8 ++++++++
 .../madoc-ts/src/frontend/site/hooks/use-topic-search.ts  | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
index 9de8e12b2..6ede4d72d 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageFilters.tsx
@@ -110,6 +110,14 @@ export const SearchPageFilters: React.FC<SearchPageFiltersProps> = ({ checkBoxCo
           </Accordion>
         );
       })}
+      <ButtonRow $noMargin>
+        <Button $primary disabled={!inQueue} onClick={() => applyAllFacets()}>
+          {t('Apply filters')}
+        </Button>
+        <Button disabled={!appliedFacets.length} onClick={() => clearAllFacets()}>
+          {t('Clear')}
+        </Button>
+      </ButtonRow>
     </SearchFilterContainer>
   );
 };
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
index 79c4fe7dd..fd0bc21b5 100644
--- a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
+++ b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -223,6 +223,5 @@ export function useTopicSearch() {
 
     return displayList;
   }, [facetDisplayOrder, facetIdMap, searchResults.resolvedData]);
-  console.log(displayFacets);
   return [searchResults, displayFacets, searchFacetConfig.isLoading || searchResults.isLoading] as const;
 }

From f0f877cc2cb3802bf1890fdec55d5d6b0fb78d93 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 13:19:07 +0000
Subject: [PATCH 44/55] IDA-1133 add option to make menu items bold

---
 .../site/features/GlobalMenuStack.tsx         | 33 +++++++++++++++++--
 .../site/features/GlobalSiteNavigation.tsx    | 29 ++++++++++++----
 .../themes/default-madoc-theme/theme.json     | 15 ---------
 services/madoc-ts/translations/en/madoc.json  |  4 +++
 4 files changed, 58 insertions(+), 23 deletions(-)
 delete mode 100644 services/madoc-ts/themes/default-madoc-theme/theme.json

diff --git a/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx b/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
index b3a07d1f1..5704ea4c2 100644
--- a/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
+++ b/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
@@ -44,11 +44,21 @@ export const GlobalMenuStack: React.FC<{
   hideSiteTitle?: boolean;
   showHomepageMenu?: boolean;
   maxWidth?: number;
+  fontWeight?: 'normal' | 'light' | 'bold';
   extraLinks?: {
     slug?: string;
     text?: string;
   }[];
-}> = ({ logo, hideSiteTitle, maxWidth, logoOptions = {}, menuOptions = {}, showHomepageMenu, extraLinks }) => {
+}> = ({
+  logo,
+  hideSiteTitle,
+  maxWidth,
+  logoOptions = {},
+  menuOptions = {},
+  showHomepageMenu,
+  extraLinks,
+  fontWeight,
+}) => {
   const site = useSite();
   const { project } = useSiteConfiguration();
   const showSiteTitle = typeof hideSiteTitle === 'undefined' ? !project.headerOptions?.hideSiteTitle : !hideSiteTitle;
@@ -71,7 +81,7 @@ export const GlobalMenuStack: React.FC<{
         </SiteTitle>
       )}
       <SiteMenuContainer data-full-width={menuOptions.fullWidth}>
-        <GlobalSiteNavigation showHomepageMenu={showHomepageMenu} extraNavItems={extraLinks} />
+        <GlobalSiteNavigation showHomepageMenu={showHomepageMenu} extraNavItems={extraLinks} fontWeight={fontWeight} />
       </SiteMenuContainer>
     </SiteDetails>
   );
@@ -93,6 +103,7 @@ blockEditorFor(GlobalMenuStack, {
     menuOptions: {
       fullWidth: false,
     },
+    fontWeight: 'normal',
     maxWidth: null,
     extraLinks: [
       {
@@ -151,6 +162,24 @@ blockEditorFor(GlobalMenuStack, {
       type: 'checkbox-field',
       inlineLabel: 'Show home as menu item',
     },
+    fontWeight: {
+      label: 'Font weight - Menu items ',
+      type: 'dropdown-field',
+      options: [
+        {
+          text: 'Bold',
+          value: 'bold',
+        },
+        {
+          text: 'Normal',
+          value: 'normal',
+        },
+        {
+          text: 'Light',
+          value: 'lighter',
+        },
+      ],
+    },
     extraLinks: {
       allowMultiple: true,
       label: 'Extra Nav item',
diff --git a/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx b/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
index 3c7306064..a1ae6eeb5 100644
--- a/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
+++ b/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
@@ -9,6 +9,7 @@ import { useSiteConfiguration } from './SiteConfigurationContext';
 
 export function GlobalSiteNavigation(props: {
   showHomepageMenu?: boolean;
+  fontWeight?: string;
   extraNavItems?: {
     slug?: string;
     text?: string;
@@ -30,27 +31,39 @@ export function GlobalSiteNavigation(props: {
   return (
     <LightNavigation>
       {props.showHomepageMenu ? (
-        <LightNavigationItem $active={location.pathname === '/'}>
+        <LightNavigationItem $active={location.pathname === '/'} style={{ fontWeight: props.fontWeight }}>
           <HrefLink href="/">{t('Home')}</HrefLink>
         </LightNavigationItem>
       ) : null}
       {showProjects ? (
-        <LightNavigationItem $active={location.pathname.startsWith('/projects') && !isExtraActive}>
+        <LightNavigationItem
+          $active={location.pathname.startsWith('/projects') && !isExtraActive}
+          style={{ fontWeight: props.fontWeight }}
+        >
           <HrefLink href="/projects">{t('Projects')}</HrefLink>
         </LightNavigationItem>
       ) : null}
       {showCollections ? (
-        <LightNavigationItem $active={location.pathname.startsWith('/collections') && !isExtraActive}>
+        <LightNavigationItem
+          $active={location.pathname.startsWith('/collections') && !isExtraActive}
+          style={{ fontWeight: props.fontWeight }}
+        >
           <HrefLink href="/collections">{t('Collections')}</HrefLink>
         </LightNavigationItem>
       ) : null}
       {showTopics ? (
-        <LightNavigationItem $active={location.pathname.startsWith('/topic') && !isExtraActive}>
+        <LightNavigationItem
+          $active={location.pathname.startsWith('/topic') && !isExtraActive}
+          style={{ fontWeight: props.fontWeight }}
+        >
           <HrefLink href="/topics">{t('Topics')}</HrefLink>
         </LightNavigationItem>
       ) : null}
       {showDashboard ? (
-        <LightNavigationItem $active={location.pathname.startsWith('/dashboard') && !isExtraActive}>
+        <LightNavigationItem
+          $active={location.pathname.startsWith('/dashboard') && !isExtraActive}
+          style={{ fontWeight: props.fontWeight }}
+        >
           <HrefLink href="/dashboard">{t('User dashboard')}</HrefLink>
         </LightNavigationItem>
       ) : null}
@@ -58,7 +71,11 @@ export function GlobalSiteNavigation(props: {
         ? props.extraNavItems.map((item, i) => {
             return (
               item.slug && (
-                <LightNavigationItem key={i} $active={location.pathname === item.slug}>
+                <LightNavigationItem
+                  key={i}
+                  $active={location.pathname === item.slug}
+                  style={{ fontWeight: props.fontWeight }}
+                >
                   <HrefLink href={item.slug}>{item.text ? t(item.text) : item.slug}</HrefLink>
                 </LightNavigationItem>
               )
diff --git a/services/madoc-ts/themes/default-madoc-theme/theme.json b/services/madoc-ts/themes/default-madoc-theme/theme.json
deleted file mode 100644
index cd03e7975..000000000
--- a/services/madoc-ts/themes/default-madoc-theme/theme.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/digirati-co-uk/madoc-platform/main/services/madoc-ts/schemas/BaseTheme.json",
-  "name": "Default Madoc Theme",
-  "version": "1.0.0",
-  "description": "Example madoc theme with default theme values.",
-  "thumbnail": "https://user-images.githubusercontent.com/8266711/118507448-25750b80-b726-11eb-9f87-d96f43c0a894.png",
-  "theme": {
-    "header": "dark",
-    "accent": "default",
-    "siteContainer": "light",
-    "footer": "dark",
-    "global": "default",
-    "fonts": "default"
-  }
-}
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 636f1d5ce..25efbf0ae 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -119,6 +119,7 @@
   "Background height": "Background height",
   "Background image": "Background image",
   "Below are the enabled activity streams. When you enable them, only new activity will be recorded.": "Below are the enabled activity streams. When you enable them, only new activity will be recorded.",
+  "Bold": "Bold",
   "Bookmarks": "Bookmarks",
   "Border color": "Border color",
   "Border radius": "Border radius",
@@ -376,6 +377,7 @@
   "Font (from google)": "Font (from google)",
   "Font Weight": "Font Weight",
   "Font size": "Font size",
+  "Font weight - Menu items ": "Font weight - Menu items ",
   "Forgot password?": "Forgot password?",
   "Form description": "Form description",
   "Form label": "Form label",
@@ -504,6 +506,7 @@
   "Languages": "Languages",
   "Layout": "Layout",
   "Leave feedback": "Leave feedback",
+  "Light": "Light",
   "Link": "Link",
   "Link text": "Link text",
   "Link to": "Link to",
@@ -617,6 +620,7 @@
   "No users assigned": "No users assigned",
   "No values exist for this": "No values exist for this",
   "Non-latin fulltext": "Non-latin fulltext",
+  "Normal": "Normal",
   "Not started": "Not started",
   "Nothing contributed yet": "Nothing contributed yet",
   "Nothing tagged yet": "Nothing tagged yet",

From ab67f52aa088dbd8743db268f258bf69a5d7af73 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 13:20:28 +0000
Subject: [PATCH 45/55] fix type errors

---
 .../madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx     | 2 +-
 .../src/frontend/site/features/GlobalSiteNavigation.tsx         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx b/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
index 5704ea4c2..1d364e0e2 100644
--- a/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
+++ b/services/madoc-ts/src/frontend/site/features/GlobalMenuStack.tsx
@@ -44,7 +44,7 @@ export const GlobalMenuStack: React.FC<{
   hideSiteTitle?: boolean;
   showHomepageMenu?: boolean;
   maxWidth?: number;
-  fontWeight?: 'normal' | 'light' | 'bold';
+  fontWeight?: 'normal' | 'lighter' | 'bold';
   extraLinks?: {
     slug?: string;
     text?: string;
diff --git a/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx b/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
index a1ae6eeb5..de936d77e 100644
--- a/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
+++ b/services/madoc-ts/src/frontend/site/features/GlobalSiteNavigation.tsx
@@ -9,7 +9,7 @@ import { useSiteConfiguration } from './SiteConfigurationContext';
 
 export function GlobalSiteNavigation(props: {
   showHomepageMenu?: boolean;
-  fontWeight?: string;
+  fontWeight?: 'normal' | 'bold' | 'lighter';
   extraNavItems?: {
     slug?: string;
     text?: string;

From b21464f376f766e68657e12b8f7e11afd132e637 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 15:11:18 +0000
Subject: [PATCH 46/55] half width surface

---
 .../{simple-html-block.ts => simple-html-block.tsx}        | 3 ++-
 .../simple-markdown-block/simple-markdown-block.tsx        | 1 +
 services/madoc-ts/src/frontend/shared/layout/Surface.tsx   | 7 +++++++
 services/madoc-ts/translations/en/madoc.json               | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)
 rename services/madoc-ts/src/extensions/page-blocks/simple-html-block/{simple-html-block.ts => simple-html-block.tsx} (85%)

diff --git a/services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.ts b/services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.tsx
similarity index 85%
rename from services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.ts
rename to services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.tsx
index 419c5fcf1..c0fc1d614 100644
--- a/services/madoc-ts/src/extensions/page-blocks/simple-html-block/simple-html-block.ts
+++ b/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;
   },
diff --git a/services/madoc-ts/src/extensions/page-blocks/simple-markdown-block/simple-markdown-block.tsx b/services/madoc-ts/src/extensions/page-blocks/simple-markdown-block/simple-markdown-block.tsx
index 827637b02..7b6f0be4e 100644
--- a/services/madoc-ts/src/extensions/page-blocks/simple-markdown-block/simple-markdown-block.tsx
+++ b/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;
diff --git a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
index 8359f8bac..a62384316 100644
--- a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
+++ b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx
@@ -46,6 +46,7 @@ const SurfaceStyled = styled.div<{
   $color?: string;
   $textAlign?: 'left' | 'center' | 'right';
   $fullWidth?: boolean;
+  $halfWidth?: boolean;
   $padding?: 'none' | 'sm' | 'md' | 'lg';
   $marginBottom?: 'none' | 'sm' | 'md' | 'lg';
   $fontSize?: 'sm' | 'md' | 'lg';
@@ -63,6 +64,7 @@ const SurfaceStyled = styled.div<{
   margin-bottom: ${parseProp('$marginBottom', '0')};
   margin-left: ${props => (props.$fullWidth ? '-3em' : '')};
   margin-right: ${props => (props.$fullWidth ? '-3em' : '')};
+  max-width: ${props => (props.$halfWidth ? '60vw' : '')};
 `;
 
 export type SurfaceProps = {
@@ -70,6 +72,7 @@ export type SurfaceProps = {
   background?: string;
   textColor?: string;
   fullWidth?: boolean;
+  halfWidth?: boolean;
   textAlign?: 'left' | 'center' | 'right';
   font?: string;
   padding?: 'none' | 'sm' | 'md' | 'lg';
@@ -83,6 +86,7 @@ export const Surface: React.FC<SurfaceProps> = ({
   textAlign,
   textColor,
   fullWidth,
+  halfWidth,
   background,
   font,
   fontSize,
@@ -103,6 +107,7 @@ export const Surface: React.FC<SurfaceProps> = ({
       $background={background}
       $textAlign={textAlign}
       $fullWidth={fullWidth}
+      $halfWidth={halfWidth}
       $font={font}
       $padding={padding}
       $fontSize={fontSize}
@@ -121,6 +126,7 @@ blockEditorFor(Surface, {
   defaultProps: {
     textColor: '',
     fullWidth: false,
+    halfWidth: false,
     background: '',
     font: '',
     padding: 'none',
@@ -134,6 +140,7 @@ blockEditorFor(Surface, {
     background: { label: 'Background color', type: 'color-field' },
     font: { label: 'Font (from google)', type: 'text-field' },
     fullWidth: { label: 'Display as full width?', type: 'checkbox-field' },
+    halfWidth: { label: 'Display as half width?', type: 'checkbox-field' },
     padding: {
       label: 'Padding size',
       description: 'How much padding should the surface have. (default: none)',
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index 25efbf0ae..fa8034048 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -297,6 +297,7 @@
   "Display as": "Display as",
   "Display as full width?": "Display as full width?",
   "Display as grid": "Display as grid",
+  "Display as half width?": "Display as half width?",
   "Display as list": "Display as list",
   "Display at half size": "Display at half size",
   "Display name": "Display name",
@@ -332,6 +333,7 @@
   "Enable unique submissions": "Enable unique submissions",
   "Enabled translations": "Enabled translations",
   "Enrichment": "Enrichment",
+  "Enter HTML content": "Enter HTML content",
   "Enter IIIF Manifest Collection URL": "Enter IIIF Manifest Collection URL",
   "Enter URL": "Enter URL",
   "Enter a heading": "Enter a heading",
@@ -1098,6 +1100,7 @@
   "switch to the main revision": "switch to the main revision",
   "task thumbnail": "task thumbnail",
   "text": "text",
+  "text max width": "text max width",
   "thumbnail": "thumbnail",
   "thumbnail for": "thumbnail for",
   "to make changes": "to make changes",

From 90e0dc90f1f6e66dd08219459499326cc9169f97 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 15:20:09 +0000
Subject: [PATCH 47/55] make search button use border theme colour

---
 .../src/frontend/shared/layout/SiteHeader.tsx         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/layout/SiteHeader.tsx b/services/madoc-ts/src/frontend/shared/layout/SiteHeader.tsx
index beb4f4f7d..8864515fd 100644
--- a/services/madoc-ts/src/frontend/shared/layout/SiteHeader.tsx
+++ b/services/madoc-ts/src/frontend/shared/layout/SiteHeader.tsx
@@ -15,6 +15,10 @@ const headerText = themeVariable('header', 'headerText', {
   midnight: '#fff',
 });
 
+const accent = themeVariable('accent', 'primary', {
+  default: '#5b80b2',
+});
+
 export const SiteHeader = styled.div`
   max-width: ${maxWidth};
   width: 100%;
@@ -76,9 +80,10 @@ export const GlobalSearchInput = styled.input`
 export const GlobalSearchButton = styled.button`
   font-size: 0.9em;
   padding: 0.2em 1em;
-  background: #333;
-  color: #fff;
-  border: 2px solid #333;
+  background: ${searchBorder};
+  color: #333;
+  border: 2px solid ${searchBorder};
+
   &:focus {
     outline: none;
     border-color: ${searchBorderFocusColor};

From b1ea89be7db59a7a11da34300ccd5d9e31b9bf13 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 22 Mar 2024 16:40:49 +0000
Subject: [PATCH 48/55] fix margin

---
 .../src/frontend/site/features/AllTopicTypeItems.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
index ad8682abd..f761ded28 100644
--- a/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AllTopicTypeItems.tsx
@@ -13,18 +13,23 @@ import { CroppedImage } from '../../shared/atoms/Images';
 const ListWrapper = styled.div`
   padding-top: 1em;
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr 1fr 1fr;
   gap: 2em;
 `;
 
 const TypeCard = styled.div`
   display: flex;
-  border: 1px solid #002d4b;
+  border: 3px solid #002d4b;
   background-color: white;
   margin-bottom: 20px;
   justify-content: space-evenly;
   max-height: 250px;
   min-width: 45%;
+  border-radius: 4px;
+
+  &:hover {
+    border: 3px solid rgba(4, 102, 166, 0.5) !important;
+  }
 `;
 
 const TypeText = styled.div`
@@ -41,7 +46,6 @@ const TypeText = styled.div`
     color: #002d4b;
     border-radius: 20px;
     padding: 0.8em;
-    margin-top: 1em;
 
     &:hover {
       background-color: #002d4b;
@@ -53,7 +57,7 @@ const TypeText = styled.div`
 const CountText = styled.div`
   font-weight: 400;
   font-size: 1em;
-  margin: 1em 0 2em 0;
+  margin: 1em 0;
 
   span {
     color: #707070;

From a1753adeb7a2ce0065a8ac3ea20985f97ecd6427 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Wed, 27 Mar 2024 12:07:57 +0000
Subject: [PATCH 49/55] IDA-1158: user feedback and add another button on
 tagging modal

---
 .../frontend/site/features/AddTagButton.tsx   | 31 +++++++-
 .../frontend/site/features/AddTopicButton.tsx | 32 +++++++-
 .../site/features/TaggingFormPannel.tsx       | 77 ++++++++++++++-----
 services/madoc-ts/translations/en/madoc.json  |  3 +
 4 files changed, 119 insertions(+), 24 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx b/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
index a116cf6d3..8456d2b29 100644
--- a/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Button } from '../../shared/navigation/Button';
 import { CloseIcon } from '../../shared/icons/CloseIcon';
 import { useApi } from '../../shared/hooks/use-api';
@@ -28,7 +28,8 @@ export const AddTagButton: React.FC<{
   statusLoading: boolean;
   onSelected: (id: string | undefined) => void;
   hideTopic?: boolean;
-}> = ({ typeSlug, typeLabel, onSelected, statusLoading, hideTopic }) => {
+  postSubmission: boolean;
+}> = ({ typeSlug, typeLabel, onSelected, statusLoading, hideTopic, postSubmission }) => {
   const container = useRef<HTMLDivElement>(null);
   const [fullText, setFulltext] = React.useState('');
   const [isLoading, setIsLoading] = React.useState(false);
@@ -36,6 +37,12 @@ export const AddTagButton: React.FC<{
   const api = useApi();
   const { t } = useTranslation();
 
+  useEffect(() => {
+    if (!postSubmission && selected) {
+      setSelected(null);
+    }
+  }, [postSubmission]);
+
   const { data: pages, fetchMore, canFetchMore, isFetchingMore, isLoading: queryLoading } = useInfiniteQuery(
     ['topic-autocomplete', { fullText, typeSlug }],
     async (key, _, vars: { page?: number } = { page: 1 }) => {
@@ -69,6 +76,26 @@ export const AddTagButton: React.FC<{
   // const tags = data?.entity_tags;
   // const appliedTagIDs = tags?.map(tag => tag.entity.id);
 
+  if (selected && postSubmission) {
+    return (
+      <div>
+        <div
+          style={{
+            display: 'flex',
+            backgroundColor: 'rgba(197,232,197,0.32)',
+            padding: '0.5em',
+            borderRadius: '4px',
+          }}
+        >
+          <p> {t('Canvas tagged with')}: </p>
+          <TagPill style={{ alignSelf: 'end' }}>
+            <LocaleString>{selected.title}</LocaleString>
+          </TagPill>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div>
       {selected ? (
diff --git a/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx b/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
index 88699f644..26b6ed1df 100644
--- a/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
@@ -12,6 +12,7 @@ import { TagPill } from '../hooks/canvas-menu/tagging-panel';
 import { AutoCompleteEntitySnippet } from '../../../extensions/enrichment/types';
 import { AddTagButton } from './AddTagButton';
 import { useTranslation } from 'react-i18next';
+import { LocaleString } from '../../shared/components/LocaleString';
 
 export const TopicPill = styled(TagPill)`
   border-color: orange;
@@ -19,7 +20,8 @@ export const TopicPill = styled(TagPill)`
 export const AddTopicButton: React.FC<{
   statusLoading: boolean;
   onSelected: (slug: string | undefined) => void;
-}> = ({ onSelected, statusLoading }) => {
+  postSubmission: boolean;
+}> = ({ onSelected, statusLoading, postSubmission }) => {
   const container = useRef<HTMLDivElement>(null);
   const [fullText, setFulltext] = React.useState('');
   const [isLoading, setIsLoading] = React.useState(false);
@@ -56,6 +58,33 @@ export const AddTopicButton: React.FC<{
     setIsLoading(false);
   };
 
+  if (selected && postSubmission) {
+    return (
+      <div>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            gap: '5px',
+            backgroundColor: 'rgba(197,232,197,0.32)',
+            padding: '0.5em',
+            borderRadius: '4px',
+          }}
+        >
+          <p> {t('Canvas tagged with')}: </p>
+
+          <b> {t('Topic Type')}: </b>
+          <TopicPill style={{ alignSelf: 'start' }}>{selected.label}</TopicPill>
+
+          <b> {t('Tag')}: </b>
+          <TagPill style={{ alignSelf: 'start' }}>
+            <LocaleString>{selected.title}</LocaleString>
+          </TagPill>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div style={{ maxWidth: '100%' }}>
       <p>{t('Choose a topic type first')}</p>
@@ -78,6 +107,7 @@ export const AddTopicButton: React.FC<{
             typeLabel={selected.label}
             statusLoading={statusLoading}
             onSelected={onSelected}
+            postSubmission={false}
             hideTopic
           />
         </>
diff --git a/services/madoc-ts/src/frontend/site/features/TaggingFormPannel.tsx b/services/madoc-ts/src/frontend/site/features/TaggingFormPannel.tsx
index 0e0a8c53b..5e49c1757 100644
--- a/services/madoc-ts/src/frontend/site/features/TaggingFormPannel.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TaggingFormPannel.tsx
@@ -52,7 +52,7 @@ export const TaggingFormPannel = () => {
   const { canvasId } = useRouteContext();
   const api = useApi();
   const ResourceTags = useGetResourceTags();
-
+  const [postSubmission, setPostSubmission] = useState(false);
   const [selectedId, setSelectedId] = useState<string | undefined>(undefined);
 
   const [remove, removeStatus] = useMutation(async (id: string) => {
@@ -76,19 +76,33 @@ export const TaggingFormPannel = () => {
       <ModalButton
         style={{ fontWeight: '500', display: 'block', marginBottom: '0.5em' }}
         title={t('Tag this resource')}
-        render={() => <AddTopicButton onSelected={onSelect} statusLoading={addStatus.isLoading} />}
+        render={() => (
+          <AddTopicButton onSelected={onSelect} statusLoading={addStatus.isLoading} postSubmission={postSubmission} />
+        )}
         footerAlignRight
         renderFooter={({ close }) => (
           <ButtonRow $noMargin>
-            <Button
-              $primary
-              disabled={!selectedId}
-              onClick={() => {
-                addTag(selectedId).then(() => close());
-              }}
-            >
-              {t('Submit')}
-            </Button>
+            {postSubmission ? (
+              <Button
+                $primary
+                onClick={() => {
+                  setSelectedId(undefined);
+                  setPostSubmission(false);
+                }}
+              >
+                {t('Add another')}
+              </Button>
+            ) : (
+              <Button
+                $primary
+                disabled={!selectedId}
+                onClick={() => {
+                  addTag(selectedId).then(() => setPostSubmission(true));
+                }}
+              >
+                {t('Submit')}
+              </Button>
+            )}
             <Button
               onClick={() => {
                 setSelectedId(undefined);
@@ -100,7 +114,14 @@ export const TaggingFormPannel = () => {
           </ButtonRow>
         )}
       >
-        <Button>{t('Add new')}</Button>
+        <Button
+          onClick={() => {
+            setPostSubmission(false);
+            setSelectedId(undefined);
+          }}
+        >
+          {t('Add new')}
+        </Button>
       </ModalButton>
       {ResourceTags.length === 0 ? (
         <MetadataEmptyState style={{ marginTop: 100 }}>{t('No tags')}</MetadataEmptyState>
@@ -119,20 +140,34 @@ export const TaggingFormPannel = () => {
                   typeLabel={tagType.type}
                   onSelected={onSelect}
                   statusLoading={addStatus.isLoading}
+                  postSubmission={postSubmission}
                 />
               )}
               footerAlignRight
               renderFooter={({ close }) => (
                 <ButtonRow $noMargin>
-                  <Button
-                    $primary
-                    disabled={!selectedId}
-                    onClick={() => {
-                      addTag(selectedId).then(() => close());
-                    }}
-                  >
-                    {t('Submit')}
-                  </Button>
+                  {postSubmission ? (
+                    <Button
+                      $primary
+                      onClick={() => {
+                        setSelectedId(undefined);
+                        setPostSubmission(false);
+                      }}
+                    >
+                      {t('Add another')}
+                    </Button>
+                  ) : (
+                    <Button
+                      $primary
+                      disabled={!selectedId}
+                      onClick={() => {
+                        addTag(selectedId).then(() => setPostSubmission(true));
+                      }}
+                    >
+                      {t('Submit')}
+                    </Button>
+                  )}
+
                   <Button
                     onClick={() => {
                       setSelectedId(undefined);
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index fa8034048..a29f4c0d3 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -19,6 +19,7 @@
   "Add New Tag": "Add New Tag",
   "Add Tag": "Add Tag",
   "Add a new empty collection and start adding IIIF manifests to it": "Add a new empty collection and start adding IIIF manifests to it",
+  "Add another": "Add another",
   "Add another {{label}}": "Add another {{label}}",
   "Add existing collection": "Add existing collection",
   "Add existing manifest": "Add existing manifest",
@@ -143,6 +144,7 @@
   "Canvas not found": "Canvas not found",
   "Canvas page annotations": "Canvas page annotations",
   "Canvas page document regions": "Canvas page document regions",
+  "Canvas tagged with": "Canvas tagged with",
   "Canvas text color": "Canvas text color",
   "Canvas thumbnail": "Canvas thumbnail",
   "Canvas title": "Canvas title",
@@ -815,6 +817,7 @@
   "Submission approvals required": "Submission approvals required",
   "Submit": "Submit",
   "Submit for review": "Submit for review",
+  "Submita": "Submita",
   "Submitted": "Submitted",
   "Suggest edit": "Suggest edit",
   "Suggested translations": "Suggested translations",

From edf32b5a5d19baecea3827f7731769a3ed6e2674 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Wed, 3 Apr 2024 11:32:15 +0100
Subject: [PATCH 50/55] 1136-topics ordering

---
 .../src/extensions/enrichment/extension.ts    |  4 +-
 .../src/frontend/site/features/TopicGrid.tsx  | 50 +++++++++++++++++--
 .../site/pages/loaders/topic-type-loader.tsx  | 17 ++++---
 services/madoc-ts/src/gateway/api.ts          |  4 +-
 .../src/routes/site/site-topic-type.ts        |  5 +-
 5 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/services/madoc-ts/src/extensions/enrichment/extension.ts b/services/madoc-ts/src/extensions/enrichment/extension.ts
index dd12f82d4..638bf0bb1 100644
--- a/services/madoc-ts/src/extensions/enrichment/extension.ts
+++ b/services/madoc-ts/src/extensions/enrichment/extension.ts
@@ -148,8 +148,8 @@ export class EnrichmentExtension extends BaseDjangoExtension {
   }
 
   // Entity - List, filtered by chosen Entity Type
-  getEntities(slug: string, page?: number) {
-    return this.api.request<any>(`/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
diff --git a/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx b/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
index 900f313b3..2f29d6634 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
@@ -1,10 +1,25 @@
 import { ImageGrid } from '../../shared/atoms/ImageGrid';
-import { Link } from 'react-router-dom';
-import React from 'react';
+import { Link, useHref, useLocation, useNavigate } from 'react-router-dom';
+import React, { useLayoutEffect, useState } from 'react';
 import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
 import { useRelativeLinks } from '../hooks/use-relative-links';
 import { useTopicType } from '../pages/loaders/topic-type-loader';
 import { TopicCard } from '../../shared/components/TopicCard';
+import { Dropdown } from '../../shared/capture-models/editor/atoms/Dropdown';
+import styled from 'styled-components';
+import { useRouteContext } from '../hooks/use-route-context';
+
+const DropdownContainer = styled.div`
+  margin: 1em 1em 1em 0;
+  font-size: 0.9em;
+  font-weight: 400;
+  width: 250px;
+  margin-left: auto;
+  & strong {
+    font-size: 0.9em;
+    font-weight: 400;
+  }
+`;
 
 export const TopicGrid: React.FC<{
   background?: string;
@@ -12,16 +27,45 @@ export const TopicGrid: React.FC<{
   cardBorder?: string;
   imageStyle?: string;
 }> = ({ background, textColor, cardBorder }) => {
+  const scrollX = window.scrollX;
+  const scrollY = window.scrollY;
+
+  useLayoutEffect(() => {
+    window.scrollTo(scrollX, scrollY);
+  });
+
   const { data } = useTopicType();
   const items = data?.topics;
   const createLink = useRelativeLinks();
-
+  const { pathname } = useLocation();
+  const navigate = useNavigate();
   if (!data) {
     return null;
   }
 
   return (
     <div style={{ margin: '4em' }}>
+      <DropdownContainer>
+        <Dropdown
+          key={'fulltext'}
+          placeholder={`sort by`}
+          value={''}
+          onChange={val => {
+            const page = 1;
+            navigate(`${pathname}?page=${page}&order_by=${val}`, { resetScroll: false, replace: true });
+          }}
+          options={[
+            {
+              value: '',
+              text: 'Appearances',
+            },
+            {
+              value: 'label',
+              text: 'Alphabetical',
+            },
+          ]}
+        />
+      </DropdownContainer>
       <ImageGrid $size="large">
         {items?.map(topic => (
           <Link
diff --git a/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-loader.tsx b/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-loader.tsx
index d0fffcef9..e0aaf63a4 100644
--- a/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-loader.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/loaders/topic-type-loader.tsx
@@ -9,14 +9,16 @@ import { AutoSlotLoader } from '../../../shared/page-blocks/auto-slot-loader';
 
 export type TopicTypeLoaderType = {
   params: { topicType: string };
-  variables: { topicType: string; page: number };
-  query: { page?: string };
+  variables: { topicType: string; page: number; order_by: string };
+  query: { page?: string; order_by: string };
   data: TopicType;
 };
 
 export function useTopicType() {
-  const params = useParams<{ topicType?: string }>();
-  return usePaginatedData(TopicTypeLoader, undefined, { enabled: params.topicType && params.topicType !== '_' });
+  const params = useParams<{ topicType?: string; order_by?: string }>();
+  return usePaginatedData(TopicTypeLoader, undefined, {
+    enabled: params.topicType && params.topicType !== '_',
+  });
 }
 
 export const TopicTypeLoader: UniversalComponent<TopicTypeLoaderType> = createUniversalComponent<TopicTypeLoaderType>(
@@ -35,10 +37,13 @@ export const TopicTypeLoader: UniversalComponent<TopicTypeLoaderType> = createUn
   },
   {
     getKey: (params, query) => {
-      return ['site-topic-type', { topicType: params.topicType, page: Number(query.page) || 1 }];
+      return [
+        'site-topic-type',
+        { topicType: params.topicType, page: Number(query.page) || 1, order_by: query.order_by || '' },
+      ];
     },
     getData: async (key, vars, api) => {
-      return await api.getSiteTopicType(vars.topicType, vars.page);
+      return await api.getSiteTopicType(vars.topicType, vars.page, vars.order_by);
     },
   }
 );
diff --git a/services/madoc-ts/src/gateway/api.ts b/services/madoc-ts/src/gateway/api.ts
index d712b073a..66577c266 100644
--- a/services/madoc-ts/src/gateway/api.ts
+++ b/services/madoc-ts/src/gateway/api.ts
@@ -2170,8 +2170,8 @@ export class ApiClient {
   getSiteTopicTypes(page = 1) {
     return this.publicRequest<TopicTypeListResponse>(`/madoc/api/topics?page=${page}`);
   }
-  getSiteTopicType(slug: string, page: number) {
-    return this.publicRequest<TopicType>(`/madoc/api/topics/${slug}?page=${page}`);
+  getSiteTopicType(slug: string, page: number, order_by: string) {
+    return this.publicRequest<TopicType>(`/madoc/api/topics/${slug}?page=${page}&order_by=${order_by}`);
   }
   getSiteEnrichmentResource(id: string) {
     return this.publicRequest<EnrichmentResource>(`/madoc/api/resource/${id}`);
diff --git a/services/madoc-ts/src/routes/site/site-topic-type.ts b/services/madoc-ts/src/routes/site/site-topic-type.ts
index 23cf49177..42fb5c8b2 100644
--- a/services/madoc-ts/src/routes/site/site-topic-type.ts
+++ b/services/madoc-ts/src/routes/site/site-topic-type.ts
@@ -1,14 +1,15 @@
 import { RouteMiddleware } from '../../types/route-middleware';
 import { compatTopicType } from '../topics/topic-compat';
 
-export const siteTopicType: RouteMiddleware<{ type: string }> = async context => {
+export const siteTopicType: RouteMiddleware<{ type: string; order_by: string }> = async context => {
   const { siteApi } = context.state;
 
   const slug = context.params.type;
   const page = context.query.page ? Number(context.query.page) : 1;
+  const order_by = context.query.order_by ? context.query.order_by : 'test';
 
   const response = await siteApi.enrichment.getEntityType(slug);
-  const topics = await siteApi.enrichment.getEntities(slug, page);
+  const topics = await siteApi.enrichment.getEntities(slug, page, order_by);
 
   context.response.body = compatTopicType(response, topics);
 };

From e8696b2474296a41533d6b08c7ddb727af31a095 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Wed, 3 Apr 2024 14:22:28 +0100
Subject: [PATCH 51/55] IDA-1157/timeout for model flicker

---
 .../madoc-ts/src/frontend/site/features/AddTagButton.tsx   | 7 ++++---
 .../madoc-ts/src/frontend/site/features/AddTopicButton.tsx | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx b/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
index 8456d2b29..5766e42b7 100644
--- a/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AddTagButton.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { lazy, useEffect, useRef } from 'react';
 import { Button } from '../../shared/navigation/Button';
 import { CloseIcon } from '../../shared/icons/CloseIcon';
 import { useApi } from '../../shared/hooks/use-api';
@@ -69,7 +69,8 @@ export const AddTagButton: React.FC<{
   const startAutoComplete = (val: string) => {
     setIsLoading(true);
     setFulltext(val);
-    setIsLoading(false);
+    const timeout = setTimeout(() => setIsLoading(false), 1000);
+    return () => clearTimeout(timeout);
   };
 
   // const { data } = useEnrichmentResource();
@@ -154,7 +155,7 @@ export const AddTagButton: React.FC<{
           </InputContainer>
           {isLoading || queryLoading ? (
             <EmptyState>
-              <Spinner /> ...{t('loading')}
+              <Spinner stroke="#000" />
             </EmptyState>
           ) : !pages || (pages[0].pagination.totalResults === 0 && fullText) ? (
             <TagResults>
diff --git a/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx b/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
index 26b6ed1df..1b5746bba 100644
--- a/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
+++ b/services/madoc-ts/src/frontend/site/features/AddTopicButton.tsx
@@ -55,7 +55,8 @@ export const AddTopicButton: React.FC<{
   const startAutoComplete = (val: string) => {
     setIsLoading(true);
     setFulltext(val);
-    setIsLoading(false);
+    const timeout = setTimeout(() => setIsLoading(false), 1000);
+    return () => clearTimeout(timeout);
   };
 
   if (selected && postSubmission) {

From f213878aba801f91ba9c0cdbde37ba2f25f52640 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Wed, 3 Apr 2024 14:48:33 +0100
Subject: [PATCH 52/55] IDA-1144- trunicate text option on search results

---
 .../shared/components/SearchResults.tsx       | 36 +++++++++++++++++--
 .../site/features/SearchPageResults.tsx       |  5 +++
 services/madoc-ts/translations/en/madoc.json  |  2 ++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/shared/components/SearchResults.tsx b/services/madoc-ts/src/frontend/shared/components/SearchResults.tsx
index 1d10bd4d4..1004a0403 100644
--- a/services/madoc-ts/src/frontend/shared/components/SearchResults.tsx
+++ b/services/madoc-ts/src/frontend/shared/components/SearchResults.tsx
@@ -49,6 +49,16 @@ const ResultText = styled.span`
   text-decoration: none;
   line-height: 1.3em;
 `;
+const ResultTextTrunicate = styled.div`
+  text-decoration: none;
+  line-height: 1.3em;
+  position: relative;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
 
 export const ResultTitle = styled.div`
   text-decoration: none;
@@ -118,12 +128,25 @@ export const SearchItem: React.FC<{
   search?: string;
   list?: boolean;
   hideSnippet?: boolean;
+  trunicateSnippet?: boolean;
   border?: string;
   textColor?: string;
   background?: string;
   imageStyle?: string;
   admin?: boolean;
-}> = ({ result, size, search, list, border, textColor, background, imageStyle, hideSnippet, admin }) => {
+}> = ({
+  result,
+  size,
+  search,
+  list,
+  border,
+  textColor,
+  background,
+  imageStyle,
+  hideSnippet,
+  trunicateSnippet,
+  admin,
+}) => {
   const things = ((result && result.contexts) || []).map(value => {
     return parseUrn(typeof value === 'string' ? value : value.id);
   });
@@ -173,7 +196,7 @@ export const SearchItem: React.FC<{
             <TextContainer data-list-item={list} style={{ alignSelf: 'flex-start' }}>
               <LocaleString as={ResultTitle}>{result.label}</LocaleString>
               <LocaleString as={Subtitle}>{result.resource_type}</LocaleString>
-              {snippet && !hideSnippet ? (
+              {snippet && !hideSnippet && !trunicateSnippet ? (
                 <div style={{ paddingBottom: '.8em', maxWidth: 600 }}>
                   <ResultText
                     key={snippet}
@@ -182,6 +205,15 @@ export const SearchItem: React.FC<{
                     }}
                   />
                 </div>
+              ) : snippet && trunicateSnippet ? (
+                <div style={{ paddingBottom: '.8em', maxWidth: 600 }}>
+                  <ResultTextTrunicate
+                    key={snippet}
+                    dangerouslySetInnerHTML={{
+                      __html: replaceBreaks(sanitizeLabel(snippet)),
+                    }}
+                  />
+                </div>
               ) : null}
 
               {/*{result.metadata && (*/}
diff --git a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
index 26242a1c4..bb4062ba3 100644
--- a/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
+++ b/services/madoc-ts/src/frontend/site/features/SearchPageResults.tsx
@@ -16,6 +16,7 @@ interface SearchPageResultsProps {
   background?: string;
   grid?: boolean;
   snippet?: boolean;
+  trunSnippet?: boolean;
   textColor?: string;
   cardBorder?: string;
   imageStyle?: string;
@@ -23,6 +24,7 @@ interface SearchPageResultsProps {
 
 export const SearchPageResults: React.FC<SearchPageResultsProps> = ({
   snippet,
+  trunSnippet,
   cardBorder,
   textColor,
   background,
@@ -89,6 +91,7 @@ export const SearchPageResults: React.FC<SearchPageResultsProps> = ({
                 textColor={textColor}
                 list={resultsView === 'list'}
                 hideSnippet={snippet}
+                trunicateSnippet={trunSnippet}
                 imageStyle={imageStyle}
               />
             ) : null;
@@ -107,12 +110,14 @@ blockEditorFor(SearchPageResults, {
   defaultProps: {
     background: '',
     snippet: '',
+    trunSnippet: '',
     textColor: '',
     cardBorder: '',
     imageStyle: 'fit',
   },
   editor: {
     snippet: { type: 'checkbox-field', label: 'Snippet', inlineLabel: 'Hide snippet?' },
+    trunSnippet: { type: 'checkbox-field', label: 'Trunicate Snippet', inlineLabel: 'Trunicate snippet?' },
     background: { label: 'Card background color', type: 'color-field' },
     textColor: { label: 'Card text color', type: 'color-field' },
     cardBorder: { label: 'Card border', type: 'color-field' },
diff --git a/services/madoc-ts/translations/en/madoc.json b/services/madoc-ts/translations/en/madoc.json
index a29f4c0d3..a9f887fd1 100644
--- a/services/madoc-ts/translations/en/madoc.json
+++ b/services/madoc-ts/translations/en/madoc.json
@@ -890,6 +890,8 @@
   "Total contributions": "Total contributions",
   "Total contributors": "Total contributors",
   "Transcription": "Transcription",
+  "Trunicate Snippet": "Trunicate Snippet",
+  "Trunicate snippet?": "Trunicate snippet?",
   "Type": "Type",
   "Types": "Types",
   "URI / URL": "URI / URL",

From fd286e208c76198d7263193473ec6040057a7bc7 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Thu, 11 Apr 2024 15:18:34 +0100
Subject: [PATCH 53/55] use topic-search for pagination and facets

---
 .../site/features/TopicPageFilters.tsx        | 125 ++++++++++++++++++
 .../site/features/TopicResultsPagination.tsx  |  57 ++++++++
 .../src/frontend/site/pages/view-topic.tsx    |   9 +-
 3 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 services/madoc-ts/src/frontend/site/features/TopicPageFilters.tsx
 create mode 100644 services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx

diff --git a/services/madoc-ts/src/frontend/site/features/TopicPageFilters.tsx b/services/madoc-ts/src/frontend/site/features/TopicPageFilters.tsx
new file mode 100644
index 000000000..f023f0cd2
--- /dev/null
+++ b/services/madoc-ts/src/frontend/site/features/TopicPageFilters.tsx
@@ -0,0 +1,125 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  SearchFilterContainer,
+  SearchFilterItem,
+  SearchFilterItemCount,
+  SearchFilterItemList,
+  SearchFilterLabel,
+  SearchFilterTitle,
+} from '../../shared/components/SearchFilters';
+import { Button, ButtonRow } from '../../shared/navigation/Button';
+import { LocaleString } from '../../shared/components/LocaleString';
+import { useSearchQuery } from '../hooks/use-search-query';
+import { useSearchFacets } from '../hooks/use-search-facets';
+import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
+import { CheckboxBtn } from '../../shared/atoms/CheckboxBtn';
+import { Accordion } from '../../shared/atoms/Accordion';
+import { Spinner } from '../../shared/icons/Spinner';
+import { EmptyState } from '../../shared/layout/EmptyState';
+import { useTopicSearch } from '../hooks/use-topic-search';
+
+interface TopicPageFiltersProps {
+  checkBoxColor?: string;
+  filterHeader?: string;
+}
+
+export const TopicPageFilters: React.FC<TopicPageFiltersProps> = ({ checkBoxColor, filterHeader }) => {
+  const [{ resolvedData: searchResponse, latestData }, displayFacets, isLoading] = useTopicSearch();
+  const { t } = useTranslation();
+  const { appliedFacets, fulltext, rscType } = useSearchQuery();
+
+  const {
+    inQueue,
+    queueSingleFacet,
+    dequeueSingleFacet,
+    isFacetSelected,
+    applyAllFacets,
+    clearAllFacets,
+  } = useSearchFacets();
+
+  const uniqueFacets = [...new Map(displayFacets.map(v => [v.id, v])).values()];
+
+  if (!uniqueFacets) {
+    return null;
+  }
+  if (isLoading) {
+    return (
+      <EmptyState style={{ width: '200px' }}>
+        <Spinner stroke="#000" />
+      </EmptyState>
+    );
+  }
+  return (
+    <SearchFilterContainer>
+      <SearchFilterTitle>{filterHeader}</SearchFilterTitle>
+
+      <ButtonRow $noMargin>
+        <Button $primary disabled={!inQueue} onClick={() => applyAllFacets()}>
+          {t('Apply filters')}
+        </Button>
+        <Button disabled={!appliedFacets.length} onClick={() => clearAllFacets()}>
+          {t('Clear')}
+        </Button>
+      </ButtonRow>
+
+      {uniqueFacets?.map(facet => {
+        if (facet.items.length === 0) {
+          return null;
+        }
+        return (
+          <Accordion key={facet.id} title={facet.label} defaultOpen={appliedFacets.some(f => f.k === facet.id)}>
+            <SearchFilterItemList>
+              {facet.items.map(item => {
+                const isSelected = isFacetSelected(item.key, item.values);
+                const itemHash = `item__${facet.id}::${item.key}::${item.values}`;
+
+                return (
+                  <SearchFilterItem key={item.values.join(',')} $selected={!!isSelected}>
+                    <CheckboxBtn
+                      color={checkBoxColor}
+                      id={itemHash}
+                      checked={isSelected !== 0}
+                      onChange={(e: { target: { checked: any } }) =>
+                        e.target.checked
+                          ? queueSingleFacet(item.key, item.values, item.type)
+                          : dequeueSingleFacet(item.key, item.values, item.type)
+                      }
+                    />
+                    <SearchFilterLabel htmlFor={itemHash}>
+                      <LocaleString>{item.label}</LocaleString>
+                    </SearchFilterLabel>
+                    <SearchFilterItemCount>({item.count})</SearchFilterItemCount>
+                  </SearchFilterItem>
+                );
+              })}
+            </SearchFilterItemList>
+          </Accordion>
+        );
+      })}
+      <ButtonRow $noMargin>
+        <Button $primary disabled={!inQueue} onClick={() => applyAllFacets()}>
+          {t('Apply filters')}
+        </Button>
+        <Button disabled={!appliedFacets.length} onClick={() => clearAllFacets()}>
+          {t('Clear')}
+        </Button>
+      </ButtonRow>
+    </SearchFilterContainer>
+  );
+};
+
+blockEditorFor(TopicPageFilters, {
+  label: 'Topic Page Filters',
+  type: 'default.TopicPageFilters',
+  anyContext: ['collection', 'manifest', 'canvas', 'project', 'topic', 'topicType'],
+  requiredContext: ['page'],
+  defaultProps: {
+    checkBoxColor: '',
+    filterHeader: 'Refine search',
+  },
+  editor: {
+    checkBoxColor: { label: 'Check box color', type: 'color-field' },
+    filterHeader: { label: 'filter header', type: 'text-field' },
+  },
+});
diff --git a/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx b/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx
new file mode 100644
index 000000000..5c3eb61fb
--- /dev/null
+++ b/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
+import { Pagination, PaginationNumbered } from '../../shared/components/Pagination';
+import { useSearchQuery } from '../hooks/use-search-query';
+import { useSearch } from '../hooks/use-search';
+
+export const TopicResultsPagination: React.FC<{
+  paginationStyle?: boolean;
+  position?: 'flex-end' | 'flex-start' | 'center';
+}> = ({ paginationStyle, position }) => {
+  const { rawQuery, page } = useSearchQuery();
+  const [{ resolvedData: searchResponse, latestData }, displayFacets, isLoading] = useSearch();
+  const PaginationComponent = paginationStyle ? PaginationNumbered : Pagination;
+
+  const pagination = searchResponse?.pagination;
+
+  if (!pagination || !latestData || !searchResponse) {
+    return null;
+  }
+
+  return (
+    <PaginationComponent
+      page={page}
+      totalPages={pagination.totalPages ? pagination.totalPages : undefined}
+      stale={isLoading}
+      extraQuery={rawQuery}
+      position={position}
+    />
+  );
+};
+
+blockEditorFor(TopicResultsPagination, {
+  type: 'default.TopicResultsPagination',
+  label: 'Topic Results pagination',
+  anyContext: ['collection', 'manifest', 'canvas', 'project', 'topic', 'topicType'],
+  requiredContext: ['page'],
+  defaultProps: {
+    paginationStyle: true,
+    position: 'flex-end',
+  },
+  editor: {
+    paginationStyle: {
+      type: 'checkbox-field',
+      inlineLabel: 'Pagination as Numbered?',
+      label: 'Pagination Numbered',
+    },
+    position: {
+      label: 'Position',
+      type: 'dropdown-field',
+      options: [
+        { value: 'flex-start', text: 'Start' },
+        { value: 'center', text: 'Center' },
+        { value: 'flex-end', text: 'End' },
+      ],
+    },
+  },
+});
diff --git a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
index e74e2d289..9f4f230c9 100644
--- a/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
+++ b/services/madoc-ts/src/frontend/site/pages/view-topic.tsx
@@ -4,16 +4,15 @@ import { Slot } from '../../shared/page-blocks/slot';
 import { TopicHero } from '../features/TopicHero';
 import { FeaturedTopicItems } from '../features/FeaturedTopicItems';
 import { RelatedTopics } from '../features/RelatedTopics';
-import { SearchPagination } from '../features/SearchPagination';
 import { AppliedFacets } from '../features/AppliedFacets';
-import { SearchPageFilters } from '../features/SearchPageFilters';
 import { TopicActions } from '../features/TopicActions';
 import { TopicAuthorities } from '../features/TopicAuthorities';
 import { TopicHeroImage } from '../features/TopicHeroImage';
-import { SearchPageResults } from '../features/SearchPageResults';
 import { SearchPageSearch } from '../features/SearchPageSearch';
 import { useTopic } from './loaders/topic-loader';
 import { TopicPageResults } from '../features/TopicPageResults';
+import { TopicPageFilters } from '../features/TopicPageFilters';
+import { TopicResultsPagination } from '../features/TopicResultsPagination';
 export const ViewTopic = () => {
   const { data } = useTopic();
   return (
@@ -48,7 +47,7 @@ export const ViewTopic = () => {
         <div style={{ display: 'flex' }}>
           <div style={{ maxWidth: 500 }}>
             <Slot name="topic-results-filters" small>
-              <SearchPageFilters />
+              <TopicPageFilters />
             </Slot>
           </div>
 
@@ -60,7 +59,7 @@ export const ViewTopic = () => {
             </Slot>
 
             <Slot name="topic-items-pagination">
-              <SearchPagination />
+              <TopicResultsPagination />
             </Slot>
           </div>
         </div>

From 2fd6080bc5af190b3048f4aa946e52a9c621ca47 Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Thu, 11 Apr 2024 16:28:13 +0100
Subject: [PATCH 54/55] useTopicSearch for pagination

---
 .../src/frontend/site/features/TopicResultsPagination.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx b/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx
index 5c3eb61fb..23350f0c8 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicResultsPagination.tsx
@@ -2,14 +2,14 @@ import React from 'react';
 import { blockEditorFor } from '../../../extensions/page-blocks/block-editor-for';
 import { Pagination, PaginationNumbered } from '../../shared/components/Pagination';
 import { useSearchQuery } from '../hooks/use-search-query';
-import { useSearch } from '../hooks/use-search';
+import { useTopicSearch } from '../hooks/use-topic-search';
 
 export const TopicResultsPagination: React.FC<{
   paginationStyle?: boolean;
   position?: 'flex-end' | 'flex-start' | 'center';
 }> = ({ paginationStyle, position }) => {
   const { rawQuery, page } = useSearchQuery();
-  const [{ resolvedData: searchResponse, latestData }, displayFacets, isLoading] = useSearch();
+  const [{ resolvedData: searchResponse, latestData }, displayFacets, isLoading] = useTopicSearch();
   const PaginationComponent = paginationStyle ? PaginationNumbered : Pagination;
 
   const pagination = searchResponse?.pagination;

From f7aea4d43e43e0d3bf323994b1ed9dc333f3affd Mon Sep 17 00:00:00 2001
From: Heather0K <hkerri200@gmail.com>
Date: Fri, 12 Apr 2024 10:30:57 +0100
Subject: [PATCH 55/55] fix window is undefined

---
 .../madoc-ts/src/frontend/site/features/TopicGrid.tsx  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx b/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
index 2f29d6634..51d07e95f 100644
--- a/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
+++ b/services/madoc-ts/src/frontend/site/features/TopicGrid.tsx
@@ -27,11 +27,13 @@ export const TopicGrid: React.FC<{
   cardBorder?: string;
   imageStyle?: string;
 }> = ({ background, textColor, cardBorder }) => {
-  const scrollX = window.scrollX;
-  const scrollY = window.scrollY;
-
   useLayoutEffect(() => {
-    window.scrollTo(scrollX, scrollY);
+    if (typeof window !== 'undefined') {
+      const scrollX = window.scrollX;
+      const scrollY = window.scrollY;
+
+      window.scrollTo(scrollX, scrollY);
+    }
   });
 
   const { data } = useTopicType();