Merge branch 'vaash/2687' into staging

equinor · Dec 26, 2024 · 76b812e · 76b812e
2 parents 09aaed9 + 44be986
commit 76b812e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/sanityv3/package.json b/sanityv3/package.json
@@ -47,7 +47,7 @@
     "@types/react-dom": "^18.0.5",
     "@types/styled-components": "^5.1.26",
     "eslint": "^8.6.0",
-    "nanoid": "^5.0.4",
+    "nanoid": "^5.0.9",
     "prettier": "^2.8.3",
     "typescript": "^4.0.0"
   }

diff --git a/sanityv3/pnpm-lock.yaml b/sanityv3/pnpm-lock.yaml
diff --git a/search/IndexArchivedNews/algolia.ts b/search/IndexArchivedNews/algolia.ts
diff --git a/search/IndexArchivedNews/index.ts b/search/IndexArchivedNews/index.ts
@@ -11,7 +11,7 @@ import * as T from 'fp-ts/lib/Task'
 import { init, getClient, getFileList, copyFile } from './blobStorage'
 import { ContainerClient } from '@azure/storage-blob'
 import { update, generateIndexName, getEnvironment, languageFromIso, languageOrDefault, NewsIndex } from '../common'
-import { indexSettings } from './algolia'
+import { indexSettings } from '../IndexSanityContent/common/news/algolia'
 import { mapData } from './mapper'
 import { loadJson } from './fileStorage'
 

diff --git a/web/templates/magazine/Magazineroom.tsx b/web/templates/magazine/Magazineroom.tsx
@@ -35,9 +35,7 @@ const MagazineRoom = ({ pageData, slug }: MagazineIndexTemplateProps) => {
   const resultsRef = useRef<HTMLDivElement>(null)
   const [isLoading, setIsLoading] = useState(false)
   const router = useRouter()
-  const parentSlug =
-    (router.locale !== router.defaultLocale ? `/${router.locale}` : '') +
-    router.asPath.substring(router.asPath.indexOf('/'), router.asPath.lastIndexOf('/'))
+  const parentSlug = `${router.locale !== router.defaultLocale ? `/${router.locale}` : ''}${router.pathname}`
 
   const magazineList = useMemo(() => magazineArticles, [magazineArticles])
   const pagedList = useMemo(() => chunkArray(magazineList, 12), [magazineList])