ballerina-core 1.0.207 → 1.0.208

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

@@ -1,179 +1,39 @@
 import { Map, Set } from "immutable";
+import { ValueInfiniteStreamState } from "../../../../../../../../value-infinite-data-stream/state";
 import {
-  ValueInfiniteStreamState,
-  ValueStreamPosition,
-} from "../../../../../../../../value-infinite-data-stream/state";
-import {
-  replaceWith,
+  DispatchParsedType,
+  DispatchTableApiSource,
+  PredicateValue,
   SumNType,
-  TableAbstractRendererState,
   Unit,
+  ValueOrErrors,
 } from "../../../../../../../../../main";
-import { TableAbstractRendererReadonlyContext } from "../../../../../../../../../main";
-import { CoTypedFactory } from "../../../../../../../../../main";
-
-const Co = <CustomPresentationContext = Unit, ExtraContext = Unit>() =>
-  CoTypedFactory<
-    TableAbstractRendererReadonlyContext<
-      CustomPresentationContext,
-      ExtraContext
-    >,
-    TableAbstractRendererState
-  >();
-
-// TODO -- very unsafe, needs work, checking undefined etc,,,
-const DEFAULT_CHUNK_SIZE = 20;
-const initialiseFiltersAndSorting = <
-  CustomPresentationContext = Unit,
-  ExtraContext = Unit,
->(
-  filterTypes: Map<string, SumNType<any>>,
-) => {
-  return filterTypes.size == 0
-    ? Co<CustomPresentationContext, ExtraContext>().SetState(
-        TableAbstractRendererState.Updaters.Core.customFormState.children.isFilteringInitialized(
-          // always set to true even if the first call fails so we don't block the flow
-          replaceWith(true),
-        ),
-      )
-    : Co<CustomPresentationContext, ExtraContext>().Seq([
-        Co<CustomPresentationContext, ExtraContext>()
-          .GetState()
-          .then((current) => {
-            const getDefaultFiltersAndSorting =
-              current.tableApiSource.getDefaultFiltersAndSorting(filterTypes);
-            return Co<CustomPresentationContext, ExtraContext>()
-              .Await(
-                getDefaultFiltersAndSorting(current.parseFromApiByType),
-                () =>
-                  console.error(
-                    "error getting default filters and sorting from api",
-                  ),
-              )
-              .then((filtersAndSorting) => {
-                return filtersAndSorting.kind == "l"
-                  ? Co<CustomPresentationContext, ExtraContext>().SetState(
-                      TableAbstractRendererState.Updaters.Core.customFormState.children
-                        .filters(replaceWith(filtersAndSorting.value.filters))
-                        .then(
-                          TableAbstractRendererState.Updaters.Core.customFormState.children.sorting(
-                            replaceWith(filtersAndSorting.value.sorting),
-                          ),
-                        ),
-                    )
-                  : Co<CustomPresentationContext, ExtraContext>().Wait(0);
-              });
-          }),
-        Co<CustomPresentationContext, ExtraContext>().SetState(
-          TableAbstractRendererState.Updaters.Core.customFormState.children.isFilteringInitialized(
-            // always set to true even if the first call fails so we don't block the flow
-            replaceWith(true),
-          ),
-        ),
-      ]);
-};
-
-const intialiseTable = <
-  CustomPresentationContext = Unit,
-  ExtraContext = Unit,
->() =>
-  Co<CustomPresentationContext, ExtraContext>()
-    .GetState()
-    .then((current) => {
-      if (current.value == undefined) {
-        return Co<CustomPresentationContext, ExtraContext>().Wait(0);
-      }
-      const initialData = current.value.data;
-      const hasMoreValues = current.value.hasMoreValues;
-      const from = current.value.from;
-      const to = current.value.to;
-      const getChunkWithParams = current.tableApiSource.getMany(
-        current.fromTableApiParser,
-      );
-
-      const params =
-        current.customFormState.filterAndSortParam == ""
-          ? Map<string, string>()
-          : Map([
-              ["filtersAndSorting", current.customFormState.filterAndSortParam],
-            ]);
-
-      return Co<CustomPresentationContext, ExtraContext>().SetState(
-        TableAbstractRendererState.Updaters.Core.customFormState.children
-          .stream(
-            replaceWith(
-              ValueInfiniteStreamState.Default(
-                DEFAULT_CHUNK_SIZE,
-                getChunkWithParams(params),
-                initialData.size == 0 && hasMoreValues ? "loadMore" : false,
-              ),
-            )
-              .then(
-                ValueInfiniteStreamState.Updaters.Coroutine.addLoadedChunk(0, {
-                  data: initialData,
-                  hasMoreValues: hasMoreValues,
-                  from,
-                  to,
-                }),
-              )
-              .then(
-                ValueInfiniteStreamState.Updaters.Core.position(
-                  ValueStreamPosition.Updaters.Core.nextStart(replaceWith(to)),
-                ),
-              ),
-          )
-          .thenMany([
-            TableAbstractRendererState.Updaters.Core.customFormState.children.rowStates(
-              replaceWith(Map()),
-            ),
-            TableAbstractRendererState.Updaters.Core.customFormState.children.selectedRows(
-              replaceWith(Set()),
-            ),
-            TableAbstractRendererState.Updaters.Core.customFormState.children.selectedDetailRow(
-              replaceWith(undefined as any),
-            ),
-            TableAbstractRendererState.Updaters.Core.customFormState.children.getChunkWithParams(
-              replaceWith(getChunkWithParams),
-            ),
-            TableAbstractRendererState.Updaters.Template.shouldReinitialize(
-              false,
-            ),
-            TableAbstractRendererState.Updaters.Core.customFormState.children.previousRemoteEntityVersionIdentifier(
-              replaceWith(current.remoteEntityVersionIdentifier),
-            ),
-            TableAbstractRendererState.Updaters.Core.customFormState.children.initializationStatus(
-              replaceWith<
-                TableAbstractRendererState["customFormState"]["initializationStatus"]
-              >("initialized"),
-            ),
-          ]),
-      );
-    });
-
-const reinitialise = <
-  CustomPresentationContext = Unit,
-  ExtraContext = Unit,
->() =>
-  Co<CustomPresentationContext, ExtraContext>()
-    .GetState()
-    .then((_) => {
-      return Co<CustomPresentationContext, ExtraContext>().SetState(
-        TableAbstractRendererState.Updaters.Core.customFormState.children.initializationStatus(
-          replaceWith<
-            TableAbstractRendererState["customFormState"]["initializationStatus"]
-          >("reinitializing"),
-        ),
-      );
-    });
+import { Co, InfiniteLoaderCo } from "./builder";
+import {} from "./initialiseFiltersAndSorting";
+import { InitialiseFiltersAndSorting } from "./initialiseFiltersAndSorting";
+import { TableInfiniteLoader } from "./infiniteLoader";
+import { InitialiseTable } from "./initialiseTable";
 
 export const TableInitialiseFiltersAndSortingRunner = <
   CustomPresentationContext = Unit,
   ExtraContext = Unit,
 >(
   filterTypes: Map<string, SumNType<any>>,
+  tableApiSource: DispatchTableApiSource,
+  parseFromApiByType: (
+    type: DispatchParsedType<any>,
+  ) => (raw: any) => ValueOrErrors<PredicateValue, string>,
+  parseToApiByType: (
+    type: DispatchParsedType<any>,
+    value: PredicateValue,
+    state: any,
+  ) => ValueOrErrors<any, string>,
 ) =>
   Co<CustomPresentationContext, ExtraContext>().Template<any>(
-    initialiseFiltersAndSorting<CustomPresentationContext, ExtraContext>(
+    InitialiseFiltersAndSorting<CustomPresentationContext, ExtraContext>(
+      tableApiSource,
+      parseFromApiByType,
+      parseToApiByType,
       filterTypes,
     ),
     {
@@ -182,37 +42,46 @@ export const TableInitialiseFiltersAndSortingRunner = <
         props.context.customFormState.isFilteringInitialized == false,
     },
   );
-export const TableReinitialiseRunner = <
+
+export const TableInitialiseTableRunner = <
   CustomPresentationContext = Unit,
   ExtraContext = Unit,
->() =>
-  Co<CustomPresentationContext, ExtraContext>().Template<any>(
-    reinitialise<CustomPresentationContext, ExtraContext>(),
+>(
+  tableApiSource: DispatchTableApiSource,
+  fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>,
+) =>
+  InfiniteLoaderCo<CustomPresentationContext, ExtraContext>().Template<any>(
+    InitialiseTable<CustomPresentationContext, ExtraContext>(
+      tableApiSource,
+      fromTableApiParser,
+    ),
     {
       interval: 15,
       runFilter: (props) =>
-        props.context.customFormState.initializationStatus === "initialized" &&
         props.context.customFormState.isFilteringInitialized &&
-        props.context.customFormState.shouldReinitialize,
+        (props.context.customFormState.loadingState == "loading" ||
+          props.context.customFormState.loadingState == "reload from 0"),
     },
   );
 
-export const TableRunner = <
+export const TableInfiniteLoaderRunner = <
   CustomPresentationContext = Unit,
   ExtraContext = Unit,
->() =>
-  Co<CustomPresentationContext, ExtraContext>().Template<any>(
-    intialiseTable<CustomPresentationContext, ExtraContext>(),
+>(
+  tableApiSource: DispatchTableApiSource,
+  fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>,
+) =>
+  InfiniteLoaderCo<CustomPresentationContext, ExtraContext>().Template<any>(
+    TableInfiniteLoader<CustomPresentationContext, ExtraContext>(
+      tableApiSource,
+      fromTableApiParser,
+    ),
     {
       interval: 15,
-      runFilter: (props) => {
-        return (
-          (props.context.customFormState.initializationStatus ===
-            "not initialized" ||
-            props.context.customFormState.initializationStatus ===
-              "reinitializing") &&
-          props.context.customFormState.isFilteringInitialized
-        );
-      },
+      runFilter: (props) =>
+        props.context.customFormState.isFilteringInitialized &&
+        props.context.customFormState.loadingState == "loaded" &&
+        (props.context.customFormState.loadMore == "load more" ||
+          props.context.customFormState.loadMore == "loading more"),
     },
   );

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

@@ -10,7 +10,6 @@ import {
   ValueRecord,
   ValueTable,
   replaceWith,
-  DispatchTableApiSource,
   DispatchOnChange,
   Unit,
   ValueCallbackWithOptionalFlags,
@@ -22,8 +21,6 @@ import {
   TableMethod,
   CommonAbstractRendererViewOnlyReadonlyContext,
   RecordType,
-  ValueTuple,
-  ValueUnit,
   FilterType,
   MapRepo,
   ValueFilter,
@@ -33,12 +30,8 @@ import {
   SumNType,
   ValueSumN,
 } from "../../../../../../../../main";
-import { Debounced } from "../../../../../../../debounced/state";
-import { BasicFun } from "../../../../../../../fun/state";
 import { Template, View } from "../../../../../../../template/state";
 
-import { ValueInfiniteStreamState } from "../../../../../../../value-infinite-data-stream/state";
-
 export type TableAbstractRendererReadonlyContext<
   CustomPresentationContext = Unit,
   ExtraContext = Unit,
@@ -48,11 +41,6 @@ export type TableAbstractRendererReadonlyContext<
   CustomPresentationContext,
   ExtraContext
 > & {
-  tableApiSource: DispatchTableApiSource;
-  fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>;
-  parseFromApiByType: (
-    type: DispatchParsedType<any>,
-  ) => (raw: any) => ValueOrErrors<PredicateValue, string>;
   tableHeaders: string[];
   columnLabels: Map<string, string | undefined>;
   apiMethods: Array<TableMethod>;
@@ -60,28 +48,23 @@ export type TableAbstractRendererReadonlyContext<
   highlightedFilters: Array<string>;
 };
 
-export type TableAbstractRendererSelectedDetailRow =
-  | ValueTuple
-  | ValueUnit
-  | undefined;
+export type TableAbstractRendererSelectedDetailRow = string | undefined;
 
 export type TableAbstractRendererState = CommonAbstractRendererState & {
   customFormState: {
+    loadingState: "loading" | "loaded" | "error" | "reload from 0";
+    loadMore:
+      | "load more"
+      | "loading more"
+      | "don't load more"
+      | "error loading more";
     isFilteringInitialized: boolean;
     selectedRows: Set<string>;
     rowStates: Map<string, RecordAbstractRendererState>;
     selectedDetailRow: TableAbstractRendererSelectedDetailRow;
-    initializationStatus: "not initialized" | "initialized" | "reinitializing";
     filters: Map<string, List<ValueFilter>>;
     sorting: Map<string, "Ascending" | "Descending" | undefined>;
     filterAndSortParam: string;
-    stream: ValueInfiniteStreamState;
-    getChunkWithParams: BasicFun<
-      Map<string, string>,
-      ValueInfiniteStreamState["getChunk"]
-    >;
-    previousRemoteEntityVersionIdentifier: string;
-    shouldReinitialize: boolean;
     filterStates: Map<string, List<any>>;
   };
 };
@@ -89,19 +72,15 @@ export const TableAbstractRendererState = {
   Default: (): TableAbstractRendererState => ({
     ...CommonAbstractRendererState.Default(),
     customFormState: {
+      loadingState: "loading",
+      loadMore: "don't load more",
       isFilteringInitialized: false,
-      initializationStatus: "not initialized",
       selectedRows: Set(),
       selectedDetailRow: undefined,
       filterAndSortParam: "",
       rowStates: Map(),
       filters: Map(),
       sorting: Map(),
-      // TODO: replace with sum
-      getChunkWithParams: undefined as any,
-      stream: undefined as any,
-      previousRemoteEntityVersionIdentifier: "",
-      shouldReinitialize: false,
       filterStates: Map(),
     },
   }),
@@ -109,13 +88,10 @@ export const TableAbstractRendererState = {
     Core: {
       ...simpleUpdaterWithChildren<TableAbstractRendererState>()({
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "getChunkWithParams",
-        ),
-        ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "stream",
+          "filterAndSortParam",
         ),
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "filterAndSortParam",
+          "loadMore",
         ),
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "filters",
@@ -123,21 +99,12 @@ export const TableAbstractRendererState = {
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "sorting",
         ),
-        ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "initializationStatus",
-        ),
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "selectedDetailRow",
         ),
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "selectedRows",
         ),
-        ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "previousRemoteEntityVersionIdentifier",
-        ),
-        ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
-          "shouldReinitialize",
-        ),
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "rowStates",
         ),
@@ -147,6 +114,9 @@ export const TableAbstractRendererState = {
         ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
           "isFilteringInitialized",
         ),
+        ...simpleUpdater<TableAbstractRendererState["customFormState"]>()(
+          "loadingState",
+        ),
       })("customFormState"),
       ...simpleUpdaterWithChildren<TableAbstractRendererState>()({
         ...simpleUpdater<TableAbstractRendererState["commonFormState"]>()(
@@ -181,8 +151,10 @@ export const TableAbstractRendererState = {
               ),
             )
             .then(
-              TableAbstractRendererState.Updaters.Core.customFormState.children.shouldReinitialize(
-                replaceWith(true),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.loadingState(
+                replaceWith<
+                  TableAbstractRendererState["customFormState"]["loadingState"]
+                >("reload from 0"),
               ),
             )(_),
         ),
@@ -218,8 +190,10 @@ export const TableAbstractRendererState = {
               ),
             )
             .then(
-              TableAbstractRendererState.Updaters.Core.customFormState.children.shouldReinitialize(
-                replaceWith(true),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.loadingState(
+                replaceWith<
+                  TableAbstractRendererState["customFormState"]["loadingState"]
+                >("reload from 0"),
               ),
             )(_),
         );
@@ -254,19 +228,29 @@ export const TableAbstractRendererState = {
               ),
             )
             .then(
-              TableAbstractRendererState.Updaters.Core.customFormState.children.shouldReinitialize(
-                replaceWith(true),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.loadingState(
+                replaceWith<
+                  TableAbstractRendererState["customFormState"]["loadingState"]
+                >("reload from 0"),
               ),
             )(_),
         );
       },
       loadMore: (): Updater<TableAbstractRendererState> =>
