Merge branch 'main' into dependabot/npm_and_yarn/testing-library/reac…

…t-15.0.7
navikt · Oct 31, 2024 · dff9c40 · dff9c40
2 parents cdfbf12 + 161b5bd
commit dff9c40
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 28 deletions.
diff --git a/.env.development b/.env.development
@@ -2,6 +2,7 @@ NEXT_PUBLIC_API_MOCKING=enabled
 SERVERSIDE_LOGIN=disabled
 NEXT_PUBLIC_TELEMETRY_URL=http://localhost:12347/collect
 
+NEXT_PUBLIC_SANITY_DATASET=development
 
 INNSYN_API=https://dp-innsyn.intern.dev.nav.no
 IDPORTEN_REDIRECT_URI=http://localhost:3000/api/auth/callback
@@ -12,3 +13,5 @@ AMPLITUDE_API_KEY=
 
 SOKNADSDIALOG_URL=https://arbeid.intern.dev.nav.no/dagpenger/dialog
 NEXT_PUBLIC_LOCALHOST=true
+
+APP_ENV=localhost
diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
@@ -8,7 +8,7 @@ permissions:
 jobs:
   dependabot:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
     steps:
       - name: Dependabot metadata
         id: metadata

diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -56,6 +56,8 @@ spec:
       value: {{uxsignalsMode}}
     - name: APP_ENV
       value: {{appEnv}}
