ballerina-core 1.0.238 → 1.0.239

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/one/template.tsx

@@ -32,6 +32,7 @@ import {
   Updater,
   RecordAbstractRendererReadonlyContext,
   RecordAbstractRendererForeignMutationsExpected,
+  NestedRenderer,
 } from "../../../../../../../../main";
 import {
   OneAbstractRendererForeignMutationsExpected,
@@ -88,6 +89,8 @@ export const OneAbstractRenderer = <
     | undefined,
   IdProvider: (props: IdWrapperProps) => React.ReactNode,
   ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode,
+  DetailsRendererRaw: NestedRenderer<any>,
+  PreviewRendererRaw: NestedRenderer<any> | undefined,
   oneEntityType: RecordType<any>,
 ) => {
   const typedInitializeStreamRunner = initializeStreamRunner<
@@ -123,6 +126,11 @@ export const OneAbstractRenderer = <
           ExtraContext
         >
     >((_) => {
+      const labelContext =
+        CommonAbstractRendererState.Operations.GetLabelContext(
+          _.labelContext,
+          DetailsRendererRaw,
+        );
       if (PredicateValue.Operations.IsUnit(_.value)) {
         return undefined;
       }
@@ -156,6 +164,7 @@ export const OneAbstractRenderer = <
         ),
         domNodeAncestorPath: _.domNodeAncestorPath + "[one][details]",
         lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+        labelContext,
       };
     })
       .mapState(
@@ -214,95 +223,108 @@ export const OneAbstractRenderer = <
         },
       }));
 
