Shifting complexity in expressions/hierarchy

src/__mocks__/formLayoutGroupMock.ts

@@ -1,7 +1,11 @@
+import type { ExprUnresolved } from 'src/features/expressions/types';
 import type { ILayoutGroup } from 'src/layout/Group/types';
 
-export function getFormLayoutGroupMock(customMock?: Partial<ILayoutGroup>, children?: string[]): ILayoutGroup {
-  const mockLayoutGroup: ILayoutGroup = {
+export function getFormLayoutGroupMock(
+  customMock?: Partial<ExprUnresolved<ILayoutGroup>>,
+  children?: string[],
+): ExprUnresolved<ILayoutGroup> {
+  const mockLayoutGroup: ExprUnresolved<ILayoutGroup> = {
     id: 'container-closed-id',
     type: 'Group',
     children: children || ['field1', 'field2', 'field3', 'field4'],
@@ -16,7 +20,7 @@ export function getFormLayoutGroupMock(customMock?: Partial<ILayoutGroup>, child
   };
 }
 
-export function getMultiPageGroupMock(): ILayoutGroup {
+export function getMultiPageGroupMock(): ExprUnresolved<ILayoutGroup> {
   return {
     type: 'Group',
     id: 'multipageGroup',

src/components/message/ErrorReport.tsx

@@ -10,10 +10,10 @@ import { renderLayoutComponent } from 'src/features/form/containers/Form';
 import { FormLayoutActions } from 'src/features/form/layout/formLayoutSlice';
 import { getLanguageFromKey, getParsedLanguageFromText } from 'src/language/sharedLanguage';
 import { AsciiUnitSeparator } from 'src/utils/attachment';
-import { nodesInLayouts } from 'src/utils/layout/hierarchy';
+import { useExprContext } from 'src/utils/layout/ExprContext';
 import { getMappedErrors, getUnmappedErrors } from 'src/utils/validation/validation';
 import type { ILayout } from 'src/layout/layout';
-import type { AnyChildNode } from 'src/utils/layout/hierarchy.types';
+import type { LayoutNode } from 'src/utils/layout/hierarchy';
 import type { FlatError } from 'src/utils/validation/validation';
 
 export interface IErrorReportProps {
@@ -56,12 +56,11 @@ export const ErrorReport = ({ components }: IErrorReportProps) => {
   const classes = useStyles();
   const dispatch = useAppDispatch();
   const currentView = useAppSelector((state) => state.formLayout.uiConfig.currentView);
-  const layouts = useAppSelector((state) => state.formLayout.layouts);
-  const repeatingGroups = useAppSelector((state) => state.formLayout.uiConfig.repeatingGroups);
   const [errorsMapped, errorsUnmapped] = useAppSelector((state) => [
     getMappedErrors(state.formValidations.validations),
     getUnmappedErrors(state.formValidations.validations),
   ]);
+  const nodes = useExprContext();
   const language = useAppSelector((state) => state.language.language);
   const hasErrors = errorsUnmapped.length > 0 || errorsMapped.length > 0;
 
@@ -82,14 +81,13 @@ export const ErrorReport = ({ components }: IErrorReportProps) => {
       );
     }
 
-    const nodes = nodesInLayouts(layouts, error.layout, repeatingGroups);
-    const componentNode = nodes.findById(error.componentId);
+    const componentNode = nodes?.findById(error.componentId);
 
     // Iterate over parent repeating groups
     componentNode?.parents().forEach((parentNode, i, allParents) => {
       const parent = parentNode.item;
       if (parent?.type == 'Group' && parent.edit?.mode !== 'likert' && parent.maxCount && parent.maxCount > 1) {
-        const childNode = i == 0 ? componentNode : (allParents[i - 1] as AnyChildNode<'unresolved'>);
+        const childNode = i == 0 ? componentNode : (allParents[i - 1] as LayoutNode);
 
         // Go to correct multiPage page if necessary
         if (parent.edit?.multiPage && 'multiPageIndex' in childNode.item) {

src/components/summary/SummaryComponent.test.tsx

@@ -8,6 +8,7 @@ import { SummaryComponent } from 'src/components/summary/SummaryComponent';
 import { FormLayoutActions } from 'src/features/form/layout/formLayoutSlice';
 import { renderWithProviders } from 'src/testUtils';
 import type { ISummaryComponent } from 'src/components/summary/SummaryComponent';
+import type { ExprUnresolved } from 'src/features/expressions/types';
 import type { ILayoutState } from 'src/features/form/layout/formLayoutSlice';
 import type { ILayoutComponent } from 'src/layout/layout';
 import type { IValidations } from 'src/types';
@@ -28,7 +29,7 @@ describe('SummaryComponent', () => {
                 textResourceBindings: {},
                 children: [],
                 maxCount: 10,
-              } as ILayoutComponent),
+              } as ExprUnresolved<ILayoutComponent>),
           ),
         ],
       },

src/components/summary/SummaryComponent.tsx

@@ -23,11 +23,11 @@ import {
 } from 'src/utils/formComponentUtils';
 import { useResolvedNode } from 'src/utils/layout/ExprContext';
 import { getTextFromAppOrDefault } from 'src/utils/textResource';
-import type { ComponentExceptGroupAndSummary, ILayoutComponent, RenderableGenericComponent } from 'src/layout/layout';
+import type { ExprUnresolved } from 'src/features/expressions/types';
 import type { ILayoutCompSummary } from 'src/layout/Summary/types';
 import type { IComponentValidations, IRuntimeState } from 'src/types';
 
-export interface ISummaryComponent extends Omit<ILayoutCompSummary, 'type'> {
+export interface ISummaryComponent extends Omit<ExprUnresolved<ILayoutCompSummary>, 'type'> {
   formData?: any;
 }
 
@@ -79,7 +79,7 @@ export function SummaryComponent(_props: ISummaryComponent) {
   const attachments = useAppSelector((state: IRuntimeState) => state.attachments.attachments);
   const formComponent = useResolvedNode(componentRef)?.item;
   const summaryComponent = useResolvedNode(id)?.item;
-  const layoutComponent = getLayoutComponentObject(formComponent?.type as ComponentExceptGroupAndSummary);
+  const layoutComponent = getLayoutComponentObject(formComponent?.type);
   const formComponentLegacy = useAppSelector(
     (state) =>
       (state.formLayout.layouts &&
@@ -121,7 +121,7 @@ export function SummaryComponent(_props: ISummaryComponent) {
       getDisplayFormDataForComponent(
         state.formData.formData,
         attachments,
-        formComponent as ILayoutComponent,
+        formComponent,
         state.textResources.resources,
         state.optionState.options,
         state.formLayout.uiConfig.repeatingGroups,
@@ -192,9 +192,13 @@ export function SummaryComponent(_props: ISummaryComponent) {
         )}
       />
     );
-  } else if (layoutComponent?.getComponentType() === ComponentType.Presentation) {
+  } else if (
+    layoutComponent?.getComponentType() === ComponentType.Presentation &&
+    formComponentLegacy.type !== 'Summary' &&
+    formComponentLegacy.type !== 'Group'
+  ) {
     // Render non-input components as normal
-    return <GenericComponent {...(formComponentLegacy as RenderableGenericComponent)} />;
+    return <GenericComponent {...formComponentLegacy} />;
   }
 
   const displayGrid = display && display.useComponentGrid ? formComponent?.grid : grid;

src/components/summary/SummaryComponentSwitch.tsx

@@ -8,6 +8,7 @@ import { AttachmentSummaryComponent } from 'src/layout/FileUpload/AttachmentSumm
 import { AttachmentWithTagSummaryComponent } from 'src/layout/FileUploadWithTag/AttachmentWithTagSummaryComponent';
 import { MapComponentSummary } from 'src/layout/Map/MapComponentSummary';
 import { useResolvedNode } from 'src/utils/layout/ExprContext';
+import type { ExprUnresolved } from 'src/features/expressions/types';
 import type { ILayoutGroup } from 'src/layout/Group/types';
 import type { ILayoutComponent } from 'src/layout/layout';
 import type { ILayoutCompSummary } from 'src/layout/Summary/types';
@@ -17,7 +18,7 @@ export interface ISummaryComponentSwitch extends Omit<ILayoutCompSummary, 'type'
     onChangeClick: () => void;
     changeText: string | null;
   };
-  formComponent?: ILayoutComponent | ILayoutGroup;
+  formComponent?: ExprUnresolved<ILayoutComponent | ILayoutGroup>;
   hasValidationMessages?: boolean;
   label?: JSX.Element | JSX.Element[] | null | undefined;
   formData?: any;

src/components/summary/SummaryGroupComponent.tsx

@@ -16,12 +16,12 @@ import { AltinnAppTheme } from 'src/theme/altinnAppTheme';
 import { getDisplayFormDataForComponent, getFormDataForComponentInRepeatingGroup } from 'src/utils/formComponentUtils';
 import { useResolvedNode } from 'src/utils/layout/ExprContext';
 import { getTextFromAppOrDefault } from 'src/utils/textResource';
+import type { ExprUnresolved } from 'src/features/expressions/types';
 import type { ComponentFromSummary } from 'src/features/form/containers/DisplayGroupContainer';
 import type { ILayoutGroup } from 'src/layout/Group/types';
-import type { ComponentExceptGroupAndSummary, ILayoutComponent } from 'src/layout/layout';
 import type { SummaryDisplayProperties } from 'src/layout/Summary/types';
 import type { IRuntimeState } from 'src/types';
-import type { AnyNode } from 'src/utils/layout/hierarchy.types';
+import type { LayoutNode } from 'src/utils/layout/hierarchy';
 
 export interface ISummaryGroupComponent {
   pageRef?: string;
@@ -89,7 +89,7 @@ export function SummaryGroupComponent({
   const node = useResolvedNode(componentRef);
   const textResourceBindings = node?.item.textResourceBindings;
 
-  const removeExcludedChildren = (n: AnyNode<'resolved'>) =>
+  const removeExcludedChildren = (n: LayoutNode) =>
     !excludedChildren ||
     (!excludedChildren.includes(n.item.id) && !excludedChildren.includes(`${n.item.baseComponentId}`));
 
@@ -141,11 +141,7 @@ export function SummaryGroupComponent({
       const childSummaryComponents = node
         .children(undefined, row.index)
         .filter(removeExcludedChildren)
-        .filter(
-          (node) =>
-            getLayoutComponentObject(node.item.type as ComponentExceptGroupAndSummary)?.getComponentType() ===
-            ComponentType.Form,
-        )
+        .filter((node) => getLayoutComponentObject(node.item.type)?.getComponentType() === ComponentType.Form)
         .map((n) => {
           if (n.isHidden(hiddenFields)) {
             return;
@@ -154,7 +150,7 @@ export function SummaryGroupComponent({
           const formDataForComponent = getDisplayFormDataForComponent(
             formData,
             attachments,
-            n.item as ILayoutComponent,
+            n.item,
             textResources,
             options,
             repeatingGroups,
@@ -196,7 +192,7 @@ export function SummaryGroupComponent({
       const groupContainer = {
         ...node.item,
         children: [],
-      } as ILayoutGroup;
+      } as ExprUnresolved<ILayoutGroup>;
 
       const childSummaryComponents: ComponentFromSummary[] = [];
       node
@@ -214,7 +210,7 @@ export function SummaryGroupComponent({
             formDataForComponent = getFormDataForComponentInRepeatingGroup(
               formData,
               attachments,
-              n.item as ILayoutComponent,
+              n.item,
               row.index,
               groupDataModelBinding,
               textResources,

src/features/expressions/ExprContext.ts

@@ -2,10 +2,10 @@ import dot from 'dot-object';
 
 import { ExprRuntimeError, NodeNotFound, NodeNotFoundWithoutContext } from 'src/features/expressions/errors';
 import { prettyErrors, prettyErrorsToConsole } from 'src/features/expressions/prettyErrors';
-import type { BaseValue, ExprConfig, Expression } from 'src/features/expressions/types';
+import type { ExprConfig, Expression } from 'src/features/expressions/types';
 import type { IFormData } from 'src/features/form/data';
 import type { IApplicationSettings, IInstanceContext } from 'src/types/shared';
-import type { LayoutNode, LayoutRootNode } from 'src/utils/layout/hierarchy';
+import type { LayoutNode, LayoutPage } from 'src/utils/layout/hierarchy';
 
 export interface ContextDataSources {
   instanceContext: IInstanceContext | null;
@@ -15,7 +15,7 @@ export interface ContextDataSources {
 }
 
 export interface PrettyErrorsOptions {
-  config?: ExprConfig<BaseValue>;
+  config?: ExprConfig;
   introText?: string;
 }
 
@@ -28,7 +28,7 @@ export class ExprContext {
 
   private constructor(
     public expr: Expression,
-    public node: LayoutNode<any> | LayoutRootNode<any> | NodeNotFoundWithoutContext,
+    public node: LayoutNode | LayoutPage | NodeNotFoundWithoutContext,
     public dataSources: ContextDataSources,
   ) {}
 
@@ -37,7 +37,7 @@ export class ExprContext {
    */
   public static withBlankPath(
     expr: Expression,
-    node: LayoutNode<any> | LayoutRootNode<any> | NodeNotFoundWithoutContext,
+    node: LayoutNode | LayoutPage | NodeNotFoundWithoutContext,
     dataSources: ContextDataSources,
   ): ExprContext {
     return new ExprContext(expr, node, dataSources);
@@ -57,7 +57,7 @@ export class ExprContext {
   /**
    * Utility function used to get the LayoutNode for this context, or fail if the node was not found
    */
-  public failWithoutNode(): LayoutNode<any> | LayoutRootNode<any> {
+  public failWithoutNode(): LayoutNode | LayoutPage {
     if (this.node instanceof NodeNotFoundWithoutContext) {
       throw new NodeNotFound(this, this.node);
     }

src/features/expressions/index.test.ts

@@ -1,12 +1,13 @@
 import { NodeNotFoundWithoutContext } from 'src/features/expressions/errors';
 import { CONFIG_FOR_ALL_VALUES_IN_OBJ, evalExpr, evalExprInObj } from 'src/features/expressions/index';
+import { ExprVal } from 'src/features/expressions/types';
 import type { ContextDataSources } from 'src/features/expressions/ExprContext';
 import type { ExprConfig } from 'src/features/expressions/types';
 
 describe('Expressions', () => {
   it('should return default value if expression evaluates to null', () => {
-    const config: ExprConfig<'string'> = {
-      returnType: 'string',
+    const config: ExprConfig<ExprVal.String> = {
+      returnType: ExprVal.String,
       defaultValue: 'hello world',
       resolvePerRow: false,
     };
@@ -60,12 +61,12 @@ describe('Expressions', () => {
         input: { obj: ['instanceContext', 'whatever1'], other: ['instanceContext', 'whatever2'] },
         config: {
           [CONFIG_FOR_ALL_VALUES_IN_OBJ]: {
-            returnType: 'string',
+            returnType: ExprVal.String,
             defaultValue: 'some-default-result',
             resolvePerRow: false,
           },
           obj: {
-            returnType: 'string',
+            returnType: ExprVal.String,
             defaultValue: 'default-for-this-one',
             resolvePerRow: false,
           },