@webiny/app-aco 6.4.5 → 6.6.0-alpha.0

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/listFolders/ListFoldersGqlGateway.d.ts

@@ -17,7 +17,7 @@ export interface ListFoldersQueryVariables {
     sort?: Record<string, any>;
     after?: string | null;
 }
-export declare const LIST_FOLDERS: (FOLDER_FIELDS: string) => import("graphql").DocumentNode;
+export declare const LIST_FOLDERS: (FOLDER_FIELDS: string) => string;
 declare class ListFoldersGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
     private folderModelProvider;

package/features/folders/listFolders/ListFoldersGqlGateway.js

@@ -1,9 +1,8 @@
-import graphql_tag from "graphql-tag";
 import { MainGraphQLClient } from "@webiny/app/features/mainGraphQLClient/index.js";
 import { RootFolder } from "../../../domain/folder/RootFolder.js";
 import { FolderModelProvider } from "../abstractions.js";
 import { ListFoldersGateway } from "./abstractions.js";
-const LIST_FOLDERS = (FOLDER_FIELDS)=>graphql_tag`
+const LIST_FOLDERS = (FOLDER_FIELDS)=>`
     query ListFolders($type: String!, $limit: Int!) {
         aco {
             listFolders(where: { type: $type }, limit: $limit) {

package/features/folders/listFolders/ListFoldersGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/listFolders/ListFoldersGqlGateway.js","sources":["../../../../src/features/folders/listFolders/ListFoldersGqlGateway.ts"],"sourcesContent":["import gql from \"graphql-tag\";\nimport { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { RootFolder } from \"~/domain/folder/RootFolder.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { ListFoldersGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface ListFoldersResponse {\n    aco: {\n        listFolders: {\n            data: FolderDto[] | null;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface ListFoldersQueryVariables {\n    type: string;\n    limit: number;\n    sort?: Record<string, any>;\n    after?: string | null;\n}\n\nexport const LIST_FOLDERS = (FOLDER_FIELDS: string) => gql`\n    query ListFolders($type: String!, $limit: Int!) {\n        aco {\n            listFolders(where: { type: $type }, limit: $limit) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass ListFoldersGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: MainGraphQLClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(type: string) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const response = await this.client.execute<ListFoldersResponse, ListFoldersQueryVariables>({\n            query: LIST_FOLDERS(fields),\n            variables: {\n                type,\n                limit: 10000\n            }\n        });\n\n        const { data, error } = response.aco.listFolders;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not fetch folders\");\n        }\n\n        return [RootFolder.create(), ...(data || [])];\n    }\n}\n\nexport const ListFoldersGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: ListFoldersGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["LIST_FOLDERS","FOLDER_FIELDS","gql","ListFoldersGqlGatewayImpl","client","folderModelProvider","type","fields","response","data","error","Error","RootFolder","ListFoldersGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;;;AAwBO,MAAMA,eAAe,CAACC,gBAA0BC,WAAG,CAAC;;;;qBAItC,EAAED,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAME;IACF,YACYC,MAAmC,EACnCC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,IAAY,EAAE;QACxB,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAiD;YACvF,OAAOR,aAAaO;YACpB,WAAW;gBACPD;gBACA,OAAO;YACX;QACJ;QAEA,MAAM,EAAEG,IAAI,EAAEC,KAAK,EAAE,GAAGF,SAAS,GAAG,CAAC,WAAW;QAEhD,IAAI,CAACC,MACD,MAAM,IAAIE,MAAMD,OAAO,WAAW;QAGtC,OAAO;YAACE,WAAW,MAAM;eAAQH,QAAQ,EAAE;SAAE;IACjD;AACJ;AAEO,MAAMI,wBAAwBC,mBAAAA,oBAAuC,CAAC;IACzE,gBAAgBX;IAChB,cAAc;QAACY;QAAmBC;KAAoB;AAC1D"}
+{"version":3,"file":"features/folders/listFolders/ListFoldersGqlGateway.js","sources":["../../../../src/features/folders/listFolders/ListFoldersGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { RootFolder } from \"~/domain/folder/RootFolder.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { ListFoldersGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface ListFoldersResponse {\n    aco: {\n        listFolders: {\n            data: FolderDto[] | null;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface ListFoldersQueryVariables {\n    type: string;\n    limit: number;\n    sort?: Record<string, any>;\n    after?: string | null;\n}\n\nexport const LIST_FOLDERS = (FOLDER_FIELDS: string) => /* GraphQL */ `\n    query ListFolders($type: String!, $limit: Int!) {\n        aco {\n            listFolders(where: { type: $type }, limit: $limit) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass ListFoldersGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: MainGraphQLClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(type: string) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const response = await this.client.execute<ListFoldersResponse, ListFoldersQueryVariables>({\n            query: LIST_FOLDERS(fields),\n            variables: {\n                type,\n                limit: 10000\n            }\n        });\n\n        const { data, error } = response.aco.listFolders;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not fetch folders\");\n        }\n\n        return [RootFolder.create(), ...(data || [])];\n    }\n}\n\nexport const ListFoldersGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: ListFoldersGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["LIST_FOLDERS","FOLDER_FIELDS","ListFoldersGqlGatewayImpl","client","folderModelProvider","type","fields","response","data","error","Error","RootFolder","ListFoldersGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;;AAuBO,MAAMA,eAAe,CAACC,gBAAwC,CAAC;;;;qBAIjD,EAAEA,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAMC;IACF,YACYC,MAAmC,EACnCC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,IAAY,EAAE;QACxB,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAiD;YACvF,OAAOP,aAAaM;YACpB,WAAW;gBACPD;gBACA,OAAO;YACX;QACJ;QAEA,MAAM,EAAEG,IAAI,EAAEC,KAAK,EAAE,GAAGF,SAAS,GAAG,CAAC,WAAW;QAEhD,IAAI,CAACC,MACD,MAAM,IAAIE,MAAMD,OAAO,WAAW;QAGtC,OAAO;YAACE,WAAW,MAAM;eAAQH,QAAQ,EAAE;SAAE;IACjD;AACJ;AAEO,MAAMI,wBAAwBC,mBAAAA,oBAAuC,CAAC;IACzE,gBAAgBX;IAChB,cAAc;QAACY;QAAmBC;KAAoB;AAC1D"}

package/features/folders/listFolders/useListFolders.d.ts

@@ -1,6 +1,6 @@
 import type { FolderDto } from "../../../domain/folder/FolderDto.js";
 export declare const useListFolders: () => {
-    listFolders: () => Promise<void>;
     folders: FolderDto[];
     loading: Record<string, boolean>;
+    listFolders: () => Promise<void>;
 };

package/features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.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 { ListFoldersByParentIdsGateway as GatewayAbstraction } from "./abstractions.js";
@@ -18,11 +18,11 @@ export interface ListFoldersByParentIdsQueryVariables {
     sort?: Record<string, any>;
     after?: string | null;
 }
-export declare const LIST_FOLDERS_BY_PARENT_IDS: (FOLDER_FIELDS: string) => import("graphql").DocumentNode;
+export declare const LIST_FOLDERS_BY_PARENT_IDS: (FOLDER_FIELDS: string) => string;
 declare class ListFoldersByParentIdsGqlGatewayImpl implements GatewayAbstraction.Interface {
     private client;
     private folderModelProvider;
-    constructor(client: ApolloClient.Interface, folderModelProvider: FolderModelProvider.Interface);
+    constructor(client: MainGraphQLClient.Interface, folderModelProvider: FolderModelProvider.Interface);
     execute(type: string, parentIds: string[]): Promise<FolderDto[]>;
 }
 export declare const ListFoldersByParentIdsGqlGateway: typeof ListFoldersByParentIdsGqlGatewayImpl & {

package/features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.js

@@ -1,9 +1,8 @@
-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 { RootFolder } from "../../../domain/folder/RootFolder.js";
 import { FolderModelProvider } from "../abstractions.js";
 import { ListFoldersByParentIdsGateway } from "./abstractions.js";
-const LIST_FOLDERS_BY_PARENT_IDS = (FOLDER_FIELDS)=>graphql_tag`
+const LIST_FOLDERS_BY_PARENT_IDS = (FOLDER_FIELDS)=>`
     query ListFoldersByParentIds($type: String!, $parentIds_in: [ID!]!, $limit: Int!) {
         aco {
             listFolders(where: { type: $type, parentId_in: $parentIds_in }, limit: $limit) {
@@ -24,14 +23,13 @@ class ListFoldersByParentIdsGqlGatewayImpl {
     }
     async execute(type, parentIds) {
         const fields = await this.folderModelProvider.getGraphQLSelection();
-        const { data: response } = await this.client.query({
+        const response = await this.client.execute({
             query: LIST_FOLDERS_BY_PARENT_IDS(fields),
             variables: {
                 type,
                 parentIds_in: parentIds,
                 limit: 10000
-            },
-            fetchPolicy: "network-only"
+            }
         });
         if (!response) throw new Error("Network error while listing folders.");
         const { data, error } = response.aco.listFolders;
@@ -45,7 +43,7 @@ class ListFoldersByParentIdsGqlGatewayImpl {
 const ListFoldersByParentIdsGqlGateway = ListFoldersByParentIdsGateway.createImplementation({
     implementation: ListFoldersByParentIdsGqlGatewayImpl,
     dependencies: [
-        ApolloClient,
+        MainGraphQLClient,
         FolderModelProvider
     ]
 });

package/features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.js","sources":["../../../../src/features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.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 { RootFolder } from \"~/domain/folder/RootFolder.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { ListFoldersByParentIdsGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface ListFoldersByParentIdsResponse {\n    aco: {\n        listFolders: {\n            data: FolderDto[] | null;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface ListFoldersByParentIdsQueryVariables {\n    type: string;\n    parentIds_in: string[];\n    limit: number;\n    sort?: Record<string, any>;\n    after?: string | null;\n}\n\nexport const LIST_FOLDERS_BY_PARENT_IDS = (FOLDER_FIELDS: string) => gql`\n    query ListFoldersByParentIds($type: String!, $parentIds_in: [ID!]!, $limit: Int!) {\n        aco {\n            listFolders(where: { type: $type, parentId_in: $parentIds_in }, limit: $limit) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass ListFoldersByParentIdsGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: ApolloClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(type: string, parentIds: string[]) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const { data: response } = await this.client.query<\n            ListFoldersByParentIdsResponse,\n            ListFoldersByParentIdsQueryVariables\n        >({\n            query: LIST_FOLDERS_BY_PARENT_IDS(fields),\n            variables: {\n                type,\n                parentIds_in: parentIds,\n                limit: 10000\n            },\n            fetchPolicy: \"network-only\"\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while listing folders.\");\n        }\n\n        const { data, error } = response.aco.listFolders;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not fetch folders\");\n        }\n\n        return [RootFolder.create(), ...(data || [])];\n    }\n}\n\nexport const ListFoldersByParentIdsGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: ListFoldersByParentIdsGqlGatewayImpl,\n    dependencies: [ApolloClient, FolderModelProvider]\n});\n"],"names":["LIST_FOLDERS_BY_PARENT_IDS","FOLDER_FIELDS","gql","ListFoldersByParentIdsGqlGatewayImpl","client","folderModelProvider","type","parentIds","fields","response","Error","data","error","RootFolder","ListFoldersByParentIdsGqlGateway","GatewayAbstraction","ApolloClient","FolderModelProvider"],"mappings":";;;;;AAyBO,MAAMA,6BAA6B,CAACC,gBAA0BC,WAAG,CAAC;;;;qBAIpD,EAAED,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAME;IACF,YACYC,MAA8B,EAC9BC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,IAAY,EAAEC,SAAmB,EAAE;QAC7C,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAM,EAAE,MAAMC,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAGhD;YACE,OAAOT,2BAA2BQ;YAClC,WAAW;gBACPF;gBACA,cAAcC;gBACd,OAAO;YACX;YACA,aAAa;QACjB;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,WAAW;QAEhD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAO;YAACC,WAAW,MAAM;eAAQF,QAAQ,EAAE;SAAE;IACjD;AACJ;AAEO,MAAMG,mCAAmCC,8BAAAA,oBAAuC,CAAC;IACpF,gBAAgBZ;IAChB,cAAc;QAACa;QAAcC;KAAoB;AACrD"}
+{"version":3,"file":"features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.js","sources":["../../../../src/features/folders/listFoldersByParentIds/ListFoldersByParentIdsGqlGateway.ts"],"sourcesContent":["import { MainGraphQLClient } from \"@webiny/app/features/mainGraphQLClient/index.js\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\nimport { RootFolder } from \"~/domain/folder/RootFolder.js\";\nimport { FolderModelProvider } from \"~/features/folders/abstractions.js\";\nimport { ListFoldersByParentIdsGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\n\nexport interface ListFoldersByParentIdsResponse {\n    aco: {\n        listFolders: {\n            data: FolderDto[] | null;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface ListFoldersByParentIdsQueryVariables {\n    type: string;\n    parentIds_in: string[];\n    limit: number;\n    sort?: Record<string, any>;\n    after?: string | null;\n}\n\nexport const LIST_FOLDERS_BY_PARENT_IDS = (FOLDER_FIELDS: string) => /* GraphQL */ `\n    query ListFoldersByParentIds($type: String!, $parentIds_in: [ID!]!, $limit: Int!) {\n        aco {\n            listFolders(where: { type: $type, parentId_in: $parentIds_in }, limit: $limit) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass ListFoldersByParentIdsGqlGatewayImpl implements GatewayAbstraction.Interface {\n    constructor(\n        private client: MainGraphQLClient.Interface,\n        private folderModelProvider: FolderModelProvider.Interface\n    ) {}\n\n    async execute(type: string, parentIds: string[]) {\n        const fields = await this.folderModelProvider.getGraphQLSelection();\n\n        const response = await this.client.execute<\n            ListFoldersByParentIdsResponse,\n            ListFoldersByParentIdsQueryVariables\n        >({\n            query: LIST_FOLDERS_BY_PARENT_IDS(fields),\n            variables: {\n                type,\n                parentIds_in: parentIds,\n                limit: 10000\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while listing folders.\");\n        }\n\n        const { data, error } = response.aco.listFolders;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not fetch folders\");\n        }\n\n        return [RootFolder.create(), ...(data || [])];\n    }\n}\n\nexport const ListFoldersByParentIdsGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: ListFoldersByParentIdsGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["LIST_FOLDERS_BY_PARENT_IDS","FOLDER_FIELDS","ListFoldersByParentIdsGqlGatewayImpl","client","folderModelProvider","type","parentIds","fields","response","Error","data","error","RootFolder","ListFoldersByParentIdsGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;;AAwBO,MAAMA,6BAA6B,CAACC,gBAAwC,CAAC;;;;qBAI/D,EAAEA,cAAc;;;;;;;;;AASrC,CAAC;AAED,MAAMC;IACF,YACYC,MAAmC,EACnCC,mBAAkD,CAC5D;aAFUD,MAAM,GAANA;aACAC,mBAAmB,GAAnBA;IACT;IAEH,MAAM,QAAQC,IAAY,EAAEC,SAAmB,EAAE;QAC7C,MAAMC,SAAS,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAGxC;YACE,OAAOR,2BAA2BO;YAClC,WAAW;gBACPF;gBACA,cAAcC;gBACd,OAAO;YACX;QACJ;QAEA,IAAI,CAACE,UACD,MAAM,IAAIC,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGH,SAAS,GAAG,CAAC,WAAW;QAEhD,IAAI,CAACE,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAO;YAACC,WAAW,MAAM;eAAQF,QAAQ,EAAE;SAAE;IACjD;AACJ;AAEO,MAAMG,mCAAmCC,8BAAAA,oBAAuC,CAAC;IACpF,gBAAgBZ;IAChB,cAAc;QAACa;QAAmBC;KAAoB;AAC1D"}

package/features/folders/listFoldersByParentIds/useListFoldersByParentIds.d.ts

@@ -1,7 +1,7 @@
 import type { FolderDto } from "../../../domain/folder/FolderDto.js";
 export declare const useListFoldersByParentIds: () => {
-    listFoldersByParentIds: (parentIds?: string[]) => Promise<void>;
-    getIsFolderLoading: (action?: string) => boolean;
     folders: FolderDto[];
     loading: string[];
+    listFoldersByParentIds: (parentIds?: string[]) => Promise<void>;
+    getIsFolderLoading: (action?: string) => boolean;
 };

package/features/folders/loadFolderHierarchy/useLoadFolderHierarchy.d.ts

@@ -1,7 +1,7 @@
 import type { FolderDto } from "../../../domain/folder/FolderDto.js";
 export declare const useLoadFolderHierarchy: () => {
-    getIsFolderLoading: (action?: string) => boolean;
-    loadFolderHierarchy: (id: string) => Promise<void>;
     folders: FolderDto[];
     loading: Record<string, boolean>;
+    getIsFolderLoading: (action?: string) => boolean;
+    loadFolderHierarchy: (id: string) => Promise<void>;
 };

package/features/folders/updateFolder/UpdateFolderGqlGateway.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";
@@ -16,11 +16,11 @@ export interface UpdateFolderVariables {
     id: string;
     data: Partial<Omit<FolderDto, "id" | "createdOn" | "createdBy" | "savedOn" | "savedBy" | "modifiedOn" | "modifiedBy">>;
 }
-export declare const UPDATE_FOLDER: (FOLDER_FIELDS: string) => import("graphql").DocumentNode;
+export declare const UPDATE_FOLDER: (FOLDER_FIELDS: string) => string;
 declare class UpdateFolderGqlGatewayImpl 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 UpdateFolderGqlGateway: typeof UpdateFolderGqlGatewayImpl & {

package/features/folders/updateFolder/UpdateFolderGqlGateway.js

@@ -1,9 +1,8 @@
-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 { UpdateFolderGateway } from "./abstractions.js";
 import { ROOT_FOLDER } from "../../../constants.js";
-const UPDATE_FOLDER = (FOLDER_FIELDS)=>graphql_tag`
+const UPDATE_FOLDER = (FOLDER_FIELDS)=>`
     mutation UpdateFolder($id: ID!, $data: FolderUpdateInput!) {
         aco {
             updateFolder(id: $id, data: $data) {
@@ -25,8 +24,8 @@ class UpdateFolderGqlGatewayImpl {
     async execute(folder) {
         const fields = await this.folderModelProvider.getGraphQLSelection();
         const { id, title, slug, permissions, parentId, extensions } = folder;
-        const { data: response } = await this.client.mutate({
-            mutation: UPDATE_FOLDER(fields),
+        const response = await this.client.execute({
+            query: UPDATE_FOLDER(fields),
             variables: {
                 id,
                 data: {
@@ -47,7 +46,7 @@ class UpdateFolderGqlGatewayImpl {
 const UpdateFolderGqlGateway = UpdateFolderGateway.createImplementation({
     implementation: UpdateFolderGqlGatewayImpl,
     dependencies: [
-        ApolloClient,
+        MainGraphQLClient,
         FolderModelProvider
     ]
 });

package/features/folders/updateFolder/UpdateFolderGqlGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/folders/updateFolder/UpdateFolderGqlGateway.js","sources":["../../../../src/features/folders/updateFolder/UpdateFolderGqlGateway.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 { UpdateFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\n\nexport interface UpdateFolderResponse {\n    aco: {\n        updateFolder: {\n            data: FolderDto;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface UpdateFolderVariables {\n    id: string;\n    data: Partial<\n        Omit<\n            FolderDto,\n            \"id\" | \"createdOn\" | \"createdBy\" | \"savedOn\" | \"savedBy\" | \"modifiedOn\" | \"modifiedBy\"\n        >\n    >;\n}\n\nexport const UPDATE_FOLDER = (FOLDER_FIELDS: string) => gql`\n    mutation UpdateFolder($id: ID!, $data: FolderUpdateInput!) {\n        aco {\n            updateFolder(id: $id, data: $data) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass UpdateFolderGqlGatewayImpl 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 { id, title, slug, permissions, parentId, extensions } = folder;\n\n        const { data: response } = await this.client.mutate<\n            UpdateFolderResponse,\n            UpdateFolderVariables\n        >({\n            mutation: UPDATE_FOLDER(fields),\n            variables: {\n                id,\n                data: {\n                    title,\n                    slug,\n                    extensions,\n                    parentId: parentId === ROOT_FOLDER ? null : parentId,\n                    permissions: permissions.filter(p => !p.inheritedFrom)\n                }\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while updating folder.\");\n        }\n\n        const { data, error } = response.aco.updateFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not update folder\");\n        }\n\n        return data;\n    }\n}\n\nexport const UpdateFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: UpdateFolderGqlGatewayImpl,\n    dependencies: [ApolloClient, FolderModelProvider]\n});\n"],"names":["UPDATE_FOLDER","FOLDER_FIELDS","gql","UpdateFolderGqlGatewayImpl","client","folderModelProvider","folder","fields","id","title","slug","permissions","parentId","extensions","response","ROOT_FOLDER","p","Error","data","error","UpdateFolderGqlGateway","GatewayAbstraction","ApolloClient","FolderModelProvider"],"mappings":";;;;;AA4BO,MAAMA,gBAAgB,CAACC,gBAA0BC,WAAG,CAAC;;;;qBAIvC,EAAED,cAAc;;;;;;;;;AASrC,CAAC;AAED,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,EAAEC,EAAE,EAAEC,KAAK,EAAEC,IAAI,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,UAAU,EAAE,GAAGP;QAE/D,MAAM,EAAE,MAAMQ,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAGjD;YACE,UAAUd,cAAcO;YACxB,WAAW;gBACPC;gBACA,MAAM;oBACFC;oBACAC;oBACAG;oBACA,UAAUD,aAAaG,cAAc,OAAOH;oBAC5C,aAAaD,YAAY,MAAM,CAACK,CAAAA,IAAK,CAACA,EAAE,aAAa;gBACzD;YACJ;QACJ;QAEA,IAAI,CAACF,UACD,MAAM,IAAIG,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGL,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACI,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBlB;IAChB,cAAc;QAACmB;QAAcC;KAAoB;AACrD"}
+{"version":3,"file":"features/folders/updateFolder/UpdateFolderGqlGateway.js","sources":["../../../../src/features/folders/updateFolder/UpdateFolderGqlGateway.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 { UpdateFolderGateway as GatewayAbstraction } from \"./abstractions.js\";\nimport type { AcoError } from \"~/types.js\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\n\nexport interface UpdateFolderResponse {\n    aco: {\n        updateFolder: {\n            data: FolderDto;\n            error: AcoError | null;\n        };\n    };\n}\n\nexport interface UpdateFolderVariables {\n    id: string;\n    data: Partial<\n        Omit<\n            FolderDto,\n            \"id\" | \"createdOn\" | \"createdBy\" | \"savedOn\" | \"savedBy\" | \"modifiedOn\" | \"modifiedBy\"\n        >\n    >;\n}\n\nexport const UPDATE_FOLDER = (FOLDER_FIELDS: string) => /* GraphQL */ `\n    mutation UpdateFolder($id: ID!, $data: FolderUpdateInput!) {\n        aco {\n            updateFolder(id: $id, data: $data) {\n                data ${FOLDER_FIELDS}\n                error {\n                    code\n                    data\n                    message\n                }\n            }\n        }\n    }\n`;\n\nclass UpdateFolderGqlGatewayImpl 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 { id, title, slug, permissions, parentId, extensions } = folder;\n\n        const response = await this.client.execute<UpdateFolderResponse, UpdateFolderVariables>({\n            query: UPDATE_FOLDER(fields),\n            variables: {\n                id,\n                data: {\n                    title,\n                    slug,\n                    extensions,\n                    parentId: parentId === ROOT_FOLDER ? null : parentId,\n                    permissions: permissions.filter(p => !p.inheritedFrom)\n                }\n            }\n        });\n\n        if (!response) {\n            throw new Error(\"Network error while updating folder.\");\n        }\n\n        const { data, error } = response.aco.updateFolder;\n\n        if (!data) {\n            throw new Error(error?.message || \"Could not update folder\");\n        }\n\n        return data;\n    }\n}\n\nexport const UpdateFolderGqlGateway = GatewayAbstraction.createImplementation({\n    implementation: UpdateFolderGqlGatewayImpl,\n    dependencies: [MainGraphQLClient, FolderModelProvider]\n});\n"],"names":["UPDATE_FOLDER","FOLDER_FIELDS","UpdateFolderGqlGatewayImpl","client","folderModelProvider","folder","fields","id","title","slug","permissions","parentId","extensions","response","ROOT_FOLDER","p","Error","data","error","UpdateFolderGqlGateway","GatewayAbstraction","MainGraphQLClient","FolderModelProvider"],"mappings":";;;;AA2BO,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,MAAM,EAAEC,EAAE,EAAEC,KAAK,EAAEC,IAAI,EAAEC,WAAW,EAAEC,QAAQ,EAAEC,UAAU,EAAE,GAAGP;QAE/D,MAAMQ,WAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAA8C;YACpF,OAAOb,cAAcM;YACrB,WAAW;gBACPC;gBACA,MAAM;oBACFC;oBACAC;oBACAG;oBACA,UAAUD,aAAaG,cAAc,OAAOH;oBAC5C,aAAaD,YAAY,MAAM,CAACK,CAAAA,IAAK,CAACA,EAAE,aAAa;gBACzD;YACJ;QACJ;QAEA,IAAI,CAACF,UACD,MAAM,IAAIG,MAAM;QAGpB,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGL,SAAS,GAAG,CAAC,YAAY;QAEjD,IAAI,CAACI,MACD,MAAM,IAAID,MAAME,OAAO,WAAW;QAGtC,OAAOD;IACX;AACJ;AAEO,MAAME,yBAAyBC,oBAAAA,oBAAuC,CAAC;IAC1E,gBAAgBlB;IAChB,cAAc;QAACmB;QAAmBC;KAAoB;AAC1D"}

package/hooks/index.d.ts

@@ -1,7 +1 @@
-export * from "./useAcoList.js";
-export * from "./useAcoApp.js";
 export * from "./useFolder.js";
-export * from "./useFoldersType.js";
-export * from "./useRecords.js";
-export * from "./useTags.js";
-export * from "./useNavigateFolder.js";

package/hooks/index.js

@@ -1,7 +1 @@
-export * from "./useAcoList.js";
-export * from "./useAcoApp.js";
 export * from "./useFolder.js";
-export * from "./useFoldersType.js";
-export * from "./useRecords.js";
-export * from "./useTags.js";
-export * from "./useNavigateFolder.js";

package/index.d.ts

@@ -1,11 +1,11 @@
-export * from "./app.js";
 export * from "./components/index.js";
 export * from "./config/index.js";
 export * from "./contexts/index.js";
 export * from "./hooks/index.js";
 export * from "./dialogs/index.js";
-export * from "./sorting.js";
 export type { TableRow, FolderTableRow, RecordTableRow } from "./table.types.js";
+export { sortFolders } from "./components/Table/createTableData.js";
+export type { FolderSortConfig } from "./components/Table/createTableData.js";
 export type { ListMeta, FolderLevelPermissionsTarget } from "./types.js";
 export { LIST_FOLDER_LEVEL_PERMISSIONS_TARGETS } from "./dialogs/DialogSetPermissions/graphql.js";
 export { UsersTeamsMultiAutocomplete } from "./dialogs/DialogSetPermissions/UsersTeamsMultiAutocomplete.js";
@@ -23,3 +23,4 @@ export * from "./features/folders/loadFolderHierarchy/useLoadFolderHierarchy.js"
 export * from "./features/folders/listFolders/useListFolders.js";
 export * from "./features/folders/listFoldersByParentIds/useListFoldersByParentIds.js";
 export * from "./presentation/folderTree/index.js";
+export * from "./app.js";

package/index.js

@@ -1,10 +1,8 @@
-export * from "./app.js";
 export * from "./components/index.js";
 export * from "./config/index.js";
 export * from "./contexts/index.js";
 export * from "./hooks/index.js";
 export * from "./dialogs/index.js";
-export * from "./sorting.js";
 export * from "./domain/folder/FolderDto.js";
 export * from "./domain/folder/FolderDtoMapper.js";
 export * from "./features/folders/createFolder/useCreateFolder.js";
@@ -19,5 +17,7 @@ export * from "./features/folders/loadFolderHierarchy/useLoadFolderHierarchy.js"
 export * from "./features/folders/listFolders/useListFolders.js";
 export * from "./features/folders/listFoldersByParentIds/useListFoldersByParentIds.js";
 export * from "./presentation/folderTree/index.js";
+export * from "./app.js";
+export { sortFolders } from "./components/Table/createTableData.js";
 export { LIST_FOLDER_LEVEL_PERMISSIONS_TARGETS } from "./dialogs/DialogSetPermissions/graphql.js";
 export { UsersTeamsMultiAutocomplete } from "./dialogs/DialogSetPermissions/UsersTeamsMultiAutocomplete.js";