@webiny/app-aco 6.4.11 → 6.6.0-alpha.1

package/domain/folder/Folder.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/folder/Folder.js","sources":["../../../src/domain/folder/Folder.ts"],"sourcesContent":["import type { CmsIdentity, FolderPermission } from \"~/types.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\n\nexport interface FolderData {\n    id?: string;\n    title: string;\n    slug: string;\n    type: string;\n    parentId: string | null;\n    path?: string;\n    permissions: FolderPermission[];\n    hasNonInheritedPermissions?: boolean;\n    canManagePermissions?: boolean;\n    canManageStructure?: boolean;\n    canManageContent?: boolean;\n    createdBy?: CmsIdentity;\n    createdOn?: string;\n    savedBy?: CmsIdentity;\n    savedOn?: string;\n    modifiedBy?: CmsIdentity | null;\n    modifiedOn?: string | null;\n    extensions?: Record<string, any>;\n}\n\nexport class Folder {\n    public id: string;\n    public title: string;\n    public slug: string;\n    public type: string;\n    public parentId: string | null;\n    public path: string;\n    public permissions: FolderPermission[];\n    public hasNonInheritedPermissions?: boolean;\n    public canManagePermissions?: boolean;\n    public canManageStructure?: boolean;\n    public canManageContent?: boolean;\n    public createdBy?: CmsIdentity;\n    public createdOn?: string;\n    public savedBy?: CmsIdentity;\n    public savedOn?: string;\n    public modifiedBy?: CmsIdentity | null;\n    public modifiedOn?: string | null;\n    public extensions: Record<string, any>;\n\n    protected constructor(folder: FolderData) {\n        this.id = folder.id ?? \"\";\n        this.title = folder.title;\n        this.slug = folder.slug;\n        this.type = folder.type;\n        this.parentId = folder.parentId;\n        this.path = folder.path ?? `${ROOT_FOLDER}/${folder.slug}`;\n        this.permissions = folder.permissions;\n        this.hasNonInheritedPermissions = folder.hasNonInheritedPermissions;\n        this.canManagePermissions = folder.canManagePermissions;\n        this.canManageStructure = folder.canManageStructure;\n        this.canManageContent = folder.canManageContent;\n        this.createdBy = folder.createdBy;\n        this.createdOn = folder.createdOn;\n        this.savedBy = folder.savedBy;\n        this.savedOn = folder.savedOn;\n        this.modifiedBy = folder.modifiedBy;\n        this.modifiedOn = folder.modifiedOn;\n        this.extensions = folder.extensions ?? {};\n    }\n\n    static create(folder: FolderData) {\n        return new Folder(folder);\n    }\n}\n"],"names":["Folder","folder","ROOT_FOLDER"],"mappings":";AAwBO,MAAMA;IAoBT,YAAsBC,MAAkB,CAAE;QACtC,IAAI,CAAC,EAAE,GAAGA,OAAO,EAAE,IAAI;QACvB,IAAI,CAAC,KAAK,GAAGA,OAAO,KAAK;QACzB,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI;QACvB,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI;QACvB,IAAI,CAAC,QAAQ,GAAGA,OAAO,QAAQ;QAC/B,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI,IAAI,GAAGC,YAAY,CAAC,EAAED,OAAO,IAAI,EAAE;QAC1D,IAAI,CAAC,WAAW,GAAGA,OAAO,WAAW;QACrC,IAAI,CAAC,0BAA0B,GAAGA,OAAO,0BAA0B;QACnE,IAAI,CAAC,oBAAoB,GAAGA,OAAO,oBAAoB;QACvD,IAAI,CAAC,kBAAkB,GAAGA,OAAO,kBAAkB;QACnD,IAAI,CAAC,gBAAgB,GAAGA,OAAO,gBAAgB;QAC/C,IAAI,CAAC,SAAS,GAAGA,OAAO,SAAS;QACjC,IAAI,CAAC,SAAS,GAAGA,OAAO,SAAS;QACjC,IAAI,CAAC,OAAO,GAAGA,OAAO,OAAO;QAC7B,IAAI,CAAC,OAAO,GAAGA,OAAO,OAAO;QAC7B,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU;QACnC,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU;QACnC,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU,IAAI,CAAC;IAC5C;IAEA,OAAO,OAAOA,MAAkB,EAAE;QAC9B,OAAO,IAAID,OAAOC;IACtB;AACJ"}
+{"version":3,"file":"domain/folder/Folder.js","sources":["../../../src/domain/folder/Folder.ts"],"sourcesContent":["import type { FolderPermission } from \"~/types.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\nimport type { CmsIdentity } from \"~/types.js\";\n\nexport interface FolderData {\n    id?: string;\n    title: string;\n    slug: string;\n    type: string;\n    parentId: string | null;\n    path?: string;\n    permissions: FolderPermission[];\n    hasNonInheritedPermissions?: boolean;\n    canManagePermissions?: boolean;\n    canManageStructure?: boolean;\n    canManageContent?: boolean;\n    createdBy?: CmsIdentity;\n    createdOn?: string;\n    savedBy?: CmsIdentity;\n    savedOn?: string;\n    modifiedBy?: CmsIdentity | null;\n    modifiedOn?: string | null;\n    extensions?: Record<string, any>;\n}\n\nexport class Folder {\n    public id: string;\n    public title: string;\n    public slug: string;\n    public type: string;\n    public parentId: string | null;\n    public path: string;\n    public permissions: FolderPermission[];\n    public hasNonInheritedPermissions?: boolean;\n    public canManagePermissions?: boolean;\n    public canManageStructure?: boolean;\n    public canManageContent?: boolean;\n    public createdBy?: CmsIdentity;\n    public createdOn?: string;\n    public savedBy?: CmsIdentity;\n    public savedOn?: string;\n    public modifiedBy?: CmsIdentity | null;\n    public modifiedOn?: string | null;\n    public extensions: Record<string, any>;\n\n    protected constructor(folder: FolderData) {\n        this.id = folder.id ?? \"\";\n        this.title = folder.title;\n        this.slug = folder.slug;\n        this.type = folder.type;\n        this.parentId = folder.parentId;\n        this.path = folder.path ?? `${ROOT_FOLDER}/${folder.slug}`;\n        this.permissions = folder.permissions;\n        this.hasNonInheritedPermissions = folder.hasNonInheritedPermissions;\n        this.canManagePermissions = folder.canManagePermissions;\n        this.canManageStructure = folder.canManageStructure;\n        this.canManageContent = folder.canManageContent;\n        this.createdBy = folder.createdBy;\n        this.createdOn = folder.createdOn;\n        this.savedBy = folder.savedBy;\n        this.savedOn = folder.savedOn;\n        this.modifiedBy = folder.modifiedBy;\n        this.modifiedOn = folder.modifiedOn;\n        this.extensions = folder.extensions ?? {};\n    }\n\n    static create(folder: FolderData) {\n        return new Folder(folder);\n    }\n}\n"],"names":["Folder","folder","ROOT_FOLDER"],"mappings":";AAyBO,MAAMA;IAoBT,YAAsBC,MAAkB,CAAE;QACtC,IAAI,CAAC,EAAE,GAAGA,OAAO,EAAE,IAAI;QACvB,IAAI,CAAC,KAAK,GAAGA,OAAO,KAAK;QACzB,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI;QACvB,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI;QACvB,IAAI,CAAC,QAAQ,GAAGA,OAAO,QAAQ;QAC/B,IAAI,CAAC,IAAI,GAAGA,OAAO,IAAI,IAAI,GAAGC,YAAY,CAAC,EAAED,OAAO,IAAI,EAAE;QAC1D,IAAI,CAAC,WAAW,GAAGA,OAAO,WAAW;QACrC,IAAI,CAAC,0BAA0B,GAAGA,OAAO,0BAA0B;QACnE,IAAI,CAAC,oBAAoB,GAAGA,OAAO,oBAAoB;QACvD,IAAI,CAAC,kBAAkB,GAAGA,OAAO,kBAAkB;QACnD,IAAI,CAAC,gBAAgB,GAAGA,OAAO,gBAAgB;QAC/C,IAAI,CAAC,SAAS,GAAGA,OAAO,SAAS;QACjC,IAAI,CAAC,SAAS,GAAGA,OAAO,SAAS;QACjC,IAAI,CAAC,OAAO,GAAGA,OAAO,OAAO;QAC7B,IAAI,CAAC,OAAO,GAAGA,OAAO,OAAO;QAC7B,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU;QACnC,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU;QACnC,IAAI,CAAC,UAAU,GAAGA,OAAO,UAAU,IAAI,CAAC;IAC5C;IAEA,OAAO,OAAOA,MAAkB,EAAE;QAC9B,OAAO,IAAID,OAAOC;IACtB;AACJ"}

