Support multiple datamodels in the same task

schemas/json/layout/expression.schema.v1.json

@@ -169,10 +169,11 @@
     },
     "func-dataModel": {
       "title": "Data model lookup function",
-      "description": "This function will look up a value in the data model, using the JSON dot notation for referencing the data model structure. Relative positioning inside repeating groups will be resolved automatically if no positional indexes are specified.",
+      "description": "This function will look up a value in the data model, using the JSON dot notation for referencing the data model structure. Relative positioning inside repeating groups will be resolved automatically if no positional indexes are specified. The final parameter is optional and specifies the data type to look up.",
       "type": "array",
       "items": [
         { "const":  "dataModel" },
+        { "$ref": "#/definitions/string" },
         { "$ref": "#/definitions/string" }
       ],
       "additionalItems": false

src/__mocks__/getApplicationMetadataMock.ts

@@ -48,7 +48,6 @@ export const getIncomingApplicationMetadataMock = (
           autoCreate: true,
           classRef: 'Altinn.App.Models.Skjema2',
         },
-        taskId: 'Task_0',
         maxCount: 1,
         minCount: 1,
       },
@@ -60,7 +59,6 @@ export const getIncomingApplicationMetadataMock = (
           classRef: 'Altinn.App.Models.Skjema3',
           allowAnonymousOnStateless: true,
         },
-        taskId: 'Task_0',
         maxCount: 1,
         minCount: 1,
       },

src/__mocks__/getExpressionDataSourcesMock.ts

@@ -1,4 +1,5 @@
 import { getApplicationSettingsMock } from 'src/__mocks__/getApplicationSettingsMock';
+import { defaultDataTypeMock } from 'src/__mocks__/getLayoutSetsMock';
 import { staticUseLanguageForTests } from 'src/features/language/useLanguage';
 import type { IInstanceDataSources } from 'src/types/shared';
 import type { ExpressionDataSources } from 'src/utils/layout/useExpressionDataSources';
@@ -13,9 +14,11 @@ export function getExpressionDataSourcesMock(): ExpressionDataSources {
     },
     optionsSelector: () => ({ isFetching: false, options: [] }),
     applicationSettings: getApplicationSettingsMock(),
+    dataModelNames: [defaultDataTypeMock],
     instanceDataSources: {} as IInstanceDataSources | null,
     langToolsSelector: () => staticUseLanguageForTests(),
     currentLanguage: 'nb',
