@strapi/content-manager 5.60.0 → 5.61.0

package/dist/server/custom-order/services/utils.js

@@ -0,0 +1,152 @@
+'use strict';
+
+var constants = require('../constants.js');
+
+/**
+ * Works out how to place a document right before or after an anchor document.
+ *
+ * Positions are unique integers that may have gaps. Only the documents sitting between
+ * the moved document and the anchor are shifted, by one, towards the slot the moved
+ * document leaves behind.
+ *
+ * @returns null when the document is already in place.
+ */ const computeMove = ({ from, anchor, placement })=>{
+    if (from === anchor) {
+        // Two documents should never share a position. If it happens anyway (e.g. concurrent
+        // writes), open a slot next to the anchor instead of relying on the slot left behind.
+        return placement === 'before' ? {
+            position: anchor,
+            shift: {
+                from: anchor,
+                to: null,
+                by: 1
+            }
+        } : {
+            position: anchor + 1,
+            shift: {
+                from: anchor + 1,
+                to: null,
+                by: 1
+            }
+        };
+    }
+    const movingDown = from < anchor;
+    if (placement === 'before') {
+        if (movingDown) {
+            const position = anchor - 1;
+            return from === position ? null : {
+                position,
+                shift: {
+                    from: from + 1,
+                    to: position,
+                    by: -1
+                }
+            };
+        }
+        return {
+            position: anchor,
+            shift: {
+                from: anchor,
+                to: from - 1,
+                by: 1
+            }
+        };
+    }
+    if (movingDown) {
+        return {
+            position: anchor,
+            shift: {
+                from: from + 1,
+                to: anchor,
+                by: -1
+            }
+        };
+    }
+    const position = anchor + 1;
+    return from === position ? null : {
+        position,
+        shift: {
+            from: position,
+            to: from - 1,
+            by: 1
+        }
+    };
+};
+/**
+ * Whether a Document Service `sort` param is absent or empty.
+ */ const isEmptySort = (sort)=>{
+    if (sort === undefined || sort === null || sort === '') {
+        return true;
+    }
+    if (Array.isArray(sort)) {
+        return sort.length === 0;
+    }
+    if (typeof sort === 'object') {
+        return Object.keys(sort).length === 0;
+    }
+    return false;
+};
+const parseSortEntry = (entry)=>{
+    if (typeof entry === 'string') {
+        const [field, direction] = entry.trim().split(':');
+        return field ? {
+            field,
+            direction: toDirection(direction)
+        } : null;
+    }
+    if (entry && typeof entry === 'object') {
+        const fields = Object.keys(entry);
+        const field = fields[fields.length - 1];
+        return field ? {
+            field,
+            direction: toDirection(entry[field])
+        } : null;
+    }
+    return null;
+};
+const toDirection = (value)=>typeof value === 'string' && value.toLowerCase() === 'desc' ? 'desc' : 'asc';
+/**
+ * Completes a sort that ends on the position with the `id` of the row.
+ *
+ * Positions alone don't make a total order: every row of a document shares its position,
+ * rows written outside of the Document Service have none, and without a tie-breaker each
+ * database would place those rows differently, and not always on the same page. Among
+ * equals the most recent row comes first, like new entries do.
+ *
+ * @returns the same `sort` when it does not end on the position.
+ */ const toSortEntries = (sort)=>{
+    if (typeof sort === 'string') {
+        return sort.split(',');
+    }
+    return Array.isArray(sort) ? sort : [
+        sort
+    ];
+};
+const withTieBreaker = (sort)=>{
+    const entries = toSortEntries(sort);
+    const last = parseSortEntry(entries[entries.length - 1]);
+    if (!last || last.field !== constants.POSITION_ATTRIBUTE) {
+        return sort;
+    }
+    const tieBreaker = last.direction === 'asc' ? 'desc' : 'asc';
+    if (typeof sort === 'string') {
+        return `${sort},id:${tieBreaker}`;
+    }
+    if (Array.isArray(sort)) {
+        return [
+            ...sort,
+            typeof entries[entries.length - 1] === 'string' ? `id:${tieBreaker}` : {
+                id: tieBreaker
+            }
+        ];
+    }
+    return {
+        ...sort,
+        id: tieBreaker
+    };
+};
+
+exports.computeMove = computeMove;
+exports.isEmptySort = isEmptySort;
+exports.withTieBreaker = withTieBreaker;
+//# sourceMappingURL=utils.js.map

