Merge remote-tracking branch 'refs/remotes/origin/next' into adrian/p…

…lugin-scaffolds

.github/workflows/pullRequests.yml

@@ -177,7 +177,7 @@ jobs:
           - 18
         package: >-
           ${{
-          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-locking-mechanism","id":"api-locking-mechanism"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
+          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-record-locking","id":"api-record-locking"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
           }}
     runs-on: ${{ matrix.os }}
     env:

.github/workflows/pushDev.yml

@@ -143,7 +143,7 @@ jobs:
           - 18
         package: >-
           ${{
-          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-locking-mechanism","id":"api-locking-mechanism"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
+          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-record-locking","id":"api-record-locking"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
           }}
     runs-on: ${{ matrix.os }}
     env:

.github/workflows/pushNext.yml

@@ -143,7 +143,7 @@ jobs:
           - 18
         package: >-
           ${{
-          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-locking-mechanism","id":"api-locking-mechanism"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
+          fromJson('[{"cmd":"packages/api","id":"api"},{"cmd":"packages/api-admin-settings","id":"api-admin-settings"},{"cmd":"packages/api-authentication","id":"api-authentication"},{"cmd":"packages/api-authentication-cognito","id":"api-authentication-cognito"},{"cmd":"packages/api-dynamodb-to-elasticsearch","id":"api-dynamodb-to-elasticsearch"},{"cmd":"packages/api-headless-cms-ddb","id":"api-headless-cms-ddb"},{"cmd":"packages/api-record-locking","id":"api-record-locking"},{"cmd":"packages/api-wcp","id":"api-wcp"},{"cmd":"packages/api-websockets","id":"api-websockets"},{"cmd":"packages/app-aco","id":"app-aco"},{"cmd":"packages/app-admin","id":"app-admin"},{"cmd":"packages/cwp-template-aws","id":"cwp-template-aws"},{"cmd":"packages/data-migration","id":"data-migration"},{"cmd":"packages/db-dynamodb","id":"db-dynamodb"},{"cmd":"packages/form","id":"form"},{"cmd":"packages/handler","id":"handler"},{"cmd":"packages/handler-aws","id":"handler-aws"},{"cmd":"packages/handler-graphql","id":"handler-graphql"},{"cmd":"packages/handler-logs","id":"handler-logs"},{"cmd":"packages/ioc","id":"ioc"},{"cmd":"packages/lexical-converter","id":"lexical-converter"},{"cmd":"packages/plugins","id":"plugins"},{"cmd":"packages/pubsub","id":"pubsub"},{"cmd":"packages/react-composition","id":"react-composition"},{"cmd":"packages/react-properties","id":"react-properties"},{"cmd":"packages/react-rich-text-lexical-renderer","id":"react-rich-text-lexical-renderer"},{"cmd":"packages/utils","id":"utils"},{"cmd":"packages/validation","id":"validation"}]')
           }}
     runs-on: ${{ matrix.os }}
     env:

.gitignore

