fix(app-trash-bin): move TrashBinConfigs to higher level

webiny · Jun 18, 2024 · 4746eff · 4746eff
1 parent 4ae4eb4
commit 4746eff
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/...ges/app-headless-cms/src/admin/components/ContentEntries/TrashBin/components/TrashBin.tsx b/...ges/app-headless-cms/src/admin/components/ContentEntries/TrashBin/components/TrashBin.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from "react";
+import React, { useMemo, useCallback } from "react";
 import { useApolloClient, useModel, usePermission } from "~/admin/hooks";
 import { TrashBin as BaseTrashBin } from "@webiny/app-trash-bin";
 import {
@@ -36,6 +36,13 @@ export const TrashBin = () => {
         return new TrashBinItemMapper();
     }, []);
 
+    const handleItemAfterRestore = useCallback(
+        async (item: { location: { folderId: string | undefined } }) => {
+            navigateToFolder(item.location.folderId);
+        },
+        [navigateToFolder]
+    );
+
     if (!canDeleteEntries("cms.contentEntry")) {
         return null;
     }
@@ -49,7 +56,7 @@ export const TrashBin = () => {
             deleteGateway={deleteGateway}
             restoreGateway={restoreGateway}
             itemMapper={itemMapper}
-            onItemAfterRestore={async item => navigateToFolder(item.location.folderId)}
+            onItemAfterRestore={handleItemAfterRestore}
             nameColumnId={model.titleFieldId || "id"}
             title={`Trash - ${model.name}`}
         />

diff --git a/packages/app-serverless-cms/package.json b/packages/app-serverless-cms/package.json
@@ -31,6 +31,7 @@
     "@webiny/app-security-access-management": "0.0.0",
     "@webiny/app-tenancy": "0.0.0",
     "@webiny/app-tenant-manager": "0.0.0",
+    "@webiny/app-trash-bin": "0.0.0",
     "@webiny/app-websockets": "0.0.0",
     "@webiny/lexical-editor-actions": "0.0.0",
     "@webiny/lexical-editor-pb-element": "0.0.0",

diff --git a/packages/app-serverless-cms/src/Admin.tsx b/packages/app-serverless-cms/src/Admin.tsx
@@ -31,6 +31,7 @@ import { Module as MailerSettings } from "@webiny/app-mailer";
 import { Folders } from "@webiny/app-aco";
 import { Websockets } from "@webiny/app-websockets";
 import { RecordLocking } from "@webiny/app-record-locking";
+import { TrashBinConfigs } from "@webiny/app-trash-bin";
 
 export interface AdminProps extends Omit<BaseAdminProps, "createApolloClient"> {
     createApolloClient?: BaseAdminProps["createApolloClient"];
@@ -67,6 +68,7 @@ const App = (props: AdminProps) => {
             <TenantManager />
             <AuditLogs />
             <MailerSettings />
+            <TrashBinConfigs />
             {props.children}
         </BaseAdmin>
     );

diff --git a/packages/app-serverless-cms/tsconfig.build.json b/packages/app-serverless-cms/tsconfig.build.json
@@ -22,6 +22,7 @@
     { "path": "../app-security-access-management/tsconfig.build.json" },
     { "path": "../app-tenancy/tsconfig.build.json" },
     { "path": "../app-tenant-manager/tsconfig.build.json" },
+    { "path": "../app-trash-bin/tsconfig.build.json" },
     { "path": "../app-websockets/tsconfig.build.json" },
     { "path": "../lexical-editor-actions/tsconfig.build.json" },
     { "path": "../lexical-editor-pb-element/tsconfig.build.json" },

diff --git a/packages/app-serverless-cms/tsconfig.json b/packages/app-serverless-cms/tsconfig.json
@@ -22,6 +22,7 @@
     { "path": "../app-security-access-management" },
     { "path": "../app-tenancy" },
     { "path": "../app-tenant-manager" },
+    { "path": "../app-trash-bin" },
     { "path": "../app-websockets" },
     { "path": "../lexical-editor-actions" },
     { "path": "../lexical-editor-pb-element" },
@@ -74,6 +75,8 @@
       "@webiny/app-tenancy": ["../app-tenancy/src"],
       "@webiny/app-tenant-manager/*": ["../app-tenant-manager/src/*"],
       "@webiny/app-tenant-manager": ["../app-tenant-manager/src"],
+      "@webiny/app-trash-bin/*": ["../app-trash-bin/src/*"],
+      "@webiny/app-trash-bin": ["../app-trash-bin/src"],
       "@webiny/app-websockets/*": ["../app-websockets/src/*"],
       "@webiny/app-websockets": ["../app-websockets/src"],
       "@webiny/lexical-editor-actions/*": ["../lexical-editor-actions/src/*"],