ballerina-core 1.0.207 → 1.0.209

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

@@ -1,11 +1,10 @@
-import { List, Map, Set } from "immutable";
+import { List, Map, OrderedMap, Set } from "immutable";
 import {
   BasicUpdater,
   id,
   PredicateValue,
   TableAbstractRendererState,
   TableLayout,
-  ValueInfiniteStreamTemplate,
   Expr,
   PredicateVisibleColumns,
   DispatchDelta,
@@ -30,46 +29,22 @@ import {
   MapRepo,
   ValueTable,
   RecordType,
-  unit,
-  ValueUnit,
   TableAbstractRendererSelectedDetailRow,
-  TableApiFiltering,
   ValueFilter,
-  CommonAbstractRendererViewOnlyReadonlyContext,
   FilterType,
   ListRepo,
   Updater,
   SumNType,
+  DispatchTableApiSource,
+  ValueUnit,
 } from "../../../../../../../../main";
 import { Template } from "../../../../../../../template/state";
-import { ValueInfiniteStreamState } from "../../../../../../../value-infinite-data-stream/state";
 import {
+  TableInfiniteLoaderRunner,
   TableInitialiseFiltersAndSortingRunner,
-  TableReinitialiseRunner,
-  TableRunner,
+  TableInitialiseTableRunner,
 } from "./coroutines/runner";
 
-const EmbeddedValueInfiniteStreamTemplate = <
-  CustomPresentationContext = Unit,
-  Flags = Unit,
-  ExtraContext = Unit,
->() =>
-  ValueInfiniteStreamTemplate.mapContext<
-    TableAbstractRendererReadonlyContext<
-      CustomPresentationContext,
-      ExtraContext
-    > &
-      TableAbstractRendererState
-  >((_) => _.customFormState.stream)
-    .mapState<TableAbstractRendererState>(
-      TableAbstractRendererState.Updaters.Core.customFormState.children.stream,
-    )
-    .mapForeignMutationsFromProps<
-      TableAbstractRendererForeignMutationsExpected<Flags>
-    >((props) => ({
-      ...props.foreignMutations,
-    }));
-
 export const TableAbstractRenderer = <
   CustomPresentationContext = Unit,
   Flags = Unit,
@@ -133,6 +108,11 @@ export const TableAbstractRenderer = <
     value: PredicateValue,
     state: any,
   ) => ValueOrErrors<any, string>,
+  parseFromApiByType: (
+    type: DispatchParsedType<any>,
+  ) => (raw: any) => ValueOrErrors<PredicateValue, string>,
+  fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>,
+  tableApiSource: DispatchTableApiSource,
 ): Template<
   TableAbstractRendererReadonlyContext<
     CustomPresentationContext,
