fix redirect after restore

Author: davisagli

packages/cmsui/routes/recyclebin-item.test.tsx

@@ -28,7 +28,10 @@ const callLoader = (request: Request, cli: Record<string, unknown>) => {
 
 const callAction = (request: Request, cli: Record<string, unknown>) => {
   const context = new RouterContextProvider();
-  context.set(ploneClientContext, cli as any);
+  context.set(ploneClientContext, {
+    config: { apiPath: 'http://example.com/Plone' },
+    ...cli,
+  } as any);
   return action({
     request,
     params: { id: 'deleted-item' },
@@ -127,13 +130,15 @@ describe('recycle bin item route', () => {
 
   it('restores the item with an optional target path', async () => {
     const restoreRecycleBinItem = vi.fn().mockResolvedValue({
-      data: { restored_item: { '@id': '/restored-item' } },
+      data: {
+        restored_item: { '@id': 'http://example.com/Plone/restored-item' },
+      },
     });
     const formData = new FormData();
     formData.append('_action', 'restore');
     formData.append('target_path', 'target-folder');
 
-    await callAction(
+    const result = await callAction(
       new Request('http://example.com/@@recyclebin/deleted-item', {
         method: 'POST',
         body: formData,
@@ -145,6 +150,7 @@ describe('recycle bin item route', () => {
       id: 'deleted-item',
       data: { target_path: 'target-folder' },
     });
+    expect((result as Response).headers.get('Location')).toBe('/restored-item');
   });
 
   it('purges the item', async () => {

packages/cmsui/routes/recyclebin-item.tsx

@@ -14,7 +14,10 @@ import { Container } from '@plone/components/quanta';
 import { useTranslation } from 'react-i18next';
 import { ploneClientContext } from 'seven/app/middleware.server';
 import { RecycleBinItemDetails } from '../components/RecycleBin/RecycleBinItemDetails';
-import { normalizeRecycleBinItemPaths } from '../components/RecycleBin/utils';
+import {
+  normalizeRecycleBinItemPaths,
+  stripPortalBasePath,
+} from '../components/RecycleBin/utils';
 
 const getErrorMessage = (error: unknown) => {
   if (
@@ -30,6 +33,21 @@ const getErrorMessage = (error: unknown) => {
   return 'Request failed';
 };
 
+const getRestoredItemRedirectUrl = (
+  restoredUrl: string | undefined,
+  apiPath: string,
+) => {
+  if (!restoredUrl) return '/@@recyclebin';
+
+  const flattenedUrl = flattenToAppURL(restoredUrl);
+
+  try {
+    return stripPortalBasePath(new URL(flattenedUrl).pathname, apiPath);
+  } catch {
+    return stripPortalBasePath(flattenedUrl, apiPath);
+  }
+};
+
 export async function loader({
   params,
   request,
@@ -76,7 +94,7 @@ export async function action({
       });
       const restoredUrl = result.data.restored_item?.['@id'];
       return redirect(
-        restoredUrl ? flattenToAppURL(restoredUrl) : '/@@recyclebin',
+        getRestoredItemRedirectUrl(restoredUrl, cli.config.apiPath),
       );
     }
 

packages/cmsui/routes/recyclebin.test.tsx

@@ -28,7 +28,10 @@ const callLoader = (request: Request, cli: Record<string, unknown>) => {
 
 const callAction = (request: Request, cli: Record<string, unknown>) => {
   const context = new RouterContextProvider();
-  context.set(ploneClientContext, cli as any);
+  context.set(ploneClientContext, {
+    config: { apiPath: 'http://example.com/Plone' },
+    ...cli,
+  } as any);
   return action({
     request,
     params: {},
@@ -156,7 +159,9 @@ describe('recycle bin route', () => {
   });
 
   it('restores selected items', async () => {
-    const restoreRecycleBinItem = vi.fn().mockResolvedValue({});
+    const restoreRecycleBinItem = vi.fn().mockResolvedValue({
+      data: { restored_item: { '@id': 'http://example.com/Plone/restored' } },
+    });
     const formData = new FormData();
     formData.append('_action', 'restore-selected');
     formData.append('selected_items', 'one');
@@ -180,6 +185,27 @@ describe('recycle bin route', () => {
     });
   });
 
+  it('redirects to the restored item when one selected item is restored', async () => {
+    const restoreRecycleBinItem = vi.fn().mockResolvedValue({
+      data: {
+        restored_item: { '@id': 'http://example.com/Plone/restored-item' },
+      },
+    });
+    const formData = new FormData();
+    formData.append('_action', 'restore-selected');
+    formData.append('selected_items', 'one');
+
+    const result = await callAction(
+      new Request('http://example.com/@@recyclebin', {
+        method: 'POST',
+        body: formData,
+      }),
+      { restoreRecycleBinItem },
+    );
+
+    expect((result as Response).headers.get('Location')).toBe('/restored-item');
+  });
+
   it('purges selected items', async () => {
     const purgeRecycleBinItem = vi.fn().mockResolvedValue({});
     const formData = new FormData();

packages/cmsui/routes/recyclebin.tsx

@@ -20,6 +20,7 @@ import {
 import {
   getQueryStateFromSearchParams,
   normalizeRecycleBinPaths,
+  stripPortalBasePath,
   toRecycleBinQuery,
 } from '../components/RecycleBin/utils';
 
@@ -37,6 +38,21 @@ const getErrorMessage = (error: unknown) => {
   return 'Request failed';
 };
 
+const getRestoredItemRedirectUrl = (
+  restoredUrl: string | undefined,
+  apiPath: string,
+) => {
+  if (!restoredUrl) return '/@@recyclebin';
+
+  const flattenedUrl = flattenToAppURL(restoredUrl);
+
+  try {
+    return stripPortalBasePath(new URL(flattenedUrl).pathname, apiPath);
+  } catch {
+    return stripPortalBasePath(flattenedUrl, apiPath);
+  }
+};
+
 export async function loader({
   request,
   context,
@@ -71,6 +87,7 @@ export async function action({
   const intent = formData.get('_action');
   const selectedItems = formData.getAll('selected_items').map(String);
   const failures: Array<{ id: string; message: string }> = [];
+  const restoredUrls: string[] = [];
   let succeeded = 0;
 
   if (intent === 'empty') {
@@ -95,7 +112,11 @@ export async function action({
   for (const id of selectedItems) {
     try {
       if (intent === 'restore-selected') {
-        await cli.restoreRecycleBinItem({ id, data: {} });
+        const result = await cli.restoreRecycleBinItem({ id, data: {} });
+        const restoredUrl = result.data.restored_item?.['@id'];
+        if (restoredUrl) {
+          restoredUrls.push(restoredUrl);
+        }
       } else {
         await cli.purgeRecycleBinItem({ id });
       }
@@ -115,6 +136,12 @@ export async function action({
     );
   }
 
+  if (intent === 'restore-selected' && selectedItems.length === 1) {
+    return redirect(
+      getRestoredItemRedirectUrl(restoredUrls[0], cli.config.apiPath),
+    );
+  }
+
   return redirect(`/@@recyclebin${url.search}`);
 }