@strapi/content-manager 0.0.0-experimental.b1d7921ddb1b36c84b58a3946e1dc9dbda91b2dc → 0.0.0-experimental.b9dd0757c8a7db6ee1063edc33424319784ae3a6

package/dist/server/index.js

@@ -2364,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,
@@ -2613,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 } });
@@ -4103,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(