package/dist/server/custom-order/services/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../../server/src/custom-order/services/utils.ts"],"sourcesContent":["import { POSITION_ATTRIBUTE } from '../constants';\n\nexport type Placement = 'before' | 'after';\n\nexport interface MovePlan {\n  /** New position of the moved document. */\n  position: number;\n  /**\n   * Positions to shift to make room, bounds included. `to: null` means every position\n   * from `from` upwards.\n   */\n  shift: { from: number; to: number | null; by: 1 | -1 } | null;\n}\n\n/**\n * Works out how to place a document right before or after an anchor document.\n *\n * Positions are unique integers that may have gaps. Only the documents sitting between\n * the moved document and the anchor are shifted, by one, towards the slot the moved\n * document leaves behind.\n *\n * @returns null when the document is already in place.\n */\nexport const computeMove = ({\n  from,\n  anchor,\n  placement,\n}: {\n  from: number;\n  anchor: number;\n  placement: Placement;\n}): MovePlan | null => {\n  if (from === anchor) {\n    // Two documents should never share a position. If it happens anyway (e.g. concurrent\n    // writes), open a slot next to the anchor instead of relying on the slot left behind.\n    return placement === 'before'\n      ? { position: anchor, shift: { from: anchor, to: null, by: 1 } }\n      : { position: anchor + 1, shift: { from: anchor + 1, to: null, by: 1 } };\n  }\n\n  const movingDown = from < anchor;\n\n  if (placement === 'before') {\n    if (movingDown) {\n      const position = anchor - 1;\n\n      return from === position\n        ? null\n        : { position, shift: { from: from + 1, to: position, by: -1 } };\n    }\n\n    return { position: anchor, shift: { from: anchor, to: from - 1, by: 1 } };\n  }\n\n  if (movingDown) {\n    return { position: anchor, shift: { from: from + 1, to: anchor, by: -1 } };\n  }\n\n  const position = anchor + 1;\n\n  return from === position ? null : { position, shift: { from: position, to: from - 1, by: 1 } };\n};\n\n/**\n * Whether a Document Service `sort` param is absent or empty.\n */\nexport const isEmptySort = (sort: unknown): boolean => {\n  if (sort === undefined || sort === null || sort === '') {\n    return true;\n  }\n\n  if (Array.isArray(sort)) {\n    return sort.length === 0;\n  }\n\n  if (typeof sort === 'object') {\n    return Object.keys(sort).length === 0;\n  }\n\n  return false;\n};\n\ntype Direction = 'asc' | 'desc';\n\nconst parseSortEntry = (entry: unknown): { field: string; direction: Direction } | null => {\n  if (typeof entry === 'string') {\n    const [field, direction] = entry.trim().split(':');\n\n    return field ? { field, direction: toDirection(direction) } : null;\n  }\n\n  if (entry && typeof entry === 'object') {\n    const fields = Object.keys(entry);\n    const field = fields[fields.length - 1];\n\n    return field\n      ? { field, direction: toDirection((entry as Record<string, unknown>)[field]) }\n      : null;\n  }\n\n  return null;\n};\n\nconst toDirection = (value: unknown): Direction =>\n  typeof value === 'string' && value.toLowerCase() === 'desc' ? 'desc' : 'asc';\n\n/**\n * Completes a sort that ends on the position with the `id` of the row.\n *\n * Positions alone don't make a total order: every row of a document shares its position,\n * rows written outside of the Document Service have none, and without a tie-breaker each\n * database would place those rows differently, and not always on the same page. Among\n * equals the most recent row comes first, like new entries do.\n *\n * @returns the same `sort` when it does not end on the position.\n */\nconst toSortEntries = (sort: unknown): unknown[] => {\n  if (typeof sort === 'string') {\n    return sort.split(',');\n  }\n\n  return Array.isArray(sort) ? sort : [sort];\n};\n\nexport const withTieBreaker = (sort: unknown): unknown => {\n  const entries = toSortEntries(sort);\n  const last = parseSortEntry(entries[entries.length - 1]);\n\n  if (!last || last.field !== POSITION_ATTRIBUTE) {\n    return sort;\n  }\n\n  const tieBreaker: Direction = last.direction === 'asc' ? 'desc' : 'asc';\n\n  if (typeof sort === 'string') {\n    return `${sort},id:${tieBreaker}`;\n  }\n\n  if (Array.isArray(sort)) {\n    return [\n      ...sort,\n      typeof entries[entries.length - 1] === 'string' ? `id:${tieBreaker}` : { id: tieBreaker },\n    ];\n  }\n\n  return { ...(sort as Record<string, unknown>), id: tieBreaker };\n};\n"],"names":["computeMove","from","anchor","placement","position","shift","to","by","movingDown","isEmptySort","sort","undefined","Array","isArray","length","Object","keys","parseSortEntry","entry","field","direction","trim","split","toDirection","fields","value","toLowerCase","toSortEntries","withTieBreaker","entries","last","POSITION_ATTRIBUTE","tieBreaker","id"],"mappings":"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"}

package/dist/server/custom-order/services/utils.mjs

@@ -0,0 +1,148 @@
+import { POSITION_ATTRIBUTE } from '../constants.mjs';
+
+/**
+ * Works out how to place a document right before or after an anchor document.
+ *
+ * Positions are unique integers that may have gaps. Only the documents sitting between
+ * the moved document and the anchor are shifted, by one, towards the slot the moved
+ * document leaves behind.
+ *
+ * @returns null when the document is already in place.
+ */ const computeMove = ({ from, anchor, placement })=>{
+    if (from === anchor) {
+        // Two documents should never share a position. If it happens anyway (e.g. concurrent
+        // writes), open a slot next to the anchor instead of relying on the slot left behind.
+        return placement === 'before' ? {
+            position: anchor,
+            shift: {
+                from: anchor,
+                to: null,
+                by: 1
+            }
+        } : {
+            position: anchor + 1,
+            shift: {
+                from: anchor + 1,
+                to: null,
+                by: 1
+            }
+        };
+    }
+    const movingDown = from < anchor;
+    if (placement === 'before') {
+        if (movingDown) {
+            const position = anchor - 1;
+            return from === position ? null : {
+                position,
+                shift: {
+                    from: from + 1,
+                    to: position,
+                    by: -1
+                }
+            };
+        }
+        return {
+            position: anchor,
+            shift: {
+                from: anchor,
+                to: from - 1,
+                by: 1
+            }
+        };
+    }
+    if (movingDown) {
+        return {
+            position: anchor,
+            shift: {
+                from: from + 1,
+                to: anchor,
+                by: -1
+            }
+        };
+    }
+    const position = anchor + 1;
+    return from === position ? null : {
+        position,
+        shift: {
+            from: position,
+            to: from - 1,
+            by: 1
+        }
+    };
+};
+/**
+ * Whether a Document Service `sort` param is absent or empty.
+ */ const isEmptySort = (sort)=>{
+    if (sort === undefined || sort === null || sort === '') {
+        return true;
+    }
+    if (Array.isArray(sort)) {
+        return sort.length === 0;
+    }
+    if (typeof sort === 'object') {
+        return Object.keys(sort).length === 0;
+    }
+    return false;
+};
+const parseSortEntry = (entry)=>{
+    if (typeof entry === 'string') {
+        const [field, direction] = entry.trim().split(':');
+        return field ? {
+            field,
+            direction: toDirection(direction)
+        } : null;
+    }
+    if (entry && typeof entry === 'object') {
+        const fields = Object.keys(entry);
+        const field = fields[fields.length - 1];
+        return field ? {
+            field,
+            direction: toDirection(entry[field])
+        } : null;
+    }
+    return null;
+};
+const toDirection = (value)=>typeof value === 'string' && value.toLowerCase() === 'desc' ? 'desc' : 'asc';
+/**
+ * Completes a sort that ends on the position with the `id` of the row.
+ *
+ * Positions alone don't make a total order: every row of a document shares its position,
+ * rows written outside of the Document Service have none, and without a tie-breaker each
+ * database would place those rows differently, and not always on the same page. Among
+ * equals the most recent row comes first, like new entries do.
+ *
+ * @returns the same `sort` when it does not end on the position.
+ */ const toSortEntries = (sort)=>{
+    if (typeof sort === 'string') {
+        return sort.split(',');
+    }
+    return Array.isArray(sort) ? sort : [
+        sort
+    ];
+};
+const withTieBreaker = (sort)=>{
+    const entries = toSortEntries(sort);
+    const last = parseSortEntry(entries[entries.length - 1]);
+    if (!last || last.field !== POSITION_ATTRIBUTE) {
+        return sort;
+    }
+    const tieBreaker = last.direction === 'asc' ? 'desc' : 'asc';
+    if (typeof sort === 'string') {
+        return `${sort},id:${tieBreaker}`;
+    }
+    if (Array.isArray(sort)) {
+        return [
+            ...sort,
+            typeof entries[entries.length - 1] === 'string' ? `id:${tieBreaker}` : {
+                id: tieBreaker
+            }
+        ];
+    }
+    return {
+        ...sort,
+        id: tieBreaker
+    };
+};
+
+export { computeMove, isEmptySort, withTieBreaker };
+//# sourceMappingURL=utils.mjs.map

package/dist/server/custom-order/services/utils.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.mjs","sources":["../../../../server/src/custom-order/services/utils.ts"],"sourcesContent":["import { POSITION_ATTRIBUTE } from '../constants';\n\nexport type Placement = 'before' | 'after';\n\nexport interface MovePlan {\n  /** New position of the moved document. */\n  position: number;\n  /**\n   * Positions to shift to make room, bounds included. `to: null` means every position\n   * from `from` upwards.\n   */\n  shift: { from: number; to: number | null; by: 1 | -1 } | null;\n}\n\n/**\n * Works out how to place a document right before or after an anchor document.\n *\n * Positions are unique integers that may have gaps. Only the documents sitting between\n * the moved document and the anchor are shifted, by one, towards the slot the moved\n * document leaves behind.\n *\n * @returns null when the document is already in place.\n */\nexport const computeMove = ({\n  from,\n  anchor,\n  placement,\n}: {\n  from: number;\n  anchor: number;\n  placement: Placement;\n}): MovePlan | null => {\n  if (from === anchor) {\n    // Two documents should never share a position. If it happens anyway (e.g. concurrent\n    // writes), open a slot next to the anchor instead of relying on the slot left behind.\n    return placement === 'before'\n      ? { position: anchor, shift: { from: anchor, to: null, by: 1 } }\n      : { position: anchor + 1, shift: { from: anchor + 1, to: null, by: 1 } };\n  }\n\n  const movingDown = from < anchor;\n\n  if (placement === 'before') {\n    if (movingDown) {\n      const position = anchor - 1;\n\n      return from === position\n        ? null\n        : { position, shift: { from: from + 1, to: position, by: -1 } };\n    }\n\n    return { position: anchor, shift: { from: anchor, to: from - 1, by: 1 } };\n  }\n\n  if (movingDown) {\n    return { position: anchor, shift: { from: from + 1, to: anchor, by: -1 } };\n  }\n\n  const position = anchor + 1;\n\n  return from === position ? null : { position, shift: { from: position, to: from - 1, by: 1 } };\n};\n\n/**\n * Whether a Document Service `sort` param is absent or empty.\n */\nexport const isEmptySort = (sort: unknown): boolean => {\n  if (sort === undefined || sort === null || sort === '') {\n    return true;\n  }\n\n  if (Array.isArray(sort)) {\n    return sort.length === 0;\n  }\n\n  if (typeof sort === 'object') {\n    return Object.keys(sort).length === 0;\n  }\n\n  return false;\n};\n\ntype Direction = 'asc' | 'desc';\n\nconst parseSortEntry = (entry: unknown): { field: string; direction: Direction } | null => {\n  if (typeof entry === 'string') {\n    const [field, direction] = entry.trim().split(':');\n\n    return field ? { field, direction: toDirection(direction) } : null;\n  }\n\n  if (entry && typeof entry === 'object') {\n    const fields = Object.keys(entry);\n    const field = fields[fields.length - 1];\n\n    return field\n      ? { field, direction: toDirection((entry as Record<string, unknown>)[field]) }\n      : null;\n  }\n\n  return null;\n};\n\nconst toDirection = (value: unknown): Direction =>\n  typeof value === 'string' && value.toLowerCase() === 'desc' ? 'desc' : 'asc';\n\n/**\n * Completes a sort that ends on the position with the `id` of the row.\n *\n * Positions alone don't make a total order: every row of a document shares its position,\n * rows written outside of the Document Service have none, and without a tie-breaker each\n * database would place those rows differently, and not always on the same page. Among\n * equals the most recent row comes first, like new entries do.\n *\n * @returns the same `sort` when it does not end on the position.\n */\nconst toSortEntries = (sort: unknown): unknown[] => {\n  if (typeof sort === 'string') {\n    return sort.split(',');\n  }\n\n  return Array.isArray(sort) ? sort : [sort];\n};\n\nexport const withTieBreaker = (sort: unknown): unknown => {\n  const entries = toSortEntries(sort);\n  const last = parseSortEntry(entries[entries.length - 1]);\n\n  if (!last || last.field !== POSITION_ATTRIBUTE) {\n    return sort;\n  }\n\n  const tieBreaker: Direction = last.direction === 'asc' ? 'desc' : 'asc';\n\n  if (typeof sort === 'string') {\n    return `${sort},id:${tieBreaker}`;\n  }\n\n  if (Array.isArray(sort)) {\n    return [\n      ...sort,\n      typeof entries[entries.length - 1] === 'string' ? `id:${tieBreaker}` : { id: tieBreaker },\n    ];\n  }\n\n  return { ...(sort as Record<string, unknown>), id: tieBreaker };\n};\n"],"names":["computeMove","from","anchor","placement","position","shift","to","by","movingDown","isEmptySort","sort","undefined","Array","isArray","length","Object","keys","parseSortEntry","entry","field","direction","trim","split","toDirection","fields","value","toLowerCase","toSortEntries","withTieBreaker","entries","last","POSITION_ATTRIBUTE","tieBreaker","id"],"mappings":"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"}

package/dist/server/custom-order/utils.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var constants = require('./constants.js');
+
+function getService(strapi, name) {
+    // Cast is needed because the return type of strapi.service is too vague
+    return strapi.service(`plugin::content-manager.${name}`);
+}
+const isFeatureEnabled = (strapi)=>strapi.features.future.isEnabled(constants.FUTURE_FLAG);
+
+exports.getService = getService;
+exports.isFeatureEnabled = isFeatureEnabled;
+//# sourceMappingURL=utils.js.map

package/dist/server/custom-order/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../server/src/custom-order/utils.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nimport { FUTURE_FLAG } from './constants';\n\ntype CustomOrderServices = typeof import('./services').services;\n\nfunction getService<T extends keyof CustomOrderServices>(strapi: Core.Strapi, name: T) {\n  // Cast is needed because the return type of strapi.service is too vague\n  return strapi.service(`plugin::content-manager.${name}`) as ReturnType<CustomOrderServices[T]>;\n}\n\nconst isFeatureEnabled = (strapi: Core.Strapi) => strapi.features.future.isEnabled(FUTURE_FLAG);\n\nexport { getService, isFeatureEnabled };\n"],"names":["getService","strapi","name","service","isFeatureEnabled","features","future","isEnabled","FUTURE_FLAG"],"mappings":";;;;AAMA,SAASA,UAAAA,CAAgDC,MAAmB,EAAEC,IAAO,EAAA;;AAEnF,IAAA,OAAOD,OAAOE,OAAO,CAAC,CAAC,wBAAwB,EAAED,IAAAA,CAAAA,CAAM,CAAA;AACzD;AAEA,MAAME,gBAAAA,GAAmB,CAACH,MAAAA,GAAwBA,MAAAA,CAAOI,QAAQ,CAACC,MAAM,CAACC,SAAS,CAACC,qBAAAA;;;;;"}

package/dist/server/custom-order/utils.mjs

@@ -0,0 +1,10 @@
+import { FUTURE_FLAG } from './constants.mjs';
+
+function getService(strapi, name) {
+    // Cast is needed because the return type of strapi.service is too vague
+    return strapi.service(`plugin::content-manager.${name}`);
+}
+const isFeatureEnabled = (strapi)=>strapi.features.future.isEnabled(FUTURE_FLAG);
+
+export { getService, isFeatureEnabled };
+//# sourceMappingURL=utils.mjs.map

package/dist/server/custom-order/utils.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.mjs","sources":["../../../server/src/custom-order/utils.ts"],"sourcesContent":["import type { Core } from '@strapi/types';\n\nimport { FUTURE_FLAG } from './constants';\n\ntype CustomOrderServices = typeof import('./services').services;\n\nfunction getService<T extends keyof CustomOrderServices>(strapi: Core.Strapi, name: T) {\n  // Cast is needed because the return type of strapi.service is too vague\n  return strapi.service(`plugin::content-manager.${name}`) as ReturnType<CustomOrderServices[T]>;\n}\n\nconst isFeatureEnabled = (strapi: Core.Strapi) => strapi.features.future.isEnabled(FUTURE_FLAG);\n\nexport { getService, isFeatureEnabled };\n"],"names":["getService","strapi","name","service","isFeatureEnabled","features","future","isEnabled","FUTURE_FLAG"],"mappings":";;AAMA,SAASA,UAAAA,CAAgDC,MAAmB,EAAEC,IAAO,EAAA;;AAEnF,IAAA,OAAOD,OAAOE,OAAO,CAAC,CAAC,wBAAwB,EAAED,IAAAA,CAAAA,CAAM,CAAA;AACzD;AAEA,MAAME,gBAAAA,GAAmB,CAACH,MAAAA,GAAwBA,MAAAA,CAAOI,QAAQ,CAACC,MAAM,CAACC,SAAS,CAACC,WAAAA;;;;"}

package/dist/server/history/constants.js

@@ -8,7 +8,8 @@ const FIELDS_TO_IGNORE = [
     'createdBy',
     'updatedBy',
     'strapi_stage',
-    'strapi_assignee'
+    'strapi_assignee',
+    'strapi_position'
 ];
 
 exports.FIELDS_TO_IGNORE = FIELDS_TO_IGNORE;

package/dist/server/history/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sources":["../../../server/src/history/constants.ts"],"sourcesContent":["export const HISTORY_VERSION_UID = 'plugin::content-manager.history-version';\nexport const FIELDS_TO_IGNORE = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'strapi_stage',\n  'strapi_assignee',\n];\n"],"names":["HISTORY_VERSION_UID","FIELDS_TO_IGNORE"],"mappings":";;AAAO,MAAMA,sBAAsB;MACtBC,gBAAAA,GAAmB;AAC9B,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,cAAA;AACA,IAAA;;;;;;"}
+{"version":3,"file":"constants.js","sources":["../../../server/src/history/constants.ts"],"sourcesContent":["export const HISTORY_VERSION_UID = 'plugin::content-manager.history-version';\nexport const FIELDS_TO_IGNORE = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'strapi_stage',\n  'strapi_assignee',\n  'strapi_position',\n];\n"],"names":["HISTORY_VERSION_UID","FIELDS_TO_IGNORE"],"mappings":";;AAAO,MAAMA,sBAAsB;MACtBC,gBAAAA,GAAmB;AAC9B,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,cAAA;AACA,IAAA,iBAAA;AACA,IAAA;;;;;;"}

package/dist/server/history/constants.mjs

@@ -6,7 +6,8 @@ const FIELDS_TO_IGNORE = [
     'createdBy',
     'updatedBy',
     'strapi_stage',
-    'strapi_assignee'
+    'strapi_assignee',
+    'strapi_position'
 ];
 
 export { FIELDS_TO_IGNORE, HISTORY_VERSION_UID };

package/dist/server/history/constants.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"constants.mjs","sources":["../../../server/src/history/constants.ts"],"sourcesContent":["export const HISTORY_VERSION_UID = 'plugin::content-manager.history-version';\nexport const FIELDS_TO_IGNORE = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'strapi_stage',\n  'strapi_assignee',\n];\n"],"names":["HISTORY_VERSION_UID","FIELDS_TO_IGNORE"],"mappings":"AAAO,MAAMA,sBAAsB;MACtBC,gBAAAA,GAAmB;AAC9B,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,cAAA;AACA,IAAA;;;;;"}
+{"version":3,"file":"constants.mjs","sources":["../../../server/src/history/constants.ts"],"sourcesContent":["export const HISTORY_VERSION_UID = 'plugin::content-manager.history-version';\nexport const FIELDS_TO_IGNORE = [\n  'createdAt',\n  'updatedAt',\n  'publishedAt',\n  'createdBy',\n  'updatedBy',\n  'strapi_stage',\n  'strapi_assignee',\n  'strapi_position',\n];\n"],"names":["HISTORY_VERSION_UID","FIELDS_TO_IGNORE"],"mappings":"AAAO,MAAMA,sBAAsB;MACtBC,gBAAAA,GAAmB;AAC9B,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,aAAA;AACA,IAAA,WAAA;AACA,IAAA,WAAA;AACA,IAAA,cAAA;AACA,IAAA,iBAAA;AACA,IAAA;;;;;"}

package/dist/server/history/controllers/history-version.js

@@ -13,7 +13,6 @@ var historyVersion = require('./validation/history-version.js');
     let pageSizeNumber = 20;
     if (page) {
         const parsedPage = parseInt(page, 10);
-        pageNumber = parseInt(page, 10);
         if (!Number.isNaN(parsedPage) && parsedPage >= 1) {
             pageNumber = parsedPage;
         }
@@ -93,7 +92,12 @@ const createHistoryVersionController = ({ strapi })=>{
             if (permissionChecker.cannot.update()) {
                 throw new strapiUtils.errors.ForbiddenError();
             }
-            const restoredDocument = await utils.getService(strapi, 'history').restoreVersion(request.params.versionId);
+            // Version ids are positive integers, other values cannot match a version
+            const versionId = Number(request.params.versionId);
+            if (Number.isInteger(versionId) === false || versionId < 1) {
+                throw new strapiUtils.errors.NotFoundError('History version not found');
+            }
+            const restoredDocument = await utils.getService(strapi, 'history').restoreVersion(versionId);
             return {
                 data: {
                     documentId: restoredDocument.documentId

package/dist/server/history/controllers/history-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-version.js","sources":["../../../../server/src/history/controllers/history-version.ts"],"sourcesContent":["import { async, errors } from '@strapi/utils';\nimport type { Core, UID } from '@strapi/types';\nimport { pick } from 'lodash';\n\nimport { getService as getContentManagerService } from '../../utils';\nimport { getService } from '../utils';\nimport type { HistoryVersions } from '../../../../shared/contracts';\nimport { validateRestoreVersion } from './validation/history-version';\n\n/**\n * Parses pagination params and makes sure they're within valid ranges\n */\nconst getValidPagination = ({ page, pageSize }: { page: any; pageSize: any }) => {\n  let pageNumber = 1;\n  let pageSizeNumber = 20;\n\n  if (page) {\n    const parsedPage = parseInt(page, 10);\n    pageNumber = parseInt(page, 10);\n\n    if (!Number.isNaN(parsedPage) && parsedPage >= 1) {\n      pageNumber = parsedPage;\n    }\n  }\n\n  if (pageSize) {\n    const parsedPageSize = parseInt(pageSize, 10);\n\n    if (!Number.isNaN(parsedPageSize) && parsedPageSize >= 1 && parsedPageSize <= 100) {\n      pageSizeNumber = parsedPageSize;\n    }\n  }\n\n  return { page: pageNumber, pageSize: pageSizeNumber };\n};\n\nconst createHistoryVersionController = ({ strapi }: { strapi: Core.Strapi }) => {\n  return {\n    async findMany(ctx) {\n      const contentTypeUid = ctx.query.contentType as UID.ContentType;\n      const isSingleType = strapi.getModel(contentTypeUid)?.kind === 'singleType';\n\n      if (isSingleType && !contentTypeUid) {\n        throw new errors.ForbiddenError('contentType is required');\n      }\n\n      if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {\n        throw new errors.ForbiddenError('contentType and documentId are required');\n      }\n\n      /**\n       * There are no permissions specifically for history versions,\n       * but we need to check that the user can read the content type\n       */\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: ctx.query.contentType,\n      });\n\n      if (permissionChecker.cannot.read()) {\n        return ctx.forbidden();\n      }\n\n      const query: HistoryVersions.GetHistoryVersions.Request['query'] =\n        await permissionChecker.sanitizeQuery(ctx.query);\n\n      const { results, pagination } = await getService(strapi, 'history').findVersionsPage({\n        query: {\n          ...query,\n          ...getValidPagination({ page: query.page, pageSize: query.pageSize }),\n        },\n        state: { userAbility: ctx.state.userAbility },\n      });\n\n      const sanitizedResults = await async.map(\n        results,\n        async (version: HistoryVersions.HistoryVersionDataResponse & { locale: string }) => {\n          return {\n            ...version,\n            data: await permissionChecker.sanitizeOutput(version.data),\n            createdBy: version.createdBy\n              ? pick(version.createdBy, ['id', 'firstname', 'lastname', 'username', 'email'])\n              : undefined,\n          };\n        }\n      );\n\n      return {\n        data: sanitizedResults,\n        meta: { pagination },\n      };\n    },\n\n    async restoreVersion(ctx) {\n      const request = ctx.request as unknown as HistoryVersions.RestoreHistoryVersion.Request;\n\n      await validateRestoreVersion(request.body, 'contentType is required');\n\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: request.body.contentType,\n      });\n\n      if (permissionChecker.cannot.update()) {\n        throw new errors.ForbiddenError();\n      }\n\n      const restoredDocument = await getService(strapi, 'history').restoreVersion(\n        request.params.versionId\n      );\n\n      return {\n        data: { documentId: restoredDocument.documentId },\n      } satisfies HistoryVersions.RestoreHistoryVersion.Response;\n    },\n  } satisfies Core.Controller;\n};\n\nexport { createHistoryVersionController };\n"],"names":["getValidPagination","page","pageSize","pageNumber","pageSizeNumber","parsedPage","parseInt","Number","isNaN","parsedPageSize","createHistoryVersionController","strapi","findMany","ctx","contentTypeUid","query","contentType","isSingleType","getModel","kind","errors","ForbiddenError","documentId","permissionChecker","getContentManagerService","create","userAbility","state","model","cannot","read","forbidden","sanitizeQuery","results","pagination","getService","findVersionsPage","sanitizedResults","async","map","version","data","sanitizeOutput","createdBy","pick","undefined","meta","restoreVersion","request","validateRestoreVersion","body","update","restoredDocument","params","versionId"],"mappings":"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"}
+{"version":3,"file":"history-version.js","sources":["../../../../server/src/history/controllers/history-version.ts"],"sourcesContent":["import { async, errors } from '@strapi/utils';\nimport type { Core, UID } from '@strapi/types';\nimport { pick } from 'lodash';\n\nimport { getService as getContentManagerService } from '../../utils';\nimport { getService } from '../utils';\nimport type { HistoryVersions } from '../../../../shared/contracts';\nimport { validateRestoreVersion } from './validation/history-version';\n\n/**\n * Parses pagination params and makes sure they're within valid ranges\n */\nconst getValidPagination = ({ page, pageSize }: { page: any; pageSize: any }) => {\n  let pageNumber = 1;\n  let pageSizeNumber = 20;\n\n  if (page) {\n    const parsedPage = parseInt(page, 10);\n\n    if (!Number.isNaN(parsedPage) && parsedPage >= 1) {\n      pageNumber = parsedPage;\n    }\n  }\n\n  if (pageSize) {\n    const parsedPageSize = parseInt(pageSize, 10);\n\n    if (!Number.isNaN(parsedPageSize) && parsedPageSize >= 1 && parsedPageSize <= 100) {\n      pageSizeNumber = parsedPageSize;\n    }\n  }\n\n  return { page: pageNumber, pageSize: pageSizeNumber };\n};\n\nconst createHistoryVersionController = ({ strapi }: { strapi: Core.Strapi }) => {\n  return {\n    async findMany(ctx) {\n      const contentTypeUid = ctx.query.contentType as UID.ContentType;\n      const isSingleType = strapi.getModel(contentTypeUid)?.kind === 'singleType';\n\n      if (isSingleType && !contentTypeUid) {\n        throw new errors.ForbiddenError('contentType is required');\n      }\n\n      if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {\n        throw new errors.ForbiddenError('contentType and documentId are required');\n      }\n\n      /**\n       * There are no permissions specifically for history versions,\n       * but we need to check that the user can read the content type\n       */\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: ctx.query.contentType,\n      });\n\n      if (permissionChecker.cannot.read()) {\n        return ctx.forbidden();\n      }\n\n      const query: HistoryVersions.GetHistoryVersions.Request['query'] =\n        await permissionChecker.sanitizeQuery(ctx.query);\n\n      const { results, pagination } = await getService(strapi, 'history').findVersionsPage({\n        query: {\n          ...query,\n          ...getValidPagination({ page: query.page, pageSize: query.pageSize }),\n        },\n        state: { userAbility: ctx.state.userAbility },\n      });\n\n      const sanitizedResults = await async.map(\n        results,\n        async (version: HistoryVersions.HistoryVersionDataResponse & { locale: string }) => {\n          return {\n            ...version,\n            data: await permissionChecker.sanitizeOutput(version.data),\n            createdBy: version.createdBy\n              ? pick(version.createdBy, ['id', 'firstname', 'lastname', 'username', 'email'])\n              : undefined,\n          };\n        }\n      );\n\n      return {\n        data: sanitizedResults,\n        meta: { pagination },\n      };\n    },\n\n    async restoreVersion(ctx) {\n      const request = ctx.request as unknown as HistoryVersions.RestoreHistoryVersion.Request;\n\n      await validateRestoreVersion(request.body, 'contentType is required');\n\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: request.body.contentType,\n      });\n\n      if (permissionChecker.cannot.update()) {\n        throw new errors.ForbiddenError();\n      }\n\n      // Version ids are positive integers, other values cannot match a version\n      const versionId = Number(request.params.versionId);\n      if (Number.isInteger(versionId) === false || versionId < 1) {\n        throw new errors.NotFoundError('History version not found');\n      }\n\n      const restoredDocument = await getService(strapi, 'history').restoreVersion(versionId);\n\n      return {\n        data: { documentId: restoredDocument.documentId },\n      } satisfies HistoryVersions.RestoreHistoryVersion.Response;\n    },\n  } satisfies Core.Controller;\n};\n\nexport { createHistoryVersionController };\n"],"names":["getValidPagination","page","pageSize","pageNumber","pageSizeNumber","parsedPage","parseInt","Number","isNaN","parsedPageSize","createHistoryVersionController","strapi","findMany","ctx","contentTypeUid","query","contentType","isSingleType","getModel","kind","errors","ForbiddenError","documentId","permissionChecker","getContentManagerService","create","userAbility","state","model","cannot","read","forbidden","sanitizeQuery","results","pagination","getService","findVersionsPage","sanitizedResults","async","map","version","data","sanitizeOutput","createdBy","pick","undefined","meta","restoreVersion","request","validateRestoreVersion","body","update","versionId","params","isInteger","NotFoundError","restoredDocument"],"mappings":"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"}

package/dist/server/history/controllers/history-version.mjs

@@ -11,7 +11,6 @@ import { validateRestoreVersion } from './validation/history-version.mjs';
     let pageSizeNumber = 20;
     if (page) {
         const parsedPage = parseInt(page, 10);
-        pageNumber = parseInt(page, 10);
         if (!Number.isNaN(parsedPage) && parsedPage >= 1) {
             pageNumber = parsedPage;
         }
@@ -91,7 +90,12 @@ const createHistoryVersionController = ({ strapi })=>{
             if (permissionChecker.cannot.update()) {
                 throw new errors.ForbiddenError();
             }
-            const restoredDocument = await getService$1(strapi, 'history').restoreVersion(request.params.versionId);
+            // Version ids are positive integers, other values cannot match a version
+            const versionId = Number(request.params.versionId);
+            if (Number.isInteger(versionId) === false || versionId < 1) {
+                throw new errors.NotFoundError('History version not found');
+            }
+            const restoredDocument = await getService$1(strapi, 'history').restoreVersion(versionId);
             return {
                 data: {
                     documentId: restoredDocument.documentId

package/dist/server/history/controllers/history-version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"history-version.mjs","sources":["../../../../server/src/history/controllers/history-version.ts"],"sourcesContent":["import { async, errors } from '@strapi/utils';\nimport type { Core, UID } from '@strapi/types';\nimport { pick } from 'lodash';\n\nimport { getService as getContentManagerService } from '../../utils';\nimport { getService } from '../utils';\nimport type { HistoryVersions } from '../../../../shared/contracts';\nimport { validateRestoreVersion } from './validation/history-version';\n\n/**\n * Parses pagination params and makes sure they're within valid ranges\n */\nconst getValidPagination = ({ page, pageSize }: { page: any; pageSize: any }) => {\n  let pageNumber = 1;\n  let pageSizeNumber = 20;\n\n  if (page) {\n    const parsedPage = parseInt(page, 10);\n    pageNumber = parseInt(page, 10);\n\n    if (!Number.isNaN(parsedPage) && parsedPage >= 1) {\n      pageNumber = parsedPage;\n    }\n  }\n\n  if (pageSize) {\n    const parsedPageSize = parseInt(pageSize, 10);\n\n    if (!Number.isNaN(parsedPageSize) && parsedPageSize >= 1 && parsedPageSize <= 100) {\n      pageSizeNumber = parsedPageSize;\n    }\n  }\n\n  return { page: pageNumber, pageSize: pageSizeNumber };\n};\n\nconst createHistoryVersionController = ({ strapi }: { strapi: Core.Strapi }) => {\n  return {\n    async findMany(ctx) {\n      const contentTypeUid = ctx.query.contentType as UID.ContentType;\n      const isSingleType = strapi.getModel(contentTypeUid)?.kind === 'singleType';\n\n      if (isSingleType && !contentTypeUid) {\n        throw new errors.ForbiddenError('contentType is required');\n      }\n\n      if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {\n        throw new errors.ForbiddenError('contentType and documentId are required');\n      }\n\n      /**\n       * There are no permissions specifically for history versions,\n       * but we need to check that the user can read the content type\n       */\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: ctx.query.contentType,\n      });\n\n      if (permissionChecker.cannot.read()) {\n        return ctx.forbidden();\n      }\n\n      const query: HistoryVersions.GetHistoryVersions.Request['query'] =\n        await permissionChecker.sanitizeQuery(ctx.query);\n\n      const { results, pagination } = await getService(strapi, 'history').findVersionsPage({\n        query: {\n          ...query,\n          ...getValidPagination({ page: query.page, pageSize: query.pageSize }),\n        },\n        state: { userAbility: ctx.state.userAbility },\n      });\n\n      const sanitizedResults = await async.map(\n        results,\n        async (version: HistoryVersions.HistoryVersionDataResponse & { locale: string }) => {\n          return {\n            ...version,\n            data: await permissionChecker.sanitizeOutput(version.data),\n            createdBy: version.createdBy\n              ? pick(version.createdBy, ['id', 'firstname', 'lastname', 'username', 'email'])\n              : undefined,\n          };\n        }\n      );\n\n      return {\n        data: sanitizedResults,\n        meta: { pagination },\n      };\n    },\n\n    async restoreVersion(ctx) {\n      const request = ctx.request as unknown as HistoryVersions.RestoreHistoryVersion.Request;\n\n      await validateRestoreVersion(request.body, 'contentType is required');\n\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: request.body.contentType,\n      });\n\n      if (permissionChecker.cannot.update()) {\n        throw new errors.ForbiddenError();\n      }\n\n      const restoredDocument = await getService(strapi, 'history').restoreVersion(\n        request.params.versionId\n      );\n\n      return {\n        data: { documentId: restoredDocument.documentId },\n      } satisfies HistoryVersions.RestoreHistoryVersion.Response;\n    },\n  } satisfies Core.Controller;\n};\n\nexport { createHistoryVersionController };\n"],"names":["getValidPagination","page","pageSize","pageNumber","pageSizeNumber","parsedPage","parseInt","Number","isNaN","parsedPageSize","createHistoryVersionController","strapi","findMany","ctx","contentTypeUid","query","contentType","isSingleType","getModel","kind","errors","ForbiddenError","documentId","permissionChecker","getContentManagerService","create","userAbility","state","model","cannot","read","forbidden","sanitizeQuery","results","pagination","getService","findVersionsPage","sanitizedResults","async","map","version","data","sanitizeOutput","createdBy","pick","undefined","meta","restoreVersion","request","validateRestoreVersion","body","update","restoredDocument","params","versionId"],"mappings":"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"}
+{"version":3,"file":"history-version.mjs","sources":["../../../../server/src/history/controllers/history-version.ts"],"sourcesContent":["import { async, errors } from '@strapi/utils';\nimport type { Core, UID } from '@strapi/types';\nimport { pick } from 'lodash';\n\nimport { getService as getContentManagerService } from '../../utils';\nimport { getService } from '../utils';\nimport type { HistoryVersions } from '../../../../shared/contracts';\nimport { validateRestoreVersion } from './validation/history-version';\n\n/**\n * Parses pagination params and makes sure they're within valid ranges\n */\nconst getValidPagination = ({ page, pageSize }: { page: any; pageSize: any }) => {\n  let pageNumber = 1;\n  let pageSizeNumber = 20;\n\n  if (page) {\n    const parsedPage = parseInt(page, 10);\n\n    if (!Number.isNaN(parsedPage) && parsedPage >= 1) {\n      pageNumber = parsedPage;\n    }\n  }\n\n  if (pageSize) {\n    const parsedPageSize = parseInt(pageSize, 10);\n\n    if (!Number.isNaN(parsedPageSize) && parsedPageSize >= 1 && parsedPageSize <= 100) {\n      pageSizeNumber = parsedPageSize;\n    }\n  }\n\n  return { page: pageNumber, pageSize: pageSizeNumber };\n};\n\nconst createHistoryVersionController = ({ strapi }: { strapi: Core.Strapi }) => {\n  return {\n    async findMany(ctx) {\n      const contentTypeUid = ctx.query.contentType as UID.ContentType;\n      const isSingleType = strapi.getModel(contentTypeUid)?.kind === 'singleType';\n\n      if (isSingleType && !contentTypeUid) {\n        throw new errors.ForbiddenError('contentType is required');\n      }\n\n      if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {\n        throw new errors.ForbiddenError('contentType and documentId are required');\n      }\n\n      /**\n       * There are no permissions specifically for history versions,\n       * but we need to check that the user can read the content type\n       */\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: ctx.query.contentType,\n      });\n\n      if (permissionChecker.cannot.read()) {\n        return ctx.forbidden();\n      }\n\n      const query: HistoryVersions.GetHistoryVersions.Request['query'] =\n        await permissionChecker.sanitizeQuery(ctx.query);\n\n      const { results, pagination } = await getService(strapi, 'history').findVersionsPage({\n        query: {\n          ...query,\n          ...getValidPagination({ page: query.page, pageSize: query.pageSize }),\n        },\n        state: { userAbility: ctx.state.userAbility },\n      });\n\n      const sanitizedResults = await async.map(\n        results,\n        async (version: HistoryVersions.HistoryVersionDataResponse & { locale: string }) => {\n          return {\n            ...version,\n            data: await permissionChecker.sanitizeOutput(version.data),\n            createdBy: version.createdBy\n              ? pick(version.createdBy, ['id', 'firstname', 'lastname', 'username', 'email'])\n              : undefined,\n          };\n        }\n      );\n\n      return {\n        data: sanitizedResults,\n        meta: { pagination },\n      };\n    },\n\n    async restoreVersion(ctx) {\n      const request = ctx.request as unknown as HistoryVersions.RestoreHistoryVersion.Request;\n\n      await validateRestoreVersion(request.body, 'contentType is required');\n\n      const permissionChecker = getContentManagerService('permission-checker').create({\n        userAbility: ctx.state.userAbility,\n        model: request.body.contentType,\n      });\n\n      if (permissionChecker.cannot.update()) {\n        throw new errors.ForbiddenError();\n      }\n\n      // Version ids are positive integers, other values cannot match a version\n      const versionId = Number(request.params.versionId);\n      if (Number.isInteger(versionId) === false || versionId < 1) {\n        throw new errors.NotFoundError('History version not found');\n      }\n\n      const restoredDocument = await getService(strapi, 'history').restoreVersion(versionId);\n\n      return {\n        data: { documentId: restoredDocument.documentId },\n      } satisfies HistoryVersions.RestoreHistoryVersion.Response;\n    },\n  } satisfies Core.Controller;\n};\n\nexport { createHistoryVersionController };\n"],"names":["getValidPagination","page","pageSize","pageNumber","pageSizeNumber","parsedPage","parseInt","Number","isNaN","parsedPageSize","createHistoryVersionController","strapi","findMany","ctx","contentTypeUid","query","contentType","isSingleType","getModel","kind","errors","ForbiddenError","documentId","permissionChecker","getContentManagerService","create","userAbility","state","model","cannot","read","forbidden","sanitizeQuery","results","pagination","getService","findVersionsPage","sanitizedResults","async","map","version","data","sanitizeOutput","createdBy","pick","undefined","meta","restoreVersion","request","validateRestoreVersion","body","update","versionId","params","isInteger","NotFoundError","restoredDocument"],"mappings":"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"}

package/dist/server/history/services/history.js

@@ -5,6 +5,7 @@ var _ = require('lodash');
 var constants = require('../constants.js');
 var utils = require('./utils.js');
 var index = require('../../utils/index.js');
+var auditLogs = require('../../audit-logs.js');
 
 const createHistoryService = ({ strapi })=>{
     const query = strapi.db.query(constants.HISTORY_VERSION_UID);
@@ -80,15 +81,16 @@ const createHistoryService = ({ strapi })=>{
             const results = ids.map((id)=>versionsById.get(id)).filter(Boolean);
             const populateEntry = async (entry)=>{
                 return strapiUtils.traverseEntity(async (options, utils)=>{
+                    if (options.key === 'id' && options.schema.modelType === 'component') {
+                        // Ids on components throw an error when restoring
+                        utils.remove('id');
+                        return;
+                    }
                     if (!options.attribute) return;
                     if (!options.value) return;
                     const currentValue = Array.isArray(options.value) ? options.value : [
                         options.value
                     ];
-                    if (options.attribute.type === 'component') {
-                        // Ids on components throw an error when restoring
-                        utils.remove('id');
-                    }
                     if (options.attribute.type === 'relation' && // TODO: handle polymorphic relations
                     options.attribute.relation !== 'morphToOne' && options.attribute.relation !== 'morphToMany') {
                         if (options.attribute.target === 'admin::user') {
@@ -158,6 +160,9 @@ const createHistoryService = ({ strapi })=>{
                     id: versionId
                 }
             });
+            if (version === null) {
+                throw new strapiUtils.errors.NotFoundError('History version not found');
+            }
             const contentTypeSchemaAttributes = strapi.getModel(version.contentType).attributes;
             const schemaDiff = serviceUtils.getSchemaAttributesDiff(version.schema, contentTypeSchemaAttributes);
             // Set all added attribute values to null
@@ -170,10 +175,13 @@ const createHistoryService = ({ strapi })=>{
             const schema = structuredClone(version.schema);
             schema.attributes = _.omit(contentTypeSchemaAttributes, constants.FIELDS_TO_IGNORE);
             const dataWithoutMissingRelations = await strapiUtils.traverseEntity(async (options, utils)=>{
-                if (!options.attribute) return;
-                if (options.attribute.type === 'component') {
+                if (options.key === 'id' && options.schema.modelType === 'component') {
                     // Ids on components throw an error when restoring
                     utils.remove('id');
+                    return;
+                }
+                if (!options.attribute) return;
+                if (options.attribute.type === 'component') {
                     if (options.attribute.repeatable && options.value === null) {
                         // Repeatable Components should always be an array
                         utils.set(options.key, []);
@@ -212,6 +220,15 @@ const createHistoryService = ({ strapi })=>{
             if (!restoredDocument) {
                 throw new strapiUtils.errors.ApplicationError('Failed to restore version');
             }
+            await strapiUtils.emitAudit({
+                strapi
+            }, auditLogs.AUDITED_EVENTS.ENTRY_HISTORY_RESTORE, {
+                uid: version.contentType,
+                documentId: restoredDocument.documentId,
+                locale: version.locale ?? null,
+                versionId: version.id,
+                versionCreatedAt: new Date(version.createdAt).toISOString()
+            });
             return restoredDocument;
         }
     };