App data

src/App.test.tsx

@@ -4,7 +4,6 @@ import { jest } from '@jest/globals';
 import { screen } from '@testing-library/react';
 
 import { App } from 'src/App';
-import { fetchApplicationMetadata } from 'src/queries/queries';
 import { renderWithInstanceAndLayout, renderWithoutInstanceAndLayout } from 'src/test/renderWithProviders';
 
 describe('App', () => {
@@ -23,25 +22,7 @@ describe('App', () => {
         fetchApplicationSettings: () => Promise.reject(new Error('400 Bad Request')),
       },
     });
-    await screen.findByRole('heading', { level: 1, name: 'Ukjent feil' });
-  });
-
-  test('should render unknown error when hasApplicationMetadataError', async () => {
-    jest.mocked(fetchApplicationMetadata).mockImplementation(() => Promise.reject(new Error('500 Server Error')));
-
-    await renderWithInstanceAndLayout({
-      renderer: () => <App />,
-    });
-    await screen.findByRole('heading', { level: 1, name: 'Ukjent feil' });
-  });
 
-  test('should render unknown error when hasLayoutSetError', async () => {
-    await renderWithInstanceAndLayout({
-      renderer: () => <App />,
-      queries: {
-        fetchLayoutSets: () => Promise.reject(new Error('400 Bad Request')),
-      },
-    });
     await screen.findByRole('heading', { level: 1, name: 'Ukjent feil' });
   });
 

src/__mocks__/getApplicationMetadataMock.ts

@@ -1,107 +1,84 @@
-import type { ApplicationMetadata, IncomingApplicationMetadata } from 'src/features/applicationMetadata/types';
+import type { ApplicationMetadata } from 'src/features/applicationMetadata/types';
 
