ballerina-core 1.0.8 → 1.0.10

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "main.ts",
   "dependencies": {
     "immutable": "^5.0.0-beta.5",

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

@@ -20,7 +20,7 @@ export const FormRunnerErrorsTemplate = (parsedFormsConfig: FormParsingResult) =
 export const FormRunnerTemplate =
   Template.Default<FormRunnerContext & FormRunnerState, FormRunnerState, FormRunnerForeignMutationsExpected>(props => {
     if (props.context.form.kind == "r") return <></>
-    console.log("props.context.form.value.formState", props.context)
+    // console.log("props.context.form.value.formState", props.context)
     return <>
         <props.context.form.value.form
           context={{

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

@@ -32,6 +32,7 @@ export const Type = {
 }
 export type FieldConfig = {
   renderer: string;
+  label: string
   api: { stream?: string, enumOptions?: string },
   elementRenderer?: string,
   visible: BoolExpr<any>;
@@ -453,6 +454,7 @@ export const FormsConfig = {
           formDef.fields = formDef.fields.set(
             fieldName, {
             renderer: fieldConfig.renderer,
+            label: fieldConfig.label ?? fieldName,
             elementRenderer: fieldConfig.elementRenderer,
             visible: BoolExpr.Default(fieldConfig.visible),
             disabled: fieldConfig.disabled != undefined ?

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

@@ -24,48 +24,48 @@ const parseOptions = (leafPredicates: any, options: any) => {
 };
 
 export const FieldView = //<Context, FieldViews extends DefaultFieldViews, EnumFieldConfigs extends {}, EnumSources extends {}>() => <ViewType extends keyof FieldViews, ViewName extends keyof FieldViews[ViewType]>
-  (fieldViews: any, viewType: any, viewName: any, fieldName: string, enumFieldConfigs: any, enumSources: any, leafPredicates: any): any => // FieldView<Context, FieldViews, ViewType, ViewName> => 
+  (fieldViews: any, viewType: any, viewName: any, fieldName: string, label: string, enumFieldConfigs: any, enumSources: any, leafPredicates: any): any => // FieldView<Context, FieldViews, ViewType, ViewName> => 
   {
     if (viewType == "MaybeBooleanViews")
       return MaybeBooleanForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & SharedFormState & Value<boolean>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & SharedFormState & Value<boolean>>(_ => ({ ..._, label: label })) as any
     if (viewType == "BooleanViews")
       return BooleanForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & SharedFormState & Value<boolean>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & SharedFormState & Value<boolean>>(_ => ({ ..._, label: label })) as any
     if (viewType == "DateViews")
       return DateForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & DateFormState & Value<Date>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & DateFormState & Value<Date>>(_ => ({ ..._, label: label })) as any
     if (viewType == "NumberViews")
       return NumberForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & SharedFormState & Value<number>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & SharedFormState & Value<number>>(_ => ({ ..._, label: label })) as any
     if (viewType == "StringViews")
       return StringForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & SharedFormState & Value<string>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & SharedFormState & Value<string>>(_ => ({ ..._, label: label })) as any
     if (viewType == "EnumViews")
       return EnumForm<any & FormLabel & BaseEnumContext<any, CollectionReference>, Unit, CollectionReference>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
         .mapContext<any & EnumFormState<any & BaseEnumContext<any, CollectionReference>, CollectionReference> & Value<CollectionSelection<CollectionReference>>>(_ => ({
-          ..._, label: fieldName, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
+          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
         })) as any
     if (viewType == "EnumMultiselectViews")
       return EnumMultiselectForm<any & FormLabel & BaseEnumContext<any, CollectionReference>, Unit, CollectionReference>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
         .mapContext<any & EnumFormState<any & BaseEnumContext<any, CollectionReference>, CollectionReference> & Value<OrderedMap<Guid, CollectionReference>>>(_ => ({
-          ..._, label: fieldName, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
+          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
         })) as any
     if (viewType == "InfiniteStreamViews")
       return SearchableInfiniteStreamForm<CollectionReference, any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & SearchableInfiniteStreamState<CollectionReference> & Value<CollectionSelection<CollectionReference>>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & SearchableInfiniteStreamState<CollectionReference> & Value<CollectionSelection<CollectionReference>>>(_ => ({ ..._, label: label })) as any
     if (viewType == "InfiniteStreamMultiselectViews")
       return InfiniteMultiselectDropdownForm<CollectionReference, any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-        .mapContext<any & FormLabel & SharedFormState & SearchableInfiniteStreamState<CollectionReference> & Value<OrderedMap<Guid, CollectionReference>>>(_ => ({ ..._, label: fieldName })) as any
+        .mapContext<any & FormLabel & SharedFormState & SearchableInfiniteStreamState<CollectionReference> & Value<OrderedMap<Guid, CollectionReference>>>(_ => ({ ..._, label: label })) as any
     return `error: the view for ${viewType as string}::${viewName as string} cannot be found`;
   }
 
@@ -145,40 +145,49 @@ export const ParseForm = (
     }
   });
   const formConfig: any = {};
+  console.log(fieldsViewsConfig)
+  console.log(Object.keys(fieldsViewsConfig))
   Object.keys(fieldsViewsConfig).forEach(fieldName => {
+    const label = formDef.fields.get(fieldName)!.label
     const viewName = (fieldsViewsConfig as any)[fieldName];
-    const viewType = fieldNameToViewCategory(fieldName) as any
-    if (viewType == "ListViews") {
-      const elementRendererName = formFieldElementRenderers[fieldName]
-      const field = type.fields.get(fieldName)!
-      const initialElementValue = defaultValue(field.kind == "primitive" ? field.value : field.kind == "lookup" ? field.name : field.args[0])
-      const elementForm = otherForms.get(elementRendererName)
-      if (elementForm != undefined) { // the list argument is a nested form
-        const initialFormState = elementForm.initialFormState
-        formConfig[fieldName] = ListForm<any, any, any & FormLabel, Unit>(
-          { Default: () => ({ ...initialFormState }) },
-          { Default: () => ({ ...initialElementValue }) },
-          _ => PromiseRepo.Default.mock(() => []),
-          elementForm.form.withView(containerFormView)
-        ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-          .mapContext<any>(_ => ({ ..._, label: fieldName }))
-      } else { // the list argument is a primitive
-        const elementForm = FieldView(fieldViews, fieldNameToElementViewCategory(fieldName) as any, elementRendererName, fieldName, EnumOptionsSources, fieldsOptionsConfig, leafPredicates)
-        const initialFormState = FieldFormState(fieldViews, fieldNameToElementViewCategory(fieldName) as any, elementRendererName, fieldName, InfiniteStreamSources, fieldsInfiniteStreamsConfig);
-        formConfig[fieldName] = ListForm<any, any, any & FormLabel, Unit>(
-          { Default: () => initialFormState },
-          { Default: () => initialElementValue },
-          _ => PromiseRepo.Default.mock(() => []),
-          elementForm
-        ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
-          .mapContext<any>(_ => ({ ..._, label: fieldName }))
+    const otherForm = otherForms.get(viewName)
+    if (otherForm != undefined) {
+      formConfig[fieldName] = otherForm.form.withView(containerFormView).mapContext<any>(_ => ({ ..._, label: label }))
+    } else {
+      const viewType = fieldNameToViewCategory(fieldName) as any
+      if (viewType == "ListViews") {
+        const elementRendererName = formFieldElementRenderers[fieldName]
+        const field = type.fields.get(fieldName)!
+        const initialElementValue = defaultValue(field.kind == "primitive" ? field.value : field.kind == "lookup" ? field.name : field.args[0])
+        const elementForm = otherForms.get(elementRendererName)
+        if (elementForm != undefined) { // the list argument is a nested form
+          const initialFormState = elementForm.initialFormState
+          formConfig[fieldName] = ListForm<any, any, any & FormLabel, Unit>(
+            { Default: () => ({ ...initialFormState }) },
+            { Default: () => ({ ...initialElementValue }) },
+            _ => PromiseRepo.Default.mock(() => []),
+            elementForm.form.withView(containerFormView)
+          ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
+            .mapContext<any>(_ => ({ ..._, label: label }))
+        } else { // the list argument is a primitive
+          const elementForm = FieldView(fieldViews, fieldNameToElementViewCategory(fieldName) as any, elementRendererName, fieldName, label, EnumOptionsSources, fieldsOptionsConfig, leafPredicates)
+          const initialFormState = FieldFormState(fieldViews, fieldNameToElementViewCategory(fieldName) as any, elementRendererName, fieldName, InfiniteStreamSources, fieldsInfiniteStreamsConfig);
+          formConfig[fieldName] = ListForm<any, any, any & FormLabel, Unit>(
+            { Default: () => initialFormState },
+            { Default: () => initialElementValue },
+            _ => PromiseRepo.Default.mock(() => []),
+            elementForm
+          ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
+            .mapContext<any>(_ => ({ ..._, label: label }))
+        }
+      } else {
+        formConfig[fieldName] = FieldView(fieldViews, viewType, viewName, fieldName, label, EnumOptionsSources, fieldsOptionsConfig, leafPredicates);
       }
-    } else
-      formConfig[fieldName] =
-        otherForms.get(viewName)?.form.withView(containerFormView).mapContext<any>(_ => ({ ..._, label: fieldName })) ??
-        FieldView(fieldViews, viewType, viewName, fieldName, EnumOptionsSources, fieldsOptionsConfig, leafPredicates);
+    }
     if (typeof formConfig[fieldName] == "string") {
+      debugger
       const err = formConfig[fieldName]
+      console.log(`error processing field ${fieldName}`, err)
       formConfig[fieldName] = (props: any) => <>Error: field {fieldName} with {viewName} could not be instantiated</>
       throw err
     }