@@ -143,25 +123,24 @@ export const TableAbstractRenderer = <
   TableAbstractRendererForeignMutationsExpected<Flags>,
   TableAbstractRendererView<CustomPresentationContext, Flags, ExtraContext>
 > => {
-  const InstantiatedTableRunner = TableRunner<
-    CustomPresentationContext,
-    ExtraContext
-  >();
-  const InstantiatedTableReinitialiseRunner = TableReinitialiseRunner<
+  const InstantiatedInfiniteLoaderRunner = TableInfiniteLoaderRunner<
     CustomPresentationContext,
     ExtraContext
-  >();
-  const InstantiatedEmbeddedParseFromApiByTypeTemplate =
+  >(tableApiSource, fromTableApiParser);
+  const InstantiatedInitialiseFiltersAndSortingRunner =
     TableInitialiseFiltersAndSortingRunner<
       CustomPresentationContext,
       ExtraContext
-    >(Filters.map(({ filters }) => filters));
-  const InstantiatedEmbeddedValueInfiniteStreamTemplate =
-    EmbeddedValueInfiniteStreamTemplate<
-      CustomPresentationContext,
-      Flags,
-      ExtraContext
-    >();
+    >(
+      Filters.map(({ filters }) => filters),
+      tableApiSource,
+      parseFromApiByType,
+      parseToApiByType,
+    );
+  const InstantiatedInitialiseTableRunner = TableInitialiseTableRunner<
+    CustomPresentationContext,
+    ExtraContext
+  >(tableApiSource, fromTableApiParser);
 
   const embedCellTemplate =
     (
@@ -177,7 +156,6 @@ export const TableAbstractRenderer = <
         CommonAbstractRendererForeignMutationsExpected<Flags>
       >,
     ) =>
-    (chunkIndex: number) =>
     (rowId: string) =>
     (value: PredicateValue) =>
     (disabled: boolean) =>
@@ -196,13 +174,11 @@ export const TableAbstractRenderer = <
             rowState?.fieldStates.get(column) ??
             CellTemplates.get(column)!.GetDefaultState();
 
-          const rowValue = _.customFormState.stream.loadedElements
-            .get(chunkIndex)
-            ?.data.get(rowId);
+          const rowValue = _.value.data.get(rowId);
 
           if (rowValue == undefined) {
             console.error(
-              `Row value is undefined for row ${rowId} in chunk ${chunkIndex}\n
+              `Row value is undefined for row ${rowId}\n
               ...When rendering table field ${column}\n
               ...${_.domNodeAncestorPath}`,
             );
@@ -275,15 +251,6 @@ export const TableAbstractRenderer = <
                   TableAbstractRendererState.Updaters.Core.commonFormState.children.modifiedByUser(
                     replaceWith(true),
                   ),
-                )
-                .then(
-                  TableAbstractRendererState.Updaters.Core.customFormState.children.stream(
-                    ValueInfiniteStreamState.Updaters.Template.updateChunkValueItem(
-                      chunkIndex,
-                      rowId,
-                      column,
-                    )(nestedUpdater.kind == "r" ? nestedUpdater.value : id),
-                  ),
                 ),
             );
 
@@ -345,35 +312,20 @@ export const TableAbstractRenderer = <
           }
 
           if (
-            !PredicateValue.Operations.IsTuple(selectedDetailRow) &&
+            !PredicateValue.Operations.IsString(selectedDetailRow) &&
             !PredicateValue.Operations.IsUnit(selectedDetailRow)
           ) {
             console.error(
-              `Selected detail row is not a tuple or unit\n
+              `Selected detail row is not a string or unit\n
               ...When rendering table field\n
               ...${_.domNodeAncestorPath}`,
             );
             return undefined;
           }
 
-          const chunkIndex = PredicateValue.Operations.IsTuple(
-            selectedDetailRow,
-          )
-            ? Number(selectedDetailRow.values.get(0))
-            : undefined;
-          const chunkValueKey = PredicateValue.Operations.IsTuple(
-            selectedDetailRow,
-          )
-            ? selectedDetailRow.values.get(1)?.toString()
-            : undefined;
-
           const value = PredicateValue.Operations.IsUnit(selectedDetailRow)
             ? ValueUnit.Default()
-            : chunkIndex !== undefined && chunkValueKey !== undefined
-              ? _.customFormState.stream.loadedElements
-                  .get(chunkIndex)
-                  ?.data.get(chunkValueKey)
-              : undefined;
+            : _.value.data.get(selectedDetailRow);
 
           if (value == undefined) {
             console.error(
@@ -384,8 +336,9 @@ export const TableAbstractRenderer = <
             return undefined;
           }
 
-          const rowState = chunkValueKey
-            ? _.customFormState.rowStates.get(chunkValueKey)
+          const rowState = PredicateValue.Operations.IsString(selectedDetailRow)
+            ? (_.customFormState.rowStates.get(selectedDetailRow) ??
+              RecordAbstractRendererState.Default.fieldState(Map()))
             : RecordAbstractRendererState.Default.fieldState(Map());
 
           return {
@@ -416,25 +369,12 @@ export const TableAbstractRenderer = <
               );
               return id;
             }
-
-            if (!PredicateValue.Operations.IsTuple(selectedDetailRow)) {
-              return id;
-            }
-
-            const chunkValueKey = selectedDetailRow.values.get(1);
-
-            if (chunkValueKey == undefined) {
-              console.error(
-                `Chunk value key is undefined for selected detail row\n
-                ...When rendering table detail view \n
-                ...${props.context.domNodeAncestorPath}`,
-              );
+            if (!PredicateValue.Operations.IsString(selectedDetailRow)) {
               return id;
             }
-
             return TableAbstractRendererState.Updaters.Core.customFormState.children.rowStates(
               MapRepo.Updaters.upsert(
-                chunkValueKey.toString(),
+                selectedDetailRow,
                 () => RecordAbstractRendererState.Default.fieldState(Map()),
                 updater,
               ),
@@ -444,7 +384,7 @@ export const TableAbstractRenderer = <
             TableAbstractRendererForeignMutationsExpected<Flags>
           >((props) => ({
             onChange: (
-              _: Option<BasicUpdater<ValueRecord>>,
+              nestedUpdater: Option<BasicUpdater<ValueRecord>>,
               nestedDelta: DispatchDelta<Flags>,
             ) => {
               const { selectedDetailRow } = props.context.customFormState;
@@ -459,54 +399,46 @@ export const TableAbstractRenderer = <
               }
 
               if (
-                !PredicateValue.Operations.IsTuple(selectedDetailRow) &&
+                !PredicateValue.Operations.IsString(selectedDetailRow) &&
                 !PredicateValue.Operations.IsUnit(selectedDetailRow)
               ) {
                 console.error(
-                  `Selected detail row is not a tuple or unit\n
-                  ...When rendering table field\n
-                  ...${props.context.domNodeAncestorPath}`,
+                  `Selected detail row is not a string or unit\n
+                    ...When rendering table field\n
+                    ...${props.context.domNodeAncestorPath}`,
                 );
                 return id;
               }
 
-              if (PredicateValue.Operations.IsTuple(selectedDetailRow)) {
-                const chunkIndex = Number(selectedDetailRow.values.get(0));
-                const chunkValueKey = selectedDetailRow.values.get(1);
-
-                if (!chunkValueKey) {
-                  console.error(
-                    `Chunk value key is undefined for selected detail row\n
-                    ...When rendering table field\n
-                    ...${props.context.domNodeAncestorPath}`,
-                  );
-                  return id;
-                }
-
+              if (PredicateValue.Operations.IsString(selectedDetailRow)) {
                 props.setState(
-                  TableAbstractRendererState.Updaters.Core.commonFormState.children
-                    .modifiedByUser(replaceWith(true))
-                    .then(
-                      TableAbstractRendererState.Updaters.Core.customFormState.children.stream(
-                        ValueInfiniteStreamState.Updaters.Template.updateChunkValue(
-                          chunkIndex,
-                          chunkValueKey.toString(),
-                        )(_.kind == "r" ? _.value : id),
-                      ),
-                    ),
+                  TableAbstractRendererState.Updaters.Core.commonFormState.children.modifiedByUser(
+                    replaceWith(true),
+                  ),
                 );
 
-                // TODO, different delta for details
                 const delta: DispatchDelta<Flags> = {
                   kind: "TableValue",
-                  id: chunkValueKey.toString(),
+                  id: selectedDetailRow,
                   nestedDelta: nestedDelta,
                   flags,
                   sourceAncestorLookupTypeNames:
                     nestedDelta.sourceAncestorLookupTypeNames,
                 };
 
-                props.foreignMutations.onChange(Option.Default.none(), delta);
+                const updater =
+                  nestedUpdater.kind == "l"
+                    ? nestedUpdater
+                    : Option.Default.some(
+                        ValueTable.Updaters.data(
+                          MapRepo.Updaters.update(
+                            selectedDetailRow,
+                            nestedUpdater.value,
+                          ),
+                        ),
+                      );
+
+                props.foreignMutations.onChange(updater, delta);
               }
             },
           }))
@@ -587,13 +519,6 @@ export const TableAbstractRenderer = <
       );
     }
 
-    if (
-      props.context.customFormState.initializationStatus !== "initialized" &&
-      props.context.customFormState.initializationStatus !== "reinitializing"
-    ) {
-      return <></>;
-    }
-
     const updatedBindings = props.context.bindings.set(
       "local",
       props.context.value,
@@ -648,38 +573,42 @@ export const TableAbstractRenderer = <
       disabledColumnKeys.value.filter((fieldName) => fieldName != null),
     );
 
-    const hasMoreValues =
-      props.context.customFormState.stream.loadedElements.last()?.hasMoreValues;
+    const hasMoreValues = props.context.value.hasMoreValues;
 
     const embeddedTableData =
-      props.context.customFormState.stream.loadedElements.flatMap(
-        (chunk, chunkIndex) =>
-          chunk.data.map((rowData, rowId) =>
+      props.context.customFormState.loadingState != "loaded"
+        ? OrderedMap<string, OrderedMap<string, any>>()
+        : props.context.value.data.map((rowData, rowId) =>
             rowData.fields
               .filter((_, column) =>
                 visibleColumns.value.columns.includes(column),
               )
-              .flatMap((_, column) => {
-                const EmbeddedCell = EmbeddedCellTemplates.get(column);
-                if (EmbeddedCell == undefined) {
-                  return [];
-                }
-                return [
-                  [
-                    column,
-                    EmbeddedCell(chunkIndex)(rowId)(
-                      rowData.fields.get(column)!,
-                    )(disabledColumnKeysSet.has(column)),
-                  ],
-                ];
+              .map((_, column) => {
+                return EmbeddedCellTemplates.get(column)!(rowId)(
+                  rowData.fields.get(column)!,
+                )(disabledColumnKeysSet.has(column));
               }),
-          ),
-      );
+          );
 
     const validVisibleColumns = visibleColumns.value.columns.filter((_) =>
       TableEntityType.fields.keySeq().toArray().includes(_),
     );
 
+    if (props.context.customFormState.isFilteringInitialized == false) {
+      return <></>;
+    }
+
+    // Detail row may have been deleted from outside the table
+    const isSelectedDetailRowValid =
+      props.context.customFormState.selectedDetailRow != undefined &&
+      !PredicateValue.Operations.IsUnit(
+        props.context.customFormState.selectedDetailRow,
+      ) &&
+      props.context.value.data.size > 0 &&
+      props.context.value.data.has(
+        props.context.customFormState.selectedDetailRow,
+      );
+
     return (
       <>
         <IdProvider domNodeId={domNodeId}>
@@ -687,6 +616,12 @@ export const TableAbstractRenderer = <
             {...props}
             context={{
               ...props.context,
+              customFormState: {
+                ...props.context.customFormState,
+                selectedDetailRow: isSelectedDetailRowValid
+                  ? props.context.customFormState.selectedDetailRow
+                  : undefined,
+              },
               domNodeId,
               tableHeaders: validVisibleColumns,
               columnLabels: ColumnLabels,
@@ -703,20 +638,9 @@ export const TableAbstractRenderer = <
                 }
               },
               selectDetailView: (rowId: string) => {
-                const chunkIndex =
-                  ValueInfiniteStreamState.Operations.getChunkIndexForValue(
-                    props.context.customFormState.stream,
-                    rowId,
-                  );
                 props.setState(
                   TableAbstractRendererState.Updaters.Core.customFormState.children.selectedDetailRow(
-                    chunkIndex.kind == "value"
-                      ? replaceWith<TableAbstractRendererSelectedDetailRow>(
-                          PredicateValue.Default.tuple(
-                            List([chunkIndex.value, rowId]),
-                          ),
-                        )
-                      : id,
+                    replaceWith<TableAbstractRendererSelectedDetailRow>(rowId),
                   ),
                 );
               },
@@ -865,11 +789,9 @@ export const TableAbstractRenderer = <
                   ),
                 );
               },
-              reinitialize: () =>
+              reloadFrom0: () =>
                 props.setState(
-                  TableAbstractRendererState.Updaters.Template.shouldReinitialize(
-                    true,
-                  ),
+                  TableAbstractRendererState.Updaters.Template.reloadFrom0(),
                 ),
             }}
             DetailsRenderer={embedDetailsRenderer}
