ballerina-core 1.0.102 → 1.0.103

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.102",
+  "version": "1.0.103",
   "main": "main.ts",
   "scripts": {
     "prettier": "prettier --write ."

package/src/forms/domains/parser/domains/renderer/state.ts

@@ -58,7 +58,6 @@ type Form = {
 export type RawRenderer = {
   renderer?: any;
   label?: any;
-  overrideChildLabels?: boolean;
   tooltip?: any;
   visible?: any;
   disabled?: any;
@@ -74,7 +73,7 @@ export type RawRenderer = {
 };
 export type ParsedRenderer<T> = (
   | { kind: "primitive" }
-  | { kind: "record"; overrideChildLabels?: boolean }
+  | { kind: "record" }
   | { kind: "unit" }
   | { kind: "enum"; options: string }
   | { kind: "stream"; stream: string }
@@ -130,7 +129,6 @@ export const ParsedRenderer = {
       label?: string,
       tooltip?: string,
       details?: string,
-      overrideChildLabels?: boolean,
     ): ParsedRenderer<T> => ({
       kind: "record",
       type,
@@ -138,7 +136,6 @@ export const ParsedRenderer = {
       label,
       tooltip,
       details,
-      overrideChildLabels,
       visible,
       disabled: disabled != undefined ? disabled : false,
     }),
@@ -310,7 +307,6 @@ export const ParsedRenderer = {
           field.label,
           field.tooltip,
           field.details,
-          field.overrideChildLabels,
         );
       if (fieldType.kind == "application" && "options" in field)
         return ParsedRenderer.Default.enum(
@@ -463,6 +459,7 @@ export const ParsedRenderer = {
         form: Form;
         visibilityPredicateExpression: FieldPredicateExpression;
         disabledPredicatedExpression: FieldPredicateExpression;
+        label: string | undefined;
       },
       string
     > => {
@@ -510,6 +507,7 @@ export const ParsedRenderer = {
                     FieldPredicateExpression.Default.primitive(visibilityExpr),
                   disabledPredicatedExpression:
                     FieldPredicateExpression.Default.primitive(disabledExpr),
+                  label: parsedRenderer.label,
                 }),
               );
             },
@@ -529,9 +527,7 @@ export const ParsedRenderer = {
                         )
                         .mapContext<any>((_) => ({
                           ..._,
-                          ...(parsedRenderer.label && {
-                            label: parsedRenderer.label,
-                          }),
+                          label: parsedRenderer.label,
                           tooltip: parsedRenderer.tooltip,
                           details: parsedRenderer.details,
                         })),
@@ -546,6 +542,7 @@ export const ParsedRenderer = {
                       FieldPredicateExpression.Default.unit(visibilityExpr),
                     disabledPredicatedExpression:
                       FieldPredicateExpression.Default.unit(disabledExpr),
+                    label: parsedRenderer.label,
                   }),
               ),
           );
@@ -561,11 +558,7 @@ export const ParsedRenderer = {
                         .form.withView(parsingContext.nestedContainerFormView)
                         .mapContext<any>((_) => ({
                           ..._,
-                          overrideChildLabels:
-                            parsedRenderer.overrideChildLabels,
-                          ...(parsedRenderer.label && {
-                            label: parsedRenderer.label,
-                          }),
+                          label: parsedRenderer.label,
                           tooltip: parsedRenderer.tooltip,
                           details: parsedRenderer.details,
                         })),
@@ -588,6 +581,7 @@ export const ParsedRenderer = {
                         parsingContext.forms.get(parsedRenderer.renderer)!
                           .disabledPredicatedExpressions,
                       ),
+                    label: parsedRenderer.label,
                   }),
               ),
           );