-        TableAbstractRendererState.Updaters.Core.customFormState.children.stream(
-          ValueInfiniteStreamState.Updaters.Template.loadMore(),
+        Updater((_) =>
+          _.customFormState.loadMore == "loading more"
+            ? _
+            : TableAbstractRendererState.Updaters.Core.customFormState.children.loadMore(
+                replaceWith<
+                  TableAbstractRendererState["customFormState"]["loadMore"]
+                >("load more"),
+              )(_),
         ),
-      shouldReinitialize: (_: boolean) =>
-        TableAbstractRendererState.Updaters.Core.customFormState.children.shouldReinitialize(
-          replaceWith(_),
+      reloadFrom0: (): Updater<TableAbstractRendererState> =>
+        TableAbstractRendererState.Updaters.Core.customFormState.children.loadingState(
+          replaceWith<
+            TableAbstractRendererState["customFormState"]["loadingState"]
+          >("reload from 0"),
         ),
     },
   },
@@ -443,13 +427,13 @@ export type TableAbstractRendererViewForeignMutationsExpected<Flags = Unit> = {
     | ((key: string, to: string, flags: Flags | undefined) => void)
     | undefined;
   duplicate: ValueCallbackWithOptionalFlags<string, Flags> | undefined;
-  reinitialize: SimpleCallback<void>;
   updateFilters: (filters: Map<string, List<ValueFilter>>) => void;
   addSorting: (
     columnName: string,
     direction: "Ascending" | "Descending" | undefined,
   ) => void;
   removeSorting: (columnName: string) => void;
+  reloadFrom0: () => void;
 };
 
 export type TableAbstractRendererView<