fix: improved ui for rules tabs, refactored validation for rules

.github/workflows/pullRequests.yml

@@ -132,6 +132,8 @@ jobs:
         run: yarn --immutable
       - name: Build packages (full)
         run: yarn build
+      - name: Check types for Cypress tests
+        run: yarn cy:ts
     env:
       NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false

.github/workflows/wac/pullRequests.wac.ts

@@ -211,6 +211,10 @@ export const pullRequests = createWorkflow({
                 {
                     name: "Build packages (full)",
                     run: "yarn build"
+                },
+                {
+                    name: "Check types for Cypress tests",
+                    run: "yarn cy:ts"
                 }
             ]
         }),

.gitignore

@@ -48,3 +48,5 @@ lerna.json
 
 # TODO remove after moving traffic splitting config to WPC
 gateway.*.json
+
+packages/tasks/tpl/*

.prettierignore

@@ -8,3 +8,4 @@
 .webiny/**
 packages/ui/src/RichTextEditor/editorjs/**
 lerna.json
+coverage/**

apps/api/graphql/package.json

@@ -12,6 +12,7 @@
     "@webiny/api-apw": "0.0.0",
     "@webiny/api-apw-scheduler-so-ddb": "0.0.0",
     "@webiny/api-audit-logs": "0.0.0",
+    "@webiny/api-background-tasks-ddb": "0.0.0",
     "@webiny/api-file-manager": "0.0.0",
     "@webiny/api-file-manager-ddb": "0.0.0",
     "@webiny/api-file-manager-s3": "0.0.0",
@@ -43,7 +44,8 @@
     "@webiny/handler-db": "0.0.0",
     "@webiny/handler-graphql": "0.0.0",
     "@webiny/handler-logs": "0.0.0",
-    "@webiny/project-utils": "0.0.0"
+    "@webiny/project-utils": "0.0.0",
+    "@webiny/tasks": "0.0.0"
   },
   "devDependencies": {
     "@webiny/cli-plugin-deploy-pulumi": "0.0.0",

apps/api/graphql/src/index.ts

@@ -23,7 +23,7 @@ import {
 } from "@webiny/api-file-manager";
 import { createFileManagerStorageOperations } from "@webiny/api-file-manager-ddb";
 import logsPlugins from "@webiny/handler-logs";
-import fileManagerS3 from "@webiny/api-file-manager-s3";
+import fileManagerS3, { createAssetDelivery } from "@webiny/api-file-manager-s3";
 import { createFormBuilder } from "@webiny/api-form-builder";
 import { createFormBuilderStorageOperations } from "@webiny/api-form-builder-so-ddb";
 import { createHeadlessCmsContext, createHeadlessCmsGraphQL } from "@webiny/api-headless-cms";
@@ -35,10 +35,11 @@ import { createStorageOperations as createApwSaStorageOperations } from "@webiny
 import { createAco } from "@webiny/api-aco";
 import { createAcoPageBuilderContext } from "@webiny/api-page-builder-aco";
 import { createAuditLogs } from "@webiny/api-audit-logs";
-
-// Imports plugins created via scaffolding utilities.
+import { createBackgroundTasks } from "@webiny/api-background-tasks-ddb";
 import scaffoldsPlugins from "./plugins/scaffolds";
 import { createBenchmarkEnablePlugin } from "~/plugins/benchmarkEnable";
+import { createCountDynamoDbTask } from "~/plugins/countDynamoDbTask";
+import { createContinuingTask } from "~/plugins/continuingTask";
 
 const debug = process.env.DEBUG === "true";
 const documentClient = getDocumentClient();
@@ -65,12 +66,14 @@ export const handler = createHandler({
             })
         }),
         createHeadlessCmsGraphQL(),
+        createBackgroundTasks(),
         createFileManagerContext({
             storageOperations: createFileManagerStorageOperations({
                 documentClient
             })
         }),
         createFileManagerGraphQL(),
+        createAssetDelivery({ documentClient }),
         fileManagerS3(),
         prerenderingServicePlugins({
             eventBus: String(process.env.EVENT_BUS)
@@ -119,7 +122,9 @@ export const handler = createHandler({
                 }
             });
         }),
-        createAuditLogs()
+        createAuditLogs(),
+        createCountDynamoDbTask(),
+        createContinuingTask()
     ],
     debug
 });

apps/api/graphql/src/plugins/continuingTask.ts

@@ -0,0 +1,58 @@
+import { createTaskDefinition } from "@webiny/tasks";
+import { Context } from "../types";
+import { ITaskResponseContinueOptions } from "@webiny/tasks/response/abstractions";
+
+const MAX_RUNS = 5;
+
+const getMaxRuns = (input?: string | number) => {
+    const value = Number(input);
+    if (isNaN(value)) {
+        return MAX_RUNS;
+    }
+    return value > 0 && value < 50 ? value : MAX_RUNS;
+};
+
+interface TaskValues {
+    run?: number;
+    maxRuns?: string | number;
+    seconds?: number | string;
+}
+
+const getOptions = (values: TaskValues): ITaskResponseContinueOptions | undefined => {
+    if (!values.seconds || typeof values.seconds !== "number" || values.seconds < 1) {
+        return undefined;
+    }
+    return {
+        seconds: values.seconds
+    };
+};
+
+export const createContinuingTask = () => {
+    return createTaskDefinition<Context, TaskValues>({
+        id: "continuingTask",
+        title: "Mock Continuing Task",
+        description:
+            "This is a mock task which will continue to run until it reaches the defined run limit.",
+        async run(params) {
+            const { response, isAborted, input } = params;
+            const run = input.run || 0;
+            const maxRuns = getMaxRuns(input.maxRuns);
+            if (run >= maxRuns) {
+                return response.done("Got to the run limit.");
+            }
+            if (isAborted()) {
+                return response.aborted();
+            }
+
+            await new Promise(resolve => setTimeout(resolve, 10000));
+
+            return response.continue(
+                {
+                    ...(input || {}),
+                    run: run + 1
+                },
+                getOptions(input)
+            );
+        }
+    });
+};

apps/api/graphql/src/plugins/countDynamoDbTask.ts

@@ -0,0 +1,25 @@
+import { createTaskDefinition } from "@webiny/tasks";
+import { getDocumentClient } from "@webiny/aws-sdk/client-dynamodb";
+
+export const createCountDynamoDbTask = () => {
+    return createTaskDefinition({
+        id: "countDdb",
+        title: "Count DynamoDB",
+        description: "Counts DynamoDB items.",
+        run: async params => {
+            const { response, isAborted, isCloseToTimeout } = params;
+            if (isAborted()) {
+                return response.aborted();
+            } else if (isCloseToTimeout()) {
+                return response.continue({});
+            }
+            const documentClient = getDocumentClient();
+
+            const results = await documentClient.scan({
+                TableName: process.env.DB_TABLE
+            });
+
+            return response.done(`Count: ${results.Count}`);
+        }
+    });
+};

apps/api/graphql/src/types.ts

@@ -7,6 +7,7 @@ import { FormBuilderContext } from "@webiny/api-form-builder/types";
 import { CmsContext } from "@webiny/api-headless-cms/types";
 import { AcoContext } from "@webiny/api-aco/types";
 import { PbAcoContext } from "@webiny/api-page-builder-aco/types";
+import { Context as TasksContext } from "@webiny/tasks/types";
 
 // When working with the `context` object (for example while defining a new GraphQL resolver function),
 // you can import this interface and assign it to it. This will give you full autocomplete functionality
@@ -23,4 +24,5 @@ export interface Context
         CmsContext,
         FormBuilderContext,
         AcoContext,
+        TasksContext,
         PbAcoContext {}

apps/api/graphql/tsconfig.json

@@ -112,6 +112,12 @@
     },
     {
       "path": "../../../packages/api-apw-scheduler-so-ddb"
+    },
+    {
+      "path": "../../../packages/api-background-tasks-ddb/tsconfig.build.json"
+    },
+    {
+      "path": "../../../packages/tasks/tsconfig.build.json"
     }
   ],
   "compilerOptions": {
@@ -188,7 +194,11 @@
       "@webiny/handler-graphql/*": ["../../../packages/handler-graphql/src/*"],
       "@webiny/handler-graphql": ["../../../packages/handler-graphql/src"],
       "@webiny/handler-logs/*": ["../../../packages/handler-logs/src/*"],
-      "@webiny/handler-logs": ["../../../packages/handler-logs/src"]
+      "@webiny/handler-logs": ["../../../packages/handler-logs/src"],
+      "@webiny/api-background-tasks-ddb/*": ["../../../packages/api-background-tasks-ddb/src/*"],
+      "@webiny/api-background-tasks-ddb": ["../../../packages/api-background-tasks-ddb/src"],
+      "@webiny/tasks/*": ["../../../packages/tasks/src/*"],
+      "@webiny/tasks": ["../../../packages/tasks/src"]
     },
     "baseUrl": "."
   }