@@ -26,6 +26,7 @@ apps/**/build/
 cypress.json
 cypress.config.ts
 cypress/screenshots/*
+cypress-tests/cypress/screenshots/*
 .pulumi
 Pulumi.*
 !Pulumi.yaml

apps/admin/package.json

@@ -7,7 +7,7 @@
     "@editorjs/list": "^1.6.0",
     "@editorjs/quote": "^2.4.0",
     "@editorjs/underline": "^1.0.0",
-    "@types/react": "17.0.39",
+    "@types/react": "18.2.65",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-admin-users-cognito": "0.0.0",
     "@webiny/app-form-builder": "0.0.0",
@@ -22,8 +22,8 @@
     "core-js": "^3.0.1",
     "cross-fetch": "^3.0.4",
     "prop-types": "^15.7.2",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "regenerator-runtime": "^0.13.5",
     "theme": "^0.1.0",
     "tslib": "^2.4.0"

apps/admin/src/index.tsx

@@ -1,10 +1,10 @@
+import React from "react";
 import "cross-fetch/polyfill";
 import "core-js/stable";
 import "regenerator-runtime/runtime";
-import React from "react";
-import ReactDOM from "react-dom";
 import { App } from "./App";
 import "./plugins";
 
-const render = module.hot ? ReactDOM.render : ReactDOM.hydrate;
-render(<App />, document.getElementById("root"));
+import { renderApp } from "@webiny/app-admin";
+
+renderApp(<App />);

apps/api/graphql/package.json

@@ -25,14 +25,14 @@
     "@webiny/api-i18n": "0.0.0",
     "@webiny/api-i18n-content": "0.0.0",
     "@webiny/api-i18n-ddb": "0.0.0",
-    "@webiny/api-locking-mechanism": "0.0.0",
     "@webiny/api-page-builder": "0.0.0",
     "@webiny/api-page-builder-aco": "0.0.0",
     "@webiny/api-page-builder-import-export": "0.0.0",
     "@webiny/api-page-builder-import-export-so-ddb": "0.0.0",
     "@webiny/api-page-builder-so-ddb": "0.0.0",
     "@webiny/api-prerendering-service": "0.0.0",
     "@webiny/api-prerendering-service-aws": "0.0.0",
+    "@webiny/api-record-locking": "0.0.0",
     "@webiny/api-security": "0.0.0",
     "@webiny/api-security-cognito": "0.0.0",
     "@webiny/api-security-so-ddb": "0.0.0",

apps/api/graphql/src/index.ts

@@ -42,7 +42,7 @@ import { createBenchmarkEnablePlugin } from "~/plugins/benchmarkEnable";
 import { createCountDynamoDbTask } from "~/plugins/countDynamoDbTask";
 import { createContinuingTask } from "~/plugins/continuingTask";
 import { createWebsockets } from "@webiny/api-websockets";
-import { createLockingMechanism } from "@webiny/api-locking-mechanism";
+import { createRecordLocking } from "@webiny/api-record-locking";
 
 import scaffoldsPlugins from "./plugins/scaffolds";
 import { extensions } from "./extensions";
@@ -73,7 +73,7 @@ export const handler = createHandler({
             })
         }),
         createHeadlessCmsGraphQL(),
-        createLockingMechanism(),
+        createRecordLocking(),
         createBackgroundTasks(),
         createFileManagerContext({
             storageOperations: createFileManagerStorageOperations({

apps/api/graphql/tsconfig.json

@@ -18,7 +18,7 @@
       "path": "../../../packages/api-audit-logs/tsconfig.build.json"
     },
     {
-      "path": "../../../packages/api-locking-mechanism/tsconfig.build.json"
+      "path": "../../../packages/api-record-locking/tsconfig.build.json"
     },
     {
       "path": "../../../packages/api-file-manager/tsconfig.build.json"
@@ -156,8 +156,8 @@
       "@webiny/api-headless-cms-aco": ["../../../packages/api-headless-cms-aco/src"],
       "@webiny/api-headless-cms-ddb/*": ["../../../packages/api-headless-cms-ddb/src/*"],
       "@webiny/api-headless-cms-ddb": ["../../../packages/api-headless-cms-ddb/src"],
-      "@webiny/api-locking-mechanism/*": ["../../../packages/api-locking-mechanism/src/*"],
-      "@webiny/api-locking-mechanism": ["../../../packages/api-locking-mechanism/src"],
+      "@webiny/api-record-locking/*": ["../../../packages/api-record-locking/src/*"],
+      "@webiny/api-record-locking": ["../../../packages/api-record-locking/src"],
       "@webiny/api-headless-cms-tasks/*": ["../../../packages/api-headless-cms-tasks/src/*"],
       "@webiny/api-headless-cms-tasks": ["../../../packages/api-headless-cms-tasks/src"],
       "@webiny/api-i18n/*": ["../../../packages/api-i18n/src/*"],

apps/website/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.10.6",
-    "@types/react": "17.0.39",
+    "@types/react": "18.2.65",
     "@webiny/app": "0.0.0",
     "@webiny/app-form-builder": "0.0.0",
     "@webiny/app-page-builder": "0.0.0",
@@ -20,8 +20,8 @@
     "cross-fetch": "^3.0.4",
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "regenerator-runtime": "^0.13.5",
     "theme": "^0.1.0"
   },

apps/website/src/index.tsx

@@ -1,11 +1,11 @@
+import React from "react";
 import "cross-fetch/polyfill";
 import "core-js/stable";
 import "regenerator-runtime/runtime";
-import React from "react";
-import ReactDOM from "react-dom";
 import { App } from "./App";
 import "./plugins";
 import "theme/global.scss";
 
-const render = module.hot ? ReactDOM.render : ReactDOM.hydrate;
-render(<App />, document.getElementById("root"));
+import { renderApp } from "@webiny/app";
+
+renderApp(<App />);

cypress-tests/cypress/e2e/admin/formBuilder/forms/createForm.cy.ts

@@ -52,7 +52,9 @@ context("Forms Creation", () => {
                     .first()
                     .within(() => {
                         cy.findByText(newFormTitle2).should("be.visible");
-                        cy.findByTestId("edit-form-action").click({ force: true });
+                        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+                        // Now targeting <button> directly. Revert to `.findByTestId("edit-form-action")` if issue is fixed.
+                        cy.get('button[data-testid="edit-form-action"]').click({ force: true });
                     });
             });
 
@@ -88,7 +90,9 @@ context("Forms Creation", () => {
                 cy.findAllByTestId("default-data-list-element")
                     .first()
                     .within(() => {
-                        cy.findByTestId("delete-form-action").click({ force: true });
+                        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+                        // Now targeting <button> directly. Revert to `.findByTestId("delete-form-action")` if issue is fixed.
+                        cy.get('button[data-testid="delete-form-action"]').click({ force: true });
                     });
             });
 

cypress-tests/cypress/e2e/admin/formBuilder/forms/publishAndUnpublishForm.cy.js

@@ -43,7 +43,9 @@ context("Forms Creation", () => {
         });
 
         // 4. UnPublish the form
-        cy.findByTestId("fb.form-preview.header.unpublish").click();
+        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+        // Now targeting <button> directly. Revert to `.findByTestId("fb.form-preview.header.unpublish")` if issue is fixed.
+        cy.get('button[data-testid="fb.form-preview.header.unpublish"]').click();
         cy.findByTestId("fb.form-preview.header.unpublish-dialog").within(() => {
             cy.findByTestId("confirmationdialog-confirm-action").click();
         });
@@ -60,7 +62,9 @@ context("Forms Creation", () => {
         });
 
         // 5. Create a new revision from the locked v1 and publish it
-        cy.findByTestId("fb.form-preview.header.create-revision").click();
+        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+        // Now targeting <button> directly. Revert to `.findByTestId("fb.form-preview.header.create-revision")` if issue is fixed.
+        cy.get('button[data-testid="fb.form-preview.header.create-revision"]').click();
         cy.wait(500);
         // 5.1. Add "Website" field to the form
         cy.findByTestId("form-editor-field-group-contact").click();
@@ -126,7 +130,9 @@ context("Forms Creation", () => {
         cy.findAllByTestId("fb.form-revisions.action-menu.create-revision").last().click();
         cy.wait(1000);
         // 8. Go back in form details view and check it's status
-        cy.findByTestId("fb-editor-back-button").click();
+        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+        // Now targeting <button> directly. Revert to `.findByTestId("fb-editor-back-button")` if issue is fixed.
+        cy.get('button[data-testid="fb-editor-back-button"]').click();
         cy.wait(1000);
 
         cy.findByTestId("default-data-list").within(() => {
@@ -140,7 +146,9 @@ context("Forms Creation", () => {
         });
 
         // Delete form.
-        cy.findByTestId("fb.form-preview.header.delete").click();
+        // Workaround for "@rmwc/icon-button" v14 issue: props duplication onto <i>, causing multiple elements with same `data-testid`.
+        // Now targeting <button> directly. Revert to `.findByTestId("fb.form-preview.header.delete")` if issue is fixed.
+        cy.get('button[data-testid="fb.form-preview.header.delete"]').click();
         cy.wait(500);
         cy.findByTestId("fb.form-preview.header.delete-dialog").within(() => {
             cy.findByText("Confirmation required!").should("exist");