Folder Level Permissions

apps/api/graphql/package.json

@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "@webiny/api-aco": "0.0.0",
-    "@webiny/api-admin-users-cognito": "0.0.0",
-    "@webiny/api-admin-users-cognito-so-ddb": "0.0.0",
+    "@webiny/api-admin-users": "0.0.0",
+    "@webiny/api-admin-users-so-ddb": "0.0.0",
     "@webiny/api-apw": "0.0.0",
     "@webiny/api-apw-scheduler-so-ddb": "0.0.0",
     "@webiny/api-file-manager": "0.0.0",
@@ -50,8 +50,6 @@
   "adio": {
     "ignore": {
       "dependencies": [
-        "@webiny/api-admin-users-cognito",
-        "@webiny/api-admin-users-cognito-so-ddb",
         "@webiny/api-security-cognito",
         "@webiny/api-security-okta"
       ],

apps/api/graphql/src/security.ts

@@ -6,12 +6,11 @@ import { createStorageOperations as securityStorageOperations } from "@webiny/ap
 import { authenticateUsingHttpHeader } from "@webiny/api-security/plugins/authenticateUsingHttpHeader";
 import apiKeyAuthentication from "@webiny/api-security/plugins/apiKeyAuthentication";
 import apiKeyAuthorization from "@webiny/api-security/plugins/apiKeyAuthorization";
-import cognitoAuthentication from "@webiny/api-security-cognito";
+import cognitoAuthentication, { syncWithCognito } from "@webiny/api-security-cognito";
 import anonymousAuthorization from "@webiny/api-security/plugins/anonymousAuthorization";
 import tenantLinkAuthorization from "@webiny/api-security/plugins/tenantLinkAuthorization";
-import createAdminUsersApp from "@webiny/api-admin-users-cognito";
-import { syncWithCognito } from "@webiny/api-admin-users-cognito/syncWithCognito";
-import { createStorageOperations as createAdminUsersStorageOperations } from "@webiny/api-admin-users-cognito-so-ddb";
+import createAdminUsersApp from "@webiny/api-admin-users";
+import { createStorageOperations as createAdminUsersStorageOperations } from "@webiny/api-admin-users-so-ddb";
 
 export default ({ documentClient }: { documentClient: DocumentClient }) => [
     /**

apps/api/graphql/tsconfig.json

@@ -6,10 +6,10 @@
       "path": "../../../packages/api-aco/tsconfig.build.json"
     },
     {
-      "path": "../../../packages/api-admin-users-cognito/tsconfig.build.json"
+      "path": "../../../packages/api-admin-users/tsconfig.build.json"
     },
     {
-      "path": "../../../packages/api-admin-users-cognito-so-ddb/tsconfig.build.json"
+      "path": "../../../packages/api-admin-users-so-ddb/tsconfig.build.json"
     },
     {
       "path": "../../../packages/api-apw/tsconfig.build.json"
@@ -113,14 +113,8 @@
       "~/*": ["./src/*"],
       "@webiny/api-aco/*": ["../../../packages/api-aco/src/*"],
       "@webiny/api-aco": ["../../../packages/api-aco/src"],
-      "@webiny/api-admin-users-cognito/*": ["../../../packages/api-admin-users-cognito/src/*"],
-      "@webiny/api-admin-users-cognito": ["../../../packages/api-admin-users-cognito/src"],
-      "@webiny/api-admin-users-cognito-so-ddb/*": [
-        "../../../packages/api-admin-users-cognito-so-ddb/src/*"
-      ],
-      "@webiny/api-admin-users-cognito-so-ddb": [
-        "../../../packages/api-admin-users-cognito-so-ddb/src"
-      ],
+      "@webiny/api-admin-users-so-ddb/*": ["../../../packages/api-admin-users-so-ddb/src/*"],
+      "@webiny/api-admin-users-so-ddb": ["../../../packages/api-admin-users-so-ddb/src"],
       "@webiny/api-apw/*": ["../../../packages/api-apw/src/*"],
       "@webiny/api-apw": ["../../../packages/api-apw/src"],
       "@webiny/api-file-manager/*": ["../../../packages/api-file-manager/src/*"],

cypress/integration/admin/formBuilder/forms/publishAndUnpublishForm.spec.js

@@ -138,25 +138,12 @@ context("Forms Creation", () => {
                 });
         });
 
-        // Finally, delete the form and it's all revisions
-        for (let i = 0; i < 2; i++) {
-            cy.findByTestId("fb.form-preview.header.delete").click();
-            cy.wait(500);
-            cy.findByTestId("fb.form-preview.header.delete-dialog").within(() => {
-                cy.findByText("Confirmation required!").should("exist");
-                cy.findByTestId("confirmationdialog-confirm-action").click();
-            });
-            cy.findByText(/Revision was deleted successfully/i).should("exist");
-            cy.wait(500);
-        }
-
         cy.findByTestId("fb.form-preview.header.delete").click();
         cy.wait(500);
         cy.findByTestId("fb.form-preview.header.delete-dialog").within(() => {
             cy.findByText("Confirmation required!").should("exist");
             cy.findByTestId("confirmationdialog-confirm-action").click();
         });
         cy.findByText(/Form was deleted successfully/i).should("exist");
-        cy.wait(500);
     });
 });

cypress/integration/admin/headlessCms/contentModel/contentModels.spec.js

@@ -17,7 +17,9 @@ context("Headless CMS - Content Models CRUD", () => {
         // 2.3 Click save button
         cy.findByTestId("new-record-button").click();
         cy.findByTestId("cms-new-content-model-modal").within(() => {
-            cy.findByText("New Content Model").should("exist");
+            // Ensures we start typing once the content model group select is loaded.
+            // This is important because otherwise, typing into the first field would be partially lost.
+            cy.contains("Ungrouped").should("exist");
 
             cy.findByTestId("cms.newcontentmodeldialog.name")
                 .focus()
@@ -179,7 +181,9 @@ context("Headless CMS - Content Models CRUD", () => {
         // 2.3 Click save button
         cy.findByTestId("new-record-button").click();
         cy.findByTestId("cms-new-content-model-modal").within(() => {
-            cy.findByText("New Content Model").should("exist");
+            // Ensures we start typing once the content model group select is loaded.
+            // This is important because otherwise, typing into the first field would be partially lost.
+            cy.contains("Ungrouped").should("exist");
 
             cy.findByTestId("cms.newcontentmodeldialog.name")
                 .focus()