@@ -622,9 +616,7 @@ export const ParsedRenderer = {
                           .mapContext<any>((_) => {
                             return {
                               ..._,
-                              ...(parsedRenderer.label && {
-                                label: parsedRenderer.label,
-                              }),
+                              label: parsedRenderer.label,
                               tooltip: parsedRenderer.tooltip,
                               details: parsedRenderer.details,
                             };
@@ -644,6 +636,7 @@ export const ParsedRenderer = {
                           disabledExpr,
                           parsedElementRenderer.disabledPredicatedExpression,
                         ),
+                      label: parsedRenderer.label,
                     }),
                   ),
               ),
@@ -692,9 +685,7 @@ export const ParsedRenderer = {
                             )
                             .mapContext<any>((_) => ({
                               ..._,
-                              ...(parsedRenderer.label && {
-                                label: parsedRenderer.label,
-                              }),
+                              label: parsedRenderer.label,
                               tooltip: parsedRenderer.tooltip,
                               details: parsedRenderer.details,
                             })),
@@ -717,6 +708,7 @@ export const ParsedRenderer = {
                             parsedKeyRenderer.disabledPredicatedExpression,
                             parsedValueRenderer.disabledPredicatedExpression,
                           ),
+                        label: parsedRenderer.label,
                       }),
                     ),
                   ),
@@ -751,9 +743,7 @@ export const ParsedRenderer = {
                           )
                           .mapContext<any>((_) => ({
                             ..._,
-                            ...(parsedRenderer.label && {
-                              label: parsedRenderer.label,
-                            }),
+                            label: parsedRenderer.label,
                             tooltip: parsedRenderer.tooltip,
                             details: parsedRenderer.details,
                           })),
@@ -778,6 +768,7 @@ export const ParsedRenderer = {
                             .map((item) => item.disabledPredicatedExpression)
                             .toArray(),
                         ),
+                      label: parsedRenderer.label,
                     }),
                   );
                 },
@@ -862,9 +853,7 @@ export const ParsedRenderer = {
                         )
                         .mapContext<any>((_) => ({
                           ..._,
-                          ...(parsedRenderer.label && {
-                            label: parsedRenderer.label,
-                          }),
+                          label: parsedRenderer.label,
                           tooltip: parsedRenderer.tooltip,
                           details: parsedRenderer.details,
                         })),
@@ -893,7 +882,8 @@ export const ParsedRenderer = {
                         parsedLeftRenderer?.value.disabledPredicatedExpression,
                         parsedRightRenderer?.value.disabledPredicatedExpression,
                       ),
-                  });
+                      label: parsedRenderer.label,
+                    });
                 },
               ),
           );

package/src/forms/domains/parser/state.tsx

@@ -38,6 +38,7 @@ import {
   PassthroughFormContext,
   PassthroughFormTemplate,
   defaultState,
+  FieldName,
 } from "../../../../main";
 import { EnumReference } from "../collection/domains/reference/state";
 import { SearchableInfiniteStreamState } from "../primitives/domains/searchable-infinite-stream/state";
@@ -51,6 +52,7 @@ export type ParsedForm<T> = {
   formDef: ParsedFormConfig<T>;
   visibilityPredicateExpressions: FieldPredicateExpressions;
   disabledPredicatedExpressions: FieldPredicateExpressions;
+  fieldLabels: Map<FieldName, string | undefined>;
 };
 export const ParseForm = <T,>(
   formName: string,
@@ -68,6 +70,7 @@ export const ParseForm = <T,>(
   const formConfig: any = {};
   let visibilityPredicateExpressions: FieldPredicateExpressions = Map();
   let disabledPredicatedExpressions: FieldPredicateExpressions = Map();
+  let fieldLabels: Map<FieldName, string | undefined> = Map();
   const initialFormState: any = {
     commonFormState: CommonFormState.Default(),
     formFieldStates: {},
@@ -103,6 +106,7 @@ export const ParseForm = <T,>(
       fieldName,
       parsedFormConfig.value.disabledPredicatedExpression,
     );
+    fieldLabels = fieldLabels.set(fieldName, parsedFormConfig.value.label);
     initialFormState["formFieldStates"][fieldName] =
       parsedFormConfig.value.form.initialState;
   });
@@ -114,6 +118,7 @@ export const ParseForm = <T,>(
     formConfig,
     visibilityPredicateExpressions,
     disabledPredicatedExpressions,
+    fieldLabels,
   };
 };
 
