Merge pull request #111 from notum-cz/feature/patch-for-strapi@4.12.0

feature: add patch for strapi 4.12.0

Author: omikulcik

README.md

@@ -57,7 +57,7 @@ module.exports = ({ env }) => ({
    yarn add patch-package
    ```
 2. Create folder `patches` in the root of your project
-3. Copy file `@strapi+admin+4.11.4.patch` located in  `patches/` of this repository to the folder created in the previous step
+3. Copy file `@strapi+admin+4.12.0.patch` located in  `patches/` of this repository to the folder created in the previous step
 4. Add the line `"postinstall": "patch-package",` to the scripts section of the `package.json`
 5. Run `npm run postinstall`
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notum-cz/strapi-plugin-content-versioning",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "This plugin enables content versioning",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Notum Technologies s.r.o. <sales@notum.cz> (https://notum.cz/en/strapi)",

patches/@strapi+admin+4.12.0.patch

@@ -0,0 +1,90 @@
+diff --git a/node_modules/@strapi/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js b/node_modules/@strapi/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js
+index eb7b5dd..f4e25bd 100644
+--- a/node_modules/@strapi/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js
++++ b/node_modules/@strapi/admin/admin/src/content-manager/components/CollectionTypeFormWrapper/index.js
+@@ -62,6 +62,11 @@ const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }
+   const requestURL =
+     isCreatingEntry && !origin ? null : getRequestUrl(`collection-types/${slug}/${origin || id}`);
+ 
++  const currentContentTypeLayout = get(allLayoutData, ['contentType'], {});
++  const hasVersions = () => {
++       return get(currentContentTypeLayout, ['pluginOptions', 'versions', 'versioned'], false);
++  };
++
+   const cleanReceivedData = useCallback((data) => {
+     const cleaned = removePasswordFieldsFromData(
+       data,
+@@ -221,6 +226,7 @@ const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }
+        */
+       const endPoint = isCloning
+         ? getRequestUrl(`collection-types/${slug}/clone/${origin}`)
++        : hasVersions ? `/content-versioning/${slug}/save${rawQuery}`
+         : getRequestUrl(`collection-types/${slug}`);
+       try {
+         // Show a loading button in the EditView/Header.js && lock the app => no navigation
+@@ -228,8 +234,12 @@ const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }
+ 
+         const { id, ...restBody } = body;
+ 
++        if (hasVersions) {
++          body.isDuplicatingEntry = isCreatingEntry && !!origin
++        }
++
+         const { data } = await post(endPoint, isCloning ? restBody : body, {
+-          params: query,
++          params: hasVersions ? rawQuery : query,
+         });
+ 
+         trackUsageRef.current('didCreateEntry', trackerProperty);
+@@ -326,14 +336,14 @@ const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }
+ 
+   const onPut = useCallback(
+     async (body, trackerProperty) => {
+-      const endPoint = getRequestUrl(`collection-types/${slug}/${id}`);
++      const endPoint = hasVersions ? `/content-versioning/${slug}/save${rawQuery}` : getRequestUrl(`collection-types/${slug}/${id}`);
+ 
+       try {
+         trackUsageRef.current('willEditEntry', trackerProperty);
+ 
+         dispatch(setStatus('submit-pending'));
+ 
+-        const { data } = await put(endPoint, body);
++        const { data } = hasVersions ? await post(endPoint, body) : await put(endPoint, body);
+ 
+         trackUsageRef.current('didEditEntry', { trackerProperty });
+         toggleNotification({
+@@ -348,6 +358,10 @@ const CollectionTypeFormWrapper = ({ allLayoutData, children, slug, id, origin }
+ 
+         dispatch(setStatus('resolved'));
+ 
++        if(hasVersions){
++          replace(`/content-manager/collectionType/${slug}/${data.id}${rawQuery}`)
++        }
++
+         return Promise.resolve(data);
+       } catch (err) {
+         trackUsageRef.current('didNotEditEntry', { error: err, trackerProperty });
+diff --git a/node_modules/@strapi/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/node_modules/@strapi/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+index 8b3d9b8..0a25b84 100644
+--- a/node_modules/@strapi/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
++++ b/node_modules/@strapi/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+@@ -81,6 +81,10 @@ const EditViewDataManagerProvider = ({
+     return get(currentContentTypeLayout, ['options', 'draftAndPublish'], false);
+   }, [currentContentTypeLayout]);
+ 
++  const hasVersions = useMemo(() => {
++    return get(currentContentTypeLayout, ['pluginOptions', 'versions', 'versioned'], false);
++  }, [currentContentTypeLayout]);
++
+   const shouldNotRunValidations = useMemo(() => {
+     return hasDraftAndPublish && !initialData.publishedAt;
+   }, [hasDraftAndPublish, initialData.publishedAt]);
+@@ -663,7 +667,7 @@ const EditViewDataManagerProvider = ({
+         <>
+           {!isSaving ? (
+             <Prompt
+-              when={!isEqual(modifiedData, initialData)}
++              when={!hasVersions && !isEqual(modifiedData, initialData)}
+               message={formatMessage({ id: 'global.prompt.unsaved' })}
+             />
+           ) : null}