Skip to content

Commit

Permalink
feat: introduce Folder Level Permissons (#3610)
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrians5j
adrians5j authored Oct 20, 2023
1 parent 3c042ff commit 3744546
Show file tree
Hide file tree
Showing 168 changed files with 6,662 additions and 1,456 deletions.
6 changes: 2 additions & 4 deletions apps/api/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
],
Expand Down
7 changes: 3 additions & 4 deletions apps/api/graphql/src/security.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => [
/**
Expand Down
14 changes: 4 additions & 10 deletions apps/api/graphql/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/*"],
Expand Down
13 changes: 0 additions & 13 deletions cypress/integration/admin/formBuilder/forms/publishAndUnpublishForm.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
8 changes: 6 additions & 2 deletions cypress/integration/admin/headlessCms/contentModel/contentModels.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
Loading

0 comments on commit 3744546

Please sign in to comment.