feat(history): restore version

packages/core/content-manager/admin/src/history/components/VersionHeader.tsx

@@ -9,6 +9,7 @@ import { NavLink, useParams, type To } from 'react-router-dom';
 import { COLLECTION_TYPES } from '../../constants/collections';
 import { useHistoryContext } from '../pages/History';
 import { useRestoreVersionMutation } from '../services/historyVersion';
+
 interface VersionHeaderProps {
   headerId: string;
 }
@@ -45,7 +46,10 @@ export const VersionHeader = ({ headerId }: VersionHeaderProps) => {
   };
 
   const handleRestore = async () => {
-    await restoreVersion({ params: { versionId: version.id } });
+    await restoreVersion({
+      params: { versionId: version.id },
+      body: { contentType: version.contentType },
+    });
   };
 
   return (

packages/core/content-manager/admin/src/history/services/historyVersion.ts

@@ -23,10 +23,11 @@ const historyVersionsApi = contentManagerApi.injectEndpoints({
     }),
     restoreVersion: builder.mutation<RestoreHistoryVersion.Response, RestoreHistoryVersion.Request>(
       {
-        query({ params }) {
+        query({ params, body }) {
           return {
             url: `/content-manager/history-versions/${params.versionId}/restore`,
             method: 'PUT',
+            data: body,
           };
         },
         invalidatesTags: ['HistoryVersion'],

packages/core/content-manager/server/src/history/controllers/history-version.ts

@@ -71,14 +71,22 @@ const createHistoryVersionController = ({ strapi }: { strapi: Core.Strapi }) =>
     },
 
     async restoreVersion(ctx) {
-      const versionId: RestoreHistoryVersion.Request['params']['versionId'] = ctx.params.versionId;
+      // @ts-expect-error can't tell koa what I want
+      const request: RestoreHistoryVersion.Request = ctx.request;
 
-      const restoredDocument = await getService(strapi, 'history').restoreVersion(versionId);
+      const permissionChecker = getContentManagerService('permission-checker').create({
+        userAbility: ctx.state.userAbility,
+        model: request.body.contentType,
+      });
 
-      if (!restoredDocument) {
-        throw new errors.ApplicationError('Failed to restore version');
+      if (permissionChecker.cannot.update()) {
+        throw new errors.ForbiddenError();
       }
 
+      const restoredDocument = await getService(strapi, 'history').restoreVersion(
+        request.params.versionId
+      );
+
       return { data: { documentId: restoredDocument.documentId } };
     },
   } satisfies Core.Controller;

packages/core/content-manager/server/src/history/services/history.ts

@@ -1,5 +1,5 @@
 import type { Core, Modules, UID, Data, Schema, Struct } from '@strapi/types';
-import { contentTypes } from '@strapi/utils';
+import { contentTypes, errors } from '@strapi/utils';
 import { omit, pick } from 'lodash/fp';
 
 import { scheduleJob } from 'node-schedule';
@@ -415,7 +415,7 @@ const createHistoryService = ({ strapi }: { strapi: Core.Strapi }) => {
         contentTypeSchemaAttributes
       ) as Struct.SchemaAttributes;
       // Set all deleted relation values to null
-      const dataWithoutMissingRelationsPromise = Object.entries(sanitizedSchemaAttributes).reduce(
+      const dataWithoutMissingRelations = await Object.entries(sanitizedSchemaAttributes).reduce(
         async (
           previousRelationAttributesPromise: Promise<Record<string, unknown>>,
           [name, attribute]: [string, Schema.Attribute.AnyAttribute]
@@ -491,14 +491,16 @@ const createHistoryService = ({ strapi }: { strapi: Core.Strapi }) => {
         Promise.resolve(structuredClone(dataWithoutAddedAttributes))
       );
 
-      // Create a new draft with the version data
-      const dataWithoutMissingRelations = await dataWithoutMissingRelationsPromise;
       const data = omit(['id', ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
       const restoredDocument = await strapi.documents(version.contentType).update({
         documentId: version.relatedDocumentId,
         data,
       });
 
+      if (!restoredDocument) {
+        throw new errors.ApplicationError('Failed to restore version');
+      }
+
       return restoredDocument;
     },
   };

packages/core/content-manager/shared/contracts/history-versions.ts

@@ -83,6 +83,9 @@ export declare namespace RestoreHistoryVersion {
     params: {
       versionId: Data.ID;
     };
+    body: {
+      contentType: UID.ContentType;
+    };
   }
 
   export type Response =