package/features/folders/createFolder/CreateFolderGqlGateway.d.ts

@@ -1,4 +1,4 @@
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import type { FolderDto } from "../../../domain/folder/FolderDto.js";
 import { FolderModelProvider } from "../../../features/folders/abstractions.js";
 import type { FolderGatewayDto } from "./abstractions.js";
@@ -15,11 +15,11 @@ export interface CreateFolderResponse {
 export interface CreateFolderVariables {
     data: Omit<FolderDto, "id" | "path" | "createdOn" | "createdBy" | "savedOn" | "savedBy" | "modifiedOn" | "modifiedBy" | "hasNonInheritedPermissions" | "canManageContent" | "canManagePermissions" | "canManageStructure">;
 }
-export declare const CREATE_FOLDER: (FOLDER_FIELDS: string) => import("graphql").DocumentNode;
+export declare const CREATE_FOLDER: (FOLDER_FIELDS: string) => string;
 declare class CreateFolderGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
     private folderModelProvider;
-    constructor(client: ApolloClient.Interface, folderModelProvider: FolderModelProvider.Interface);
+    constructor(client: MainGraphQLClient.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(folder: FolderGatewayDto): Promise<FolderDto>;
 }
 export declare const CreateFolderGqlGateway: typeof CreateFolderGqlGatewayImpl & {

package/features/folders/createFolder/CreateFolderGqlGateway.js

@@ -1,21 +1,20 @@
-import graphql_tag from "graphql-tag";
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { FolderModelProvider } from "../abstractions.js";
 import { CreateFolderGateway } from "./abstractions.js";
-const CREATE_FOLDER = (FOLDER_FIELDS)=>graphql_tag`
-        mutation CreateFolder($data: FolderCreateInput!) {
-            aco {
-                createFolder(data: $data) {
-                    data ${FOLDER_FIELDS}
-                    error {
-                        code
-                        data
-                        message
-                    }
+const CREATE_FOLDER = (FOLDER_FIELDS)=>`
+    mutation CreateFolder($data: FolderCreateInput!) {
+        aco {
+            createFolder(data: $data) {
+                data ${FOLDER_FIELDS}
+                error {
+                    code
+                    data
+                    message
                 }
             }
         }
-    `;
+    }
+`;
 class CreateFolderGqlGatewayImpl {
     constructor(client, folderModelProvider){
         this.client = client;
@@ -23,8 +22,8 @@ class CreateFolderGqlGatewayImpl {
     }
     async execute(folder) {
         const fields = await this.folderModelProvider.getGraphQLSelection();
-        const { data: response } = await this.client.mutate({
-            mutation: CREATE_FOLDER(fields),
+        const response = await this.client.execute({
+            query: CREATE_FOLDER(fields),
             variables: {
                 data: {
                     ...folder
@@ -40,7 +39,7 @@ class CreateFolderGqlGatewayImpl {
 const CreateFolderGqlGateway = CreateFolderGateway.createImplementation({
     implementation: CreateFolderGqlGatewayImpl,
     dependencies: [
-        ApolloClient,
+        MainGraphQLClient,
         FolderModelProvider
     ]
 });

package/features/folders/createFolder/CreateFolderGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/createFolder/CreateFolderGqlGateway.js","sources":["../../../../src/features/folders/createFolder/CreateFolderGqlGateway.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { ApolloClient } from \"@webiny/app-admin/features/apolloClient/abstraction.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport type { FolderGatewayDto } from \"./abstractions.js\";\nimport { CreateFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface CreateFolderResponse {\n    aco: {\n        createFolder: {\n            data: FolderDto;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface CreateFolderVariables {\n    data: Omit<\n        FolderDto,\n        | \"id\"\n        | \"path\"\n        | \"createdOn\"\n        | \"createdBy\"\n        | \"savedOn\"\n        | \"savedBy\"\n        | \"modifiedOn\"\n        | \"modifiedBy\"\n        | \"hasNonInheritedPermissions\"\n        | \"canManageContent\"\n        | \"canManagePermissions\"\n        | \"canManageStructure\"\n    >;\n}\n\nexport const CREATE_FOLDER = (FOLDER_FIELDS: string) => gql`\n        mutation CreateFolder($data: FolderCreateInput!) {\n            aco {\n                createFolder(data: $data) {\n                    data ${FOLDER_FIELDS}\n                    error {\n                        code\n                        data\n                        message\n                    }\n                }\n            }\n        }\n    `;\n\nclass CreateFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: ApolloClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(folder: FolderGatewayDto) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const { data: response } = await this.client.mutate<\n            CreateFolderResponse,\n            CreateFolderVariables\n        >({\n            mutation: CREATE_FOLDER(fields),\n            variables: {\n                data: {\n                    ...folder\n                }\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while creating folder.\");\n        }\n\n        const { data, error } = response.aco.createFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not create folder\");\n        }\n\n        return data;\n    }\n}\n\nexport const CreateFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: CreateFolderGqlGatewayImpl,\n    dependencies: [ApolloClient, FolderModelProvider]\n});\n"],"names":["CREATE_FOLDER","FOLDER_FIELDS","gql","CreateFolderGqlGatewayImpl","client","folderModelProvider","folder","fields","response","Error","data","error","CreateFolderGqlGateway","GatewayAbstraction","ApolloClient","FolderModelProvider"],"mappings":";;;;AAmCO,MAAMA,gBAAgB,CAACC,gBAA0BC,WAAG,CAAC;;;;yBAInC,EAAED,cAAc;;;;;;;;;IASrC,CAAC;AAEL,MAAME;IACF,YACYC,MAA8B,EAC9BC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,MAAwB,EAAE;QACpC,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAM,EAAE,MAAMC,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAGjD;YACE,UAAUR,cAAcO;YACxB,WAAW;gBACP,MAAM;oBACF,GAAGD,MAAM;gBACb;YACJ;QACJ;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBV;IAChB,cAAc;QAACW;QAAcC;KAAoB;AACrD"}
+{"version":3,"file":"features/folders/createFolder/CreateFolderGqlGateway.js","sources":["../../../../src/features/folders/createFolder/CreateFolderGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport type { FolderGatewayDto } from \"./abstractions.js\";\nimport { CreateFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface CreateFolderResponse {\n    aco: {\n        createFolder: {\n            data: FolderDto;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface CreateFolderVariables {\n    data: Omit<\n        FolderDto,\n        | \"id\"\n        | \"path\"\n        | \"createdOn\"\n        | \"createdBy\"\n        | \"savedOn\"\n        | \"savedBy\"\n        | \"modifiedOn\"\n        | \"modifiedBy\"\n        | \"hasNonInheritedPermissions\"\n        | \"canManageContent\"\n        | \"canManagePermissions\"\n        | \"canManageStructure\"\n    >;\n}\n\nexport const CREATE_FOLDER = (FOLDER_FIELDS: string) => /* GraphQL */ `\n    mutation CreateFolder($data: FolderCreateInput!) {\n        aco {\n            createFolder(data: $data) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass CreateFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: MainGraphQLClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(folder: FolderGatewayDto) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const response = await this.client.execute<CreateFolderResponse, CreateFolderVariables>({\n            query: CREATE_FOLDER(fields),\n            variables: {\n                data: {\n                    ...folder\n                }\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while creating folder.\");\n        }\n\n        const { data, error } = response.aco.createFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not create folder\");\n        }\n\n        return data;\n    }\n}\n\nexport const CreateFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: CreateFolderGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["CREATE_FOLDER","FOLDER_FIELDS","CreateFolderGqlGatewayImpl","client","folderModelProvider","folder","fields","response","Error","data","error","CreateFolderGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;AAkCO,MAAMA,gBAAgB,CAACC,gBAAwC,CAAC;;;;qBAIlD,EAAEA,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAMC;IACF,YACYC,MAAmC,EACnCC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,MAAwB,EAAE;QACpC,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA8C;YACpF,OAAOP,cAAcM;YACrB,WAAW;gBACP,MAAM;oBACF,GAAGD,MAAM;gBACb;YACJ;QACJ;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBV;IAChB,cAAc;QAACW;QAAmBC;KAAoB;AAC1D"}

package/features/folders/deleteFolder/DeleteFolderGqlGateway.d.ts

@@ -1,4 +1,4 @@
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { DeleteFolderGateway as GatewayAbstraction } from "./abstractions.js";
 import type { AcoError } from "../../../types.js";
 export interface DeleteFolderVariables {
@@ -12,10 +12,10 @@ export interface DeleteFolderResponse {
         };
     };
 }
-export declare const DELETE_FOLDER: import("graphql").DocumentNode;
+export declare const DELETE_FOLDER = "\n    mutation DeleteFolder($id: ID!) {\n        aco {\n            deleteFolder(id: $id) {\n                data\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n";
 declare class DeleteFolderGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
-    constructor(client: ApolloClient.Interface);
+    constructor(client: MainGraphQLClient.Interface);
     execute(id: string): Promise<void>;
 }
 export declare const DeleteFolderGqlGateway: typeof DeleteFolderGqlGatewayImpl & {

package/features/folders/deleteFolder/DeleteFolderGqlGateway.js

@@ -1,7 +1,6 @@
-import graphql_tag from "graphql-tag";
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { DeleteFolderGateway } from "./abstractions.js";
-const DELETE_FOLDER = graphql_tag`
+const DELETE_FOLDER = `
     mutation DeleteFolder($id: ID!) {
         aco {
             deleteFolder(id: $id) {
@@ -20,8 +19,8 @@ class DeleteFolderGqlGatewayImpl {
         this.client = client;
     }
     async execute(id) {
-        const { data: response } = await this.client.mutate({
-            mutation: DELETE_FOLDER,
+        const response = await this.client.execute({
+            query: DELETE_FOLDER,
             variables: {
                 id
             }
@@ -34,7 +33,7 @@ class DeleteFolderGqlGatewayImpl {
 const DeleteFolderGqlGateway = DeleteFolderGateway.createImplementation({
     implementation: DeleteFolderGqlGatewayImpl,
     dependencies: [
-        ApolloClient
+        MainGraphQLClient
     ]
 });
 export { DELETE_FOLDER, DeleteFolderGqlGateway };

package/features/folders/deleteFolder/DeleteFolderGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/deleteFolder/DeleteFolderGqlGateway.js","sources":["../../../../src/features/folders/deleteFolder/DeleteFolderGqlGateway.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { ApolloClient } from \"@webiny/app-admin/features/apolloClient/abstraction.js\";\nimport { DeleteFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface DeleteFolderVariables {\n    id: string;\n}\n\nexport interface DeleteFolderResponse {\n    aco: {\n        deleteFolder: {\n            data: boolean;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport const DELETE_FOLDER = gql`\n    mutation DeleteFolder($id: ID!) {\n        aco {\n            deleteFolder(id: $id) {\n                data\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass DeleteFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: ApolloClient.Interface) {}\n\n    async execute(id: string) {\n        const { data: response } = await this.client.mutate<\n            DeleteFolderResponse,\n            DeleteFolderVariables\n        >({\n            mutation: DELETE_FOLDER,\n            variables: {\n                id\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while deleting folder\");\n        }\n\n        const { data, error } = response.aco.deleteFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not delete folder\");\n        }\n\n        return;\n    }\n}\n\nexport const DeleteFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: DeleteFolderGqlGatewayImpl,\n    dependencies: [ApolloClient]\n});\n"],"names":["DELETE_FOLDER","gql","DeleteFolderGqlGatewayImpl","client","id","response","Error","data","error","DeleteFolderGqlGateway","GatewayAbstraction","ApolloClient"],"mappings":";;;AAkBO,MAAMA,gBAAgBC,WAAG,CAAC;;;;;;;;;;;;;AAajC,CAAC;AAED,MAAMC;IACF,YAAoBC,MAA8B,CAAE;aAAhCA,MAAM,GAANA;IAAiC;IAErD,MAAM,QAAQC,EAAU,EAAE;QACtB,MAAM,EAAE,MAAMC,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAGjD;YACE,UAAUL;YACV,WAAW;gBACPI;YACJ;QACJ;QAEA,IAAI,CAACC,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;IAI1C;AACJ;AAEO,MAAMC,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBR;IAChB,cAAc;QAACS;KAAa;AAChC"}
+{"version":3,"file":"features/folders/deleteFolder/DeleteFolderGqlGateway.js","sources":["../../../../src/features/folders/deleteFolder/DeleteFolderGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport { DeleteFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface DeleteFolderVariables {\n    id: string;\n}\n\nexport interface DeleteFolderResponse {\n    aco: {\n        deleteFolder: {\n            data: boolean;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport const DELETE_FOLDER = /* GraphQL */ `\n    mutation DeleteFolder($id: ID!) {\n        aco {\n            deleteFolder(id: $id) {\n                data\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass DeleteFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: MainGraphQLClient.Interface) {}\n\n    async execute(id: string) {\n        const response = await this.client.execute<DeleteFolderResponse, DeleteFolderVariables>({\n            query: DELETE_FOLDER,\n            variables: {\n                id\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while deleting folder\");\n        }\n\n        const { data, error } = response.aco.deleteFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not delete folder\");\n        }\n\n        return;\n    }\n}\n\nexport const DeleteFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: DeleteFolderGqlGatewayImpl,\n    dependencies: [MainGraphQLClient]\n});\n"],"names":["DELETE_FOLDER","DeleteFolderGqlGatewayImpl","client","id","response","Error","data","error","DeleteFolderGqlGateway","GatewayAbstraction","MainGraphQLClient"],"mappings":";;AAiBO,MAAMA,gBAA8B,CAAC;;;;;;;;;;;;;AAa5C,CAAC;AAED,MAAMC;IACF,YAAoBC,MAAmC,CAAE;aAArCA,MAAM,GAANA;IAAsC;IAE1D,MAAM,QAAQC,EAAU,EAAE;QACtB,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA8C;YACpF,OAAOJ;YACP,WAAW;gBACPG;YACJ;QACJ;QAEA,IAAI,CAACC,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;IAI1C;AACJ;AAEO,MAAMC,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBR;IAChB,cAAc;QAACS;KAAkB;AACrC"}

package/features/folders/folderModelProvider/FolderModelProvider.js

@@ -1,4 +1,3 @@
-import { createFieldsList } from "@webiny/app-headless-cms-common";
 import { GetFolderModelRepository } from "./abstractions.js";
 import { FolderModelProvider } from "../abstractions.js";
 class FolderModelProviderImpl {
@@ -13,38 +12,37 @@ class FolderModelProviderImpl {
     }
     async getGraphQLSelection() {
         const model = await this.getModel();
-        const fields = createFieldsList({
-            model,
-            fields: model.fields
-        });
-        return `{
-            id
-            createdOn
-            createdBy {
+        const valuesBlock = model.valuesSelection && "_empty" !== model.valuesSelection ? model.valuesSelection : "";
+        return `
+            {
                 id
-                displayName
+                createdOn
+                createdBy {
+                    id
+                    displayName
+                }
+                savedOn
+                savedBy {
+                    id
+                    displayName
+                }
+                modifiedOn
+                modifiedBy {
+                    id
+                    displayName
+                }
+                permissions {
+                    target
+                    level
+                    inheritedFrom
+                }
+                hasNonInheritedPermissions
+                canManagePermissions
+                canManageStructure
+                canManageContent
+                ${valuesBlock}
             }
-            savedOn
-            savedBy {
-                id
-                displayName
-            }
-            modifiedOn
-            modifiedBy {
-                id
-                displayName
-            }
-            permissions {
-                target
-                level
-                inheritedFrom
-            }
-            hasNonInheritedPermissions
-            canManagePermissions
-            canManageStructure
-            canManageContent
-            ${fields}
-        }`;
+        `;
     }
 }
 const FolderModelProvider_FolderModelProvider = FolderModelProvider.createImplementation({

package/features/folders/folderModelProvider/FolderModelProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/folderModelProvider/FolderModelProvider.js","sources":["../../../../src/features/folders/folderModelProvider/FolderModelProvider.ts"],"sourcesContent":["import { createFieldsList } from \"@webiny/app-headless-cms-common\";\nimport type { CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport { GetFolderModelRepository } from \"./abstractions.js\";\nimport { FolderModelProvider as Provider } from \"~/features/folders/abstractions.js\";\n\nclass FolderModelProviderImpl implements Provider.Interface {\n    constructor(private repository: GetFolderModelRepository.Interface) {}\n\n    async getModel(): Promise<CmsModel> {\n        await this.repository.load();\n\n        const model = this.repository.getModel();\n        if (!model) {\n            // Something went seriously wrong!\n            throw new Error(\"Unable to load File model!\");\n        }\n\n        return model;\n    }\n\n    async getGraphQLSelection(): Promise<string> {\n        const model = await this.getModel();\n\n        const fields = createFieldsList({ model, fields: model.fields });\n\n        return /* GraphQL */ `{\n            id\n            createdOn\n            createdBy {\n                id\n                displayName\n            }\n            savedOn\n            savedBy {\n                id\n                displayName\n            }\n            modifiedOn\n            modifiedBy {\n                id\n                displayName\n            }\n            permissions {\n                target\n                level\n                inheritedFrom\n            }\n            hasNonInheritedPermissions\n            canManagePermissions\n            canManageStructure\n            canManageContent\n            ${fields}\n        }`;\n    }\n}\n\nexport const FolderModelProvider = Provider.createImplementation({\n    implementation: FolderModelProviderImpl,\n    dependencies: [GetFolderModelRepository]\n});\n"],"names":["FolderModelProviderImpl","repository","model","Error","fields","createFieldsList","FolderModelProvider","Provider","GetFolderModelRepository"],"mappings":";;;AAKA,MAAMA;IACF,YAAoBC,UAA8C,CAAE;aAAhDA,UAAU,GAAVA;IAAiD;IAErE,MAAM,WAA8B;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI;QAE1B,MAAMC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ;QACtC,IAAI,CAACA,OAED,MAAM,IAAIC,MAAM;QAGpB,OAAOD;IACX;IAEA,MAAM,sBAAuC;QACzC,MAAMA,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAEjC,MAAME,SAASC,iBAAiB;YAAEH;YAAO,QAAQA,MAAM,MAAM;QAAC;QAE9D,OAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;YA0BlB,EAAEE,OAAO;SACZ,CAAC;IACN;AACJ;AAEO,MAAME,0CAAsBC,oBAAAA,oBAA6B,CAAC;IAC7D,gBAAgBP;IAChB,cAAc;QAACQ;KAAyB;AAC5C"}
+{"version":3,"file":"features/folders/folderModelProvider/FolderModelProvider.js","sources":["../../../../src/features/folders/folderModelProvider/FolderModelProvider.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\n\nimport { GetFolderModelRepository } from \"./abstractions.js\";\nimport { FolderModelProvider as Provider } from \"~/features/folders/abstractions.js\";\n\nclass FolderModelProviderImpl implements Provider.Interface {\n    constructor(private repository: GetFolderModelRepository.Interface) {}\n\n    async getModel(): Promise<CmsModel> {\n        await this.repository.load();\n\n        const model = this.repository.getModel();\n        if (!model) {\n            throw new Error(\"Unable to load File model!\");\n        }\n\n        return model;\n    }\n\n    async getGraphQLSelection(): Promise<string> {\n        const model = await this.getModel();\n\n        const valuesBlock =\n            model.valuesSelection && model.valuesSelection !== \"_empty\"\n                ? model.valuesSelection\n                : \"\";\n\n        return /* GraphQL */ `\n            {\n                id\n                createdOn\n                createdBy {\n                    id\n                    displayName\n                }\n                savedOn\n                savedBy {\n                    id\n                    displayName\n                }\n                modifiedOn\n                modifiedBy {\n                    id\n                    displayName\n                }\n                permissions {\n                    target\n                    level\n                    inheritedFrom\n                }\n                hasNonInheritedPermissions\n                canManagePermissions\n                canManageStructure\n                canManageContent\n                ${valuesBlock}\n            }\n        `;\n    }\n}\n\nexport const FolderModelProvider = Provider.createImplementation({\n    implementation: FolderModelProviderImpl,\n    dependencies: [GetFolderModelRepository]\n});\n"],"names":["FolderModelProviderImpl","repository","model","Error","valuesBlock","FolderModelProvider","Provider","GetFolderModelRepository"],"mappings":";;AAKA,MAAMA;IACF,YAAoBC,UAA8C,CAAE;aAAhDA,UAAU,GAAVA;IAAiD;IAErE,MAAM,WAA8B;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI;QAE1B,MAAMC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ;QACtC,IAAI,CAACA,OACD,MAAM,IAAIC,MAAM;QAGpB,OAAOD;IACX;IAEA,MAAM,sBAAuC;QACzC,MAAMA,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAEjC,MAAME,cACFF,MAAM,eAAe,IAAIA,AAA0B,aAA1BA,MAAM,eAAe,GACxCA,MAAM,eAAe,GACrB;QAEV,OAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;gBA2Bd,EAAEE,YAAY;;QAEtB,CAAC;IACL;AACJ;AAEO,MAAMC,0CAAsBC,oBAAAA,oBAA6B,CAAC;IAC7D,gBAAgBN;IAChB,cAAc;QAACO;KAAyB;AAC5C"}

package/features/folders/folderModelProvider/GetFolderModelGqlGateway.d.ts

@@ -1,4 +1,4 @@
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { GetFolderModelGateway as GatewayAbstraction } from "./abstractions.js";
 import type { CmsModel } from "@webiny/app-headless-cms-common/types/index.js";
 import type { AcoError } from "../../../types.js";
@@ -10,10 +10,10 @@ export interface GetFolderModelResponse {
         };
     };
 }
-export declare const GET_FOLDER_MODEL: import("graphql").DocumentNode;
+export declare const GET_FOLDER_MODEL = "\n    query GetFolderModel {\n        aco {\n            getFolderModel {\n                data\n                error {\n                    code\n                    message\n                    data\n                    stack\n                }\n            }\n        }\n    }\n";
 declare class GetFolderModelGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
-    constructor(client: ApolloClient.Interface);
+    constructor(client: MainGraphQLClient.Interface);
     execute(): Promise<CmsModel>;
 }
 export declare const GetFolderModelGqlGateway: typeof GetFolderModelGqlGatewayImpl & {

package/features/folders/folderModelProvider/GetFolderModelGqlGateway.js

@@ -1,7 +1,6 @@
-import graphql_tag from "graphql-tag";
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { GetFolderModelGateway } from "./abstractions.js";
-const GET_FOLDER_MODEL = graphql_tag`
+const GET_FOLDER_MODEL = `
     query GetFolderModel {
         aco {
             getFolderModel {
@@ -21,9 +20,8 @@ class GetFolderModelGqlGatewayImpl {
         this.client = client;
     }
     async execute() {
-        const { data: response } = await this.client.query({
-            query: GET_FOLDER_MODEL,
-            fetchPolicy: "network-only"
+        const response = await this.client.execute({
+            query: GET_FOLDER_MODEL
         });
         if (!response) throw new Error("Network error while fetch folder.");
         const { data, error } = response.aco.getFolderModel;
@@ -34,7 +32,7 @@ class GetFolderModelGqlGatewayImpl {
 const GetFolderModelGqlGateway = GetFolderModelGateway.createImplementation({
     implementation: GetFolderModelGqlGatewayImpl,
     dependencies: [
-        ApolloClient
+        MainGraphQLClient
     ]
 });
 export { GET_FOLDER_MODEL, GetFolderModelGqlGateway };

package/features/folders/folderModelProvider/GetFolderModelGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/folderModelProvider/GetFolderModelGqlGateway.js","sources":["../../../../src/features/folders/folderModelProvider/GetFolderModelGqlGateway.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { ApolloClient } from \"@webiny/app-admin/features/apolloClient/abstraction.js\";\nimport { GetFolderModelGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface GetFolderModelResponse {\n    aco: {\n        getFolderModel: {\n            data: CmsModel;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport const GET_FOLDER_MODEL = gql`\n    query GetFolderModel {\n        aco {\n            getFolderModel {\n                data\n                error {\n                    code\n                    message\n                    data\n                    stack\n                }\n            }\n        }\n    }\n`;\n\nclass GetFolderModelGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: ApolloClient.Interface) {}\n\n    async execute() {\n        const { data: response } = await this.client.query<GetFolderModelResponse>({\n            query: GET_FOLDER_MODEL,\n            fetchPolicy: \"network-only\"\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while fetch folder.\");\n        }\n\n        const { data, error } = response.aco.getFolderModel;\n\n        if (!data) {\n            throw new Error(error?.message || `Could not fetch folder model`);\n        }\n\n        return data;\n    }\n}\n\nexport const GetFolderModelGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: GetFolderModelGqlGatewayImpl,\n    dependencies: [ApolloClient]\n});\n"],"names":["GET_FOLDER_MODEL","gql","GetFolderModelGqlGatewayImpl","client","response","Error","data","error","GetFolderModelGqlGateway","GatewayAbstraction","ApolloClient"],"mappings":";;;AAeO,MAAMA,mBAAmBC,WAAG,CAAC;;;;;;;;;;;;;;AAcpC,CAAC;AAED,MAAMC;IACF,YAAoBC,MAA8B,CAAE;aAAhCA,MAAM,GAANA;IAAiC;IAErD,MAAM,UAAU;QACZ,MAAM,EAAE,MAAMC,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAyB;YACvE,OAAOJ;YACP,aAAa;QACjB;QAEA,IAAI,CAACI,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,cAAc;QAEnD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,2BAA2BC,sBAAAA,oBAAuC,CAAC;IAC5E,gBAAgBP;IAChB,cAAc;QAACQ;KAAa;AAChC"}
+{"version":3,"file":"features/folders/folderModelProvider/GetFolderModelGqlGateway.js","sources":["../../../../src/features/folders/folderModelProvider/GetFolderModelGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport { GetFolderModelGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { CmsModel } from \"@webiny/app-headless-cms-common/types/index.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface GetFolderModelResponse {\n    aco: {\n        getFolderModel: {\n            data: CmsModel;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport const GET_FOLDER_MODEL = /* GraphQL */ `\n    query GetFolderModel {\n        aco {\n            getFolderModel {\n                data\n                error {\n                    code\n                    message\n                    data\n                    stack\n                }\n            }\n        }\n    }\n`;\n\nclass GetFolderModelGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(private client: MainGraphQLClient.Interface) {}\n\n    async execute() {\n        const response = await this.client.execute<GetFolderModelResponse>({\n            query: GET_FOLDER_MODEL\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while fetch folder.\");\n        }\n\n        const { data, error } = response.aco.getFolderModel;\n\n        if (!data) {\n            throw new Error(error?.message || `Could not fetch folder model`);\n        }\n\n        return data;\n    }\n}\n\nexport const GetFolderModelGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: GetFolderModelGqlGatewayImpl,\n    dependencies: [MainGraphQLClient]\n});\n"],"names":["GET_FOLDER_MODEL","GetFolderModelGqlGatewayImpl","client","response","Error","data","error","GetFolderModelGqlGateway","GatewayAbstraction","MainGraphQLClient"],"mappings":";;AAcO,MAAMA,mBAAiC,CAAC;;;;;;;;;;;;;;AAc/C,CAAC;AAED,MAAMC;IACF,YAAoBC,MAAmC,CAAE;aAArCA,MAAM,GAANA;IAAsC;IAE1D,MAAM,UAAU;QACZ,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAyB;YAC/D,OAAOH;QACX;QAEA,IAAI,CAACG,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,cAAc;QAEnD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,2BAA2BC,sBAAAA,oBAAuC,CAAC;IAC5E,gBAAgBP;IAChB,cAAc;QAACQ;KAAkB;AACrC"}

package/features/folders/getFolder/GetFolderGqlGateway.d.ts

@@ -1,4 +1,4 @@
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import type { FolderDto } from "../../../domain/folder/FolderDto.js";
 import { FolderModelProvider } from "../../../features/folders/abstractions.js";
 import { GetFolderGateway as GatewayAbstraction } from "./abstractions.js";
@@ -17,11 +17,11 @@ export interface GetFolderResponse {
 export interface GetFolderQueryVariables {
     id: string;
 }
-export declare const GET_FOLDER: (FOLDER_FIELDS: string) => import("graphql").DocumentNode;
+export declare const GET_FOLDER: (FOLDER_FIELDS: string) => string;
 declare class GetFolderGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
     private folderModelProvider;
-    constructor(client: ApolloClient.Interface, folderModelProvider: FolderModelProvider.Interface);
+    constructor(client: MainGraphQLClient.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(id: string): Promise<FolderDto>;
 }
 export declare const GetFolderGqlGateway: typeof GetFolderGqlGatewayImpl & {

package/features/folders/getFolder/GetFolderGqlGateway.js

@@ -1,8 +1,7 @@
-import graphql_tag from "graphql-tag";
-import { ApolloClient } from "@webiny/app-admin/features/apolloClient/abstraction.js";
+import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { FolderModelProvider } from "../abstractions.js";
 import { GetFolderGateway } from "./abstractions.js";
-const GET_FOLDER = (FOLDER_FIELDS)=>graphql_tag`
+const GET_FOLDER = (FOLDER_FIELDS)=>`
     query GetFolder($id: ID!) {
         aco {
             getFolder(id: $id) {
@@ -23,12 +22,11 @@ class GetFolderGqlGatewayImpl {
     }
     async execute(id) {
         const fields = await this.folderModelProvider.getGraphQLSelection();
-        const { data: response } = await this.client.query({
+        const response = await this.client.execute({
             query: GET_FOLDER(fields),
             variables: {
                 id
-            },
-            fetchPolicy: "network-only"
+            }
         });
         if (!response) throw new Error("Network error while fetch folder.");
         const { data, error } = response.aco.getFolder;
@@ -39,7 +37,7 @@ class GetFolderGqlGatewayImpl {
 const GetFolderGqlGateway = GetFolderGateway.createImplementation({
     implementation: GetFolderGqlGatewayImpl,
     dependencies: [
-        ApolloClient,
+        MainGraphQLClient,
         FolderModelProvider
     ]
 });

package/features/folders/getFolder/GetFolderGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/getFolder/GetFolderGqlGateway.js","sources":["../../../../src/features/folders/getFolder/GetFolderGqlGateway.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { ApolloClient } from \"@webiny/app-admin/features/apolloClient/abstraction.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { GetFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface GetFolderResponse {\n    aco: {\n        getFolder:\n            | {\n                  data: FolderDto;\n                  error: null;\n              }\n            | {\n                  data: null;\n                  error: AcoError;\n              };\n    };\n}\n\nexport interface GetFolderQueryVariables {\n    id: string;\n}\n\nexport const GET_FOLDER = (FOLDER_FIELDS: string) => gql`\n    query GetFolder($id: ID!) {\n        aco {\n            getFolder(id: $id) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass GetFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: ApolloClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(id: string) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const { data: response } = await this.client.query<\n            GetFolderResponse,\n            GetFolderQueryVariables\n        >({\n            query: GET_FOLDER(fields),\n            variables: { id },\n            fetchPolicy: \"network-only\"\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while fetch folder.\");\n        }\n\n        const { data, error } = response.aco.getFolder;\n\n        if (!data) {\n            throw new Error(error?.message || `Could not fetch folder with id: ${id}`);\n        }\n\n        return data;\n    }\n}\n\nexport const GetFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: GetFolderGqlGatewayImpl,\n    dependencies: [ApolloClient, FolderModelProvider]\n});\n"],"names":["GET_FOLDER","FOLDER_FIELDS","gql","GetFolderGqlGatewayImpl","client","folderModelProvider","id","fields","response","Error","data","error","GetFolderGqlGateway","GatewayAbstraction","ApolloClient","FolderModelProvider"],"mappings":";;;;AAyBO,MAAMA,aAAa,CAACC,gBAA0BC,WAAG,CAAC;;;;qBAIpC,EAAED,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAME;IACF,YACYC,MAA8B,EAC9BC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,EAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAM,EAAE,MAAMC,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAGhD;YACE,OAAOR,WAAWO;YAClB,WAAW;gBAAED;YAAG;YAChB,aAAa;QACjB;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,SAAS;QAE9C,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW,CAAC,gCAAgC,EAAEL,IAAI;QAG7E,OAAOI;IACX;AACJ;AAEO,MAAME,sBAAsBC,iBAAAA,oBAAuC,CAAC;IACvE,gBAAgBV;IAChB,cAAc;QAACW;QAAcC;KAAoB;AACrD"}
+{"version":3,"file":"features/folders/getFolder/GetFolderGqlGateway.js","sources":["../../../../src/features/folders/getFolder/GetFolderGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { GetFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface GetFolderResponse {\n    aco: {\n        getFolder:\n            | {\n                  data: FolderDto;\n                  error: null;\n              }\n            | {\n                  data: null;\n                  error: AcoError;\n              };\n    };\n}\n\nexport interface GetFolderQueryVariables {\n    id: string;\n}\n\nexport const GET_FOLDER = (FOLDER_FIELDS: string) => /* GraphQL */ `\n    query GetFolder($id: ID!) {\n        aco {\n            getFolder(id: $id) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass GetFolderGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: MainGraphQLClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(id: string) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const response = await this.client.execute<GetFolderResponse, GetFolderQueryVariables>({\n            query: GET_FOLDER(fields),\n            variables: { id }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while fetch folder.\");\n        }\n\n        const { data, error } = response.aco.getFolder;\n\n        if (!data) {\n            throw new Error(error?.message || `Could not fetch folder with id: ${id}`);\n        }\n\n        return data;\n    }\n}\n\nexport const GetFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: GetFolderGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["GET_FOLDER","FOLDER_FIELDS","GetFolderGqlGatewayImpl","client","folderModelProvider","id","fields","response","Error","data","error","GetFolderGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;AAwBO,MAAMA,aAAa,CAACC,gBAAwC,CAAC;;;;qBAI/C,EAAEA,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAMC;IACF,YACYC,MAAmC,EACnCC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,EAAU,EAAE;QACtB,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA6C;YACnF,OAAOP,WAAWM;YAClB,WAAW;gBAAED;YAAG;QACpB;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,SAAS;QAE9C,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW,CAAC,gCAAgC,EAAEL,IAAI;QAG7E,OAAOI;IACX;AACJ;AAEO,MAAME,sBAAsBC,iBAAAA,oBAAuC,CAAC;IACvE,gBAAgBV;IAChB,cAAc;QAACW;QAAmBC;KAAoB;AAC1D"}

package/features/folders/getFolderExtensionsFields/GetFolderExtensionsFieldsUseCase.d.ts

@@ -14,15 +14,15 @@ declare class GetFolderExtensionsFieldsUseCaseImpl implements UseCaseAbstraction
         description?: string | React.ReactNode;
         note?: string | React.ReactNode;
         placeholder?: string;
-        validation?: (import("@webiny/app-headless-cms-common/types/validation.js").CmsModelFieldValidator | import("@webiny/validation/types.js").Validator)[];
-        listValidation?: import("@webiny/app-headless-cms-common/types/validation.js").CmsModelFieldValidator[];
+        validation?: (import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldValidator | import("@webiny/validation/types.js").Validator)[];
+        listValidation?: import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldValidator[];
         list?: boolean;
         predefinedValues?: import("@webiny/app-headless-cms-common/types/index.js").CmsEditorFieldPredefinedValues;
         settings?: import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldSettings<unknown> | undefined;
         renderer: {
             name: string;
             settings?: Record<string, any>;
-        } | import("@webiny/app-headless-cms-common/types/index.js").CmsModelFieldRendererPlugin["renderer"]["render"];
+        };
         tags?: string[];
         rules?: import("@webiny/app-headless-cms-common/types/model.js").FieldRule[];
     }[]>;

package/features/folders/getFolderExtensionsFields/useFolderExtensionsFields.d.ts

@@ -9,15 +9,15 @@ export declare const useFolderExtensionsFields: () => {
         description?: string | React.ReactNode;
         note?: string | React.ReactNode;
         placeholder?: string;
-        validation?: (import("@webiny/app-headless-cms-common/types/validation.js").CmsModelFieldValidator | import("@webiny/validation/types.js").Validator)[];
-        listValidation?: import("@webiny/app-headless-cms-common/types/validation.js").CmsModelFieldValidator[];
+        validation?: (import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldValidator | import("@webiny/validation/types.js").Validator)[];
+        listValidation?: import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldValidator[];
         list?: boolean;
         predefinedValues?: import("@webiny/app-headless-cms-common/types/index.js").CmsEditorFieldPredefinedValues;
         settings?: import("@webiny/app-headless-cms-common/types/model.js").CmsModelFieldSettings<unknown> | undefined;
         renderer: {
             name: string;
             settings?: Record<string, any>;
-        } | import("@webiny/app-headless-cms-common/types/index.js").CmsModelFieldRendererPlugin["renderer"]["render"];
+        };
         tags?: string[];
         rules?: import("@webiny/app-headless-cms-common/types/model.js").FieldRule[];
     }[];

package/features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.js

@@ -1,31 +1,27 @@
 import { describe, expect, it } from "vitest";
 import { Container } from "@webiny/di";
-import { createTestWcpLicense } from "@webiny/wcp/testing/createTestWcpLicense.js";
 import { ListCache } from "../cache/index.js";
 import { FoldersCache, FoldersContext } from "../abstractions.js";
 import { GetFolderLevelPermissionFeature } from "./feature.js";
 import { GetFolderLevelPermissionUseCase } from "./abstractions.js";
-import { WcpService } from "@webiny/app-admin/features/wcp/abstractions.js";
+import { FeatureFlagsService } from "@webiny/app-admin/features/featureFlags/abstractions.js";
 import { Folder } from "../../../domain/folder/Folder.js";
-import { License } from "@webiny/wcp";
-class WcpServiceMock {
+import { FeatureFlags } from "@webiny/feature-flags";
+class FeatureFlagsServiceMock {
     constructor(flpEnabled){
-        this.license = License.fromLicenseDto(createTestWcpLicense({
-            folderLevelPermissions: flpEnabled
-        }));
-    }
-    canUseFeature(featureName) {
-        return this.license.canUseFeature(featureName);
+        this.flags = new FeatureFlags({
+            advancedAccessControlLayer: flpEnabled ? {
+                folderLevelPermissions: true
+            } : false
+        });
     }
-    getProject() {
-        return this.license;
+    getFlags() {
+        return this.flags;
     }
     isLoaded() {
         return true;
     }
-    loadProject() {
-        return Promise.resolve(void 0);
-    }
+    async loadFlags() {}
 }
 describe("GetFolderLevelPermission", ()=>{
     const type = "abc";
@@ -70,7 +66,7 @@ describe("GetFolderLevelPermission", ()=>{
                 type
             })
         ]);
-        container.registerInstance(WcpService, new WcpServiceMock(flpEnabled));
+        container.registerInstance(FeatureFlagsService, new FeatureFlagsServiceMock(flpEnabled));
         container.registerInstance(FoldersContext, {
             type
         });

package/features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.js","sources":["../../../../src/features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { createTestWcpLicense } from \"@webiny/wcp/testing/createTestWcpLicense.js\";\nimport { ListCache } from \"~/features/folders/cache/index.js\";\nimport { FoldersContext } from \"~/features/folders/abstractions.js\";\nimport { FoldersCache } from \"~/features/folders/abstractions.js\";\nimport { GetFolderLevelPermissionFeature } from \"~/features/folders/getFolderLevelPermission/feature.js\";\nimport { GetFolderLevelPermissionUseCase } from \"~/features/folders/getFolderLevelPermission/abstractions.js\";\nimport { WcpService } from \"@webiny/app-admin/features/wcp/abstractions.js\";\nimport { Folder } from \"~/domain/folder/Folder.js\";\nimport type { ILicense } from \"@webiny/wcp/types\";\nimport { License, WCP_FEATURE_LABEL } from \"@webiny/wcp\";\n\nclass WcpServiceMock implements WcpService.Interface {\n    private readonly license: ILicense;\n\n    constructor(flpEnabled: boolean) {\n        this.license = License.fromLicenseDto(\n            createTestWcpLicense({ folderLevelPermissions: flpEnabled })\n        );\n    }\n\n    canUseFeature(featureName: keyof typeof WCP_FEATURE_LABEL): boolean {\n        return this.license.canUseFeature(featureName);\n    }\n\n    getProject(): ILicense {\n        return this.license;\n    }\n\n    isLoaded(): boolean {\n        return true;\n    }\n\n    loadProject(): Promise<void> {\n        return Promise.resolve(undefined);\n    }\n}\n\ndescribe(\"GetFolderLevelPermission\", () => {\n    const type = \"abc\";\n\n    function setupTest(params: { flpEnabled: boolean }) {\n        const { flpEnabled } = params;\n        const container = new Container();\n        const foldersCache = new ListCache<Folder>();\n\n        foldersCache.addItems([\n            Folder.create({\n                id: \"folder-canManageContent\",\n                title: \"Folder canManageContent\",\n                slug: \"folder-canManageContent\",\n                parentId: null,\n                permissions: [],\n                canManageContent: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-canManageStructure\",\n                title: \"Folder canManageStructure\",\n                slug: \"folder-canManageStructure\",\n                parentId: null,\n                permissions: [],\n                canManageStructure: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-canManagePermissions\",\n                title: \"Folder canManagePermissions3\",\n                slug: \"folder-canManagePermissions\",\n                parentId: null,\n                permissions: [],\n                canManagePermissions: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-no-permissions\",\n                title: \"Folder No Permissions\",\n                slug: \"folder-no-permissions\",\n                parentId: null,\n                permissions: [],\n                type\n            })\n        ]);\n\n        container.registerInstance(WcpService, new WcpServiceMock(flpEnabled));\n        container.registerInstance(FoldersContext, { type });\n        container.registerInstance(FoldersCache, foldersCache);\n\n        GetFolderLevelPermissionFeature.register(container);\n\n        return {\n            container,\n            foldersCache,\n            useCase: container.resolve(GetFolderLevelPermissionUseCase)\n        };\n    }\n\n    it(\"should return true in case a specific permission is set at folder level and FLP is enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-canManagePermissions\", \"canManagePermissions\");\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-canManageStructure\", \"canManageStructure\");\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-canManageContent\", \"canManageContent\");\n\n            expect(result).toBe(true);\n        }\n    });\n\n    it(\"should return false in case a specific permission is not set at folder level and FLP is enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManagePermissions\");\n            expect(result).toBe(false);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageStructure\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageContent\");\n\n            expect(result).toBe(false);\n        }\n    });\n\n    it(\"should return always false in case the folder is not found\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManagePermissions\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManageStructure\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManageContent\");\n\n            expect(result).toBe(false);\n        }\n    });\n\n    it(\"should return always true in case FLP is not enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: false });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManagePermissions\");\n\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageStructure\");\n\n            expect(result).toBe(true);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageContent\");\n\n            expect(result).toBe(true);\n        }\n    });\n});\n"],"names":["WcpServiceMock","flpEnabled","License","createTestWcpLicense","featureName","Promise","undefined","describe","type","setupTest","params","container","Container","foldersCache","ListCache","Folder","WcpService","FoldersContext","FoldersCache","GetFolderLevelPermissionFeature","GetFolderLevelPermissionUseCase","it","useCase","result","expect"],"mappings":"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"}
+{"version":3,"file":"features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.js","sources":["../../../../src/features/folders/getFolderLevelPermission/GetFolderLevelPermission.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { ListCache } from \"~/features/folders/cache/index.js\";\nimport { FoldersContext } from \"~/features/folders/abstractions.js\";\nimport { FoldersCache } from \"~/features/folders/abstractions.js\";\nimport { GetFolderLevelPermissionFeature } from \"~/features/folders/getFolderLevelPermission/feature.js\";\nimport { GetFolderLevelPermissionUseCase } from \"~/features/folders/getFolderLevelPermission/abstractions.js\";\nimport { FeatureFlagsService } from \"@webiny/app-admin/features/featureFlags/abstractions.js\";\nimport { Folder } from \"~/domain/folder/Folder.js\";\nimport { FeatureFlags } from \"@webiny/feature-flags\";\n\nclass FeatureFlagsServiceMock implements FeatureFlagsService.Interface {\n    private readonly flags: FeatureFlags;\n\n    constructor(flpEnabled: boolean) {\n        this.flags = new FeatureFlags({\n            advancedAccessControlLayer: flpEnabled ? { folderLevelPermissions: true } : false\n        });\n    }\n\n    getFlags(): FeatureFlags {\n        return this.flags;\n    }\n\n    isLoaded(): boolean {\n        return true;\n    }\n\n    async loadFlags(): Promise<void> {}\n}\n\ndescribe(\"GetFolderLevelPermission\", () => {\n    const type = \"abc\";\n\n    function setupTest(params: { flpEnabled: boolean }) {\n        const { flpEnabled } = params;\n        const container = new Container();\n        const foldersCache = new ListCache<Folder>();\n\n        foldersCache.addItems([\n            Folder.create({\n                id: \"folder-canManageContent\",\n                title: \"Folder canManageContent\",\n                slug: \"folder-canManageContent\",\n                parentId: null,\n                permissions: [],\n                canManageContent: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-canManageStructure\",\n                title: \"Folder canManageStructure\",\n                slug: \"folder-canManageStructure\",\n                parentId: null,\n                permissions: [],\n                canManageStructure: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-canManagePermissions\",\n                title: \"Folder canManagePermissions3\",\n                slug: \"folder-canManagePermissions\",\n                parentId: null,\n                permissions: [],\n                canManagePermissions: true,\n                type\n            }),\n            Folder.create({\n                id: \"folder-no-permissions\",\n                title: \"Folder No Permissions\",\n                slug: \"folder-no-permissions\",\n                parentId: null,\n                permissions: [],\n                type\n            })\n        ]);\n\n        container.registerInstance(FeatureFlagsService, new FeatureFlagsServiceMock(flpEnabled));\n        container.registerInstance(FoldersContext, { type });\n        container.registerInstance(FoldersCache, foldersCache);\n\n        GetFolderLevelPermissionFeature.register(container);\n\n        return {\n            container,\n            foldersCache,\n            useCase: container.resolve(GetFolderLevelPermissionUseCase)\n        };\n    }\n\n    it(\"should return true in case a specific permission is set at folder level and FLP is enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-canManagePermissions\", \"canManagePermissions\");\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-canManageStructure\", \"canManageStructure\");\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-canManageContent\", \"canManageContent\");\n\n            expect(result).toBe(true);\n        }\n    });\n\n    it(\"should return false in case a specific permission is not set at folder level and FLP is enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManagePermissions\");\n            expect(result).toBe(false);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageStructure\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageContent\");\n\n            expect(result).toBe(false);\n        }\n    });\n\n    it(\"should return always false in case the folder is not found\", async () => {\n        const { useCase } = setupTest({ flpEnabled: true });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManagePermissions\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManageStructure\");\n\n            expect(result).toBe(false);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"not-existing-folder\", \"canManageContent\");\n\n            expect(result).toBe(false);\n        }\n    });\n\n    it(\"should return always true in case FLP is not enabled\", async () => {\n        const { useCase } = setupTest({ flpEnabled: false });\n\n        // canManagePermissions\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManagePermissions\");\n\n            expect(result).toBe(true);\n        }\n\n        // canManageStructure\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageStructure\");\n\n            expect(result).toBe(true);\n        }\n\n        // canManageContent\n        {\n            const result = useCase.execute(\"folder-no-permissions\", \"canManageContent\");\n\n            expect(result).toBe(true);\n        }\n    });\n});\n"],"names":["FeatureFlagsServiceMock","flpEnabled","FeatureFlags","describe","type","setupTest","params","container","Container","foldersCache","ListCache","Folder","FeatureFlagsService","FoldersContext","FoldersCache","GetFolderLevelPermissionFeature","GetFolderLevelPermissionUseCase","it","useCase","result","expect"],"mappings":"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"}

package/features/folders/getFolderLevelPermission/decorators/GetFolderLevelPermissionWithFlpDecorator.d.ts

@@ -1,12 +1,12 @@
 import type { FolderPermissionName } from "../../../../features/folders/abstractions.js";
 import { FoldersCache } from "../../../../features/folders/abstractions.js";
 import { GetFolderLevelPermissionUseCase as UseCaseAbstraction } from "../abstractions.js";
-import { WcpService } from "@webiny/app-admin/features/wcp/abstractions.js";
+import { FeatureFlagsService } from "@webiny/app-admin/features/featureFlags/abstractions.js";
 declare class GetFolderLevelPermissionWithFlpDecoratorImpl implements UseCaseAbstraction.Interface {
     private cache;
-    private wcp;
+    private featureFlagsService;
     private decoratee;
-    constructor(cache: FoldersCache.Interface, wcp: WcpService.Interface, decoratee: UseCaseAbstraction.Interface);
+    constructor(cache: FoldersCache.Interface, featureFlagsService: FeatureFlagsService.Interface, decoratee: UseCaseAbstraction.Interface);
     execute(id: string, permissionName: FolderPermissionName): boolean;
 }
 export declare const GetFolderLevelPermissionWithFlpDecorator: typeof GetFolderLevelPermissionWithFlpDecoratorImpl & {

package/features/folders/getFolderLevelPermission/decorators/GetFolderLevelPermissionWithFlpDecorator.js

@@ -1,14 +1,14 @@
 import { FoldersCache } from "../../abstractions.js";
 import { GetFolderLevelPermissionUseCase } from "../abstractions.js";
-import { WcpService } from "@webiny/app-admin/features/wcp/abstractions.js";
+import { FeatureFlagsService } from "@webiny/app-admin/features/featureFlags/abstractions.js";
 class GetFolderLevelPermissionWithFlpDecoratorImpl {
-    constructor(cache, wcp, decoratee){
+    constructor(cache, featureFlagsService, decoratee){
         this.cache = cache;
-        this.wcp = wcp;
+        this.featureFlagsService = featureFlagsService;
         this.decoratee = decoratee;
     }
     execute(id, permissionName) {
-        if (!this.wcp.getProject().canUseFolderLevelPermissions()) return this.decoratee.execute(id, permissionName);
+        if (!this.featureFlagsService.getFlags().isEnabled("advancedAccessControlLayer.folderLevelPermissions")) return this.decoratee.execute(id, permissionName);
         const folder = this.cache.getItem((folder)=>folder.id === id);
         if (!folder) return false;
         return folder[permissionName] ?? false;
@@ -18,7 +18,7 @@ const GetFolderLevelPermissionWithFlpDecorator = GetFolderLevelPermissionUseCase
     decorator: GetFolderLevelPermissionWithFlpDecoratorImpl,
     dependencies: [
         FoldersCache,
-        WcpService
+        FeatureFlagsService
     ]
 });
 export { GetFolderLevelPermissionWithFlpDecorator };