-  const embeddedPreviewRenderer = PreviewRenderer
-    ? (value: ValueRecord) => (id: string) => (flags: Flags | undefined) =>
-        PreviewRenderer.mapContext<
-          OneAbstractRendererState &
-            OneAbstractRendererReadonlyContext<
-              CustomPresentationContext,
-              ExtraContext
-            >
-        >((_) => {
-          const state =
-            _.customFormState?.previewStates.get(id) ??
-            RecordAbstractRendererState.Default.zero();
-          return {
-            ...state,
-            value,
-            disabled: _.disabled || _.globallyDisabled,
-            globallyDisabled: _.globallyDisabled,
-            readOnly: _.readOnly || _.globallyReadOnly,
-            globallyReadOnly: _.globallyReadOnly,
-            locked: _.locked,
-            bindings: _.bindings,
-            extraContext: _.extraContext,
-            type: oneEntityType,
-            customPresentationContext: _.customPresentationContext,
-            remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-            typeAncestors: [_.type as DispatchParsedType<any>].concat(
-              _.typeAncestors,
-            ),
-            domNodeAncestorPath: _.domNodeAncestorPath + "[one][preview]",
-            lookupTypeAncestorNames: _.lookupTypeAncestorNames,
-          };
-        })
-          .mapState(
-            (
-              _: BasicUpdater<RecordAbstractRendererState>,
-            ): Updater<OneAbstractRendererState> =>
-              OneAbstractRendererState.Updaters.Core.customFormState.children.previewStates(
-                MapRepo.Updaters.upsert(
-                  id,
-                  () => RecordAbstractRendererState.Default.zero(),
-                  _,
-                ),
+  const embeddedPreviewRenderer =
+    PreviewRenderer && PreviewRendererRaw
+      ? (value: ValueRecord) => (id: string) => (flags: Flags | undefined) =>
+          PreviewRenderer.mapContext<
+            OneAbstractRendererState &
+              OneAbstractRendererReadonlyContext<
+                CustomPresentationContext,
+                ExtraContext
+              >
+          >((_) => {
+            const labelContext =
+              CommonAbstractRendererState.Operations.GetLabelContext(
+                _.labelContext,
+                PreviewRendererRaw,
+              );
+            const state =
+              _.customFormState?.previewStates.get(id) ??
+              RecordAbstractRendererState.Default.zero();
+            return {
+              ...state,
+              value,
+              disabled: _.disabled || _.globallyDisabled,
+              globallyDisabled: _.globallyDisabled,
+              readOnly: _.readOnly || _.globallyReadOnly,
+              globallyReadOnly: _.globallyReadOnly,
+              locked: _.locked,
+              bindings: _.bindings,
+              extraContext: _.extraContext,
+              type: oneEntityType,
+              customPresentationContext: _.customPresentationContext,
+              remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
+              typeAncestors: [_.type as DispatchParsedType<any>].concat(
+                _.typeAncestors,
               ),
-          )
-          .mapForeignMutationsFromProps<
-            OneAbstractRendererViewForeignMutationsExpected<Flags>
-          >((props) => ({
-            onChange: (
-              updater: Option<BasicUpdater<ValueRecord>>,
-              nestedDelta: DispatchDelta<Flags>,
-            ) => {
-              props.setState(
-                OneAbstractRendererState.Updaters.Core.commonFormState.children
-                  .modifiedByUser(replaceWith(true))
-                  .then(
-                    OneAbstractRendererState.Updaters.Core.customFormState.children.detailsState(
-                      RecordAbstractRendererState.Updaters.Core.commonFormState(
-                        DispatchCommonFormState.Updaters.modifiedByUser(
-                          replaceWith(true),
+              domNodeAncestorPath: _.domNodeAncestorPath + "[one][preview]",
+              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+              labelContext,
+            };
+          })
+            .mapState(
+              (
+                _: BasicUpdater<RecordAbstractRendererState>,
+              ): Updater<OneAbstractRendererState> =>
+                OneAbstractRendererState.Updaters.Core.customFormState.children.previewStates(
+                  MapRepo.Updaters.upsert(
+                    id,
+                    () => RecordAbstractRendererState.Default.zero(),
+                    _,
+                  ),
+                ),
+            )
+            .mapForeignMutationsFromProps<
+              OneAbstractRendererViewForeignMutationsExpected<Flags>
+            >((props) => ({
+              onChange: (
+                updater: Option<BasicUpdater<ValueRecord>>,
+                nestedDelta: DispatchDelta<Flags>,
+              ) => {
+                props.setState(
+                  OneAbstractRendererState.Updaters.Core.commonFormState.children
+                    .modifiedByUser(replaceWith(true))
+                    .then(
+                      OneAbstractRendererState.Updaters.Core.customFormState.children.detailsState(
+                        RecordAbstractRendererState.Updaters.Core.commonFormState(
+                          DispatchCommonFormState.Updaters.modifiedByUser(
+                            replaceWith(true),
+                          ),
                         ),
                       ),
                     ),
-                  ),
-              );
+                );
 
-              const delta: DispatchDelta<Flags> = {
-                kind: "OneValue",
-                nestedDelta,
-                flags,
-                sourceAncestorLookupTypeNames:
-                  nestedDelta.sourceAncestorLookupTypeNames,
-              };
+                const delta: DispatchDelta<Flags> = {
+                  kind: "OneValue",
+                  nestedDelta,
+                  flags,
+                  sourceAncestorLookupTypeNames:
+                    nestedDelta.sourceAncestorLookupTypeNames,
+                };
 
-              props.foreignMutations.onChange(
-                updater.kind == "l"
-                  ? Option.Default.none()
-                  : Option.Default.some<BasicUpdater<ValueOption | ValueUnit>>(
-                      (__: ValueOption | ValueUnit): ValueOption | ValueUnit =>
-                        __.kind == "unit"
-                          ? ValueUnit.Default()
-                          : !PredicateValue.Operations.IsRecord(__.value)
+                props.foreignMutations.onChange(
+                  updater.kind == "l"
+                    ? Option.Default.none()
+                    : Option.Default.some<
+                        BasicUpdater<ValueOption | ValueUnit>
+                      >(
+                        (
+                          __: ValueOption | ValueUnit,
+                        ): ValueOption | ValueUnit =>
+                          __.kind == "unit"
                             ? ValueUnit.Default()
-                            : ValueOption.Default.some(updater.value(__.value)),
-                    ),
-                delta,
-              );
-            },
-          }))
-    : undefined;
+                            : !PredicateValue.Operations.IsRecord(__.value)
+                              ? ValueUnit.Default()
+                              : ValueOption.Default.some(
+                                  updater.value(__.value),
+                                ),
+                      ),
+                  delta,
+                );
+              },
+            }))
+      : undefined;
 
   return Template.Default<
     OneAbstractRendererReadonlyContext<CustomPresentationContext, ExtraContext>,

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/readOnly/template.tsx

@@ -11,6 +11,7 @@ import {
   Option,
   BasicUpdater,
   DispatchDelta,
+  NestedRenderer,
 } from "../../../../../../../../main";
 import { Template } from "../../../../../../../template/state";
 import {
@@ -41,6 +42,7 @@ export const ReadOnlyAbstractRenderer = <
     CommonAbstractRendererState,
     CommonAbstractRendererForeignMutationsExpected<Flags>
   >,
+  ChildRenderer: NestedRenderer<any>,
   IdProvider: (props: IdWrapperProps) => React.ReactNode,
   ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode,
 ) => {
@@ -52,25 +54,33 @@ export const ReadOnlyAbstractRenderer = <
           ExtraContext
         > &
           ReadOnlyAbstractRendererState,
-      ) => ({
-        disabled: _.disabled || _.globallyDisabled,
-        globallyDisabled: _.globallyDisabled,
-        locked: _.locked,
-        value: _.value.ReadOnly,
-        ...(_.childFormState || GetDefaultChildState()),
-        readOnly: true,
-        globallyReadOnly: _.globallyReadOnly,
-        bindings: _.bindings,
-        extraContext: _.extraContext,
-        type: _.type.arg,
-        customPresentationContext: _.customPresentationContext,
-        remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-        domNodeAncestorPath: _.domNodeAncestorPath + `[readOnly]`,
-        typeAncestors: [_.type as DispatchParsedType<any>].concat(
-          _.typeAncestors,
-        ),
-        lookupTypeAncestorNames: _.lookupTypeAncestorNames,
-      }),
+      ) => {
+        const labelContext =
+          CommonAbstractRendererState.Operations.GetLabelContext(
+            _.labelContext,
+            ChildRenderer,
+          );
+        return {
+          disabled: _.disabled || _.globallyDisabled,
+          globallyDisabled: _.globallyDisabled,
+          locked: _.locked,
+          value: _.value.ReadOnly,
+          ...(_.childFormState || GetDefaultChildState()),
+          readOnly: true,
+          globallyReadOnly: _.globallyReadOnly,
+          bindings: _.bindings,
+          extraContext: _.extraContext,
+          type: _.type.arg,
+          customPresentationContext: _.customPresentationContext,
+          remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
+          domNodeAncestorPath: _.domNodeAncestorPath + `[readOnly]`,
+          typeAncestors: [_.type as DispatchParsedType<any>].concat(
+            _.typeAncestors,
+          ),
+          lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+          labelContext,
+        };
+      },
     )
     .mapState((_) =>
       ReadOnlyAbstractRendererState.Updaters.Core.childFormState(_),

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/record/template.tsx

@@ -32,6 +32,7 @@ import {
   RecordAbstractRendererState,
   RecordAbstractRendererView,
 } from "./state";
+import { RecordFieldRenderer } from "../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/record/domains/recordFieldRenderer/state";
 
 export const RecordAbstractRenderer = <
   CustomPresentationContext = Unit,
@@ -57,6 +58,7 @@ export const RecordAbstractRenderer = <
       GetDefaultState: () => CommonAbstractRendererState;
     }
   >,
+  FieldRenderers: Map<string, RecordFieldRenderer<any>>,
   Layout: PredicateFormLayout,
   DisabledFieldsPredicate: PredicateComputedOrInlined,
   IdProvider: (props: IdWrapperProps) => React.ReactNode,
@@ -95,29 +97,40 @@ export const RecordAbstractRenderer = <
               ExtraContext
             > &
               RecordAbstractRendererState,
-          ) => ({
-            value: PredicateValue.Operations.IsUnit(_.value)
-              ? _.value
-              : _.value.fields.get(fieldName)!,
-            type: _.type.fields.get(fieldName)!,
-            ...(_.fieldStates?.get(fieldName) ||
-              FieldTemplates.get(fieldName)!.GetDefaultState()),
-            disabled: _.disabled || _.globallyDisabled,
-            globallyDisabled: _.globallyDisabled,
-            readOnly: _.readOnly || _.globallyReadOnly,
-            globallyReadOnly: _.globallyReadOnly,
-            locked: _.locked,
-            bindings: isInlined ? _.bindings : _.bindings.set("local", _.value),
-            extraContext: _.extraContext,
-            customPresentationContext: _.customPresentationContext,
-            remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-            domNodeAncestorPath:
-              _.domNodeAncestorPath + `[record][${fieldName}]`,
-            typeAncestors: [_.type as DispatchParsedType<any>].concat(
-              _.typeAncestors,
-            ),
-            lookupTypeAncestorNames: _.lookupTypeAncestorNames,
-          }),
+          ) => {
+            const fieldRenderer = FieldRenderers.get(fieldName)!;
+            const labelContext =
+              CommonAbstractRendererState.Operations.GetLabelContext(
+                _.labelContext,
+                fieldRenderer,
+              );
+            return {
+              value: PredicateValue.Operations.IsUnit(_.value)
+                ? _.value
+                : _.value.fields.get(fieldName)!,
+              type: fieldRenderer.renderer.type,
+              ...(_.fieldStates?.get(fieldName) ||
+                FieldTemplates.get(fieldName)!.GetDefaultState()),
+              disabled: _.disabled || _.globallyDisabled,
+              globallyDisabled: _.globallyDisabled,
+              readOnly: _.readOnly || _.globallyReadOnly,
+              globallyReadOnly: _.globallyReadOnly,
+              locked: _.locked,
+              bindings: isInlined
+                ? _.bindings
+                : _.bindings.set("local", _.value),
+              extraContext: _.extraContext,
+              customPresentationContext: _.customPresentationContext,
+              remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
+              domNodeAncestorPath:
+                _.domNodeAncestorPath + `[record][${fieldName}]`,
+              labelContext,
+              typeAncestors: [_.type as DispatchParsedType<any>].concat(
+                _.typeAncestors,
+              ),
+              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+            };
+          },
         )
         .mapState(
           (

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/state.ts

@@ -2,11 +2,15 @@ import {
   Bindings,
   DispatchOnChange,
   DispatchParsedType,
+  NestedRenderer,
   PredicateValue,
+  Renderer,
   simpleUpdater,
   simpleUpdaterWithChildren,
   Unit,
 } from "../../../../../../../main";
+import { RecordFieldRenderer } from "../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/record/domains/recordFieldRenderer/state";
+import { TableCellRenderer } from "../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/table/domains/tableCellRenderer/state";
 
 export type CommonAbstractRendererReadonlyContext<
   T extends DispatchParsedType<any>,
@@ -26,6 +30,7 @@ export type CommonAbstractRendererReadonlyContext<
   label?: string;
   tooltip?: string;
   details?: string;
+  labelContext: string;
   customPresentationContext: C | undefined;
   remoteEntityVersionIdentifier: string;
   domNodeAncestorPath: string;
@@ -58,6 +63,27 @@ export const CommonAbstractRendererState = {
       })("commonFormState"),
     },
   },
+  Operations: {
+    GetLabelContext: (
+      parentLabelContext: string,
+      renderer:
+        | NestedRenderer<any>
+        | RecordFieldRenderer<any>
+        | TableCellRenderer<any>
+        | Renderer<any>,
+    ) => {
+      const actualRenderer = !("renderer" in renderer)
+        ? renderer
+        : renderer.renderer;
+      if (
+        actualRenderer.kind == "lookupType-lookupRenderer" ||
+        actualRenderer.kind == "inlinedType-lookupRenderer"
+      ) {
+        return actualRenderer.lookupRenderer;
+      }
+      return parentLabelContext;
+    },
+  },
 };
 
 export type CommonAbstractRendererForeignMutationsExpected<Flags = Unit> = {