@strapi/content-manager 0.0.0-experimental.fd55b75e545ef2b5c16b5f49a04e0db294663d8d → 0.0.0-experimental.fdacf4285d1cada9d94ab4dcd756c5362cba1b54

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { l, d, K, L, J, M, h, f } from "../_chunks/index-BrUzbQ30.mjs";
+import { l, d, K, L, J, M, h, f } from "../_chunks/index-jwACjpe1.mjs";
 import "@strapi/icons";
 export {
   l as DocumentRBAC,

package/dist/server/index.js

@@ -121,7 +121,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
@@ -620,17 +620,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: {
@@ -639,7 +639,7 @@ const historyVersionRouter = {
     },
     {
       method: "PUT",
-      info: info$1,
+      info,
       path: "/history-versions/:versionId/restore",
       handler: "history-version.restoreVersion",
       config: {
@@ -648,7 +648,7 @@ const historyVersionRouter = {
     }
   ]
 };
-const routes$2 = {
+const routes$1 = {
   "history-version": historyVersionRouter
 };
 const historyVersion = {
@@ -695,7 +695,7 @@ const historyVersion = {
     }
   }
 };
-const getFeature$1 = () => {
+const getFeature = () => {
   if (strapi.ee.features.isEnabled("cms-content-history")) {
     return {
       register({ strapi: strapi2 }) {
@@ -707,9 +707,9 @@ const getFeature$1 = () => {
       destroy({ strapi: strapi2 }) {
         getService(strapi2, "lifecycles").destroy();
       },
-      controllers: controllers$2,
-      services: services$2,
-      routes: routes$2
+      controllers: controllers$1,
+      services: services$1,
+      routes: routes$1
     };
   }
   return {
@@ -718,7 +718,7 @@ const getFeature$1 = () => {
     }
   };
 };
-const history = getFeature$1();
+const history = getFeature();
 const register = async ({ strapi: strapi2 }) => {
   await history.register?.({ strapi: strapi2 });
 };
@@ -726,62 +726,6 @@ 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
-};
-const createPreviewController = () => {
-  return {
-    async getPreviewURL(ctx) {
-      ctx.request;
-      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 = () => {
-};
-const services$1 = {
-  preview: createPreviewService
-};
-const getFeature = () => {
-  if (!strapi.features.future.isEnabled(FEATURE_ID)) {
-    return {};
-  }
-  return {
-    bootstrap() {
-      console.log("Bootstrapping preview server");
-      strapi.config.get("admin.preview");
-    },
-    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);
@@ -791,7 +735,6 @@ const bootstrap = async () => {
   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 });
@@ -1281,8 +1224,7 @@ const admin = {
 };
 const routes = {
   admin,
-  ...history.routes ? history.routes : {},
-  ...preview.routes ? preview.routes : {}
+  ...history.routes ? history.routes : {}
 };
 const hasPermissionsSchema = strapiUtils.yup.object({
   actions: strapiUtils.yup.array().of(strapiUtils.yup.string()),
@@ -2422,27 +2364,15 @@ const sanitizeMainField = (model, mainField, userAbility) => {
   }
   return mainField;
 };
-const addStatusToRelations = async (targetUid, relations2) => {
-  if (!strapiUtils.contentTypes.hasDraftAndPublish(strapi.getModel(targetUid))) {
+const addStatusToRelations = async (uid2, relations2) => {
+  if (!strapiUtils.contentTypes.hasDraftAndPublish(strapi.contentTypes[uid2])) {
     return relations2;
   }
   const documentMetadata2 = getService$1("document-metadata");
-  if (!relations2.length) {
-    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 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,
@@ -2671,33 +2601,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$1("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
     const dbQuery = strapi.db.query(sourceUid);
     const loadRelations = strapiUtils.relations.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 } });
@@ -2989,8 +2907,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"
@@ -4162,9 +4079,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
    */
   async getAvailableLocales(uid2, version, allVersions, validatableFields = []) {
     const versionsByLocale = fp.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) => strapiUtils.traverseEntity(
@@ -4520,8 +4435,7 @@ const services = {
   permission,
   "populate-builder": populateBuilder$1,
   uid,
-  ...history.services ? history.services : {},
-  ...preview.services ? preview.services : {}
+  ...history.services ? history.services : {}
 };
 const index = () => {
   return {