@strapi/content-manager 0.0.0-experimental.9a23f06c0b3b13548dbd12feb3dc92d3c10bebb1 → 0.0.0-experimental.9bd63a0f51283779d88aa9d86aa78c40ed628a15

package/dist/admin/src/hooks/useDocument.d.ts

@@ -31,7 +31,9 @@ type UseDocument = (args: UseDocumentArgs, opts?: UseDocumentOpts) => {
      * This is the schema of the content type, it is not the same as the layout.
      */
     schema?: Schema;
+    schemas?: Schema[];
     validate: (document: Document) => null | FormErrors;
+    hasError?: boolean;
 };
 /**
  * @alpha
@@ -78,10 +80,39 @@ declare const useDoc: () => {
      * This is the schema of the content type, it is not the same as the layout.
      */
     schema?: ContentType | undefined;
+    schemas?: ContentType[] | undefined;
     validate: (document: Document) => null | FormErrors;
+    hasError?: boolean | undefined;
     collectionType: string;
     model: string;
     id: string | undefined;
 };
-export { useDocument, useDoc };
+/**
+ * @public
+ * @experimental
+ * Content manager context hooks for plugin development.
+ * Make sure to use this hook inside the content manager.
+ */
+declare const useContentManagerContext: () => {
+    error: import("@reduxjs/toolkit").SerializedError | import("../utils/api").BaseQueryError | undefined;
+    isLoading: boolean;
+    model: string;
+    collectionType: string;
+    id: string | undefined;
+    slug: string;
+    isCreatingEntry: boolean;
+    isSingleType: boolean;
+    hasDraftAndPublish: boolean;
+    components: ComponentsDictionary;
+    contentType: ContentType | undefined;
+    contentTypes: ContentType[] | undefined;
+    form: import("@strapi/admin/strapi-admin").FormContextValue<import("@strapi/admin/strapi-admin").FormValues>;
+    layout: {
+        error?: import("@reduxjs/toolkit").SerializedError | import("../utils/api").BaseQueryError | undefined;
+        isLoading: boolean;
+        edit: import("./useDocumentLayout").EditLayout;
+        list: import("./useDocumentLayout").ListLayout;
+    };
+};
+export { useDocument, useDoc, useContentManagerContext };
 export type { UseDocument, UseDocumentArgs, Document, Schema, ComponentsDictionary };

package/dist/admin/src/pages/EditView/components/Header.d.ts

@@ -28,6 +28,7 @@ interface HeaderActionDescription {
     }>;
     onSelect?: (value: string) => void;
     value?: string;
+    customizeContent?: (value: string) => React.ReactNode;
 }
 declare const DEFAULT_HEADER_ACTIONS: DocumentActionComponent[];
 export { Header, DEFAULT_HEADER_ACTIONS };

package/dist/server/index.js

@@ -393,7 +393,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
                     if (userToPopulate == null) {
                       return null;
                     }
-                    return strapi2.query("admin::user").findOne({ where: { id: userToPopulate.id } });
+                    return strapi2.query("admin::user").findOne({
+                      where: {
+                        ...userToPopulate.id ? { id: userToPopulate.id } : {},
+                        ...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
+                      }
+                    });
                   })
                 );
                 return {
@@ -1715,7 +1720,7 @@ const updateDocument = async (ctx, opts) => {
     throw new strapiUtils.errors.ForbiddenError();
   }
   const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
-  const setCreator = strapiUtils.setCreatorFields({ user, isEdition: true });
+  const setCreator = documentVersion ? strapiUtils.setCreatorFields({ user, isEdition: true }) : strapiUtils.setCreatorFields({ user });
   const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
   const sanitizedBody = await sanitizeFn(body);
   return documentManager2.update(documentVersion?.documentId || id, model, {
@@ -1924,11 +1929,17 @@ const collectionTypes = {
       }
       const isUpdate = !isCreate;
       if (isUpdate) {
-        document = await documentManager2.findOne(id, model, { populate, locale });
-        if (!document) {
+        const documentExists = documentManager2.exists(model, id);
+        if (!documentExists) {
           throw new strapiUtils.errors.NotFoundError("Document not found");
         }
-        if (permissionChecker2.can.update(document)) {
+        document = await documentManager2.findOne(id, model, { populate, locale });
+        if (!document) {
+          if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
+            throw new strapiUtils.errors.ForbiddenError();
+          }
+          document = await updateDocument(ctx);
+        } else if (permissionChecker2.can.update(document)) {
           await updateDocument(ctx);
         }
       }
@@ -2382,11 +2393,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
   const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
   const isSourceLocalized = isLocalized(sourceModel);
   const isTargetLocalized = isLocalized(targetModel);
-  let validatedLocale = locale;
-  if (!targetModel || !isTargetLocalized)
-    validatedLocale = void 0;
   return {
-    locale: validatedLocale,
+    locale,
     isSourceLocalized,
     isTargetLocalized
   };
@@ -2489,7 +2497,7 @@ const relations = {
       attribute,
       fieldsToSelect,
       mainField,
-      source: { schema: sourceSchema },
+      source: { schema: sourceSchema, isLocalized: isSourceLocalized },
       target: { schema: targetSchema, isLocalized: isTargetLocalized },
       sourceSchema,
       targetSchema,
@@ -2511,7 +2519,8 @@ const relations = {
       fieldsToSelect,
       mainField,
       source: {
-        schema: { uid: sourceUid, modelType: sourceModelType }
+        schema: { uid: sourceUid, modelType: sourceModelType },
+        isLocalized: isSourceLocalized
       },
       target: {
         schema: { uid: targetUid },
@@ -2549,12 +2558,16 @@ const relations = {
       } else {
         where.id = id;
       }
-      if (status) {
-        where[`${alias}.published_at`] = getPublishedAtClause(status, targetUid);
+      const publishedAt = getPublishedAtClause(status, targetUid);
+      if (!fp.isEmpty(publishedAt)) {
+        where[`${alias}.published_at`] = publishedAt;
       }
-      if (filterByLocale) {
+      if (isTargetLocalized && locale) {
         where[`${alias}.locale`] = locale;
       }
+      if (isSourceLocalized && locale) {
+        where.locale = locale;
+      }
       if ((idsToInclude?.length ?? 0) !== 0) {
         where[`${alias}.id`].$notIn = idsToInclude;
       }
@@ -2572,7 +2585,8 @@ const relations = {
         id: { $notIn: fp.uniq(idsToOmit) }
       });
     }
-    const res = await strapi.db.query(targetUid).findPage(strapi.get("query-params").transform(targetUid, queryParams));
+    const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
+    const res = await strapi.db.query(targetUid).findPage(dbQuery);
     ctx.body = {
       ...res,
       results: await addStatusToRelations(targetUid, res.results)
@@ -2609,7 +2623,7 @@ const relations = {
       ...strapi.get("query-params").transform(targetUid, permissionQuery),
       ordering: "desc"
     });
-    const relationsUnion = fp.uniqBy("id", fp.concat(sanitizedRes.results, res.results));
+    const relationsUnion = fp.uniqBy("documentId", fp.concat(sanitizedRes.results, res.results));
     ctx.body = {
       pagination: res.pagination || {
         page: 1,
@@ -2694,7 +2708,7 @@ const singleTypes = {
         permissionChecker2,
         model,
         // @ts-expect-error - fix types
-        { id: document.documentId, locale, publishedAt: null },
+        { documentId: document.documentId, locale, publishedAt: null },
         { availableLocales: true, availableStatus: false }
       );
       ctx.body = { data: {}, meta };