ballerina-core 1.0.202 → 1.0.204

package/package.json

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

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

@@ -29,37 +29,48 @@ const initialiseFiltersAndSorting = <
 >(
   filterTypes: Map<string, SumNType<any>>,
 ) => {
-  return 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"),
-          )
-          .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),
-      ),
-    ),
-  ]);
+  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 = <
@@ -80,8 +91,6 @@ const intialiseTable = <
         current.fromTableApiParser,
       );
 
-      console.debug("params", current.customFormState.filterAndSortParam);
-
       const params =
         current.customFormState.filterAndSortParam == ""
           ? Map<string, string>()
@@ -183,6 +192,7 @@ export const TableReinitialiseRunner = <
       interval: 15,
       runFilter: (props) =>
         props.context.customFormState.initializationStatus === "initialized" &&
+        props.context.customFormState.isFilteringInitialized &&
         props.context.customFormState.shouldReinitialize,
     },
   );
@@ -197,10 +207,11 @@ export const TableRunner = <
       interval: 15,
       runFilter: (props) => {
         return (
-          props.context.customFormState.initializationStatus ===
+          (props.context.customFormState.initializationStatus ===
             "not initialized" ||
-          props.context.customFormState.initializationStatus ===
-            "reinitializing"
+            props.context.customFormState.initializationStatus ===
+              "reinitializing") &&
+          props.context.customFormState.isFilteringInitialized
         );
       },
     },

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

@@ -342,12 +342,45 @@ export const TableAbstractRendererState = {
       const parsedFiltersValues = parsedFilters
         .map((filter) => filter.map((f) => (f as Value<PredicateValue>).value))
         .toJS();
+
+      const valueSorting = sorting
+        .entrySeq()
+        .filter(([_, direction]) => direction != undefined)
+        .map(([columnName, direction]) =>
+          PredicateValue.Default.tuple(List([columnName, direction as string])),
+        );
+
+      const parsedValueSorting = ValueOrErrors.Operations.All(
+        valueSorting
+          .map((sorting) =>
+            toApiRaw(
+              DispatchParsedType.Default.tuple([
+                {
+                  kind: "primitive",
+                  name: "string",
+                  asString: () => "string",
+                },
+                {
+                  kind: "primitive",
+                  name: "string",
+                  asString: () => "string",
+                },
+              ]),
+              sorting,
+              {},
+            ),
+          )
+          .toList(),
+      );
+
+      const finalSorting =
+        parsedValueSorting.kind == "errors"
+          ? []
+          : parsedValueSorting.value.toArray();
+
       const params = {
         Filters: parsedFiltersValues,
-        Sorting: sorting
-          .entrySeq()
-          .toList()
-          .filter((sorting) => sorting[1] != undefined),
+        Sorting: finalSorting,
       };
       return btoa(JSON.stringify(params));
     },

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

@@ -11,6 +11,7 @@ import {
   ListRepo,
   BasicUpdater,
   Guid,
+  FilterTypeKind,
 } from "../../../../../../main";
 
 export type TuplePredicateExpression = {
@@ -912,6 +913,32 @@ export const PredicateValue = {
           return PredicateValue.Default.filterEqualsTo(value);
       }
     },
+    FilterToKindAndValue: (
+      filter: ValueFilter,
+    ): { kind: FilterTypeKind; value: PredicateValue } => {
+      switch (filter.kind) {
+        case "contains":
+          return { kind: "contains", value: filter.contains };
+        case "=":
+          return { kind: "=", value: filter.equalsTo };
+        case "!=":
+          return { kind: "!=", value: filter.notEqualsTo };
+        case ">=":
+          return { kind: ">=", value: filter.greaterThanOrEqualsTo };
+        case ">":
+          return { kind: ">", value: filter.greaterThan };
+        case "!=null":
+          return { kind: "!=null", value: PredicateValue.Default.unit() };
+        case "=null":
+          return { kind: "=null", value: PredicateValue.Default.unit() };
+        case "<=":
+          return { kind: "<=", value: filter.smallerThanOrEqualsTo };
+        case "<":
+          return { kind: "<", value: filter.smallerThan };
+        default:
+          return { kind: "startsWith", value: filter.startsWith };
+      }
+    },
     ParseAsDate: (json: any): ValueOrErrors<PredicateValue, string> => {
       if (PredicateValue.Operations.IsDate(json))
         return ValueOrErrors.Default.return(json);