@webiny/app-aco 6.0.0-alpha.5 → 6.0.0-rc.0

package/contexts/app.js

@@ -1,12 +1,9 @@
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo } from "react";
 import { DialogsProvider } from "@webiny/app-admin";
-import { createGetAppQuery } from "../graphql/app.gql";
-import { FoldersProvider as FoldersContextProvider } from "./folders";
-import { SearchRecordsProvider as SearchRecordsContextProvider } from "./records";
-import { DisplayError } from "./DisplayError";
-import { Loading } from "./Loading";
-import { NavigateFolderWithRouterProvider } from "./navigateFolderWithRouter";
-import { AcoListProvider } from "./acoList";
+import { FoldersProvider as FoldersContextProvider } from "./folders.js";
+import { SearchRecordsProvider as SearchRecordsContextProvider } from "./records.js";
+import { AcoListProvider } from "./acoList.js";
+import { NavigateFolderProvider } from "./navigateFolder.js";
 export const AcoAppContext = /*#__PURE__*/React.createContext(undefined);
 export const createAppFromModel = data => {
   return {
@@ -16,172 +13,44 @@ export const createAppFromModel = data => {
     })
   };
 };
-const createApiApp = data => {
-  if (!data) {
-    console.error(`The APP could not be created. No data received.`);
-    return null;
-  }
-  const dataField = data.model.fields.find(f => f.fieldId === "data");
-  if (!dataField) {
-    console.error(`The APP "${data.id}" does not have the data field.`);
-    return null;
-  }
-  return {
-    ...data,
-    getFields: () => {
-      return dataField?.settings?.fields || [];
-    }
-  };
-};
 export const AcoAppProvider = ({
   children,
   id,
   client,
-  model: inputModel,
+  model,
+  columns,
   getFields,
-  folderIdQueryString,
-  createNavigateFolderListLink,
+  navigateToFolder,
   createNavigateFolderStorageKey,
-  folderIdPath: initialFolderIdPath,
+  folderId,
+  folderIdPath,
   own
 }) => {
-  const [state, setState] = useState({
-    loading: false,
-    app: null,
-    model: null,
-    error: null,
-    mode: "aco"
-  });
-  const folderIdPath = initialFolderIdPath || "location.folderId";
-  const folderIdInPath = folderIdPath + "_in";
-
-  /**
-   * The APP Provider can operate in two modes:
-   * * `app` - when the `id` is provided, the app is fetched from the API
-   * * `model` - when the `model` is provided, the app is created from the model
-   */
-  useEffect(() => {
-    if (!id) {
-      return;
-    }
-    /**
-     * In the `model` mode, we don't need to fetch the app from the API.
-     * BUT, the input model must be `undefined`. In case it's `null`, just return because there will be a model at a point.
-     */
-    if (inputModel !== undefined) {
-      if (!inputModel) {
-        return;
-      }
-      setState(prev => {
-        return {
-          ...prev,
-          loading: false,
-          model: inputModel,
-          app: createAppFromModel({
-            id,
-            model: inputModel,
-            getFields
-          }),
-          mode: "cms"
-        };
-      });
-      return;
-    }
-    if (id === state.app?.id) {
-      return;
-    }
-    setState(prev => {
-      return {
-        ...prev,
-        loading: true
-      };
+  const app = useMemo(() => {
+    return createAppFromModel({
+      id,
+      model,
+      getFields
     });
-    client.query({
-      query: createGetAppQuery(),
-      variables: {
-        id
-      }
-    }).then(response => {
-      const {
-        data,
-        error
-      } = response.data.aco?.app || {};
-      if (error) {
-        setState(prev => {
-          return {
-            ...prev,
-            loading: false,
-            app: null,
-            model: null,
-            error,
-            mode: "aco"
-          };
-        });
-        return;
-      }
-      setState(prev => {
-        const app = createApiApp(data);
-        if (!app) {
-          return {
-            ...prev,
-            loading: false,
-            app: null,
-            model: null,
-            mode: "aco",
-            error: {
-              message: `App "${id}" not found!`,
-              code: "APP_NOT_FOUND"
-            }
-          };
-        }
-        return {
-          ...prev,
-          loading: false,
-          app,
-          model: app.model,
-          error: null,
-          mode: "aco"
-        };
-      });
-    });
-  }, [id, inputModel?.modelId]);
-  const {
-    app,
-    model,
-    error,
-    loading,
-    mode
-  } = state;
+  }, [model]);
+  const folderIdInPath = folderIdPath + "_in";
   const value = useMemo(() => {
     return {
       app: app,
       folderIdPath,
       folderIdInPath,
-      loading,
       client,
-      model: model,
-      error,
-      mode
+      model: model
     };
-  }, [app?.id, loading, error, model, client, mode]);
-  /**
-   * Do not render anything yet if there is no application.
-   */
-  if (error) {
-    return /*#__PURE__*/React.createElement("div", null, "Error: ", error.message);
-  } else if (loading) {
-    return /*#__PURE__*/React.createElement(Loading, null);
-  } else if (!app) {
-    return /*#__PURE__*/React.createElement(DisplayError, null, "There is no ACO App: ", /*#__PURE__*/React.createElement("strong", null, id), "!");
-  } else if (!model) {
-    return /*#__PURE__*/React.createElement(DisplayError, null, "There is no model for the ACO App: ", /*#__PURE__*/React.createElement("strong", null, id), "!");
-  }
+  }, [app?.id, model, client]);
   return /*#__PURE__*/React.createElement(AcoAppContext.Provider, {
     value: value
-  }, /*#__PURE__*/React.createElement(FoldersContextProvider, null, /*#__PURE__*/React.createElement(SearchRecordsContextProvider, null, /*#__PURE__*/React.createElement(NavigateFolderWithRouterProvider, {
-    folderIdQueryString: folderIdQueryString,
-    createListLink: createNavigateFolderListLink,
-    createStorageKey: createNavigateFolderStorageKey
+  }, /*#__PURE__*/React.createElement(FoldersContextProvider, null, /*#__PURE__*/React.createElement(SearchRecordsContextProvider, {
+    columns: columns
+  }, /*#__PURE__*/React.createElement(NavigateFolderProvider, {
+    folderId: folderId,
+    createStorageKey: createNavigateFolderStorageKey,
+    navigateToFolder: navigateToFolder
   }, /*#__PURE__*/React.createElement(AcoListProvider, {
     own: own,
     titleFieldId: model.titleFieldId

package/contexts/app.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useMemo","useState","DialogsProvider","createGetAppQuery","FoldersProvider","FoldersContextProvider","SearchRecordsProvider","SearchRecordsContextProvider","DisplayError","Loading","NavigateFolderWithRouterProvider","AcoListProvider","AcoAppContext","createContext","undefined","createAppFromModel","data","getFields","model","fields","createApiApp","console","error","dataField","find","f","fieldId","id","settings","AcoAppProvider","children","client","inputModel","folderIdQueryString","createNavigateFolderListLink","createNavigateFolderStorageKey","folderIdPath","initialFolderIdPath","own","state","setState","loading","app","mode","folderIdInPath","prev","query","variables","then","response","aco","message","code","modelId","value","createElement","Provider","createListLink","createStorageKey","titleFieldId"],"sources":["app.tsx"],"sourcesContent":["import React, { useEffect, useMemo, useState } from \"react\";\nimport type { ApolloClient } from \"apollo-client\";\nimport { DialogsProvider } from \"@webiny/app-admin\";\nimport type { AcoApp, AcoAppMode, AcoError, AcoModel, AcoModelField } from \"~/types\";\nimport type { GetAppResult, GetAppVariables } from \"~/graphql/app.gql\";\nimport { createGetAppQuery } from \"~/graphql/app.gql\";\nimport { FoldersProvider as FoldersContextProvider } from \"./folders\";\nimport { SearchRecordsProvider as SearchRecordsContextProvider } from \"./records\";\nimport { DisplayError } from \"./DisplayError\";\nimport { Loading } from \"./Loading\";\nimport { NavigateFolderWithRouterProvider } from \"~/contexts/navigateFolderWithRouter\";\nimport { AcoListProvider } from \"~/contexts/acoList\";\n\nexport interface AcoAppProviderContext {\n    app: AcoApp;\n    folderIdPath: string;\n    folderIdInPath: string;\n    model: AcoModel;\n    client: ApolloClient<any>;\n    loading: boolean;\n    error?: AcoError | null;\n    mode: AcoAppMode;\n}\n\ninterface AcoAppProviderState {\n    loading: boolean;\n    app?: AcoApp | null;\n    model?: AcoModel | null;\n    error?: AcoError | null;\n    mode: AcoAppMode;\n}\n\nexport const AcoAppContext = React.createContext<AcoAppProviderContext | undefined>(undefined);\n\ninterface BaseAcoAppProviderProps {\n    children: React.ReactNode;\n    id: string;\n    folderIdPath?: string;\n    folderIdQueryString?: string;\n    client: ApolloClient<any>;\n    createNavigateFolderListLink?: () => string;\n    createNavigateFolderStorageKey: () => string;\n    own?: boolean;\n}\n\nexport interface AcoAppProviderPropsApi extends BaseAcoAppProviderProps {\n    model?: never;\n    getFields?: never;\n}\n\nexport interface AcoAppProviderPropsManual extends BaseAcoAppProviderProps {\n    model: AcoModel;\n    getFields?: () => AcoModelField[];\n}\n\nexport type AcoAppProviderProps = AcoAppProviderPropsApi | AcoAppProviderPropsManual;\n\ninterface CreateAppParams {\n    id: string;\n    model: AcoModel;\n    getFields?: () => AcoModelField[];\n}\n\nexport const createAppFromModel = (data: CreateAppParams): AcoApp => {\n    return {\n        ...data,\n        getFields:\n            data.getFields ||\n            (() => {\n                return data.model.fields;\n            })\n    };\n};\n\ninterface CreateApiAppParams {\n    id: string;\n    model: AcoModel;\n}\n\nconst createApiApp = (data: CreateApiAppParams | null): AcoApp | null => {\n    if (!data) {\n        console.error(`The APP could not be created. No data received.`);\n        return null;\n    }\n    const dataField = data.model.fields.find(f => f.fieldId === \"data\");\n    if (!dataField) {\n        console.error(`The APP \"${data.id}\" does not have the data field.`);\n        return null;\n    }\n    return {\n        ...data,\n        getFields: () => {\n            return dataField?.settings?.fields || [];\n        }\n    };\n};\n\nexport const AcoAppProvider = ({\n    children,\n    id,\n    client,\n    model: inputModel,\n    getFields,\n    folderIdQueryString,\n    createNavigateFolderListLink,\n    createNavigateFolderStorageKey,\n    folderIdPath: initialFolderIdPath,\n    own\n}: AcoAppProviderProps) => {\n    const [state, setState] = useState<AcoAppProviderState>({\n        loading: false,\n        app: null,\n        model: null,\n        error: null,\n        mode: \"aco\"\n    });\n    const folderIdPath = initialFolderIdPath || \"location.folderId\";\n    const folderIdInPath = folderIdPath + \"_in\";\n\n    /**\n     * The APP Provider can operate in two modes:\n     * * `app` - when the `id` is provided, the app is fetched from the API\n     * * `model` - when the `model` is provided, the app is created from the model\n     */\n    useEffect(() => {\n        if (!id) {\n            return;\n        }\n        /**\n         * In the `model` mode, we don't need to fetch the app from the API.\n         * BUT, the input model must be `undefined`. In case it's `null`, just return because there will be a model at a point.\n         */\n        if (inputModel !== undefined) {\n            if (!inputModel) {\n                return;\n            }\n            setState(prev => {\n                return {\n                    ...prev,\n                    loading: false,\n                    model: inputModel,\n                    app: createAppFromModel({\n                        id,\n                        model: inputModel,\n                        getFields\n                    }),\n                    mode: \"cms\"\n                };\n            });\n            return;\n        }\n        if (id === state.app?.id) {\n            return;\n        }\n        setState(prev => {\n            return {\n                ...prev,\n                loading: true\n            };\n        });\n        client\n            .query<GetAppResult, GetAppVariables>({\n                query: createGetAppQuery(),\n                variables: {\n                    id\n                }\n            })\n            .then(response => {\n                const { data, error } = response.data.aco?.app || {};\n\n                if (error) {\n                    setState(prev => {\n                        return {\n                            ...prev,\n                            loading: false,\n                            app: null,\n                            model: null,\n                            error,\n                            mode: \"aco\"\n                        };\n                    });\n                    return;\n                }\n\n                setState(prev => {\n                    const app = createApiApp(data);\n                    if (!app) {\n                        return {\n                            ...prev,\n                            loading: false,\n                            app: null,\n                            model: null,\n                            mode: \"aco\",\n                            error: {\n                                message: `App \"${id}\" not found!`,\n                                code: \"APP_NOT_FOUND\"\n                            }\n                        };\n                    }\n                    return {\n                        ...prev,\n                        loading: false,\n                        app,\n                        model: app.model,\n                        error: null,\n                        mode: \"aco\"\n                    };\n                });\n            });\n    }, [id, inputModel?.modelId]);\n\n    const { app, model, error, loading, mode } = state;\n\n    const value = useMemo<AcoAppProviderContext>(() => {\n        return {\n            app: app as AcoApp,\n            folderIdPath,\n            folderIdInPath,\n            loading,\n            client,\n            model: model as AcoModel,\n            error,\n            mode\n        };\n    }, [app?.id, loading, error, model, client, mode]);\n    /**\n     * Do not render anything yet if there is no application.\n     */\n    if (error) {\n        return <div>Error: {error.message}</div>;\n    } else if (loading) {\n        return <Loading />;\n    } else if (!app) {\n        return (\n            <DisplayError>\n                There is no ACO App: <strong>{id}</strong>!\n            </DisplayError>\n        );\n    } else if (!model) {\n        return (\n            <DisplayError>\n                There is no model for the ACO App: <strong>{id}</strong>!\n            </DisplayError>\n        );\n    }\n\n    return (\n        <AcoAppContext.Provider value={value}>\n            <FoldersContextProvider>\n                <SearchRecordsContextProvider>\n                    <NavigateFolderWithRouterProvider\n                        folderIdQueryString={folderIdQueryString}\n                        createListLink={createNavigateFolderListLink}\n                        createStorageKey={createNavigateFolderStorageKey}\n                    >\n                        <AcoListProvider own={own} titleFieldId={model.titleFieldId}>\n                            <DialogsProvider>{children}</DialogsProvider>\n                        </AcoListProvider>\n                    </NavigateFolderWithRouterProvider>\n                </SearchRecordsContextProvider>\n            </FoldersContextProvider>\n        </AcoAppContext.Provider>\n    );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","DialogsProvider","FoldersProvider","FoldersContextProvider","SearchRecordsProvider","SearchRecordsContextProvider","AcoListProvider","NavigateFolderProvider","AcoAppContext","createContext","undefined","createAppFromModel","data","getFields","model","fields","AcoAppProvider","children","id","client","columns","navigateToFolder","createNavigateFolderStorageKey","folderId","folderIdPath","own","app","folderIdInPath","value","createElement","Provider","createStorageKey","titleFieldId"],"sources":["app.tsx"],"sourcesContent":["import React, { useMemo } from \"react\";\nimport type { ApolloClient } from \"apollo-client\";\nimport { DialogsProvider } from \"@webiny/app-admin\";\nimport type { AcoApp, AcoModel, AcoModelField } from \"~/types.js\";\nimport { FoldersProvider as FoldersContextProvider } from \"./folders.js\";\nimport { SearchRecordsProvider as SearchRecordsContextProvider } from \"./records.js\";\nimport { AcoListProvider } from \"~/contexts/acoList.js\";\nimport { NavigateFolderProvider } from \"~/contexts/navigateFolder.js\";\nimport type { ColumnConfig } from \"~/config/table/Column.js\";\n\nexport interface AcoAppProviderContext {\n    app: AcoApp;\n    folderIdPath: string;\n    folderIdInPath: string;\n    model: AcoModel;\n    client: ApolloClient<any>;\n}\n\nexport const AcoAppContext = React.createContext<AcoAppProviderContext | undefined>(undefined);\n\nexport type AcoAppProviderProps = {\n    children: React.ReactNode;\n    id: string;\n    folderId: string | undefined;\n    folderIdPath: string;\n    client: ApolloClient<any>;\n    navigateToFolder: (folderId: string) => void;\n    createNavigateFolderStorageKey: () => string;\n    model: AcoModel;\n    columns: ColumnConfig[];\n    own?: boolean;\n    getFields?: () => AcoModelField[];\n};\n\ninterface CreateAppParams {\n    id: string;\n    model: AcoModel;\n    getFields?: () => AcoModelField[];\n}\n\nexport const createAppFromModel = (data: CreateAppParams): AcoApp => {\n    return {\n        ...data,\n        getFields:\n            data.getFields ||\n            (() => {\n                return data.model.fields;\n            })\n    };\n};\n\nexport const AcoAppProvider = ({\n    children,\n    id,\n    client,\n    model,\n    columns,\n    getFields,\n    navigateToFolder,\n    createNavigateFolderStorageKey,\n    folderId,\n    folderIdPath,\n    own\n}: AcoAppProviderProps) => {\n    const app = useMemo(() => {\n        return createAppFromModel({\n            id,\n            model,\n            getFields\n        });\n    }, [model]);\n\n    const folderIdInPath = folderIdPath + \"_in\";\n\n    const value = useMemo<AcoAppProviderContext>(() => {\n        return {\n            app: app as AcoApp,\n            folderIdPath,\n            folderIdInPath,\n            client,\n            model: model as AcoModel\n        };\n    }, [app?.id, model, client]);\n\n    return (\n        <AcoAppContext.Provider value={value}>\n            <FoldersContextProvider>\n                <SearchRecordsContextProvider columns={columns}>\n                    <NavigateFolderProvider\n                        folderId={folderId}\n                        createStorageKey={createNavigateFolderStorageKey}\n                        navigateToFolder={navigateToFolder}\n                    >\n                        <AcoListProvider own={own} titleFieldId={model.titleFieldId}>\n                            <DialogsProvider>{children}</DialogsProvider>\n                        </AcoListProvider>\n                    </NavigateFolderProvider>\n                </SearchRecordsContextProvider>\n            </FoldersContextProvider>\n        </AcoAppContext.Provider>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AAEtC,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,eAAe,IAAIC,sBAAsB;AAClD,SAASC,qBAAqB,IAAIC,4BAA4B;AAC9D,SAASC,eAAe;AACxB,SAASC,sBAAsB;AAW/B,OAAO,MAAMC,aAAa,gBAAGT,KAAK,CAACU,aAAa,CAAoCC,SAAS,CAAC;AAsB9F,OAAO,MAAMC,kBAAkB,GAAIC,IAAqB,IAAa;EACjE,OAAO;IACH,GAAGA,IAAI;IACPC,SAAS,EACLD,IAAI,CAACC,SAAS,KACb,MAAM;MACH,OAAOD,IAAI,CAACE,KAAK,CAACC,MAAM;IAC5B,CAAC;EACT,CAAC;AACL,CAAC;AAED,OAAO,MAAMC,cAAc,GAAGA,CAAC;EAC3BC,QAAQ;EACRC,EAAE;EACFC,MAAM;EACNL,KAAK;EACLM,OAAO;EACPP,SAAS;EACTQ,gBAAgB;EAChBC,8BAA8B;EAC9BC,QAAQ;EACRC,YAAY;EACZC;AACiB,CAAC,KAAK;EACvB,MAAMC,GAAG,GAAG1B,OAAO,CAAC,MAAM;IACtB,OAAOW,kBAAkB,CAAC;MACtBO,EAAE;MACFJ,KAAK;MACLD;IACJ,CAAC,CAAC;EACN,CAAC,EAAE,CAACC,KAAK,CAAC,CAAC;EAEX,MAAMa,cAAc,GAAGH,YAAY,GAAG,KAAK;EAE3C,MAAMI,KAAK,GAAG5B,OAAO,CAAwB,MAAM;IAC/C,OAAO;MACH0B,GAAG,EAAEA,GAAa;MAClBF,YAAY;MACZG,cAAc;MACdR,MAAM;MACNL,KAAK,EAAEA;IACX,CAAC;EACL,CAAC,EAAE,CAACY,GAAG,EAAER,EAAE,EAAEJ,KAAK,EAAEK,MAAM,CAAC,CAAC;EAE5B,oBACIpB,KAAA,CAAA8B,aAAA,CAACrB,aAAa,CAACsB,QAAQ;IAACF,KAAK,EAAEA;EAAM,gBACjC7B,KAAA,CAAA8B,aAAA,CAAC1B,sBAAsB,qBACnBJ,KAAA,CAAA8B,aAAA,CAACxB,4BAA4B;IAACe,OAAO,EAAEA;EAAQ,gBAC3CrB,KAAA,CAAA8B,aAAA,CAACtB,sBAAsB;IACnBgB,QAAQ,EAAEA,QAAS;IACnBQ,gBAAgB,EAAET,8BAA+B;IACjDD,gBAAgB,EAAEA;EAAiB,gBAEnCtB,KAAA,CAAA8B,aAAA,CAACvB,eAAe;IAACmB,GAAG,EAAEA,GAAI;IAACO,YAAY,EAAElB,KAAK,CAACkB;EAAa,gBACxDjC,KAAA,CAAA8B,aAAA,CAAC5B,eAAe,QAAEgB,QAA0B,CAC/B,CACG,CACE,CACV,CACJ,CAAC;AAEjC,CAAC","ignoreList":[]}

package/contexts/folder.d.ts

@@ -1,11 +1,11 @@
 import React from "react";
-import type { FolderItem } from "../types";
+import type { FolderDto } from "../domain/folder/FolderDto.js";
 export interface FolderContext {
-    folder: FolderItem;
+    folder: FolderDto;
 }
 export declare const FolderContext: React.Context<FolderContext | undefined>;
 interface FolderProviderProps {
-    folder: FolderItem | undefined;
+    folder: FolderDto | undefined;
     children: React.ReactNode;
 }
 export declare const FolderProvider: ({ folder, children }: FolderProviderProps) => React.JSX.Element | null;

package/contexts/folder.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","FolderContext","undefined","FolderProvider","folder","children","value","createElement","Provider"],"sources":["folder.tsx"],"sourcesContent":["import React, { createContext } from \"react\";\nimport type { FolderItem } from \"~/types\";\n\nexport interface FolderContext {\n    folder: FolderItem;\n}\n\nexport const FolderContext = createContext<FolderContext | undefined>(undefined);\n\ninterface FolderProviderProps {\n    folder: FolderItem | undefined;\n    children: React.ReactNode;\n}\n\nexport const FolderProvider = ({ folder, children }: FolderProviderProps) => {\n    if (!folder) {\n        return null;\n    }\n\n    const value: FolderContext = { folder };\n\n    return <FolderContext.Provider value={value}>{children}</FolderContext.Provider>;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,aAAa,QAAQ,OAAO;AAO5C,OAAO,MAAMC,aAAa,gBAAGD,aAAa,CAA4BE,SAAS,CAAC;AAOhF,OAAO,MAAMC,cAAc,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAA8B,CAAC,KAAK;EACzE,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EAEA,MAAME,KAAoB,GAAG;IAAEF;EAAO,CAAC;EAEvC,oBAAOL,KAAA,CAAAQ,aAAA,CAACN,aAAa,CAACO,QAAQ;IAACF,KAAK,EAAEA;EAAM,GAAED,QAAiC,CAAC;AACpF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","createContext","FolderContext","undefined","FolderProvider","folder","children","value","createElement","Provider"],"sources":["folder.tsx"],"sourcesContent":["import React, { createContext } from \"react\";\nimport type { FolderDto } from \"~/domain/folder/FolderDto.js\";\n\nexport interface FolderContext {\n    folder: FolderDto;\n}\n\nexport const FolderContext = createContext<FolderContext | undefined>(undefined);\n\ninterface FolderProviderProps {\n    folder: FolderDto | undefined;\n    children: React.ReactNode;\n}\n\nexport const FolderProvider = ({ folder, children }: FolderProviderProps) => {\n    if (!folder) {\n        return null;\n    }\n\n    const value: FolderContext = { folder };\n\n    return <FolderContext.Provider value={value}>{children}</FolderContext.Provider>;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,aAAa,QAAQ,OAAO;AAO5C,OAAO,MAAMC,aAAa,gBAAGD,aAAa,CAA4BE,SAAS,CAAC;AAOhF,OAAO,MAAMC,cAAc,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAA8B,CAAC,KAAK;EACzE,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EAEA,MAAME,KAAoB,GAAG;IAAEF;EAAO,CAAC;EAEvC,oBAAOL,KAAA,CAAAQ,aAAA,CAACN,aAAa,CAACO,QAAQ;IAACF,KAAK,EAAEA;EAAM,GAAED,QAAiC,CAAC;AACpF,CAAC","ignoreList":[]}

package/contexts/folders.js

@@ -1,5 +1,8 @@
+import { DiContainerProvider } from "@webiny/app";
+import { useContainer } from "@webiny/app";
 import React, { useContext, useMemo } from "react";
-import { AcoAppContext } from "./app";
+import { AcoAppContext } from "./app.js";
+import { FoldersFeature } from "../features/folders/feature.js";
 export const FoldersContext = /*#__PURE__*/React.createContext(undefined);
 export const FoldersProvider = ({
   children,
@@ -11,14 +14,24 @@ export const FoldersProvider = ({
   if (!type) {
     throw Error(`FoldersProvider requires a "type" prop or an AcoAppContext to be available!`);
   }
+  const container = useContainer();
+  const routeContainer = useMemo(() => {
+    const childContainer = container.createChildContainer();
+    FoldersFeature.register(childContainer, {
+      type
+    });
+    return childContainer;
+  }, []);
   const context = useMemo(() => {
     return {
       type
     };
   }, [type]);
-  return /*#__PURE__*/React.createElement(FoldersContext.Provider, {
+  return /*#__PURE__*/React.createElement(DiContainerProvider, {
+    container: routeContainer
+  }, /*#__PURE__*/React.createElement(FoldersContext.Provider, {
     value: context
-  }, children);
+  }, children));
 };
 
 //# sourceMappingURL=folders.js.map

package/contexts/folders.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useContext","useMemo","AcoAppContext","FoldersContext","createContext","undefined","FoldersProvider","children","props","appContext","app","type","id","Error","context","createElement","Provider","value"],"sources":["folders.tsx"],"sourcesContent":["import type { ReactNode } from \"react\";\nimport React, { useContext, useMemo } from \"react\";\nimport { AcoAppContext } from \"~/contexts/app\";\n\ninterface FoldersContext {\n    type?: string | null;\n}\n\nexport const FoldersContext = React.createContext<FoldersContext | undefined>(undefined);\n\ninterface Props {\n    type?: string;\n    children: ReactNode;\n}\n\nexport const FoldersProvider = ({ children, ...props }: Props) => {\n    const appContext = useContext(AcoAppContext);\n\n    const app = appContext ? appContext.app : undefined;\n\n    const type = props.type ?? app?.id;\n\n    if (!type) {\n        throw Error(`FoldersProvider requires a \"type\" prop or an AcoAppContext to be available!`);\n    }\n\n    const context = useMemo<FoldersContext>(() => {\n        return {\n            type\n        };\n    }, [type]);\n\n    return <FoldersContext.Provider value={context}>{children}</FoldersContext.Provider>;\n};\n"],"mappings":"AACA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,SAASC,aAAa;AAMtB,OAAO,MAAMC,cAAc,gBAAGJ,KAAK,CAACK,aAAa,CAA6BC,SAAS,CAAC;AAOxF,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAa,CAAC,KAAK;EAC9D,MAAMC,UAAU,GAAGT,UAAU,CAACE,aAAa,CAAC;EAE5C,MAAMQ,GAAG,GAAGD,UAAU,GAAGA,UAAU,CAACC,GAAG,GAAGL,SAAS;EAEnD,MAAMM,IAAI,GAAGH,KAAK,CAACG,IAAI,IAAID,GAAG,EAAEE,EAAE;EAElC,IAAI,CAACD,IAAI,EAAE;IACP,MAAME,KAAK,CAAC,6EAA6E,CAAC;EAC9F;EAEA,MAAMC,OAAO,GAAGb,OAAO,CAAiB,MAAM;IAC1C,OAAO;MACHU;IACJ,CAAC;EACL,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAEV,oBAAOZ,KAAA,CAAAgB,aAAA,CAACZ,cAAc,CAACa,QAAQ;IAACC,KAAK,EAAEH;EAAQ,GAAEP,QAAkC,CAAC;AACxF,CAAC","ignoreList":[]}
+{"version":3,"names":["DiContainerProvider","useContainer","React","useContext","useMemo","AcoAppContext","FoldersFeature","FoldersContext","createContext","undefined","FoldersProvider","children","props","appContext","app","type","id","Error","container","routeContainer","childContainer","createChildContainer","register","context","createElement","Provider","value"],"sources":["folders.tsx"],"sourcesContent":["import { DiContainerProvider } from \"@webiny/app\";\nimport { useContainer } from \"@webiny/app\";\nimport type { ReactNode } from \"react\";\nimport React, { useContext, useMemo } from \"react\";\nimport { AcoAppContext } from \"~/contexts/app.js\";\nimport { FoldersFeature } from \"~/features/folders/feature.js\";\n\ninterface FoldersContext {\n    type?: string | null;\n}\n\nexport const FoldersContext = React.createContext<FoldersContext | undefined>(undefined);\n\ninterface Props {\n    type?: string;\n    children: ReactNode;\n}\n\nexport const FoldersProvider = ({ children, ...props }: Props) => {\n    const appContext = useContext(AcoAppContext);\n\n    const app = appContext ? appContext.app : undefined;\n\n    const type = props.type ?? app?.id;\n\n    if (!type) {\n        throw Error(`FoldersProvider requires a \"type\" prop or an AcoAppContext to be available!`);\n    }\n\n    const container = useContainer();\n\n    const routeContainer = useMemo(() => {\n        const childContainer = container.createChildContainer();\n\n        FoldersFeature.register(childContainer, { type });\n\n        return childContainer;\n    }, []);\n\n    const context = useMemo<FoldersContext>(() => {\n        return {\n            type\n        };\n    }, [type]);\n\n    return (\n        <DiContainerProvider container={routeContainer}>\n            <FoldersContext.Provider value={context}>{children}</FoldersContext.Provider>\n        </DiContainerProvider>\n    );\n};\n"],"mappings":"AAAA,SAASA,mBAAmB,QAAQ,aAAa;AACjD,SAASC,YAAY,QAAQ,aAAa;AAE1C,OAAOC,KAAK,IAAIC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAClD,SAASC,aAAa;AACtB,SAASC,cAAc;AAMvB,OAAO,MAAMC,cAAc,gBAAGL,KAAK,CAACM,aAAa,CAA6BC,SAAS,CAAC;AAOxF,OAAO,MAAMC,eAAe,GAAGA,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAa,CAAC,KAAK;EAC9D,MAAMC,UAAU,GAAGV,UAAU,CAACE,aAAa,CAAC;EAE5C,MAAMS,GAAG,GAAGD,UAAU,GAAGA,UAAU,CAACC,GAAG,GAAGL,SAAS;EAEnD,MAAMM,IAAI,GAAGH,KAAK,CAACG,IAAI,IAAID,GAAG,EAAEE,EAAE;EAElC,IAAI,CAACD,IAAI,EAAE;IACP,MAAME,KAAK,CAAC,6EAA6E,CAAC;EAC9F;EAEA,MAAMC,SAAS,GAAGjB,YAAY,CAAC,CAAC;EAEhC,MAAMkB,cAAc,GAAGf,OAAO,CAAC,MAAM;IACjC,MAAMgB,cAAc,GAAGF,SAAS,CAACG,oBAAoB,CAAC,CAAC;IAEvDf,cAAc,CAACgB,QAAQ,CAACF,cAAc,EAAE;MAAEL;IAAK,CAAC,CAAC;IAEjD,OAAOK,cAAc;EACzB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMG,OAAO,GAAGnB,OAAO,CAAiB,MAAM;IAC1C,OAAO;MACHW;IACJ,CAAC;EACL,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAEV,oBACIb,KAAA,CAAAsB,aAAA,CAACxB,mBAAmB;IAACkB,SAAS,EAAEC;EAAe,gBAC3CjB,KAAA,CAAAsB,aAAA,CAACjB,cAAc,CAACkB,QAAQ;IAACC,KAAK,EAAEH;EAAQ,GAAEZ,QAAkC,CAC3D,CAAC;AAE9B,CAAC","ignoreList":[]}

package/contexts/index.d.ts

@@ -1,2 +1,4 @@
-export { AcoAppProvider as AcoProvider, type AcoAppProviderProps } from "./app";
-export * from "./folder";
+export { AcoAppProvider as AcoProvider, type AcoAppProviderProps } from "../contexts/app.js";
+export { FolderProvider, type FolderContext } from "./folder.js";
+export { NavigateFolderProvider, type NavigateFolderContext, type NavigateFolderProviderProps } from "./navigateFolder.js";
+export { SearchRecordsProvider, type SearchRecordsContext, type ListRecordsParams } from "./records.js";

package/contexts/index.js

@@ -1,4 +1,6 @@
-export { AcoAppProvider as AcoProvider } from "./app";
-export * from "./folder";
+export { AcoAppProvider as AcoProvider } from "./app.js";
+export { FolderProvider } from "./folder.js";
+export { NavigateFolderProvider } from "./navigateFolder.js";
+export { SearchRecordsProvider } from "./records.js";
 
 //# sourceMappingURL=index.js.map

package/contexts/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["AcoAppProvider","AcoProvider"],"sources":["index.tsx"],"sourcesContent":["export { AcoAppProvider as AcoProvider, type AcoAppProviderProps } from \"~/contexts/app\";\nexport * from \"./folder\";\n"],"mappings":"AAAA,SAASA,cAAc,IAAIC,WAAW;AACtC","ignoreList":[]}
+{"version":3,"names":["AcoAppProvider","AcoProvider","FolderProvider","NavigateFolderProvider","SearchRecordsProvider"],"sources":["index.tsx"],"sourcesContent":["export { AcoAppProvider as AcoProvider, type AcoAppProviderProps } from \"~/contexts/app.js\";\nexport { FolderProvider, type FolderContext } from \"./folder.js\";\nexport {\n    NavigateFolderProvider,\n    type NavigateFolderContext,\n    type NavigateFolderProviderProps\n} from \"./navigateFolder.js\";\n\nexport {\n    SearchRecordsProvider,\n    type SearchRecordsContext,\n    type ListRecordsParams\n} from \"./records.js\";\n"],"mappings":"AAAA,SAASA,cAAc,IAAIC,WAAW;AACtC,SAASC,cAAc;AACvB,SACIC,sBAAsB;AAK1B,SACIC,qBAAqB","ignoreList":[]}

package/contexts/navigateFolder.d.ts

@@ -11,9 +11,7 @@ export declare const NavigateFolderContext: React.Context<NavigateFolderContext
 export interface NavigateFolderProviderProps {
     folderId: string | undefined;
     children: React.ReactNode;
-    navigateToListHome: () => void;
     navigateToFolder: (folderId: string) => void;
-    navigateToLatestFolder: (folderId: string) => void;
     createStorageKey: () => string;
 }
 export declare const NavigateFolderProvider: ({ folderId: currentFolderId, children, createStorageKey, ...props }: NavigateFolderProviderProps) => React.JSX.Element;

package/contexts/navigateFolder.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect } from "react";
-import store from "store";
-import { ROOT_FOLDER } from "../constants";
+import { ROOT_FOLDER } from "../constants.js";
+import { useLocalStorage } from "@webiny/app/exports/admin/localStorage.js";
 export const NavigateFolderContext = /*#__PURE__*/React.createContext(undefined);
 export const NavigateFolderProvider = ({
   folderId: currentFolderId,
@@ -8,22 +8,17 @@ export const NavigateFolderProvider = ({
   createStorageKey,
   ...props
 }) => {
+  const localStorage = useLocalStorage();
   /**
    * Helper function to set the current folderId to local storage:
    * we export this function to call it programmatically when we need it and
    * persist the value on view switch.
    */
   const setFolderToStorage = useCallback(newFolderId => {
-    store.set(createStorageKey(), newFolderId);
+    localStorage.set(createStorageKey(), newFolderId);
   }, [createStorageKey]);
-
-  /**
-   * Helper function to get the current folderId to local storage.
-   * NOTE: with 5.37.0 we moved from "ROOT" to "root" as home folderId,
-   * we need to return the lowercase value.
-   */
   const getFolderFromStorage = useCallback(() => {
-    const folderId = store.get(createStorageKey());
+    const folderId = localStorage.get(createStorageKey());
     return folderId?.toLowerCase();
   }, [createStorageKey]);
   useEffect(() => {
@@ -34,23 +29,26 @@ export const NavigateFolderProvider = ({
   }, []);
 
   /**
-   * Navigate to the latest folder, considering the latest visited folder.
+   * Navigate to the latest visited folder.
    */
   const navigateToLatestFolder = useCallback(() => {
     const storageFolderId = getFolderFromStorage();
-    props.navigateToLatestFolder(currentFolderId || storageFolderId || ROOT_FOLDER);
+    if (!currentFolderId) {
+      props.navigateToFolder(storageFolderId || ROOT_FOLDER);
+    }
   }, [currentFolderId]);
   const navigateToFolder = useCallback(folderId => {
     setFolderToStorage(folderId);
     props.navigateToFolder(folderId || ROOT_FOLDER);
   }, [currentFolderId]);
   const navigateToListHome = () => {
-    store.remove(createStorageKey());
-    props.navigateToListHome();
+    localStorage.remove(createStorageKey());
+    props.navigateToFolder(ROOT_FOLDER);
   };
+  const finalFolderId = currentFolderId || getFolderFromStorage() || ROOT_FOLDER;
   const context = {
-    currentFolderId: currentFolderId || getFolderFromStorage() || ROOT_FOLDER,
-    isRootFolder: currentFolderId === ROOT_FOLDER,
+    currentFolderId: finalFolderId,
+    isRootFolder: finalFolderId === ROOT_FOLDER,
     setFolderToStorage,
     navigateToListHome,
     navigateToFolder,

package/contexts/navigateFolder.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","store","ROOT_FOLDER","NavigateFolderContext","createContext","undefined","NavigateFolderProvider","folderId","currentFolderId","children","createStorageKey","props","setFolderToStorage","newFolderId","set","getFolderFromStorage","get","toLowerCase","setTimeout","navigateToLatestFolder","storageFolderId","navigateToFolder","navigateToListHome","remove","context","isRootFolder","createElement","Provider","value"],"sources":["navigateFolder.tsx"],"sourcesContent":["import React, { useCallback, useEffect } from \"react\";\nimport store from \"store\";\nimport { ROOT_FOLDER } from \"~/constants\";\n\nexport interface NavigateFolderContext {\n    currentFolderId: string;\n    isRootFolder: boolean;\n    setFolderToStorage: (folderId?: string) => void;\n    navigateToListHome: () => void;\n    navigateToFolder: (folder?: string) => void;\n    navigateToLatestFolder: () => void;\n}\n\nexport const NavigateFolderContext = React.createContext<NavigateFolderContext | undefined>(\n    undefined\n);\n\nexport interface NavigateFolderProviderProps {\n    folderId: string | undefined;\n    children: React.ReactNode;\n    navigateToListHome: () => void;\n    navigateToFolder: (folderId: string) => void;\n    navigateToLatestFolder: (folderId: string) => void;\n    createStorageKey: () => string;\n}\n\nexport const NavigateFolderProvider = ({\n    folderId: currentFolderId,\n    children,\n    createStorageKey,\n    ...props\n}: NavigateFolderProviderProps) => {\n    /**\n     * Helper function to set the current folderId to local storage:\n     * we export this function to call it programmatically when we need it and\n     * persist the value on view switch.\n     */\n    const setFolderToStorage = useCallback(\n        (newFolderId?: string): void => {\n            store.set(createStorageKey(), newFolderId);\n        },\n        [createStorageKey]\n    );\n\n    /**\n     * Helper function to get the current folderId to local storage.\n     * NOTE: with 5.37.0 we moved from \"ROOT\" to \"root\" as home folderId,\n     * we need to return the lowercase value.\n     */\n    const getFolderFromStorage = useCallback((): string | undefined => {\n        const folderId = store.get(createStorageKey()) as string | undefined;\n        return folderId?.toLowerCase();\n    }, [createStorageKey]);\n\n    useEffect(() => {\n        setTimeout(() => {\n            // Defer navigation to next tick.\n            navigateToLatestFolder();\n        });\n    }, []);\n\n    /**\n     * Navigate to the latest folder, considering the latest visited folder.\n     */\n    const navigateToLatestFolder = useCallback(() => {\n        const storageFolderId = getFolderFromStorage();\n        props.navigateToLatestFolder(currentFolderId || storageFolderId || ROOT_FOLDER);\n    }, [currentFolderId]);\n\n    const navigateToFolder = useCallback(\n        (folderId?: string) => {\n            setFolderToStorage(folderId);\n            props.navigateToFolder(folderId || ROOT_FOLDER);\n        },\n        [currentFolderId]\n    );\n\n    const navigateToListHome = () => {\n        store.remove(createStorageKey());\n        props.navigateToListHome();\n    };\n\n    const context: NavigateFolderContext = {\n        currentFolderId: currentFolderId || getFolderFromStorage() || ROOT_FOLDER,\n        isRootFolder: currentFolderId === ROOT_FOLDER,\n        setFolderToStorage,\n        navigateToListHome,\n        navigateToFolder,\n        navigateToLatestFolder\n    };\n\n    return (\n        <NavigateFolderContext.Provider value={context}>{children}</NavigateFolderContext.Provider>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,QAAQ,OAAO;AACrD,OAAOC,KAAK,MAAM,OAAO;AACzB,SAASC,WAAW;AAWpB,OAAO,MAAMC,qBAAqB,gBAAGL,KAAK,CAACM,aAAa,CACpDC,SACJ,CAAC;AAWD,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACnCC,QAAQ,EAAEC,eAAe;EACzBC,QAAQ;EACRC,gBAAgB;EAChB,GAAGC;AACsB,CAAC,KAAK;EAC/B;AACJ;AACA;AACA;AACA;EACI,MAAMC,kBAAkB,GAAGb,WAAW,CACjCc,WAAoB,IAAW;IAC5BZ,KAAK,CAACa,GAAG,CAACJ,gBAAgB,CAAC,CAAC,EAAEG,WAAW,CAAC;EAC9C,CAAC,EACD,CAACH,gBAAgB,CACrB,CAAC;;EAED;AACJ;AACA;AACA;AACA;EACI,MAAMK,oBAAoB,GAAGhB,WAAW,CAAC,MAA0B;IAC/D,MAAMQ,QAAQ,GAAGN,KAAK,CAACe,GAAG,CAACN,gBAAgB,CAAC,CAAC,CAAuB;IACpE,OAAOH,QAAQ,EAAEU,WAAW,CAAC,CAAC;EAClC,CAAC,EAAE,CAACP,gBAAgB,CAAC,CAAC;EAEtBV,SAAS,CAAC,MAAM;IACZkB,UAAU,CAAC,MAAM;MACb;MACAC,sBAAsB,CAAC,CAAC;IAC5B,CAAC,CAAC;EACN,CAAC,EAAE,EAAE,CAAC;;EAEN;AACJ;AACA;EACI,MAAMA,sBAAsB,GAAGpB,WAAW,CAAC,MAAM;IAC7C,MAAMqB,eAAe,GAAGL,oBAAoB,CAAC,CAAC;IAC9CJ,KAAK,CAACQ,sBAAsB,CAACX,eAAe,IAAIY,eAAe,IAAIlB,WAAW,CAAC;EACnF,CAAC,EAAE,CAACM,eAAe,CAAC,CAAC;EAErB,MAAMa,gBAAgB,GAAGtB,WAAW,CAC/BQ,QAAiB,IAAK;IACnBK,kBAAkB,CAACL,QAAQ,CAAC;IAC5BI,KAAK,CAACU,gBAAgB,CAACd,QAAQ,IAAIL,WAAW,CAAC;EACnD,CAAC,EACD,CAACM,eAAe,CACpB,CAAC;EAED,MAAMc,kBAAkB,GAAGA,CAAA,KAAM;IAC7BrB,KAAK,CAACsB,MAAM,CAACb,gBAAgB,CAAC,CAAC,CAAC;IAChCC,KAAK,CAACW,kBAAkB,CAAC,CAAC;EAC9B,CAAC;EAED,MAAME,OAA8B,GAAG;IACnChB,eAAe,EAAEA,eAAe,IAAIO,oBAAoB,CAAC,CAAC,IAAIb,WAAW;IACzEuB,YAAY,EAAEjB,eAAe,KAAKN,WAAW;IAC7CU,kBAAkB;IAClBU,kBAAkB;IAClBD,gBAAgB;IAChBF;EACJ,CAAC;EAED,oBACIrB,KAAA,CAAA4B,aAAA,CAACvB,qBAAqB,CAACwB,QAAQ;IAACC,KAAK,EAAEJ;EAAQ,GAAEf,QAAyC,CAAC;AAEnG,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useEffect","ROOT_FOLDER","useLocalStorage","NavigateFolderContext","createContext","undefined","NavigateFolderProvider","folderId","currentFolderId","children","createStorageKey","props","localStorage","setFolderToStorage","newFolderId","set","getFolderFromStorage","get","toLowerCase","setTimeout","navigateToLatestFolder","storageFolderId","navigateToFolder","navigateToListHome","remove","finalFolderId","context","isRootFolder","createElement","Provider","value"],"sources":["navigateFolder.tsx"],"sourcesContent":["import React, { useCallback, useEffect } from \"react\";\nimport { ROOT_FOLDER } from \"~/constants.js\";\nimport { useLocalStorage } from \"@webiny/app/exports/admin/localStorage.js\";\n\nexport interface NavigateFolderContext {\n    currentFolderId: string;\n    isRootFolder: boolean;\n    setFolderToStorage: (folderId?: string) => void;\n    navigateToListHome: () => void;\n    navigateToFolder: (folder?: string) => void;\n    navigateToLatestFolder: () => void;\n}\n\nexport const NavigateFolderContext = React.createContext<NavigateFolderContext | undefined>(\n    undefined\n);\n\nexport interface NavigateFolderProviderProps {\n    folderId: string | undefined;\n    children: React.ReactNode;\n    navigateToFolder: (folderId: string) => void;\n    createStorageKey: () => string;\n}\n\nexport const NavigateFolderProvider = ({\n    folderId: currentFolderId,\n    children,\n    createStorageKey,\n    ...props\n}: NavigateFolderProviderProps) => {\n    const localStorage = useLocalStorage();\n    /**\n     * Helper function to set the current folderId to local storage:\n     * we export this function to call it programmatically when we need it and\n     * persist the value on view switch.\n     */\n    const setFolderToStorage = useCallback(\n        (newFolderId?: string): void => {\n            localStorage.set(createStorageKey(), newFolderId);\n        },\n        [createStorageKey]\n    );\n\n    const getFolderFromStorage = useCallback((): string | undefined => {\n        const folderId = localStorage.get(createStorageKey());\n        return folderId?.toLowerCase();\n    }, [createStorageKey]);\n\n    useEffect(() => {\n        setTimeout(() => {\n            // Defer navigation to next tick.\n            navigateToLatestFolder();\n        });\n    }, []);\n\n    /**\n     * Navigate to the latest visited folder.\n     */\n    const navigateToLatestFolder = useCallback(() => {\n        const storageFolderId = getFolderFromStorage();\n        if (!currentFolderId) {\n            props.navigateToFolder(storageFolderId || ROOT_FOLDER);\n        }\n    }, [currentFolderId]);\n\n    const navigateToFolder = useCallback(\n        (folderId?: string) => {\n            setFolderToStorage(folderId);\n            props.navigateToFolder(folderId || ROOT_FOLDER);\n        },\n        [currentFolderId]\n    );\n\n    const navigateToListHome = () => {\n        localStorage.remove(createStorageKey());\n        props.navigateToFolder(ROOT_FOLDER);\n    };\n\n    const finalFolderId = currentFolderId || getFolderFromStorage() || ROOT_FOLDER;\n\n    const context: NavigateFolderContext = {\n        currentFolderId: finalFolderId,\n        isRootFolder: finalFolderId === ROOT_FOLDER,\n        setFolderToStorage,\n        navigateToListHome,\n        navigateToFolder,\n        navigateToLatestFolder\n    };\n\n    return (\n        <NavigateFolderContext.Provider value={context}>{children}</NavigateFolderContext.Provider>\n    );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,QAAQ,OAAO;AACrD,SAASC,WAAW;AACpB,SAASC,eAAe,QAAQ,2CAA2C;AAW3E,OAAO,MAAMC,qBAAqB,gBAAGL,KAAK,CAACM,aAAa,CACpDC,SACJ,CAAC;AASD,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACnCC,QAAQ,EAAEC,eAAe;EACzBC,QAAQ;EACRC,gBAAgB;EAChB,GAAGC;AACsB,CAAC,KAAK;EAC/B,MAAMC,YAAY,GAAGV,eAAe,CAAC,CAAC;EACtC;AACJ;AACA;AACA;AACA;EACI,MAAMW,kBAAkB,GAAGd,WAAW,CACjCe,WAAoB,IAAW;IAC5BF,YAAY,CAACG,GAAG,CAACL,gBAAgB,CAAC,CAAC,EAAEI,WAAW,CAAC;EACrD,CAAC,EACD,CAACJ,gBAAgB,CACrB,CAAC;EAED,MAAMM,oBAAoB,GAAGjB,WAAW,CAAC,MAA0B;IAC/D,MAAMQ,QAAQ,GAAGK,YAAY,CAACK,GAAG,CAACP,gBAAgB,CAAC,CAAC,CAAC;IACrD,OAAOH,QAAQ,EAAEW,WAAW,CAAC,CAAC;EAClC,CAAC,EAAE,CAACR,gBAAgB,CAAC,CAAC;EAEtBV,SAAS,CAAC,MAAM;IACZmB,UAAU,CAAC,MAAM;MACb;MACAC,sBAAsB,CAAC,CAAC;IAC5B,CAAC,CAAC;EACN,CAAC,EAAE,EAAE,CAAC;;EAEN;AACJ;AACA;EACI,MAAMA,sBAAsB,GAAGrB,WAAW,CAAC,MAAM;IAC7C,MAAMsB,eAAe,GAAGL,oBAAoB,CAAC,CAAC;IAC9C,IAAI,CAACR,eAAe,EAAE;MAClBG,KAAK,CAACW,gBAAgB,CAACD,eAAe,IAAIpB,WAAW,CAAC;IAC1D;EACJ,CAAC,EAAE,CAACO,eAAe,CAAC,CAAC;EAErB,MAAMc,gBAAgB,GAAGvB,WAAW,CAC/BQ,QAAiB,IAAK;IACnBM,kBAAkB,CAACN,QAAQ,CAAC;IAC5BI,KAAK,CAACW,gBAAgB,CAACf,QAAQ,IAAIN,WAAW,CAAC;EACnD,CAAC,EACD,CAACO,eAAe,CACpB,CAAC;EAED,MAAMe,kBAAkB,GAAGA,CAAA,KAAM;IAC7BX,YAAY,CAACY,MAAM,CAACd,gBAAgB,CAAC,CAAC,CAAC;IACvCC,KAAK,CAACW,gBAAgB,CAACrB,WAAW,CAAC;EACvC,CAAC;EAED,MAAMwB,aAAa,GAAGjB,eAAe,IAAIQ,oBAAoB,CAAC,CAAC,IAAIf,WAAW;EAE9E,MAAMyB,OAA8B,GAAG;IACnClB,eAAe,EAAEiB,aAAa;IAC9BE,YAAY,EAAEF,aAAa,KAAKxB,WAAW;IAC3CY,kBAAkB;IAClBU,kBAAkB;IAClBD,gBAAgB;IAChBF;EACJ,CAAC;EAED,oBACItB,KAAA,CAAA8B,aAAA,CAACzB,qBAAqB,CAAC0B,QAAQ;IAACC,KAAK,EAAEJ;EAAQ,GAAEjB,QAAyC,CAAC;AAEnG,CAAC","ignoreList":[]}

package/contexts/records.d.ts

@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import React from "react";
-import type { DeletableSearchRecordItem, ListMeta, ListSearchRecordsQueryVariables, ListTagsWhereQueryVariables, Loading, LoadingActions, MovableSearchRecordItem, SearchRecordItem, TagItem } from "../types";
+import type { DeletableSearchRecordItem, ListMeta, ListSearchRecordsQueryVariables, ListTagsWhereQueryVariables, Loading, LoadingActions, MovableSearchRecordItem, SearchRecordItem, TagItem } from "../types.js";
+import type { ColumnConfig } from "../config/table/Column.js";
 interface ListTagsParams {
     where?: ListTagsWhereQueryVariables;
 }
@@ -23,7 +24,8 @@ interface SearchRecordsContext {
 }
 export declare const SearchRecordsContext: React.Context<SearchRecordsContext | undefined>;
 interface Props {
+    columns: ColumnConfig[];
     children: ReactNode;
 }
-export declare const SearchRecordsProvider: ({ children }: Props) => React.JSX.Element;
+export declare const SearchRecordsProvider: ({ columns, children }: Props) => React.JSX.Element;
 export {};

package/contexts/records.js

@@ -1,14 +1,13 @@
 import React, { useMemo } from "react";
-import sortBy from "lodash/sortBy";
-import unionBy from "lodash/unionBy";
-import lodashMerge from "lodash/merge";
-import { apolloFetchingHandler, loadingHandler } from "../handlers";
-import { createCreateRecord, createDeleteRecord, createGetRecord, createListRecords, createListTags, createMoveRecord, createUpdateRecord } from "../graphql/records.gql";
-import { validateOrGetDefaultDbSort } from "../sorting";
-import { useAcoApp } from "../hooks";
+import sortBy from "lodash/sortBy.js";
+import unionBy from "lodash/unionBy.js";
+import lodashMerge from "lodash/merge.js";
+import { apolloFetchingHandler, loadingHandler } from "../handlers.js";
+import { createGetRecord, createListRecords, createMoveRecord } from "../graphql/records.gql.js";
+import { validateOrGetDefaultDbSort } from "../sorting.js";
+import { useAcoApp } from "../hooks/index.js";
 import { parseIdentifier } from "@webiny/utils";
 import { useStateIfMounted } from "@webiny/app-admin";
-import { useAcoConfig } from "../config";
 export const SearchRecordsContext = /*#__PURE__*/React.createContext(undefined);
 const defaultLoading = {
   INIT: true,
@@ -31,11 +30,8 @@ const mergeAndSortTags = (oldTagItems, newTags) => {
 
   return sortBy(mergedTagItems, ["tag"]);
 };
-const getResponseData = (response, mode) => {
-  if (mode === "cms") {
-    return response?.content || {};
-  }
-  return response.search?.content || {};
+const getResponseData = response => {
+  return response?.content || {};
 };
 const defaultMeta = {
   totalCount: 0,
@@ -43,12 +39,12 @@ const defaultMeta = {
   cursor: null
 };
 export const SearchRecordsProvider = ({
+  columns,
   children
 }) => {
   const {
     app,
-    client,
-    mode
+    client
   } = useAcoApp();
   const {
     model
@@ -58,10 +54,7 @@ export const SearchRecordsProvider = ({
    * Retrieve all `fieldIds` from the ACO configuration, considering field `name`:
    * The result is a deduplicated flat array of unique field IDs.
    */
-  const {
-    table
-  } = useAcoConfig();
-  const fieldIds = table.columns.map(config => config.name).filter(Boolean);
+  const fieldIds = columns.map(config => config.name).filter(Boolean);
   const [records, setRecords] = useStateIfMounted([]);
   const [tags, setTags] = useStateIfMounted([]);
   const [loading, setLoading] = useStateIfMounted(defaultLoading);
@@ -76,15 +69,15 @@ export const SearchRecordsProvider = ({
     LIST_TAGS
   } = useMemo(() => {
     return {
-      LIST_RECORDS: createListRecords(model, mode, fieldIds),
-      UPDATE_RECORD: createUpdateRecord(model, mode),
-      MOVE_RECORD: createMoveRecord(model, mode),
-      GET_RECORD: createGetRecord(model, mode),
-      LIST_TAGS: createListTags(model, mode),
-      DELETE_RECORD: createDeleteRecord(model, mode),
-      CREATE_RECORD: createCreateRecord(model, mode)
+      LIST_RECORDS: createListRecords(model, fieldIds),
+      UPDATE_RECORD: null,
+      MOVE_RECORD: createMoveRecord(model),
+      GET_RECORD: createGetRecord(model),
+      LIST_TAGS: null,
+      DELETE_RECORD: null,
+      CREATE_RECORD: null
     };
-  }, [app.id, model.modelId, fieldIds]);
+  }, [app.model.modelId, fieldIds]);
   const context = useMemo(() => {
     return {
       records,
@@ -170,7 +163,7 @@ export const SearchRecordsProvider = ({
           data,
           meta: responseMeta,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!data || !responseMeta) {
           throw new Error(error?.message || "Could not fetch records.");
         }
@@ -212,7 +205,7 @@ export const SearchRecordsProvider = ({
         const {
           data,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (error && error.code !== "NOT_FOUND") {
           throw new Error("Network error while syncing record");
         }
@@ -268,7 +261,7 @@ export const SearchRecordsProvider = ({
         const {
           data,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!data) {
           throw new Error(error?.message || "Could not create record");
         }
@@ -321,7 +314,7 @@ export const SearchRecordsProvider = ({
         const {
           data: result,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!result) {
           throw new Error(error?.message || "Could not update record");
         }
@@ -365,7 +358,7 @@ export const SearchRecordsProvider = ({
         const {
           data,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!data) {
           throw new Error(error?.message || "Could not move record.");
         }
@@ -398,7 +391,7 @@ export const SearchRecordsProvider = ({
         const {
           data,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!data) {
           throw new Error(error?.message || "Could not delete record");
         }
@@ -429,7 +422,7 @@ export const SearchRecordsProvider = ({
         const {
           data,
           error
-        } = getResponseData(response, mode);
+        } = getResponseData(response);
         if (!data) {
           throw new Error(error?.message || "Could not fetch tags");
         }