-export const getIncomingApplicationMetadataMock = (
-  overrides: Partial<IncomingApplicationMetadata> | ((application: IncomingApplicationMetadata) => void) = {},
-): IncomingApplicationMetadata => {
-  const out: IncomingApplicationMetadata = {
-    id: 'mockOrg/test-app',
-    org: 'mockOrg',
-    title: {
-      nb: 'Test App',
-    },
-    autoDeleteOnProcessEnd: false,
-    altinnNugetVersion: '8.5.0.141',
-    dataTypes: [
-      {
-        id: 'test-data-model',
-        allowedContentTypes: ['application/xml'],
-        appLogic: {
-          autoCreate: true,
-          classRef: 'Altinn.App.Models.Skjema',
-        },
-        taskId: 'Task_1',
-        maxCount: 1,
-        minCount: 1,
-      },
-      {
-        id: 'ref-data-as-pdf',
-        allowedContentTypes: ['application/pdf'],
-        maxCount: 0,
-        minCount: 0,
-      },
-      {
-        id: 'test-data-type-1',
-        allowedContentTypes: ['application/pdf'],
-        maxCount: 5,
-        minCount: 0,
-      },
-      {
-        id: 'test-data-type-2',
-        allowedContentTypes: ['application/pdf'],
-        maxCount: 2,
-        minCount: 0,
+export const getApplicationMetadataMock = (overrides: Partial<ApplicationMetadata> = {}): ApplicationMetadata => ({
+  id: 'mockOrg/test-app',
+  org: 'mockOrg',
+  title: {
+    nb: 'Test App',
+  },
+  autoDeleteOnProcessEnd: false,
+  altinnNugetVersion: '8.5.0.141',
+  dataTypes: [
+    {
+      id: 'test-data-model',
+      allowedContentTypes: ['application/xml'],
+      appLogic: {
+        autoCreate: true,
+        classRef: 'Altinn.App.Models.Skjema',
       },
-      {
-        id: 'stateless',
-        allowedContentTypes: ['application/xml'],
-        appLogic: {
-          autoCreate: true,
-          classRef: 'Altinn.App.Models.Skjema2',
-        },
-        maxCount: 1,
-        minCount: 1,
+      taskId: 'Task_1',
+      maxCount: 1,
+      minCount: 1,
+    },
+    {
+      id: 'ref-data-as-pdf',
+      allowedContentTypes: ['application/pdf'],
+      maxCount: 0,
+      minCount: 0,
+    },
+    {
+      id: 'test-data-type-1',
+      allowedContentTypes: ['application/pdf'],
+      maxCount: 5,
+      minCount: 0,
+    },
+    {
+      id: 'test-data-type-2',
+      allowedContentTypes: ['application/pdf'],
+      maxCount: 2,
+      minCount: 0,
+    },
+    {
+      id: 'stateless',
+      allowedContentTypes: ['application/xml'],
+      appLogic: {
+        autoCreate: true,
+        classRef: 'Altinn.App.Models.Skjema2',
       },
-      {
-        id: 'stateless-anon',
-        allowedContentTypes: ['application/xml'],
-        appLogic: {
-          autoCreate: true,
-          classRef: 'Altinn.App.Models.Skjema3',
-          allowAnonymousOnStateless: true,
-        },
-        maxCount: 1,
-        minCount: 1,
+      maxCount: 1,
+      minCount: 1,
+    },
+    {
+      id: 'stateless-anon',
+      allowedContentTypes: ['application/xml'],
+      appLogic: {
+        autoCreate: true,
+        classRef: 'Altinn.App.Models.Skjema3',
+        allowAnonymousOnStateless: true,
       },
-      {
-        id: 'subform-data',
-        allowedContentTypes: ['application/xml'],
-        appLogic: {
-          classRef: '...',
-        },
-        taskId: 'Task_1',
-        maxCount: 0,
-        minCount: 0,
+      maxCount: 1,
+      minCount: 1,
+    },
+    {
+      id: 'subform-data',
+      allowedContentTypes: ['application/xml'],
+      appLogic: {
+        classRef: '...',
       },
-    ],
-    partyTypesAllowed: {
-      bankruptcyEstate: false,
-      organisation: false,
-      person: true,
-      subUnit: true,
+      taskId: 'Task_1',
+      maxCount: 0,
+      minCount: 0,
     },
-    onEntry: { show: 'new-instance' },
-    ...overrides,
-  };
-
-  if (typeof overrides === 'function') {
-    overrides(out);
-  } else if (overrides && Object.keys(overrides).length > 0) {
-    Object.assign(out, overrides);
-  }
-
-  return out;
-};
-
-export const getApplicationMetadataMock = (
-  overrides: Partial<ApplicationMetadata> | ((application: ApplicationMetadata) => void) = {},
-): ApplicationMetadata => {
-  const incomingAppMetadata = getIncomingApplicationMetadataMock();
-  return {
-    ...incomingAppMetadata,
-    isValidVersion: true,
-    isStatelessApp: false,
-    logoOptions: incomingAppMetadata.logo,
-    onEntry: { show: 'new-instance' },
-    ...overrides,
-  };
-};
+  ],
+  partyTypesAllowed: {
+    bankruptcyEstate: false,
+    organisation: false,
+    person: true,
+    subUnit: true,
+  },
+  onEntry: { show: 'new-instance' },
+  isValidVersion: true,
+  isStatelessApp: false,
+  logoOptions: undefined,
+  ...overrides,
+});

src/__mocks__/getLayoutSetsMock.ts

@@ -1,26 +1,24 @@
-import type { ILayoutSet, ILayoutSets } from 'src/layout/common.generated';
+import type { ILayoutSet } from 'src/layout/common.generated';
 
 export const defaultDataTypeMock = 'test-data-model';
 export const statelessDataTypeMock = 'stateless';
-export function getLayoutSetsMock(): ILayoutSets {
-  return {
-    sets: [
-      {
-        id: 'stateless',
-        dataType: statelessDataTypeMock,
-      },
-      {
-        id: 'stateless-anon',
-        dataType: 'stateless-anon',
-      },
-      {
-        id: 'some-data-task',
-        dataType: defaultDataTypeMock,
-        tasks: ['Task_1'],
-      },
-      getSubFormLayoutSetMock(),
-    ],
-  };
+export function getLayoutSetsMock(): ILayoutSet[] {
+  return [
+    {
+      id: 'stateless',
+      dataType: statelessDataTypeMock,
+    },
+    {
+      id: 'stateless-anon',
+      dataType: 'stateless-anon',
+    },
+    {
+      id: 'some-data-task',
+      dataType: defaultDataTypeMock,
+      tasks: ['Task_1'],
+    },
+    getSubFormLayoutSetMock(),
+  ];
 }
 
 export function getSubFormLayoutSetMock(): ILayoutSet {

src/components/form/Form.tsx

@@ -8,7 +8,7 @@ import { ErrorReport, ErrorReportList } from 'src/components/message/ErrorReport
 import { ReadyForPrint } from 'src/components/ReadyForPrint';
 import { NavigateToStartUrl } from 'src/components/wrappers/ProcessWrapper';
 import { useAppName, useAppOwner } from 'src/core/texts/appTexts';
-import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { useAllAttachments } from 'src/features/attachments/hooks';
 import { FileScanResults } from 'src/features/attachments/types';
 import { useExpandedWidthLayouts, useLayoutLookups } from 'src/features/form/layout/LayoutsContext';

src/components/presentation/AppHeader/AppHeader.test.tsx

@@ -4,11 +4,11 @@ import { expect, jest } from '@jest/globals';
 import { act, screen } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 
-import { getIncomingApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
+import { getApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
 import { getLogoMock } from 'src/__mocks__/getLogoMock';
 import { LogoColor } from 'src/components/logo/AltinnLogo';
 import { AppHeader } from 'src/components/presentation/AppHeader/AppHeader';
-import { fetchApplicationMetadata } from 'src/queries/queries';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { renderWithInstanceAndLayout } from 'src/test/renderWithProviders';
 import { PartyType } from 'src/types/shared';
 import type { ApplicationMetadata } from 'src/features/applicationMetadata/types';
@@ -43,7 +43,7 @@ describe('presentation/AppHeader', () => {
     textResources?: IRawTextResource[];
   }
   const render = async ({ logo, showLanguageSelector = false, textResources = [] }: IRenderComponentProps) => {
-    jest.mocked(fetchApplicationMetadata).mockImplementation(async () => getIncomingApplicationMetadataMock({ logo }));
+    jest.mocked(useApplicationMetadata).mockReturnValue(getApplicationMetadataMock({ logoOptions: logo }));
 
     return await renderWithInstanceAndLayout({
       renderer: () => (

src/components/presentation/AppHeader/AppHeader.tsx

@@ -7,7 +7,7 @@ import { AppHeaderMenu } from 'src/components/presentation/AppHeader/AppHeaderMe
 import { LanguageSelector } from 'src/components/presentation/LanguageSelector';
 import { OrganisationLogo } from 'src/components/presentation/OrganisationLogo/OrganisationLogo';
 import { useHasAppTextsYet } from 'src/core/texts/appTexts';
-import { useApplicationMetadata } from 'src/features/applicationMetadata/ApplicationMetadataProvider';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { usePageSettings } from 'src/features/form/layoutSettings/LayoutSettingsContext';
 import { Lang } from 'src/features/language/Lang';
 import type { LogoColor } from 'src/components/logo/AltinnLogo';

src/components/presentation/OrganisationLogo/OrganisationLogo.test.tsx

@@ -3,14 +3,14 @@ import React from 'react';
 import { expect, jest } from '@jest/globals';
 import { screen } from '@testing-library/react';
 
-import { getIncomingApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
+import { getApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
 import { OrganisationLogo } from 'src/components/presentation/OrganisationLogo/OrganisationLogo';
-import { fetchApplicationMetadata } from 'src/queries/queries';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { renderWithInstanceAndLayout } from 'src/test/renderWithProviders';
 import type { IncomingApplicationMetadata } from 'src/features/applicationMetadata/types';
 
 const render = async (logo: IncomingApplicationMetadata['logo']) => {
-  jest.mocked(fetchApplicationMetadata).mockImplementation(async () => getIncomingApplicationMetadataMock({ logo }));
+  jest.mocked(useApplicationMetadata).mockReturnValue(getApplicationMetadataMock({ logoOptions: logo }));
 
   return await renderWithInstanceAndLayout({
     renderer: () => <OrganisationLogo />,

src/core/texts/appTexts.test.tsx

@@ -3,9 +3,9 @@ import React from 'react';
 import { expect, jest } from '@jest/globals';
 import { screen } from '@testing-library/react';
 
-import { getIncomingApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
+import { getApplicationMetadataMock } from 'src/__mocks__/getApplicationMetadataMock';
 import { useAppName, useAppOwner } from 'src/core/texts/appTexts';
-import { fetchApplicationMetadata } from 'src/queries/queries';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { renderWithoutInstanceAndLayout } from 'src/test/renderWithProviders';
 import type { ApplicationMetadata } from 'src/features/applicationMetadata/types';
 import type { IRawTextResource } from 'src/features/language/textResources';
@@ -31,7 +31,7 @@ interface RenderProps {
 
 async function render({ nbTitle, textResources = [], orgs = {} }: RenderProps) {
   const overrides = nbTitle ? { title: { nb: nbTitle } } : {};
-  jest.mocked(fetchApplicationMetadata).mockImplementation(async () => getIncomingApplicationMetadataMock(overrides));
+  jest.mocked(useApplicationMetadata).mockReturnValue(getApplicationMetadataMock(overrides));
 
   return await renderWithoutInstanceAndLayout({
     renderer: () => <AppTextsRenderer />,

src/core/texts/appTexts.ts

@@ -1,7 +1,4 @@
-import {
-  useApplicationMetadata,
-  useHasApplicationMetadata,
-} from 'src/features/applicationMetadata/ApplicationMetadataProvider';
+import { useApplicationMetadata } from 'src/features/appData/hooks';
 import { useCurrentLanguage } from 'src/features/language/LanguageProvider';
 import { useHasTextResources } from 'src/features/language/textResources/TextResourcesProvider';
 import { useLanguage } from 'src/features/language/useLanguage';
@@ -19,11 +16,10 @@ export function useTextResourceOr<T extends string | undefined>(resource: string
 }
 
 export function useHasAppTextsYet() {
-  const hasAppMetadata = useHasApplicationMetadata();
   const hasOrgs = useHasOrgs();
   const hasTexts = useHasTextResources();
 
-  return hasAppMetadata && hasOrgs && hasTexts;
+  return hasOrgs && hasTexts;
 }
 
 export function useAppName() {