ballerina-core 1.0.206 → 1.0.207

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/string/template.js

@@ -5,15 +5,25 @@ import {
   Template,
   Option,
 } from "../../../../../../../../main";
-export const StringAbstractRenderer = (IdProvider, ErrorRenderer) => {
+export const StringAbstractRenderer = (
+  IdProvider,
+  ErrorRenderer,
+  SerializedType,
+) => {
   return Template.Default((props) => {
-    const domNodeId = props.context.domNodeAncestorPath + "[string]";
+    const completeSerializedTypeHierarchy = [SerializedType].concat(
+      props.context.serializedTypeHierarchy,
+    );
+    const domNodeTypeHierarchy = [SerializedType].concat(
+      props.context.domNodeTypeHierarchy,
+    );
+    const domNodeId = domNodeTypeHierarchy.join(".");
     if (!PredicateValue.Operations.IsString(props.context.value)) {
       console.error(
-        `String expected but got: ${JSON.stringify(props.context.value)}\n...When rendering \n...${domNodeId}`,
+        `String expected but got: ${JSON.stringify(props.context.value)}\n...When rendering string field\n...${SerializedType}`,
       );
       return _jsx(ErrorRenderer, {
-        message: `${domNodeId}: String value expected but got ${JSON.stringify(props.context.value)}`,
+        message: `${SerializedType}: String value expected for string but got ${JSON.stringify(props.context.value)}`,
       });
     }
     return _jsx(_Fragment, {
@@ -23,6 +33,7 @@ export const StringAbstractRenderer = (IdProvider, ErrorRenderer) => {
           props.view,
           Object.assign({}, props, {
             context: Object.assign(Object.assign({}, props.context), {
+              completeSerializedTypeHierarchy,
               domNodeId,
             }),
             foreignMutations: Object.assign(
@@ -42,8 +53,6 @@ export const StringAbstractRenderer = (IdProvider, ErrorRenderer) => {
                     },
                     type: props.context.type,
                     flags,
-                    sourceAncestorLookupTypeNames:
-                      props.context.lookupTypeAncestorNames,
                   };
                   props.foreignMutations.onChange(
                     Option.Default.some(replaceWith(value)),

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/string/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/string/template.tsx"],"names":[],"mappings":";AAOA,OAAO,EAGL,cAAc,EACd,WAAW,EACX,QAAQ,EAER,MAAM,GAGP,MAAM,8BAA8B,CAAC;AAGtC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAKpC,UAAsD,EACtD,aAA6D,EAC7D,EAAE;IACF,OAAO,QAAQ,CAAC,OAAO,CAQrB,CAAC,KAAK,EAAE,EAAE;QACV,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,GAAG,UAAU,CAAC;QAEjE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC,KAAK,CACX,4BAA4B,IAAI,CAAC,SAAS,CACxC,KAAK,CAAC,OAAO,CAAC,KAAK,CACpB,4BAA4B,SAAS,EAAE,CACzC,CAAC;YACF,OAAO,CACL,KAAC,aAAa,IACZ,OAAO,EAAE,GAAG,SAAS,mCAAmC,IAAI,CAAC,SAAS,CACpE,KAAK,CAAC,OAAO,CAAC,KAAK,CACpB,EAAE,GACH,CACH,CAAC;QACJ,CAAC;QAED,OAAO,CACL,4BACE,KAAC,UAAU,IAAC,SAAS,EAAE,SAAS,YAC9B,KAAC,KAAK,CAAC,IAAI,oBACL,KAAK,IACT,OAAO,kCACF,KAAK,CAAC,OAAO,KAChB,SAAS,KAEX,gBAAgB,kCACX,KAAK,CAAC,gBAAgB,KACzB,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BAC5B,MAAM,KAAK,GAAyB;gCAClC,IAAI,EACF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW;oCACtC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ;oCACjC,CAAC,CAAC,eAAe;oCACjB,CAAC,CAAC,aAAa;gCACnB,OAAO,EAAE,KAAK;gCACd,KAAK,EAAE;oCACL,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe;oCAC9C,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe;iCAC/C;gCACD,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gCACxB,KAAK;gCACL,6BAA6B,EAC3B,KAAK,CAAC,OAAO,CAAC,uBAAuB;6BACxC,CAAC;4BACF,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAC7B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EACvC,KAAK,CACN,CAAC;wBACJ,CAAC,OAEH,GACS,GACZ,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/string/template.tsx"],"names":[],"mappings":";AAOA,OAAO,EAGL,cAAc,EACd,WAAW,EACX,QAAQ,EAER,MAAM,GAGP,MAAM,8BAA8B,CAAC;AAGtC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAKpC,UAAsD,EACtD,aAA6D,EAC7D,cAAoC,EACpC,EAAE;IACF,OAAO,QAAQ,CAAC,OAAO,CAQrB,CAAC,KAAK,EAAE,EAAE;QACV,MAAM,+BAA+B,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAC7D,KAAK,CAAC,OAAO,CAAC,uBAAuB,CACtC,CAAC;QAEF,MAAM,oBAAoB,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAClD,KAAK,CAAC,OAAO,CAAC,oBAAoB,CACnC,CAAC;QAEF,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC,KAAK,CACX,4BAA4B,IAAI,CAAC,SAAS,CACxC,KAAK,CAAC,OAAO,CAAC,KAAK,CACpB,wCAAwC,cAAc,EAAE,CAC1D,CAAC;YACF,OAAO,CACL,KAAC,aAAa,IACZ,OAAO,EAAE,GAAG,cAAc,8CAA8C,IAAI,CAAC,SAAS,CACpF,KAAK,CAAC,OAAO,CAAC,KAAK,CACpB,EAAE,GACH,CACH,CAAC;QACJ,CAAC;QAED,OAAO,CACL,4BACE,KAAC,UAAU,IAAC,SAAS,EAAE,SAAS,YAC9B,KAAC,KAAK,CAAC,IAAI,oBACL,KAAK,IACT,OAAO,kCACF,KAAK,CAAC,OAAO,KAChB,+BAA+B;wBAC/B,SAAS,KAEX,gBAAgB,kCACX,KAAK,CAAC,gBAAgB,KACzB,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BAC5B,MAAM,KAAK,GAAyB;gCAClC,IAAI,EACF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,WAAW;oCACtC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ;oCACjC,CAAC,CAAC,eAAe;oCACjB,CAAC,CAAC,aAAa;gCACnB,OAAO,EAAE,KAAK;gCACd,KAAK,EAAE;oCACL,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe;oCAC9C,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,eAAe;iCAC/C;gCACD,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gCACxB,KAAK;6BACN,CAAC;4BACF,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAC7B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EACvC,KAAK,CACN,CAAC;wBACJ,CAAC,OAEH,GACS,GACZ,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACb,CAAC,CAAC"}

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.d.ts

@@ -8,7 +8,10 @@ import {
   CommonAbstractRendererForeignMutationsExpected,
 } from "../../../../../../../../main";
 import { Template } from "../../../../../../../../main";
-import { DispatchParsedType } from "../../../../deserializer/domains/specification/domains/types/state";
+import {
+  DispatchParsedType,
+  StringSerializedType,
+} from "../../../../deserializer/domains/specification/domains/types/state";
 import {
   SumAbstractRendererForeignMutationsExpected,
   SumAbstractRendererReadonlyContext,
@@ -22,6 +25,7 @@ export declare const SumAbstractRenderer: <
 >(
   IdProvider: (props: IdWrapperProps) => React.ReactNode,
   ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode,
+  SerializedType: StringSerializedType,
   leftTemplate?: Template<
     CommonAbstractRendererReadonlyContext<
       DispatchParsedType<any>,

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,2BAA2B,EAG3B,cAAc,EACd,cAAc,EAId,kBAAkB,EAElB,IAAI,EACJ,8CAA8C,EAC/C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oEAAoE,CAAC;AACxG,OAAO,EACL,2CAA2C,EAC3C,kCAAkC,EAClC,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,mBAAmB,GAC9B,yBAAyB,GAAG,IAAI,EAChC,KAAK,GAAG,IAAI,EACZ,YAAY,GAAG,IAAI,EAEnB,YAAY,CAAC,KAAK,EAAE,cAAc,KAAK,KAAK,CAAC,SAAS,EACtD,eAAe,CAAC,KAAK,EAAE,kBAAkB,KAAK,KAAK,CAAC,SAAS,EAC7D,eAAe,QAAQ,CACrB,qCAAqC,CACnC,kBAAkB,CAAC,GAAG,CAAC,EACvB,cAAc,EACd,yBAAyB,EACzB,YAAY,CACb,GACC,2BAA2B,EAC7B,2BAA2B,EAC3B,8CAA8C,CAAC,KAAK,CAAC,CACtD,EACD,gBAAgB,QAAQ,CACtB,qCAAqC,CACnC,kBAAkB,CAAC,GAAG,CAAC,EACvB,cAAc,EACd,yBAAyB,EACzB,YAAY,CACb,GACC,2BAA2B,EAC7B,2BAA2B,EAC3B,8CAA8C,CAAC,KAAK,CAAC,CACtD;;;;;yJA2MF,CAAC"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,2BAA2B,EAG3B,cAAc,EACd,cAAc,EAId,kBAAkB,EAElB,IAAI,EACJ,8CAA8C,EAC/C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,oEAAoE,CAAC;AAC5E,OAAO,EACL,2CAA2C,EAC3C,kCAAkC,EAClC,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,mBAAmB,GAC9B,yBAAyB,GAAG,IAAI,EAChC,KAAK,GAAG,IAAI,EACZ,YAAY,GAAG,IAAI,EAEnB,YAAY,CAAC,KAAK,EAAE,cAAc,KAAK,KAAK,CAAC,SAAS,EACtD,eAAe,CAAC,KAAK,EAAE,kBAAkB,KAAK,KAAK,CAAC,SAAS,EAC7D,gBAAgB,oBAAoB,EACpC,eAAe,QAAQ,CACrB,qCAAqC,CACnC,kBAAkB,CAAC,GAAG,CAAC,EACvB,cAAc,EACd,yBAAyB,EACzB,YAAY,CACb,GACC,2BAA2B,EAC7B,2BAA2B,EAC3B,8CAA8C,CAAC,KAAK,CAAC,CACtD,EACD,gBAAgB,QAAQ,CACtB,qCAAqC,CACnC,kBAAkB,CAAC,GAAG,CAAC,EACvB,cAAc,EACd,yBAAyB,EACzB,YAAY,CACb,GACC,2BAA2B,EAC7B,2BAA2B,EAC3B,8CAA8C,CAAC,KAAK,CAAC,CACtD;;;;;yJAgNF,CAAC"}

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.js

@@ -11,6 +11,7 @@ import { SumAbstractRendererState } from "./state";
 export const SumAbstractRenderer = (
   IdProvider,
   ErrorRenderer,
+  SerializedType,
   leftTemplate,
   rightTemplate,
 ) => {
@@ -20,16 +21,18 @@ export const SumAbstractRenderer = (
           .mapContext((_) =>
             Object.assign(Object.assign({}, _.customFormState.left), {
               disabled: _.disabled,
-              locked: _.locked,
               value: _.value.value.value,
               bindings: _.bindings,
               extraContext: _.extraContext,
               type: _.type.args[0],
               customPresentationContext: _.customPresentationContext,
               remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-              domNodeAncestorPath: _.domNodeAncestorPath + "[sum][left]",
-              typeAncestors: [_.type].concat(_.typeAncestors),
-              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+              serializedTypeHierarchy: [SerializedType].concat(
+                _.serializedTypeHierarchy,
+              ),
+              domNodeTypeHierarchy: ["[left]", SerializedType].concat(
+                _.domNodeTypeHierarchy,
+              ),
             }),
           )
           .mapState(
@@ -42,8 +45,6 @@ export const SumAbstractRenderer = (
                 kind: "SumLeft",
                 value: nestedDelta,
                 flags: flags,
-                sourceAncestorLookupTypeNames:
-                  nestedDelta.sourceAncestorLookupTypeNames,
               };
               props.foreignMutations.onChange(
                 elementUpdater.kind == "l"
@@ -81,16 +82,18 @@ export const SumAbstractRenderer = (
           .mapContext((_) =>
             Object.assign(Object.assign({}, _.customFormState.right), {
               disabled: _.disabled,
-              locked: _.locked,
               value: _.value.value.value,
               bindings: _.bindings,
               extraContext: _.extraContext,
               type: _.type.args[1],
               customPresentationContext: _.customPresentationContext,
               remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-              domNodeAncestorPath: _.domNodeAncestorPath + "[sum][right]",
-              typeAncestors: [_.type].concat(_.typeAncestors),
-              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+              serializedTypeHierarchy: [SerializedType].concat(
+                _.serializedTypeHierarchy,
+              ),
+              domNodeTypeHierarchy: ["[right]", SerializedType].concat(
+                _.domNodeTypeHierarchy,
+              ),
             }),
           )
           .mapState(
@@ -103,8 +106,6 @@ export const SumAbstractRenderer = (
                 kind: "SumRight",
                 value: nestedDelta,
                 flags,
-                sourceAncestorLookupTypeNames:
-                  nestedDelta.sourceAncestorLookupTypeNames,
               };
               props.foreignMutations.onChange(
                 elementUpdater.kind == "l"
@@ -139,13 +140,19 @@ export const SumAbstractRenderer = (
           }))
     : undefined;
   return Template.Default((props) => {
-    const domNodeId = props.context.domNodeAncestorPath + "[sum]";
+    const completeSerializedTypeHierarchy = [SerializedType].concat(
+      props.context.serializedTypeHierarchy,
+    );
+    const domNodeTypeHierarchy = [SerializedType].concat(
+      props.context.domNodeTypeHierarchy,
+    );
+    const domNodeId = domNodeTypeHierarchy.join(".");
     if (!PredicateValue.Operations.IsSum(props.context.value)) {
       console.error(
-        `Sum expected but got: ${JSON.stringify(props.context.value)}\n...When rendering \n...${domNodeId}`,
+        `Sum expected but got: ${JSON.stringify(props.context.value)}\n...When rendering sum field\n...${SerializedType}`,
       );
       return _jsx(ErrorRenderer, {
-        message: `${domNodeId}: Sum value expected but got ${JSON.stringify(props.context.value)}`,
+        message: `${domNodeId}: Sum value expected for sum but got ${JSON.stringify(props.context.value)}`,
       });
     }
     return _jsx(_Fragment, {
@@ -156,6 +163,7 @@ export const SumAbstractRenderer = (
           Object.assign({}, props, {
             context: Object.assign(Object.assign({}, props.context), {
               domNodeId,
+              completeSerializedTypeHierarchy,
             }),
             foreignMutations: Object.assign({}, props.foreignMutations),
             embeddedLeftTemplate: embeddedLeftTemplate,

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"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"}

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

@@ -1,76 +1,9 @@
-import { Map, Set } from "immutable";
+import { Map } from "immutable";
 import { ValueInfiniteStreamState } from "../../../../../../../../value-infinite-data-stream/state";
 import {
-  SumNType,
   TableAbstractRendererState,
   Unit,
 } from "../../../../../../../../../main";
-export declare const TableInitialiseFiltersAndSortingRunner: <
-  CustomPresentationContext = Unit,
-  ExtraContext = Unit,
->(
-  filterTypes: Map<string, SumNType<any>>,
-) => import("../../../../../../../../template/state").Template<
-  import("../../state").CommonAbstractRendererReadonlyContext<
-    import("../../../../../../../../../main").TableType<any>,
-    import("../../../../../../parser/domains/predicates/state").ValueTable,
-    CustomPresentationContext,
-    ExtraContext
-  > & {
-    tableApiSource: import("../../../../../deserializer/state").DispatchTableApiSource;
-    fromTableApiParser: (
-      value: unknown,
-    ) => import("../../../../../../../../../main").ValueOrErrors<
-      import("../../../../../../parser/domains/predicates/state").PredicateValue,
-      string
-    >;
-    parseFromApiByType: (
-      type: import("../../../../../../../../../main").DispatchParsedType<any>,
-    ) => (
-      raw: any,
-    ) => import("../../../../../../../../../main").ValueOrErrors<
-      import("../../../../../../parser/domains/predicates/state").PredicateValue,
-      string
-    >;
-    tableHeaders: string[];
-    columnLabels: Map<string, string | undefined>;
-    apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
-  } & import("../../state").CommonAbstractRendererState & {
-      customFormState: {
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
-        rowStates: Map<
-          string,
-          import("../../record/state").RecordAbstractRendererState
-        >;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
-        initializationStatus:
-          | "not initialized"
-          | "initialized"
-          | "reinitializing";
-        filters: Map<
-          string,
-          import("immutable").List<
-            import("../../../../../../parser/domains/predicates/state").ValueFilter
-          >
-        >;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
-        stream: ValueInfiniteStreamState;
-        getChunkWithParams: import("../../../../../../../../fun/state").BasicFun<
-          Map<string, string>,
-          ValueInfiniteStreamState["getChunk"]
-        >;
-        previousRemoteEntityVersionIdentifier: string;
-        shouldReinitialize: boolean;
-        filterStates: Map<string, import("immutable").List<any>>;
-      };
-    },
-  TableAbstractRendererState,
-  any
->;
 export declare const TableReinitialiseRunner: <
   CustomPresentationContext = Unit,
   ExtraContext = Unit,
@@ -88,40 +21,24 @@ export declare const TableReinitialiseRunner: <
       import("../../../../../../parser/domains/predicates/state").PredicateValue,
       string
     >;
-    parseFromApiByType: (
-      type: import("../../../../../../../../../main").DispatchParsedType<any>,
-    ) => (
-      raw: any,
-    ) => import("../../../../../../../../../main").ValueOrErrors<
-      import("../../../../../../parser/domains/predicates/state").PredicateValue,
-      string
-    >;
     tableHeaders: string[];
     columnLabels: Map<string, string | undefined>;
     apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
   } & import("../../state").CommonAbstractRendererState & {
       customFormState: {
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
+        selectedRows: import("immutable").Set<string>;
         rowStates: Map<
           string,
           import("../../record/state").RecordAbstractRendererState
         >;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
+        selectedDetailRow: [number, string] | undefined;
         initializationStatus:
           | "not initialized"
           | "initialized"
           | "reinitializing";
-        filters: Map<
-          string,
-          import("immutable").List<
-            import("../../../../../../parser/domains/predicates/state").ValueFilter
-          >
+        streamParams: import("../../../../../../../../debounced/state").Debounced<
+          Map<string, string>
         >;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
         stream: ValueInfiniteStreamState;
         getChunkWithParams: import("../../../../../../../../fun/state").BasicFun<
           Map<string, string>,
@@ -129,7 +46,6 @@ export declare const TableReinitialiseRunner: <
         >;
         previousRemoteEntityVersionIdentifier: string;
         shouldReinitialize: boolean;
-        filterStates: Map<string, import("immutable").List<any>>;
       };
     },
   TableAbstractRendererState,
@@ -152,40 +68,24 @@ export declare const TableRunner: <
       import("../../../../../../parser/domains/predicates/state").PredicateValue,
       string
     >;
-    parseFromApiByType: (
-      type: import("../../../../../../../../../main").DispatchParsedType<any>,
-    ) => (
-      raw: any,
-    ) => import("../../../../../../../../../main").ValueOrErrors<
-      import("../../../../../../parser/domains/predicates/state").PredicateValue,
-      string
-    >;
     tableHeaders: string[];
     columnLabels: Map<string, string | undefined>;
     apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
   } & import("../../state").CommonAbstractRendererState & {
       customFormState: {
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
+        selectedRows: import("immutable").Set<string>;
         rowStates: Map<
           string,
           import("../../record/state").RecordAbstractRendererState
         >;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
+        selectedDetailRow: [number, string] | undefined;
         initializationStatus:
           | "not initialized"
           | "initialized"
           | "reinitializing";
-        filters: Map<
-          string,
-          import("immutable").List<
-            import("../../../../../../parser/domains/predicates/state").ValueFilter
-          >
+        streamParams: import("../../../../../../../../debounced/state").Debounced<
+          Map<string, string>
         >;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
         stream: ValueInfiniteStreamState;
         getChunkWithParams: import("../../../../../../../../fun/state").BasicFun<
           Map<string, string>,
@@ -193,7 +93,6 @@ export declare const TableRunner: <
         >;
         previousRemoteEntityVersionIdentifier: string;
         shouldReinitialize: boolean;
-        filterStates: Map<string, import("immutable").List<any>>;
       };
     },
   TableAbstractRendererState,

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

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EACL,wBAAwB,EAEzB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAEL,QAAQ,EACR,0BAA0B,EAC1B,IAAI,EACL,MAAM,iCAAiC,CAAC;AAwJzC,eAAO,MAAM,sCAAsC,GACjD,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI,EAEnB,aAAa,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;mCAWtC,CAAC;AACJ,eAAO,MAAM,uBAAuB,GAClC,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;mCAUlB,CAAC;AAEJ,eAAO,MAAM,WAAW,GACtB,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;mCAelB,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,wBAAwB,EAEzB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAEL,0BAA0B,EAC1B,IAAI,EACL,MAAM,iCAAiC,CAAC;AAoGzC,eAAO,MAAM,uBAAuB,GAClC,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;mCAYlB,CAAC;AAEJ,eAAO,MAAM,WAAW,GACtB,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;mCAelB,CAAC"}

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

@@ -1,4 +1,4 @@
-import { Map, Set } from "immutable";
+import { Map } from "immutable";
 import {
   ValueInfiniteStreamState,
   ValueStreamPosition,
@@ -11,42 +11,7 @@ import { CoTypedFactory } from "../../../../../../../../../main";
 const Co = () => CoTypedFactory();
 // TODO -- very unsafe, needs work, checking undefined etc,,,
 const DEFAULT_CHUNK_SIZE = 20;
-const initialiseFiltersAndSorting = (filterTypes) => {
-  console.debug("initialiseFiltersAndSorting", filterTypes);
-  return Co().Seq([
-    Co()
-      .GetState()
-      .then((current) => {
-        const getDefaultFiltersAndSorting =
-          current.tableApiSource.getDefaultFiltersAndSorting(filterTypes);
-        console.debug("parseFromApiByType", getDefaultFiltersAndSorting);
-        return Co()
-          .Await(getDefaultFiltersAndSorting(current.parseFromApiByType), () =>
-            console.error("error getting default filters and sorting"),
-          )
-          .then((filtersAndSorting) => {
-            console.debug("filtersAndSorting", filtersAndSorting);
-            return filtersAndSorting.kind == "l"
-              ? Co().SetState(
-                  TableAbstractRendererState.Updaters.Core.customFormState.children
-                    .filters(replaceWith(filtersAndSorting.value.filters))
-                    .then(
-                      TableAbstractRendererState.Updaters.Core.customFormState.children.sorting(
-                        replaceWith(filtersAndSorting.value.sorting),
-                      ),
-                    ),
-                )
-              : Co().Wait(0);
-          });
-      }),
-    Co().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),
-      ),
-    ),
-  ]);
-};
+// if value exists in entity, use that, otherwise load first chunk from infinite stream
 const intialiseTable = () =>
   Co()
     .GetState()
@@ -61,60 +26,51 @@ const intialiseTable = () =>
       const getChunkWithParams = current.tableApiSource.getMany(
         current.fromTableApiParser,
       );
-      console.debug("params", current.customFormState.filterAndSortParam);
-      const params =
-        current.customFormState.filterAndSortParam == ""
-          ? Map()
-          : Map([
-              ["filtersAndSorting", current.customFormState.filterAndSortParam],
-            ]);
       return Co().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,
-                }),
+        replaceWith(TableAbstractRendererState.Default()).then(
+          TableAbstractRendererState.Updaters.Core.customFormState.children
+            .stream(
+              replaceWith(
+                ValueInfiniteStreamState.Default(
+                  DEFAULT_CHUNK_SIZE,
+                  getChunkWithParams(Map()),
+                  initialData.size == 0 && hasMoreValues ? "loadMore" : false,
+                ),
               )
-              .then(
-                ValueInfiniteStreamState.Updaters.Core.position(
-                  ValueStreamPosition.Updaters.Core.nextStart(replaceWith(to)),
+                .then(
+                  ValueInfiniteStreamState.Updaters.Coroutine.addLoadedChunk(
+                    0,
+                    {
+                      data: initialData,
+                      hasMoreValues: hasMoreValues,
+                      from,
+                      to,
+                    },
+                  ),
+                )
+                .then(
+                  ValueInfiniteStreamState.Updaters.Core.position(
+                    ValueStreamPosition.Updaters.Core.nextStart(
+                      replaceWith(to + 1),
+                    ),
+                  ),
                 ),
+            )
+            .thenMany([
+              TableAbstractRendererState.Updaters.Core.customFormState.children.getChunkWithParams(
+                replaceWith(getChunkWithParams),
               ),
-          )
-          .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),
-            ),
-            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("initialized"),
-            ),
-          ]),
+              TableAbstractRendererState.Updaters.Template.shouldReinitialize(
+                false,
+              ),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.previousRemoteEntityVersionIdentifier(
+                replaceWith(current.remoteEntityVersionIdentifier),
+              ),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.initializationStatus(
+                replaceWith("initialized"),
+              ),
+            ]),
+        ),
       );
     });
 const reinitialise = () =>
@@ -127,18 +83,14 @@ const reinitialise = () =>
         ),
       );
     });
-export const TableInitialiseFiltersAndSortingRunner = (filterTypes) =>
-  Co().Template(initialiseFiltersAndSorting(filterTypes), {
-    interval: 15,
-    runFilter: (props) =>
-      props.context.customFormState.isFilteringInitialized == false,
-  });
 export const TableReinitialiseRunner = () =>
   Co().Template(reinitialise(), {
     interval: 15,
     runFilter: (props) =>
       props.context.customFormState.initializationStatus === "initialized" &&
-      props.context.customFormState.shouldReinitialize,
+      props.context.customFormState.shouldReinitialize &&
+      props.context.remoteEntityVersionIdentifier !==
+        props.context.customFormState.previousRemoteEntityVersionIdentifier,
   });
 export const TableRunner = () =>
   Co().Template(intialiseTable(), {

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"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"}