@strapi/content-manager 5.0.5 → 5.0.6

package/dist/server/index.mjs

@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
 import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
 import qs from "qs";
 import slugify from "@sindresorhus/slugify";
-const getService$2 = (name) => {
+const getService$1 = (name) => {
   return strapi.plugin("content-manager").service(name);
 };
-function getService$1(strapi2, name) {
+function getService(strapi2, name) {
   return strapi2.service(`plugin::content-manager.${name}`);
 }
 const historyRestoreVersionSchema = yup.object().shape({
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
       if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
         throw new errors.ForbiddenError("contentType and documentId are required");
       }
-      const permissionChecker2 = getService$2("permission-checker").create({
+      const permissionChecker2 = getService$1("permission-checker").create({
         userAbility: ctx.state.userAbility,
         model: ctx.query.contentType
       });
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
         return ctx.forbidden();
       }
       const query = await permissionChecker2.sanitizeQuery(ctx.query);
-      const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
+      const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
         query: {
           ...query,
           ...getValidPagination({ page: query.page, pageSize: query.pageSize })
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
     async restoreVersion(ctx) {
       const request = ctx.request;
       await validateRestoreVersion(request.body, "contentType is required");
-      const permissionChecker2 = getService$2("permission-checker").create({
+      const permissionChecker2 = getService$1("permission-checker").create({
         userAbility: ctx.state.userAbility,
         model: request.body.contentType
       });
       if (permissionChecker2.cannot.update()) {
         throw new errors.ForbiddenError();
       }
-      const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
+      const restoredDocument = await getService(strapi2, "history").restoreVersion(
         request.params.versionId
       );
       return {
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
     }
   };
 };
-const controllers$2 = {
+const controllers$1 = {
   "history-version": createHistoryVersionController
   /**
    * Casting is needed because the types aren't aware that Strapi supports
@@ -202,17 +202,6 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
     const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
     return documentMetadataService.getStatus(document, meta.availableStatus);
   };
-  const getComponentFields = (componentUID) => {
-    return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
-      (fieldsAcc, [key, attribute]) => {
-        if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
-          fieldsAcc.push(key);
-        }
-        return fieldsAcc;
-      },
-      []
-    );
-  };
   const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
     const model = strapi2.getModel(uid2);
     const attributes = Object.entries(model.attributes);
@@ -236,19 +225,13 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
         }
         case "component": {
           const populate = getDeepPopulate2(attribute.component);
-          acc[attributeName] = {
-            populate,
-            [fieldSelector]: getComponentFields(attribute.component)
-          };
+          acc[attributeName] = { populate };
           break;
         }
         case "dynamiczone": {
           const populatedComponents = (attribute.components || []).reduce(
             (acc2, componentUID) => {
-              acc2[componentUID] = {
-                populate: getDeepPopulate2(componentUID),
-                [fieldSelector]: getComponentFields(componentUID)
-              };
+              acc2[componentUID] = { populate: getDeepPopulate2(componentUID) };
               return acc2;
             },
             {}
@@ -361,7 +344,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
             const attributeValue = entry.data[attributeKey];
             const attributeValues = Array.isArray(attributeValue) ? attributeValue : [attributeValue];
             if (attributeSchema.type === "media") {
-              const permissionChecker2 = getService$2("permission-checker").create({
+              const permissionChecker2 = getService$1("permission-checker").create({
                 userAbility: params.state.userAbility,
                 model: "plugin::upload.file"
               });
@@ -402,7 +385,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
                   [attributeKey]: adminUsers
                 };
               }
-              const permissionChecker2 = getService$2("permission-checker").create({
+              const permissionChecker2 = getService$1("permission-checker").create({
                 userAbility: params.state.userAbility,
                 model: attributeSchema.target
               });
@@ -578,7 +561,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
           onCommit(async () => {
             for (const entry of localeEntries) {
               const status = await serviceUtils.getVersionStatus(uid2, entry);
-              await getService$1(strapi2, "history").createVersion({
+              await getService(strapi2, "history").createVersion({
                 contentType: uid2,
                 data: omit(FIELDS_TO_IGNORE, entry),
                 relatedDocumentId: documentId,
@@ -591,19 +574,15 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         });
         return result;
       });
-      state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
+      state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
         const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
         const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
         strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
           where: {
             created_at: {
-              $lt: expirationDate
+              $lt: expirationDate.toISOString()
             }
           }
-        }).catch((error) => {
-          if (error instanceof Error) {
-            strapi2.log.error("Error deleting expired history versions", error.message);
-          }
         });
       });
       state.isInitialized = true;
@@ -615,17 +594,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
     }
   };
 };
-const services$2 = {
+const services$1 = {
   history: createHistoryService,
   lifecycles: createLifecyclesService
 };
-const info$1 = { pluginName: "content-manager", type: "admin" };
+const info = { pluginName: "content-manager", type: "admin" };
 const historyVersionRouter = {
   type: "admin",
   routes: [
     {
       method: "GET",
-      info: info$1,
+      info,
       path: "/history-versions",
       handler: "history-version.findMany",
       config: {
@@ -634,7 +613,7 @@ const historyVersionRouter = {
     },
     {
       method: "PUT",
-      info: info$1,
+      info,
       path: "/history-versions/:versionId/restore",
       handler: "history-version.restoreVersion",
       config: {
@@ -643,7 +622,7 @@ const historyVersionRouter = {
     }
   ]
 };
-const routes$2 = {
+const routes$1 = {
   "history-version": historyVersionRouter
 };
 const historyVersion = {
@@ -690,21 +669,21 @@ const historyVersion = {
     }
   }
 };
-const getFeature$1 = () => {
+const getFeature = () => {
   if (strapi.ee.features.isEnabled("cms-content-history")) {
     return {
       register({ strapi: strapi2 }) {
         strapi2.get("models").add(historyVersion);
       },
       bootstrap({ strapi: strapi2 }) {
-        getService$1(strapi2, "lifecycles").bootstrap();
+        getService(strapi2, "lifecycles").bootstrap();
       },
       destroy({ strapi: strapi2 }) {
-        getService$1(strapi2, "lifecycles").destroy();
+        getService(strapi2, "lifecycles").destroy();
       },
-      controllers: controllers$2,
-      services: services$2,
-      routes: routes$2
+      controllers: controllers$1,
+      services: services$1,
+      routes: routes$1
     };
   }
   return {
@@ -713,7 +692,7 @@ const getFeature$1 = () => {
     }
   };
 };
-const history = getFeature$1();
+const history = getFeature();
 const register = async ({ strapi: strapi2 }) => {
   await history.register?.({ strapi: strapi2 });
 };
@@ -721,165 +700,15 @@ const ALLOWED_WEBHOOK_EVENTS = {
   ENTRY_PUBLISH: "entry.publish",
   ENTRY_UNPUBLISH: "entry.unpublish"
 };
-const FEATURE_ID = "preview";
-const info = { pluginName: "content-manager", type: "admin" };
-const previewRouter = {
-  type: "admin",
-  routes: [
-    {
-      method: "GET",
-      info,
-      path: "/preview/url/:contentType",
-      handler: "preview.getPreviewUrl",
-      config: {
-        policies: ["admin::isAuthenticatedAdmin"]
-      }
-    }
-  ]
-};
-const routes$1 = {
-  preview: previewRouter
-};
-function getService(strapi2, name) {
-  return strapi2.service(`plugin::content-manager.${name}`);
-}
-const getPreviewUrlSchema = yup.object().shape({
-  // Will be undefined for single types
-  documentId: yup.string(),
-  locale: yup.string().nullable(),
-  status: yup.string()
-}).required();
-const validatePreviewUrl = async (strapi2, uid2, params) => {
-  await validateYupSchema(getPreviewUrlSchema)(params);
-  const newParams = pick(["documentId", "locale", "status"], params);
-  const model = strapi2.getModel(uid2);
-  if (!model || model.modelType !== "contentType") {
-    throw new errors.ValidationError("Invalid content type");
-  }
-  const isSingleType = model?.kind === "singleType";
-  if (!isSingleType && !params.documentId) {
-    throw new errors.ValidationError("documentId is required for Collection Types");
-  }
-  if (isSingleType) {
-    const doc = await strapi2.documents(uid2).findFirst();
-    if (!doc) {
-      throw new errors.NotFoundError("Document not found");
-    }
-    newParams.documentId = doc?.documentId;
-  }
-  return newParams;
-};
-const createPreviewController = () => {
-  return {
-    /**
-     * Transforms an entry into a preview URL, so that it can be previewed
-     * in the Content Manager.
-     */
-    async getPreviewUrl(ctx) {
-      const uid2 = ctx.params.contentType;
-      const query = ctx.request.query;
-      const params = await validatePreviewUrl(strapi, uid2, query);
-      const previewService = getService(strapi, "preview");
-      const url = await previewService.getPreviewUrl(uid2, params);
-      if (!url) {
-        ctx.status = 204;
-      }
-      return {
-        data: { url }
-      };
-    }
-  };
-};
-const controllers$1 = {
-  preview: createPreviewController
-  /**
-   * Casting is needed because the types aren't aware that Strapi supports
-   * passing a controller factory as the value, instead of a controller object directly
-   */
-};
-const createPreviewService = ({ strapi: strapi2 }) => {
-  const config = getService(strapi2, "preview-config");
-  return {
-    async getPreviewUrl(uid2, params) {
-      const handler = config.getPreviewHandler();
-      try {
-        return handler(uid2, params);
-      } catch (error) {
-        strapi2.log.error(`Failed to get preview URL: ${error}`);
-        throw new errors.ApplicationError("Failed to get preview URL");
-      }
-      return;
-    }
-  };
-};
-const createPreviewConfigService = ({ strapi: strapi2 }) => {
-  return {
-    isEnabled() {
-      const config = strapi2.config.get("admin.preview");
-      if (!config) {
-        return false;
-      }
-      return config?.enabled ?? true;
-    },
-    /**
-     * Validate if the configuration is valid
-     */
-    validate() {
-      if (!this.isEnabled()) {
-        return;
-      }
-      const handler = this.getPreviewHandler();
-      if (typeof handler !== "function") {
-        throw new errors.ValidationError(
-          "Preview configuration is invalid. Handler must be a function"
-        );
-      }
-    },
-    /**
-     * Utility to get the preview handler from the configuration
-     */
-    getPreviewHandler() {
-      const config = strapi2.config.get("admin.preview");
-      const emptyHandler = () => {
-        return void 0;
-      };
-      if (!this.isEnabled()) {
-        return emptyHandler;
-      }
-      return config?.config?.handler || emptyHandler;
-    }
-  };
-};
-const services$1 = {
-  preview: createPreviewService,
-  "preview-config": createPreviewConfigService
-};
-const getFeature = () => {
-  if (!strapi.features.future.isEnabled(FEATURE_ID)) {
-    return {};
-  }
-  return {
-    bootstrap() {
-      console.log("Bootstrapping preview server");
-      const config = getService(strapi, "preview-config");
-      config.validate();
-    },
-    routes: routes$1,
-    controllers: controllers$1,
-    services: services$1
-  };
-};
-const preview = getFeature();
 const bootstrap = async () => {
   Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
     strapi.get("webhookStore").addAllowedEvent(key, value);
   });
-  getService$2("field-sizes").setCustomFieldInputSizes();
-  await getService$2("components").syncConfigurations();
-  await getService$2("content-types").syncConfigurations();
-  await getService$2("permission").registerPermissions();
+  getService$1("field-sizes").setCustomFieldInputSizes();
+  await getService$1("components").syncConfigurations();
+  await getService$1("content-types").syncConfigurations();
+  await getService$1("permission").registerPermissions();
   await history.bootstrap?.({ strapi });
-  await preview.bootstrap?.({ strapi });
 };
 const destroy = async ({ strapi: strapi2 }) => {
   await history.destroy?.({ strapi: strapi2 });
@@ -1369,8 +1198,7 @@ const admin = {
 };
 const routes = {
   admin,
-  ...history.routes ? history.routes : {},
-  ...preview.routes ? preview.routes : {}
+  ...history.routes ? history.routes : {}
 };
 const hasPermissionsSchema = yup$1.object({
   actions: yup$1.array().of(yup$1.string()),
@@ -1627,7 +1455,7 @@ const createMetadasSchema = (schema) => {
             if (!value) {
               return yup$1.string();
             }
-            const targetSchema = getService$2("content-types").findContentType(
+            const targetSchema = getService$1("content-types").findContentType(
               schema.attributes[key].targetModel
             );
             if (!targetSchema) {
@@ -1796,7 +1624,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
   }
 };
 const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
-  const documentMetadata2 = getService$2("document-metadata");
+  const documentMetadata2 = getService$1("document-metadata");
   const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
   let {
     meta: { availableLocales, availableStatus }
@@ -1822,8 +1650,8 @@ const createDocument = async (ctx, opts) => {
   const { userAbility, user } = ctx.state;
   const { model } = ctx.params;
   const { body } = ctx.request;
-  const documentManager2 = getService$2("document-manager");
-  const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+  const documentManager2 = getService$1("document-manager");
+  const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
   if (permissionChecker2.cannot.create()) {
     throw new errors.ForbiddenError();
   }
@@ -1843,13 +1671,13 @@ const updateDocument = async (ctx, opts) => {
   const { userAbility, user } = ctx.state;
   const { id, model } = ctx.params;
   const { body } = ctx.request;
-  const documentManager2 = getService$2("document-manager");
-  const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+  const documentManager2 = getService$1("document-manager");
+  const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
   if (permissionChecker2.cannot.update()) {
     throw new errors.ForbiddenError();
   }
   const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
-  const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
   const { locale } = await getDocumentLocaleAndStatus(body, model);
   const [documentVersion, documentExists] = await Promise.all([
     documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
@@ -1880,14 +1708,14 @@ const collectionTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { query } = ctx.request;
-    const documentMetadata2 = getService$2("document-metadata");
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentMetadata2 = getService$1("document-metadata");
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
     const { locale, status } = await getDocumentLocaleAndStatus(query, model);
     const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
       { ...permissionQuery, populate, locale, status },
@@ -1916,13 +1744,13 @@ const collectionTypes = {
   async findOne(ctx) {
     const { userAbility } = ctx.state;
     const { model, id } = ctx.params;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
     const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
     const version = await documentManager2.findOne(id, model, {
       populate,
@@ -1953,7 +1781,7 @@ const collectionTypes = {
   async create(ctx) {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     const [totalEntries, document] = await Promise.all([
       strapi.db.query(model).count(),
       createDocument(ctx)
@@ -1974,7 +1802,7 @@ const collectionTypes = {
   async update(ctx) {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     const updatedVersion = await updateDocument(ctx);
     const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
     ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
@@ -1983,13 +1811,13 @@ const collectionTypes = {
     const { userAbility, user } = ctx.state;
     const { model, sourceId: id } = ctx.params;
     const { body } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.create()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale } = await getDocumentLocaleAndStatus(body, model);
     const document = await documentManager2.findOne(id, model, {
       populate,
@@ -2028,13 +1856,13 @@ const collectionTypes = {
   async delete(ctx) {
     const { userAbility } = ctx.state;
     const { id, model } = ctx.params;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.delete()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
     const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
     if (documentLocales.length === 0) {
@@ -2056,14 +1884,14 @@ const collectionTypes = {
     const { userAbility } = ctx.state;
     const { id, model } = ctx.params;
     const { body } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.publish()) {
       return ctx.forbidden();
     }
     const publishedDocument = await strapi.db.transaction(async () => {
       const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
-      const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
+      const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
       let document;
       const { locale } = await getDocumentLocaleAndStatus(body, model);
       const isCreate = isNil$1(id);
@@ -2111,13 +1939,13 @@ const collectionTypes = {
     const { body } = ctx.request;
     const { documentIds } = body;
     await validateBulkActionInput(body);
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.publish()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
     const { locale } = await getDocumentLocaleAndStatus(body, model, {
       allowMultipleLocales: true
     });
@@ -2142,8 +1970,8 @@ const collectionTypes = {
     const { body } = ctx.request;
     const { documentIds } = body;
     await validateBulkActionInput(body);
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.unpublish()) {
       return ctx.forbidden();
     }
@@ -2172,8 +2000,8 @@ const collectionTypes = {
     const {
       body: { discardDraft, ...body }
     } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.unpublish()) {
       return ctx.forbidden();
     }
@@ -2181,7 +2009,7 @@ const collectionTypes = {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale } = await getDocumentLocaleAndStatus(body, model);
     const document = await documentManager2.findOne(id, model, {
       populate,
@@ -2212,13 +2040,13 @@ const collectionTypes = {
     const { userAbility } = ctx.state;
     const { id, model } = ctx.params;
     const { body } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.discard()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale } = await getDocumentLocaleAndStatus(body, model);
     const document = await documentManager2.findOne(id, model, {
       populate,
@@ -2243,13 +2071,13 @@ const collectionTypes = {
     const { query, body } = ctx.request;
     const { documentIds } = body;
     await validateBulkActionInput(body);
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.delete()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale } = await getDocumentLocaleAndStatus(body, model);
     const documentLocales = await documentManager2.findLocales(documentIds, model, {
       populate,
@@ -2270,13 +2098,13 @@ const collectionTypes = {
   async countDraftRelations(ctx) {
     const { userAbility } = ctx.state;
     const { model, id } = ctx.params;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
     const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
-    const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+    const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
     const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
     const entity = await documentManager2.findOne(id, model, { populate, locale, status });
     if (!entity) {
@@ -2295,8 +2123,8 @@ const collectionTypes = {
     const ids = ctx.request.query.documentIds;
     const locale = ctx.request.query.locale;
     const { model } = ctx.params;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
@@ -2320,13 +2148,13 @@ const collectionTypes = {
 };
 const components$1 = {
   findComponents(ctx) {
-    const components2 = getService$2("components").findAllComponents();
-    const { toDto } = getService$2("data-mapper");
+    const components2 = getService$1("components").findAllComponents();
+    const { toDto } = getService$1("data-mapper");
     ctx.body = { data: components2.map(toDto) };
   },
   async findComponentConfiguration(ctx) {
     const { uid: uid2 } = ctx.params;
-    const componentService = getService$2("components");
+    const componentService = getService$1("components");
     const component = componentService.findComponent(uid2);
     if (!component) {
       return ctx.notFound("component.notFound");
@@ -2343,7 +2171,7 @@ const components$1 = {
   async updateComponentConfiguration(ctx) {
     const { uid: uid2 } = ctx.params;
     const { body } = ctx.request;
-    const componentService = getService$2("components");
+    const componentService = getService$1("components");
     const component = componentService.findComponent(uid2);
     if (!component) {
       return ctx.notFound("component.notFound");
@@ -2377,12 +2205,12 @@ const contentTypes = {
     } catch (error) {
       return ctx.send({ error }, 400);
     }
-    const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
-    const { toDto } = getService$2("data-mapper");
+    const contentTypes2 = getService$1("content-types").findContentTypesByKind(kind);
+    const { toDto } = getService$1("data-mapper");
     ctx.body = { data: contentTypes2.map(toDto) };
   },
   async findContentTypesSettings(ctx) {
-    const { findAllContentTypes, findConfiguration } = getService$2("content-types");
+    const { findAllContentTypes, findConfiguration } = getService$1("content-types");
     const contentTypes2 = await findAllContentTypes();
     const configurations = await Promise.all(
       contentTypes2.map(async (contentType) => {
@@ -2396,7 +2224,7 @@ const contentTypes = {
   },
   async findContentTypeConfiguration(ctx) {
     const { uid: uid2 } = ctx.params;
-    const contentTypeService = getService$2("content-types");
+    const contentTypeService = getService$1("content-types");
     const contentType = await contentTypeService.findContentType(uid2);
     if (!contentType) {
       return ctx.notFound("contentType.notFound");
@@ -2418,13 +2246,13 @@ const contentTypes = {
     const { userAbility } = ctx.state;
     const { uid: uid2 } = ctx.params;
     const { body } = ctx.request;
-    const contentTypeService = getService$2("content-types");
-    const metricsService = getService$2("metrics");
+    const contentTypeService = getService$1("content-types");
+    const metricsService = getService$1("metrics");
     const contentType = await contentTypeService.findContentType(uid2);
     if (!contentType) {
       return ctx.notFound("contentType.notFound");
     }
-    if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
+    if (!getService$1("permission").canConfigureContentType({ userAbility, contentType })) {
       return ctx.forbidden();
     }
     let input;
@@ -2457,10 +2285,10 @@ const contentTypes = {
 };
 const init = {
   getInitData(ctx) {
-    const { toDto } = getService$2("data-mapper");
-    const { findAllComponents } = getService$2("components");
-    const { getAllFieldSizes } = getService$2("field-sizes");
-    const { findAllContentTypes } = getService$2("content-types");
+    const { toDto } = getService$1("data-mapper");
+    const { findAllComponents } = getService$1("components");
+    const { getAllFieldSizes } = getService$1("field-sizes");
+    const { findAllContentTypes } = getService$1("content-types");
     ctx.body = {
       data: {
         fieldSizes: getAllFieldSizes(),
@@ -2496,7 +2324,7 @@ const addFiltersClause = (params, filtersClause) => {
   params.filters.$and.push(filtersClause);
 };
 const sanitizeMainField = (model, mainField, userAbility) => {
-  const permissionChecker2 = getService$2("permission-checker").create({
+  const permissionChecker2 = getService$1("permission-checker").create({
     userAbility,
     model: model.uid
   });
@@ -2510,27 +2338,15 @@ const sanitizeMainField = (model, mainField, userAbility) => {
   }
   return mainField;
 };
-const addStatusToRelations = async (targetUid, relations2) => {
-  if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
-    return relations2;
-  }
-  const documentMetadata2 = getService$2("document-metadata");
-  if (!relations2.length) {
+const addStatusToRelations = async (uid2, relations2) => {
+  if (!contentTypes$1.hasDraftAndPublish(strapi.contentTypes[uid2])) {
     return relations2;
   }
-  const firstRelation = relations2[0];
-  const filters = {
-    documentId: { $in: relations2.map((r) => r.documentId) },
-    // NOTE: find the "opposite" status
-    publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
-  };
-  const availableStatus = await strapi.query(targetUid).findMany({
-    select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
-    filters
-  });
+  const documentMetadata2 = getService$1("document-metadata");
+  const documentsAvailableStatus = await documentMetadata2.getManyAvailableStatus(uid2, relations2);
   return relations2.map((relation) => {
-    const availableStatuses = availableStatus.filter(
-      (availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
+    const availableStatuses = documentsAvailableStatus.filter(
+      (availableDocument) => availableDocument.documentId === relation.documentId
     );
     return {
       ...relation,
@@ -2592,7 +2408,7 @@ const relations = {
       ctx.request?.query?.locale
     );
     const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
-    const permissionChecker2 = getService$2("permission-checker").create({
+    const permissionChecker2 = getService$1("permission-checker").create({
       userAbility,
       model
     });
@@ -2617,7 +2433,7 @@ const relations = {
         where.id = id;
       }
       const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
-      const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
+      const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
       const currentEntity = await strapi.db.query(model).findOne({
         where,
         populate
@@ -2632,7 +2448,7 @@ const relations = {
       }
       entryId = currentEntity.id;
     }
-    const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
+    const modelConfig = isComponent2 ? await getService$1("components").findConfiguration(sourceSchema) : await getService$1("content-types").findConfiguration(sourceSchema);
     const targetSchema = strapi.getModel(targetUid);
     const mainField = flow(
       prop(`metadatas.${targetField}.edit.mainField`),
@@ -2686,7 +2502,7 @@ const relations = {
       }
     } = await this.extractAndValidateRequestInfo(ctx, id);
     const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
-    const permissionChecker2 = getService$2("permission-checker").create({
+    const permissionChecker2 = getService$1("permission-checker").create({
       userAbility: ctx.state.userAbility,
       model: targetUid
     });
@@ -2759,33 +2575,21 @@ const relations = {
       attribute,
       targetField,
       fieldsToSelect,
-      status,
-      source: { schema: sourceSchema },
-      target: { schema: targetSchema }
+      source: {
+        schema: { uid: sourceUid }
+      },
+      target: {
+        schema: { uid: targetUid }
+      }
     } = await this.extractAndValidateRequestInfo(ctx, id);
-    const { uid: sourceUid } = sourceSchema;
-    const { uid: targetUid } = targetSchema;
-    const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
+    const permissionQuery = await getService$1("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
     const dbQuery = strapi.db.query(sourceUid);
     const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
-    const filters = {};
-    if (sourceSchema?.options?.draftAndPublish) {
-      if (targetSchema?.options?.draftAndPublish) {
-        if (status === "published") {
-          filters.publishedAt = { $notNull: true };
-        } else {
-          filters.publishedAt = { $null: true };
-        }
-      }
-    } else if (targetSchema?.options?.draftAndPublish) {
-      filters.publishedAt = { $null: true };
-    }
     const res = await loadRelations({ id: entryId }, targetField, {
-      select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
+      select: ["id", "documentId", "locale", "publishedAt"],
       ordering: "desc",
       page: ctx.request.query.page,
-      pageSize: ctx.request.query.pageSize,
-      filters
+      pageSize: ctx.request.query.pageSize
     });
     const loadedIds = res.results.map((item) => item.id);
     addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
@@ -2806,10 +2610,10 @@ const relations = {
   }
 };
 const buildPopulateFromQuery = async (query, model) => {
-  return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
+  return getService$1("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
 };
 const findDocument = async (query, uid2, opts = {}) => {
-  const documentManager2 = getService$2("document-manager");
+  const documentManager2 = getService$1("document-manager");
   const populate = await buildPopulateFromQuery(query, uid2);
   return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
 };
@@ -2817,8 +2621,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
   const { user, userAbility } = ctx.state;
   const { model } = ctx.params;
   const { body, query } = ctx.request;
-  const documentManager2 = getService$2("document-manager");
-  const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+  const documentManager2 = getService$1("document-manager");
+  const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
   if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
     throw new errors.ForbiddenError();
   }
@@ -2859,7 +2663,7 @@ const singleTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { query = {} } = ctx.request;
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
@@ -2893,7 +2697,7 @@ const singleTypes = {
   async createOrUpdate(ctx) {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     const document = await createOrUpdateDocument(ctx);
     const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
     ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
@@ -2902,8 +2706,8 @@ const singleTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { query = {} } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.delete()) {
       return ctx.forbidden();
     }
@@ -2931,8 +2735,8 @@ const singleTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { query = {} } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.publish()) {
       return ctx.forbidden();
     }
@@ -2960,8 +2764,8 @@ const singleTypes = {
       body: { discardDraft, ...body },
       query = {}
     } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.unpublish()) {
       return ctx.forbidden();
     }
@@ -2995,8 +2799,8 @@ const singleTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { body, query = {} } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     if (permissionChecker2.cannot.discard()) {
       return ctx.forbidden();
     }
@@ -3019,8 +2823,8 @@ const singleTypes = {
     const { userAbility } = ctx.state;
     const { model } = ctx.params;
     const { query } = ctx.request;
-    const documentManager2 = getService$2("document-manager");
-    const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
+    const documentManager2 = getService$1("document-manager");
+    const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
     const { locale } = await getDocumentLocaleAndStatus(query, model);
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
@@ -3044,7 +2848,7 @@ const uid$1 = {
     const { query = {} } = ctx.request;
     const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
     await validateUIDField(contentTypeUID, field);
-    const uidService = getService$2("uid");
+    const uidService = getService$1("uid");
     ctx.body = {
       data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
     };
@@ -3056,7 +2860,7 @@ const uid$1 = {
     const { query = {} } = ctx.request;
     const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
     await validateUIDField(contentTypeUID, field);
-    const uidService = getService$2("uid");
+    const uidService = getService$1("uid");
     const isAvailable = await uidService.checkUIDAvailability({
       contentTypeUID,
       field,
@@ -3077,8 +2881,7 @@ const controllers = {
   relations,
   "single-types": singleTypes,
   uid: uid$1,
-  ...history.controllers ? history.controllers : {},
-  ...preview.controllers ? preview.controllers : {}
+  ...history.controllers ? history.controllers : {}
 };
 const keys = {
   CONFIGURATION: "configuration"
@@ -3229,12 +3032,12 @@ async function syncMetadatas(configuration, schema) {
   return _.assign(metasWithDefaults, updatedMetas);
 }
 const getTargetSchema = (targetModel) => {
-  return getService$2("content-types").findContentType(targetModel);
+  return getService$1("content-types").findContentType(targetModel);
 };
 const DEFAULT_LIST_LENGTH = 4;
 const MAX_ROW_SIZE = 12;
 const isAllowedFieldSize = (type, size) => {
-  const { getFieldSize } = getService$2("field-sizes");
+  const { getFieldSize } = getService$1("field-sizes");
   const fieldSize = getFieldSize(type);
   if (!fieldSize.isResizable && size !== fieldSize.default) {
     return false;
@@ -3242,7 +3045,7 @@ const isAllowedFieldSize = (type, size) => {
   return size <= MAX_ROW_SIZE;
 };
 const getDefaultFieldSize = (attribute) => {
-  const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
+  const { hasFieldSize, getFieldSize } = getService$1("field-sizes");
   return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
 };
 async function createDefaultLayouts(schema) {
@@ -3277,7 +3080,7 @@ function syncLayouts(configuration, schema) {
     for (const el of row) {
       if (!hasEditableAttribute(schema, el.name))
         continue;
-      const { hasFieldSize } = getService$2("field-sizes");
+      const { hasFieldSize } = getService$1("field-sizes");
       const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
       if (!isAllowedFieldSize(fieldType, el.size)) {
         elementsToReAppend.push(el.name);
@@ -3417,17 +3220,17 @@ const configurationService$1 = createConfigurationService({
   isComponent: true,
   prefix: STORE_KEY_PREFIX,
   getModels() {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     return mapValues(toContentManagerModel, strapi.components);
   }
 });
 const components = ({ strapi: strapi2 }) => ({
   findAllComponents() {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     return Object.values(strapi2.components).map(toContentManagerModel);
   },
   findComponent(uid2) {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     const component = strapi2.components[uid2];
     return isNil$1(component) ? component : toContentManagerModel(component);
   },
@@ -3478,17 +3281,17 @@ const configurationService = createConfigurationService({
   storeUtils,
   prefix: "content_types",
   getModels() {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     return mapValues(toContentManagerModel, strapi.contentTypes);
   }
 });
 const service = ({ strapi: strapi2 }) => ({
   findAllContentTypes() {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     return Object.values(strapi2.contentTypes).map(toContentManagerModel);
   },
   findContentType(uid2) {
-    const { toContentManagerModel } = getService$2("data-mapper");
+    const { toContentManagerModel } = getService$1("data-mapper");
     const contentType = strapi2.contentTypes[uid2];
     return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
   },
@@ -3517,7 +3320,7 @@ const service = ({ strapi: strapi2 }) => ({
     return this.findConfiguration(contentType);
   },
   findComponentsConfigurations(contentType) {
-    return getService$2("components").findComponentsConfigurations(contentType);
+    return getService$1("components").findComponentsConfigurations(contentType);
   },
   syncConfigurations() {
     return configurationService.syncConfigurations();
@@ -3789,7 +3592,7 @@ const permission = ({ strapi: strapi2 }) => ({
     return userAbility.can(action);
   },
   async registerPermissions() {
-    const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
+    const displayedContentTypes = getService$1("content-types").findDisplayedContentTypes();
     const contentTypesUids = displayedContentTypes.map(prop("uid"));
     const actions = [
       {
@@ -4065,7 +3868,7 @@ const getQueryPopulate = async (uid2, query) => {
   return populateQuery;
 };
 const buildDeepPopulate = (uid2) => {
-  return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
+  return getService$1("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
 };
 const populateBuilder = (uid2) => {
   let getInitialPopulate = async () => {
@@ -4250,9 +4053,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
    */
   async getAvailableLocales(uid2, version, allVersions, validatableFields = []) {
     const versionsByLocale = groupBy("locale", allVersions);
-    if (version.locale) {
-      delete versionsByLocale[version.locale];
-    }
+    delete versionsByLocale[version.locale];
     const model = strapi2.getModel(uid2);
     const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
     const traversalFunction = async (localeVersion) => traverseEntity(
@@ -4608,8 +4409,7 @@ const services = {
   permission,
   "populate-builder": populateBuilder$1,
   uid,
-  ...history.services ? history.services : {},
-  ...preview.services ? preview.services : {}
+  ...history.services ? history.services : {}
 };
 const index = () => {
   return {