replace legaldocumentquery with language param, to retrieve legal doc…

…ument to spesific lang
varianter · Sep 26, 2024 · a57d06c · a57d06c
1 parent e2602ab
commit a57d06c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 42 deletions.
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
@@ -11,7 +11,7 @@ import { Navigation } from "studio/lib/interfaces/navigation";
 import { SocialMediaProfiles } from "studio/lib/interfaces/socialMedia";
 import { BRAND_ASSETS_QUERY } from "studio/lib/queries/brandAssets";
 import { COMPANY_INFO_QUERY } from "studio/lib/queries/companyDetails";
-import { LEGAL_DOCUMENTS_QUERY } from "studio/lib/queries/legalDocuments";
+import { LEGAL_DOCUMENTS_BY_LANG_QUERY } from "studio/lib/queries/legalDocuments";
 import { NAV_QUERY } from "studio/lib/queries/navigation";
 import { SOMEPROFILES_QUERY } from "studio/lib/queries/socialMediaProfiles";
 import { loadStudioQuery } from "studio/lib/store";
@@ -42,8 +42,8 @@ export default async function Layout({
       { perspective },
     ),
     loadStudioQuery<LegalDocument[]>(
-      LEGAL_DOCUMENTS_QUERY,
-      {},
+      LEGAL_DOCUMENTS_BY_LANG_QUERY,
+      { language: "en" }, //TODO: replace this with selected language for the page
       { perspective },
     ),
     loadStudioQuery<BrandAssets>(BRAND_ASSETS_QUERY, {}, { perspective }),

diff --git a/src/app/(main)/legal/[id]/page.tsx b/src/app/(main)/legal/[id]/page.tsx
@@ -2,7 +2,7 @@ import Legal from "src/blog/components/legal/Legal";
 import LegalPreview from "src/blog/components/legal/LegalPreview";
 import { getDraftModeInfo } from "src/utils/draftmode";
 import { LegalDocument } from "studio/lib/interfaces/legalDocuments";
-import { LEGAL_DOCUMENT_SLUG_QUERY } from "studio/lib/queries/legalDocuments";
+import { LEGAL_DOCUMENTS_BY_SLUG_AND_LANG_QUERY } from "studio/lib/queries/legalDocuments";
 import { loadStudioQuery } from "studio/lib/store";
 
 export const dynamic = "force-dynamic";
@@ -20,8 +20,8 @@ async function Page({ params }: Props) {
   const { perspective, isDraftMode } = getDraftModeInfo();
 
   const initialDocument = await loadStudioQuery<LegalDocument>(
-    LEGAL_DOCUMENT_SLUG_QUERY,
-    { slug: id },
+    LEGAL_DOCUMENTS_BY_SLUG_AND_LANG_QUERY,
+    { slug: id, language: "en" }, //TODO: replace this with selected language for the page
     { perspective },
   );
 
@@ -32,6 +32,7 @@ async function Page({ params }: Props) {
   if (isDraftMode) {
     return <LegalPreview initialDocument={initialDocument} />;
   }
+
   if (initialDocument) {
     return <Legal document={initialDocument.data} />;
   }

diff --git a/src/components/navigation/footer/Footer.tsx b/src/components/navigation/footer/Footer.tsx
@@ -54,7 +54,7 @@ const Footer = ({
         {legalData?.map((legal) => {
           const path = `legal/${legal.slug.current}`;
           const link = {
-            _key: legal._key,
+            _key: legal._id,
             _type: legal._type,
             linkTitle: legal.basicTitle,
             linkType: LinkType.Internal,
@@ -63,7 +63,7 @@ const Footer = ({
             },
           };
           return (
-            <li key={legal.slug.current}>
+            <li key={legal._id}>
               <CustomLink link={link} type="footerLink" />
             </li>
           );

diff --git a/studio/lib/interfaces/legalDocuments.ts b/studio/lib/interfaces/legalDocuments.ts
@@ -3,9 +3,17 @@ import { PortableTextBlock } from "sanity";
 import { Slug } from "./global";
 
 export interface LegalDocument {
-  _key: string;
+  _id: string;
   _type: string;
-  basicTitle: string;
   slug: Slug;
+  basicTitle: string;
   richText: PortableTextBlock[];
+  _translations: Translations[];
+}
+
+interface Translations {
+  basicTitle: string;
+  language: string;
+  richText: PortableTextBlock[];
+  slug: Slug;
 }
diff --git a/studio/lib/queries/legalDocuments.ts b/studio/lib/queries/legalDocuments.ts
@@ -1,9 +1,5 @@
 import { groq } from "next-sanity";
 
-export const LEGAL_DOCUMENTS_QUERY = groq`
-  *[_type == "legalDocuments"]
-`;
+export const LEGAL_DOCUMENTS_BY_LANG_QUERY = groq`*[_type == "legalDocument" && language == $language]`;
 
-export const LEGAL_DOCUMENT_SLUG_QUERY = groq`
-  *[_type == "legalDocuments" && slug.current == $slug][0]
-`;
+export const LEGAL_DOCUMENTS_BY_SLUG_AND_LANG_QUERY = groq`*[_type == "legalDocument" && language == $language && slug.current == $slug][0]`;
diff --git a/studio/studioConfig.tsx b/studio/studioConfig.tsx
@@ -14,6 +14,8 @@ import { apiVersion, dataset, projectId } from "./env";
 import { schema } from "./schema";
 import { legalDocumentID } from "./schemas/documents/admin/legalDocuments";
 
+const SUPPORTED_LANGUAGES_QUERY = `*[_type == "languageSettings" && !(_id in path("drafts.*"))].languages[]{id, title}`;
+
 const config: WorkspaceOptions = {
   name: "studio",
   title: "Studio",
@@ -22,29 +24,16 @@ const config: WorkspaceOptions = {
   basePath: "/studio",
   projectId,
   dataset,
-  schema: {
-    ...schema,
-    templates: (prev) => prev.filter((template) => !template.value.language),
-  },
+  schema,
   plugins: [
     structureTool({
       structure: deskStructure,
     }),
     visionTool({ defaultApiVersion: apiVersion }),
     documentInternationalization({
-      // When async initial value templates are supported by the plugin, we can fetch dynamic languages like:
-      // (client) => {
-      //   return client.fetch(
-      //     `*[_type == "languageSettings"].languages[]{id, title}`
-      //   );
-      // }
-      // Currently, we have to use a static list of supported languages for both Norway and Sweden
-      // Limitation: Variant Norway and Varaint Sweden will not be able to filter out unsupported languages
-      supportedLanguages: [
-        { id: "no", title: "Norwegian" },
-        { id: "se", title: "Swedish" },
-        { id: "en", title: "English" },
-      ],
+      supportedLanguages: (client) => {
+        return client.fetch(SUPPORTED_LANGUAGES_QUERY);
+      },
       schemaTypes: [legalDocumentID],
       languageField: languageID,
       apiVersion,
@@ -53,15 +42,9 @@ const config: WorkspaceOptions = {
       // bulkPublish: true,
     }),
     internationalizedArray({
-      languages: [
-        { id: "no", title: "Norwegian" },
-        { id: "se", title: "Swedish" },
-        { id: "en", title: "English" },
-      ],
-      // languages: (client) =>
-      //   client.fetch(
-      //     `*[_type == "languageSettings"].languages[!default]{id, title}`
-      //   ),
+      languages: (client) => {
+        return client.fetch(SUPPORTED_LANGUAGES_QUERY);
+      },
       fieldTypes: ["string"],
     }),
     presentationTool({