+    - name: NEXT_PUBLIC_SANITY_DATASET
+      value: {{sanity_dataset}}
   ingresses:
     {{#each ingresses as |url|}}
     - {{url}}

diff --git a/.nais/vars-dev.yaml b/.nais/vars-dev.yaml
@@ -20,4 +20,5 @@ soknadsdialog:
   ingress: https://arbeid.intern.dev.nav.no/dagpenger/dialog
 uxsignalsEnabled: enabled
 uxsignalsMode: demo
-appEnv: dev
+appEnv: dev
+sanity_dataset: development
diff --git a/.nais/vars-prod.yaml b/.nais/vars-prod.yaml
@@ -19,4 +19,5 @@ soknadsdialog:
   ingress: https://www.nav.no/dagpenger/dialog
 uxsignalsEnabled: enabled
 uxsignalsMode: production
-appEnv: production
+appEnv: production
+sanity_dataset: production
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "react-dom": "^18.3.1",
     "swr": "^2.2.5",
     "unleash-client": "^5.6.1",
-    "uuid": "^9.0.1"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@axe-core/react": "^4.9.1",

diff --git a/src/components/UxSignalsWidget.tsx b/src/components/UxSignalsWidget.tsx
@@ -23,7 +23,7 @@ export function UxSignalsWidget({ enabled, mode }: IProps) {
           src="https://uxsignals-frontend.uxsignals.app.iterate.no/embed.js"
         />
         <div
-          data-uxsignals-embed={`panel-${uxSignalId}`}
+          data-uxsignals-embed={uxSignalId}
           data-uxsignals-mode={mode}
           style={{ maxWidth: 630 }}
         />

diff --git a/src/context/sanity-context.tsx b/src/context/sanity-context.tsx
@@ -37,9 +37,9 @@ function useSanity() {
     return context?.settings?.find((setting) => setting.settingId === settingId)?.settingValue;
   }
 
-  function getRichText(slug: string): TypedObject | TypedObject[] | undefined {
+  function getRichText(textId: string): TypedObject | TypedObject[] | undefined {
     const richText = context?.richTexts?.find((richText) => {
-      return richText.slug === slug;
+      return richText.textId === textId;
     });
 
     return richText?.body;

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -15,6 +15,8 @@ import { innenfor12Uker } from "../util/soknadDato.util";
 import { PaabegyntSoknad, hentPaabegynteSoknader } from "./api/paabegynteSoknader";
 import { Søknad, hentSoknader } from "./api/soknader";
 import { UxSignalsWidget } from "../components/UxSignalsWidget";
+import { useRouter } from "next/router";
+import { useEffect } from "react";
 
 interface Props {
   fullforteSoknader: Søknad[] | null;
@@ -24,6 +26,7 @@ interface Props {
 
 interface IEnv {
   soknadsdialogIngress: string;
+  appEnv;
   uxSignals: {
     enabled: boolean;
     mode: string;
@@ -81,6 +84,7 @@ export async function getServerSideProps(
       paabegynteSoknader,
       env: {
         soknadsdialogIngress: process.env.SOKNADSDIALOG_URL,
+        appEnv: process.env.APP_ENV,
         uxSignals: {
           enabled: process.env.UXSIGNALS_ENABLED === "enabled",
           mode: process.env.UXSIGNALS_MODE === "demo" ? "demo" : "",
@@ -92,6 +96,28 @@ export async function getServerSideProps(
 
 export default function Status({ fullforteSoknader, paabegynteSoknader, env }: Props) {
   const { getAppText } = useSanity();
+  const router = useRouter();
+
+  useEffect(() => {
+    // Task analytic Spørreundersøkelse for gammel og ny vedtaksbrev
+    const nyBrev = env.appEnv === "production" ? "03409" : "03400";
+    const gammelBrev = env.appEnv === "production" ? "03408" : "03400";
+
+    setTimeout(() => {
+      //@ts-ignore Ukjent TA type
+      if (router.query && typeof window.TA === "function") {
+        if (router.query.brev === "ny") {
+          //@ts-ignore Ukjent TA type
+          window.TA("start", nyBrev);
+        }
+
+        if (router.query.brev === "gammel") {
+          //@ts-ignore Ukjent TA type
+          window.TA("start", gammelBrev);
+        }
+      }
+    }, 2000);
+  });
 
   return (
     <>

diff --git a/src/sanity/sanity-client.ts b/src/sanity/sanity-client.ts
@@ -2,7 +2,7 @@ import { createClient } from "@sanity/client";
 
 export const innsynSanityClient = createClient({
   projectId: "rt6o382n",
-  dataset: "production",
+  dataset: process.env.NEXT_PUBLIC_SANITY_DATASET || "production",
   apiVersion: "2021-06-21",
   useCdn: process.env.NODE_ENV === "production",
 });
diff --git a/src/sanity/sanity-queries.ts b/src/sanity/sanity-queries.ts
@@ -8,8 +8,8 @@ const settingFields = `{
   settingValue,
 }`;
 
-const infoTextsFields = `{
-  "slug": slug.current,
+const richTextsFields = `{
+  textId,
   body
 }`;
 
@@ -20,25 +20,25 @@ const linkFields = `{
   linkDescription
 }`;
 
-export const appTextsGroq = `* [_type=="mineDagpengerAppText" && __i18n_lang==$baseLang]{
-    ...coalesce(* [_id==^._id + "__i18n_" + $lang][0]${appTextFields}, ${appTextFields})
-  }`;
+export const appTextsGroq = `* [_type=="mineDagpengerAppText" && language==$baseLang]{
+  ...coalesce(* [textId==^.textId && language==$lang][0]${appTextFields}, ${appTextFields})
+}`;
 
-const infoTextsGroq = `* [_type=="mineDagpengerRichText"  && __i18n_lang==$baseLang]{
-  ...coalesce(* [_id==^._id + "__i18n_" + $lang][0]${infoTextsFields}, ${infoTextsFields})
-  }`;
+const richTextsGroq = `* [_type=="mineDagpengerRichText" && language==$baseLang]{
+  ...coalesce(* [textId==^.textId && language==$lang][0]${richTextsFields}, ${richTextsFields})
+}`;
 
-const linksGroq = `* [_type=="mineDagpengerLink"  && __i18n_lang==$baseLang]{
-  ...coalesce(* [_id==^._id + "__i18n_" + $lang][0]${linkFields}, ${linkFields})
-  }`;
+const linksGroq = `* [_type=="mineDagpengerLink" && language==$baseLang]{
+  ...coalesce(* [linkId==^.linkId && language==$lang][0]${linkFields}, ${linkFields})
+}`;
 
-const settingsGroq = `* [_type=="mineDagpengerSetting"  && __i18n_lang==$baseLang]{
-  ...coalesce(* [_id==^._id + "__i18n_" + $lang][0]${settingFields}, ${settingFields})
-  }`;
+const settingsGroq = `* [_type=="mineDagpengerSetting" && language==$baseLang]{
+  ...coalesce(* [settingId==^.settingId && language==$lang][0]${settingFields}, ${settingFields})
+}`;
 
 export const allTextsQuery = `{
   "appTexts": ${appTextsGroq},
-  "richTexts": ${infoTextsGroq},
+  "richTexts": ${richTextsGroq},
   "links": ${linksGroq},
   "settings": ${settingsGroq}
 }`;
diff --git a/src/types/sanity.types.ts b/src/types/sanity.types.ts
@@ -16,7 +16,7 @@ export interface ISanitySetting {
 }
 
 export interface ISanityRichText {
-  slug: string;
+  textId: string;
   body: TypedObject | TypedObject[];
 }