@@ -205,12 +210,14 @@ export const ParseForms =
         );
         const formBuilder = Form<any, any, any>().Default<any>();
         const form = formBuilder
-          .template({
-            ...parsedForm.formConfig,
-          })
+          .template(
+            {
+              ...parsedForm.formConfig,
+            },
+            parsedForm.fieldLabels,
+          )
           .mapContext<Unit>((_) => {
             return {
-              overrideChildLabels: (_ as any).overrideChildLabels ?? false,
               visible: (_ as any).visible ?? true,
               disabled: (_ as any).disabled ?? false,
               label: (_ as any).label,
@@ -481,7 +488,7 @@ export const parseFormsToLaunchers =
                     visibilities: _.visibilities,
                     disabledFields: _.disabledFields,
                   })),
-              }) as any,
+              } as any),
           )
           .withViewFromProps((props) => props.context.submitButtonWrapper)
           .mapForeignMutationsFromProps(
@@ -679,7 +686,7 @@ export const parseFormsToLaunchers =
                       visibilities: _.visibilities,
                       disabledFields: _.disabledFields,
                     })),
-                }) as any,
+                } as any),
             )
             .withViewFromProps((props) => props.context.containerWrapper)
             .mapForeignMutationsFromProps(

package/src/forms/domains/singleton/state.ts

@@ -1,4 +1,4 @@
-import { List, OrderedMap, OrderedSet } from "immutable";
+import { List, OrderedMap, OrderedSet, Map } from "immutable";
 import {
   BasicUpdater,
   id,
@@ -146,6 +146,7 @@ export type EntityFormView<
     >;
     VisibleFieldKeys: OrderedSet<FieldName>;
     DisabledFieldKeys: OrderedSet<FieldName>;
+    FieldLabels: Map<FieldName, string | undefined>;
   }
 >;
 export type EntityFormTemplate<
@@ -172,7 +173,6 @@ export type EmbeddedFieldTemplate<
 > = Template<
   EntityFormContext<Fields, FieldStates, Context, ForeignMutationsExpected> & {
     disabled: boolean;
-    overrideChildLabels?: boolean;
   },
   EntityFormState<Fields, FieldStates, Context, ForeignMutationsExpected>,
   EntityFormForeignMutationsExpected<

package/src/forms/domains/singleton/template.tsx

@@ -1,4 +1,4 @@
-import { List, OrderedSet } from "immutable";
+import { List, OrderedSet, Map } from "immutable";
 import {
   BasicUpdater,
   id,
@@ -58,6 +58,7 @@ export const Form = <
       config: id<EntityFormConfig>,
       template: (
         config: EntityFormConfig,
+        fieldLabels: Map<FieldName, string | undefined>,
         validation?: BasicFun<PredicateValue, Promise<FieldValidationWithPath>>,
       ): EntityFormTemplate<
         Fields,
@@ -87,7 +88,6 @@ export const Form = <
               > & {
                 disabled: boolean;
                 visible: boolean;
-                overrideChildLabels?: boolean;
               }
             >((_) => {
               // disabled flag is passed in from the wrapping container when mapping over fields
@@ -102,7 +102,6 @@ export const Form = <
                   : undefined;
 
               return {
-                ...(_.overrideChildLabels && { label: _.label }),
                 rootValue: _.rootValue,
                 value: (_.value as ValueRecord).fields.get(field as string),
                 extraContext: _.extraContext,
@@ -262,6 +261,7 @@ export const Form = <
                 VisibleFieldKeys={visibleFieldKeys}
                 DisabledFieldKeys={disabledFieldKeys}
                 EmbeddedFields={fieldTemplates}
+                FieldLabels={fieldLabels}
               />
             </>
           );