@@ -885,9 +807,14 @@ export const TableAbstractRenderer = <
       </>
     );
   }).any([
-    InstantiatedTableRunner,
-    InstantiatedTableReinitialiseRunner,
-    InstantiatedEmbeddedValueInfiniteStreamTemplate,
-    InstantiatedEmbeddedParseFromApiByTypeTemplate,
+    InstantiatedInfiniteLoaderRunner.mapContextFromProps((props) => ({
+      ...props.context,
+      onChange: props.foreignMutations.onChange,
+    })),
+    InstantiatedInitialiseFiltersAndSortingRunner,
+    InstantiatedInitialiseTableRunner.mapContextFromProps((props) => ({
+      ...props.context,
+      onChange: props.foreignMutations.onChange,
+    })),
   ]);
 };

package/src/forms/domains/dispatched-forms/runner/domains/dispatcher/domains/table/state.ts

@@ -282,6 +282,11 @@ export const TableDispatcher = {
                             tableEntityType,
                             AllowedFilters,
                             dispatcherContext.parseToApiByType,
+                            dispatcherContext.parseFromApiByType,
+                            dispatcherContext.parseFromApiByType(
+                              renderer.type.arg,
+                            ),
+                            tableApiSource,
                           )
                             .mapContext((_: any) => ({
                               ..._,
@@ -292,15 +297,8 @@ export const TableDispatcher = {
                                   : (dispatcherContext.specApis.tables?.get(
                                       api!,
                                     )?.methods ?? []),
-                              tableApiSource,
                               sorting,
                               highlightedFilters,
-                              fromTableApiParser:
-                                dispatcherContext.parseFromApiByType(
-                                  renderer.type.arg,
-                                ),
-                              parseFromApiByType:
-                                dispatcherContext.parseFromApiByType,
                             }))
                             .withView(concreteRenderer),
                         );