+    currentLayoutSet: { id: 'form', dataType: 'data', tasks: ['task1'] },
     isHiddenSelector: () => false,
     nodeFormDataSelector: (() => ({})) as unknown as NodeFormDataSelector,
     nodeDataSelector: () => {

src/__mocks__/getFormLayoutGroupMock.ts

@@ -1,3 +1,4 @@
+import { defaultDataTypeMock } from 'src/__mocks__/getLayoutSetsMock';
 import type { CompRepeatingGroupExternal } from 'src/layout/RepeatingGroup/config.generated';
 
 export const getFormLayoutRepeatingGroupMock = (
@@ -8,7 +9,7 @@ export const getFormLayoutRepeatingGroupMock = (
   children: ['field1', 'field2', 'field3', 'field4'],
   maxCount: 8,
   dataModelBindings: {
-    group: 'some-group',
+    group: { dataType: defaultDataTypeMock, field: 'some-group' },
   },
   ...customMock,
 });

src/__mocks__/getInstanceDataMock.ts

@@ -1,5 +1,7 @@
 import type { IInstance } from 'src/types/shared';
 
+export const defaultMockDataElementId = '4f2610c9-911a-46a3-bc2d-5191602193f4';
+
 export function getInstanceDataMock(mutate?: (data: IInstance) => void): IInstance {
   const out: IInstance = {
     instanceOwner: {
@@ -10,7 +12,7 @@ export function getInstanceDataMock(mutate?: (data: IInstance) => void): IInstan
     created: new Date('2020-01-01').toISOString(),
     data: [
       {
-        id: '4f2610c9-911a-46a3-bc2d-5191602193f4',
+        id: defaultMockDataElementId,
         instanceGuid: '91cefc5e-c47b-40ff-a8a4-05971205f783',
         dataType: 'test-data-model',
         contentType: 'application/xml',

src/__mocks__/getLayoutSetsMock.ts

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

src/__mocks__/getMultiPageGroupMock.ts

@@ -1,10 +1,11 @@
+import { defaultDataTypeMock } from 'src/__mocks__/getLayoutSetsMock';
 import type { CompRepeatingGroupExternal } from 'src/layout/RepeatingGroup/config.generated';
 
 export const getMultiPageGroupMock = (overrides: Partial<CompRepeatingGroupExternal>): CompRepeatingGroupExternal => ({
   id: 'myMultiPageGroup',
   type: 'RepeatingGroup',
   dataModelBindings: {
-    group: 'multipageGroup',
+    group: { dataType: defaultDataTypeMock, field: 'multipageGroup' },
   },
   maxCount: 2,
   edit: {

src/codegen/CG.ts

@@ -3,6 +3,7 @@ import { GenerateArray } from 'src/codegen/dataTypes/GenerateArray';
 import { GenerateBoolean } from 'src/codegen/dataTypes/GenerateBoolean';
 import { GenerateCommonImport } from 'src/codegen/dataTypes/GenerateCommonImport';
 import { GenerateConst } from 'src/codegen/dataTypes/GenerateConst';
+import { GenerateDataModelBinding } from 'src/codegen/dataTypes/GenerateDataModelBinding';
 import { GenerateEnum } from 'src/codegen/dataTypes/GenerateEnum';
 import { GenerateExpressionOr } from 'src/codegen/dataTypes/GenerateExpressionOr';
 import { GenerateImportedSymbol } from 'src/codegen/dataTypes/GenerateImportedSymbol';
@@ -42,6 +43,7 @@ export const CG = {
   obj: GenerateObject,
   prop: GenerateProperty,
   trb: GenerateTextResourceBinding,
+  dataModelBinding: GenerateDataModelBinding,
 
   // Known values that we have types for elsewhere, or other imported types
   common: generateCommonImport,

src/codegen/CodeGenerator.ts

@@ -6,6 +6,8 @@ export interface JsonSchemaExt<T> {
   title: string | undefined;
   description: string | undefined;
   examples: T[];
+  deprecated: boolean | undefined;
+  deprecationWarning: string | undefined;
 }
 
 export interface TypeScriptExt {
@@ -40,20 +42,36 @@ export abstract class CodeGenerator<T> {
       title: undefined,
       description: undefined,
       examples: [],
+      deprecated: undefined,
+      deprecationWarning: undefined,
     },
     typeScript: {},
     optional: false,
     frozen: false,
   };
 
+  /**
+   * Gets the schemas description, and prepends a deprecation warning if the property is deprecated
+   */
+  private getSchemaDescription(): string | undefined {
+    const description = this.internal.jsonSchema.description;
+    if (this.internal.jsonSchema.deprecated) {
+      const deprecationMessage = `**Deprecated**: ${this.internal.jsonSchema.deprecationWarning}`;
+      return description ? [deprecationMessage, description].join('\n') : deprecationMessage;
+    }
+    return description;
+  }
+
   protected getInternalJsonSchema(): JSONSchema7 {
     this.freeze('getInternalJsonSchema');
     return {
       title: this.internal.jsonSchema.title || this.internal.symbol?.name || undefined,
-      description: this.internal.jsonSchema.description,
+      description: this.getSchemaDescription(),
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       examples: this.internal.jsonSchema.examples.length ? (this.internal.jsonSchema.examples as any) : undefined,
       default: this.internal.optional ? (this.internal.optional.default as JSONSchema7Type) : undefined,
+      // @ts-expect-error Although not included in JSON schema version 7, this is implemented in more recent versions, and works in VS Code
+      deprecated: this.internal.jsonSchema.deprecated,
     };
   }
 
@@ -168,6 +186,13 @@ export abstract class MaybeOptionalCodeGenerator<T> extends MaybeSymbolizedCodeG
 }
 
 export abstract class DescribableCodeGenerator<T> extends MaybeOptionalCodeGenerator<T> {
+  setDeprecated(warning: string): this {
+    this.ensureMutable();
+    this.internal.jsonSchema.deprecated = true;
+    this.internal.jsonSchema.deprecationWarning = warning;
+    return this;
+  }
+
   setTitle(title: string): this {
     this.ensureMutable();
     this.internal.jsonSchema.title = title;

src/codegen/Common.ts

@@ -128,38 +128,61 @@ const common = {
       ),
     ),
 
+  IDataModelReference: () =>
+    new CG.obj(
+      new CG.prop(
+        'dataType',
+        new CG.str().setTitle('Data type').setDescription('The name of the datamodel type to reference'),
+      ),
+      new CG.prop(
+        'field',
+        new CG.str().setTitle('Field').setDescription('The path to the property using dot-notation'),
+      ),
+    ),
+  IRawDataModelBinding: () => new CG.union(new CG.str(), CG.common('IDataModelReference')),
+
   // Data model bindings:
   IDataModelBindingsSimple: () =>
-    new CG.obj(new CG.prop('simpleBinding', new CG.str()))
-      .setTitle('Data model binding')
-      .setDescription(
-        'Describes the location in the data model where the component should store its value(s). A simple ' +
-          'binding is used for components that only store a single value, usually a string.',
-      ),
-  IDataModelBindingsOptionsSimple: () =>
     new CG.obj(
-      new CG.prop('simpleBinding', new CG.str()),
-      new CG.prop('label', new CG.str().optional()),
       new CG.prop(
-        'metadata',
-        new CG.str()
-          .optional()
+        'simpleBinding',
+        new CG.dataModelBinding()
+          .setTitle('Data model binding')
           .setDescription(
-            'Describes the location where metadata for the option based component should be stored in the datamodel.',
+            'Describes the location in the data model where the component should store its value(s). ' +
+              'A simple binding is used for components that only store a single value, usually a string.',
           ),
       ),
-    )
-      .setTitle('Data model binding')
-      .setDescription(
-        'Describes the location in the data model where the component should store its value(s). A simple ' +
-          'binding is used for components that only store a single value, usually a string.',
+    ),
+  IDataModelBindingsOptionsSimple: () =>
+    new CG.obj(
+      new CG.prop(
+        'simpleBinding',
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for value')
+          .setDescription('Describes the location in the data model where the component should store its values.'),
+      ),
+      new CG.prop(
+        'label',
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for label')
+          .setDescription('Describes the location in the data model where the component should store its labels')
+          .optional(),
+      ),
+      new CG.prop(
+        'metadata',
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for metadata')
+          .setDescription('Describes the location in the data model where the component should store its metadata')
+          .optional(),
       ),
+    ),
   IDataModelBindingsLikert: () =>
     new CG.obj(
       new CG.prop(
         'answer',
-        new CG.str()
-          .setTitle('Answer')
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for answer')
           .setDescription(
             'Dot notation location for the answers. This must point to a property of the objects inside the ' +
               'question array. The answer for each question will be stored in the answer property of the ' +
@@ -168,25 +191,24 @@ const common = {
       ),
       new CG.prop(
         'questions',
-        new CG.str()
-          .setTitle('Questions')
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for questions')
           .setDescription('Dot notation location for a likert structure (array of objects), where the data is stored'),
       ),
-    )
-      .setTitle('Data model binding')
-      .setDescription(
-        'Describes the location in the data model where the component should store its value(s). A list binding ' +
-          'should be pointed to an array structure in the data model, and is used for components that store multiple ' +
-          'simple values (e.g. a list of strings).',
-      ),
+    ),
   IDataModelBindingsList: () =>
-    new CG.obj(new CG.prop('list', new CG.str()))
-      .setTitle('Data model binding')
-      .setDescription(
-        'Describes the location in the data model where the component should store its value(s). A list binding ' +
-          'should be pointed to an array structure in the data model, and is used for components that store multiple ' +
-          'simple values (e.g. a list of strings).',
+    new CG.obj(
+      new CG.prop(
+        'list',
+        new CG.dataModelBinding()
+          .setTitle('Data model binding for values')
+          .setDescription(
+            'Describes the location in the data model where the component should store its values. A list binding ' +
+              'should be pointed to an array structure in the data model, and is used for components that store multiple ' +
+              'simple values (e.g. a list of strings).',
+          ),
       ),
+    ),
 
   // Text resource bindings:
   TRBSummarizable: () =>
@@ -256,13 +278,22 @@ const common = {
       ),
   IQueryParameters: () =>
     new CG.obj()
-      .additionalProperties(new CG.str())
+      .additionalProperties(new CG.expr(ExprVal.String))
       .setTitle('Query parameters')
       .setDescription(
         'A mapping of query string parameters to values. Will be appended to the URL when fetching options.',
       ),
   IOptionSource: () =>
     new CG.obj(
+      new CG.prop(
+        'dataType',
+        new CG.str()
+          .setTitle('Data type')
+          .setDescription(
+            'The datamodel where the repeating group data is stored. If not specified, the data model defined in the layout-set will be used.',
+          )
+          .optional(),
+      ),
       new CG.prop(
         'group',
         new CG.str()
@@ -318,7 +349,12 @@ const common = {
           .setTitle('Dynamic options (fetched from server)')
           .setDescription('ID of the option list to fetch from the server'),
       ),
-      new CG.prop('mapping', CG.common('IMapping').optional()),
+      new CG.prop(
+        'mapping',
+        CG.common('IMapping')
+          .optional()
+          .setDeprecated('Will be removed in the next major version. Use `queryParameters` with expressions instead.'),
+      ),
       new CG.prop('queryParameters', CG.common('IQueryParameters').optional()),
       new CG.prop(
         'options',