@strapi/content-releases 0.0.0-experimental.fc1ac2acd58c8a5a858679956b6d102ac5ee4011 → 0.0.0-experimental.fd379e4937e431407d784eaa5fe7f93cf2a53386

package/dist/_chunks/{App-0Er6xxcq.mjs → App-Cne--1Z8.mjs}

@@ -1,25 +1,23 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { useLicenseLimits, Page, Pagination, unstable_useDocument } from "@strapi/admin/strapi-admin";
-import { useLocation, useNavigate, useParams, Navigate, Link as Link$2, Routes, Route } from "react-router-dom";
-import { g as getTimezoneOffset, p as pluginId, u as useGetReleasesQuery, a as useCreateReleaseMutation, P as PERMISSIONS, i as isAxiosError, b as useGetReleaseQuery, c as useUpdateReleaseMutation, d as useDeleteReleaseMutation, e as usePublishReleaseMutation, f as useTypedDispatch, h as useGetReleaseActionsQuery, j as useUpdateReleaseActionMutation, R as ReleaseActionOptions, k as ReleaseActionMenu, r as releaseApi } from "./index-fJx1up7m.mjs";
+import { useNotification, useAPIErrorHandler, useQueryParams, useTracking, useRBAC, Page, Layouts, Pagination, isFetchError, ConfirmDialog, BackButton, useStrapiApp, Table } from "@strapi/admin/strapi-admin";
+import { useLocation, useNavigate, NavLink, useParams, Navigate, Link as Link$1, Routes, Route } from "react-router-dom";
+import { g as getTimezones, p as pluginId, u as useGetReleasesQuery, a as useGetReleaseSettingsQuery, b as useCreateReleaseMutation, P as PERMISSIONS, c as useGetReleaseQuery, d as useUpdateReleaseMutation, e as useDeleteReleaseMutation, f as usePublishReleaseMutation, h as getTimezoneOffset, i as useGetReleaseActionsQuery, j as useUpdateReleaseActionMutation, R as ReleaseActionOptions, k as ReleaseActionMenu, r as releaseApi } from "./index-Cy7qwpaU.mjs";
 import * as React from "react";
-import { ModalLayout, ModalHeader, Typography, ModalBody, Flex, TextInput, Box, Checkbox, DatePicker, TimePicker, ModalFooter, Button, Combobox, ComboboxOption, Alert, Main, HeaderLayout, ContentLayout, TabGroup, Tabs, Tab, Divider, TabPanels, TabPanel, EmptyStateLayout, Grid, GridItem, Badge, Link as Link$1, IconButton, SingleSelect, SingleSelectOption, Tr, Td, Icon, Tooltip } from "@strapi/design-system";
-import { Link, Menu, LinkButton } from "@strapi/design-system/v2";
-import { useNotification, useAPIErrorHandler, useQueryParams, useTracking, CheckPermissions, ConfirmDialog, useRBAC, Table } from "@strapi/helper-plugin";
-import { Plus, EmptyDocuments, Pencil, Trash, ArrowLeft, More, CrossCircle, CheckCircle } from "@strapi/icons";
-import format from "date-fns/format";
-import { zonedTimeToUtc, utcToZonedTime } from "date-fns-tz";
+import { unstable_useDocument } from "@strapi/content-manager/strapi-admin";
+import { Modal, Flex, Field, TextInput, Box, Checkbox, Typography, DatePicker, TimePicker, Button, Combobox, ComboboxOption, Link, Alert, Main, Tabs, Divider, EmptyStateLayout, Grid, Badge, MenuItem, SimpleMenu, Dialog, LinkButton, SingleSelect, SingleSelectOption, Tr, Td, Tooltip } from "@strapi/design-system";
+import { Plus, Pencil, Trash, More, CrossCircle, CheckCircle, ArrowsCounterClockwise } from "@strapi/icons";
+import { EmptyDocuments } from "@strapi/icons/symbols";
+import format$1 from "date-fns/format";
+import { utcToZonedTime, zonedTimeToUtc } from "date-fns-tz";
 import { useIntl } from "react-intl";
-import styled from "styled-components";
-import { intervalToDuration, isPast, formatISO, parse } from "date-fns";
+import { styled } from "styled-components";
+import { intervalToDuration, isPast, formatISO, format } from "date-fns";
 import { Formik, Form, useFormikContext } from "formik";
-import * as yup from "yup";
-import "@reduxjs/toolkit/query";
-import "axios";
-import "@reduxjs/toolkit/query/react";
-import "react-redux";
+import { R as RELEASE_SCHEMA } from "./schemas-DdA2ic2U.mjs";
+import { useDispatch } from "react-redux";
+import { useLicenseLimits } from "@strapi/admin/strapi-admin/ee";
 const intervals = ["years", "months", "days", "hours", "minutes", "seconds"];
-const RelativeTime = React.forwardRef(
+const RelativeTime$1 = React.forwardRef(
   ({ timestamp, customIntervals = [], ...restProps }, forwardedRef) => {
     const { formatRelativeTime, formatDate, formatTime } = useIntl();
     const interval = intervalToDuration({
@@ -48,28 +46,9 @@ const RelativeTime = React.forwardRef(
     );
   }
 );
-const RELEASE_SCHEMA = yup.object().shape({
-  name: yup.string().trim().required(),
-  scheduledAt: yup.string().nullable(),
-  isScheduled: yup.boolean().optional(),
-  time: yup.string().when("isScheduled", {
-    is: true,
-    then: yup.string().trim().required(),
-    otherwise: yup.string().nullable()
-  }),
-  timezone: yup.string().when("isScheduled", {
-    is: true,
-    then: yup.string().required().nullable(),
-    otherwise: yup.string().nullable()
-  }),
-  date: yup.string().when("isScheduled", {
-    is: true,
-    then: yup.string().required().nullable(),
-    otherwise: yup.string().nullable()
-  })
-}).required().noUnknown();
 const ReleaseModal = ({
   handleClose,
+  open,
   handleSubmit,
   initialValues,
   isLoading = false
@@ -77,7 +56,6 @@ const ReleaseModal = ({
   const { formatMessage } = useIntl();
   const { pathname } = useLocation();
   const isCreatingRelease = pathname === `/plugins/${pluginId}`;
-  const IsSchedulingEnabled = window.strapi.future.isEnabled("contentReleasesScheduling");
   const { timezoneList, systemTimezone = { value: "UTC+00:00-Africa/Abidjan " } } = getTimezones(
     initialValues.scheduledAt ? new Date(initialValues.scheduledAt) : /* @__PURE__ */ new Date()
   );
@@ -85,18 +63,17 @@ const ReleaseModal = ({
     const { date, time, timezone } = values;
     if (!date || !time || !timezone)
       return null;
-    const formattedDate = parse(time, "HH:mm", new Date(date));
-    const timezoneWithoutOffset = timezone.split("_")[1];
-    return zonedTimeToUtc(formattedDate, timezoneWithoutOffset);
+    const timezoneWithoutOffset = timezone.split("&")[1];
+    return zonedTimeToUtc(`${date} ${time}`, timezoneWithoutOffset);
   };
   const getTimezoneWithOffset = () => {
     const currentTimezone = timezoneList.find(
-      (timezone) => timezone.value.split("_")[1] === initialValues.timezone
+      (timezone) => timezone.value.split("&")[1] === initialValues.timezone
     );
     return currentTimezone?.value || systemTimezone.value;
   };
-  return /* @__PURE__ */ jsxs(ModalLayout, { onClose: handleClose, labelledBy: "title", children: [
-    /* @__PURE__ */ jsx(ModalHeader, { children: /* @__PURE__ */ jsx(Typography, { id: "title", fontWeight: "bold", textColor: "neutral800", children: formatMessage(
+  return /* @__PURE__ */ jsx(Modal.Root, { open, onOpenChange: handleClose, children: /* @__PURE__ */ jsxs(Modal.Content, { children: [
+    /* @__PURE__ */ jsx(Modal.Header, { children: /* @__PURE__ */ jsx(Modal.Title, { children: formatMessage(
       {
         id: "content-releases.modal.title",
         defaultMessage: "{isCreatingRelease, select, true {New release} other {Edit release}}"
@@ -109,7 +86,7 @@ const ReleaseModal = ({
         onSubmit: (values) => {
           handleSubmit({
             ...values,
-            timezone: values.timezone ? values.timezone.split("_")[1] : null,
+            timezone: values.timezone ? values.timezone.split("&")[1] : null,
             scheduledAt: values.isScheduled ? getScheduledTimestamp(values) : null
           });
         },
@@ -119,31 +96,33 @@ const ReleaseModal = ({
         },
         validationSchema: RELEASE_SCHEMA,
         validateOnChange: false,
-        children: ({ values, errors, handleChange, setFieldValue }) => /* @__PURE__ */ jsxs(Form, { children: [
-          /* @__PURE__ */ jsx(ModalBody, { children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
-            /* @__PURE__ */ jsx(
-              TextInput,
-              {
-                label: formatMessage({
-                  id: "content-releases.modal.form.input.label.release-name",
-                  defaultMessage: "Name"
-                }),
-                name: "name",
-                value: values.name,
-                error: errors.name,
-                onChange: handleChange,
-                required: true
-              }
-            ),
-            IsSchedulingEnabled && /* @__PURE__ */ jsxs(Fragment, { children: [
+        children: ({ values, errors, handleChange, setFieldValue }) => {
+          return /* @__PURE__ */ jsxs(Form, { children: [
+            /* @__PURE__ */ jsx(Modal.Body, { children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
+              /* @__PURE__ */ jsxs(
+                Field.Root,
+                {
+                  name: "name",
+                  error: errors.name && formatMessage({ id: errors.name, defaultMessage: errors.name }),
+                  required: true,
+                  children: [
+                    /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                      id: "content-releases.modal.form.input.label.release-name",
+                      defaultMessage: "Name"
+                    }) }),
+                    /* @__PURE__ */ jsx(TextInput, { value: values.name, onChange: handleChange }),
+                    /* @__PURE__ */ jsx(Field.Error, {})
+                  ]
+                }
+              ),
               /* @__PURE__ */ jsx(Box, { width: "max-content", children: /* @__PURE__ */ jsx(
                 Checkbox,
                 {
                   name: "isScheduled",
-                  value: values.isScheduled,
-                  onChange: (event) => {
-                    setFieldValue("isScheduled", event.target.checked);
-                    if (!event.target.checked) {
+                  checked: values.isScheduled,
+                  onCheckedChange: (checked) => {
+                    setFieldValue("isScheduled", checked);
+                    if (!checked) {
                       setFieldValue("date", null);
                       setFieldValue("time", "");
                       setFieldValue("timezone", null);
@@ -171,85 +150,89 @@ const ReleaseModal = ({
               ) }),
               values.isScheduled && /* @__PURE__ */ jsxs(Fragment, { children: [
                 /* @__PURE__ */ jsxs(Flex, { gap: 4, alignItems: "start", children: [
-                  /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsx(
-                    DatePicker,
+                  /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(
+                    Field.Root,
                     {
-                      label: formatMessage({
-                        id: "content-releases.modal.form.input.label.date",
-                        defaultMessage: "Date"
-                      }),
                       name: "date",
-                      error: errors.date,
-                      onChange: (date) => {
-                        const isoFormatDate = date ? formatISO(date, { representation: "date" }) : null;
-                        setFieldValue("date", isoFormatDate);
-                      },
-                      clearLabel: formatMessage({
-                        id: "content-releases.modal.form.input.clearLabel",
-                        defaultMessage: "Clear"
-                      }),
-                      onClear: () => {
-                        setFieldValue("date", null);
-                      },
-                      selectedDate: values.date || void 0,
-                      required: true
+                      error: errors.date && formatMessage({ id: errors.date, defaultMessage: errors.date }),
+                      required: true,
+                      children: [
+                        /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                          id: "content-releases.modal.form.input.label.date",
+                          defaultMessage: "Date"
+                        }) }),
+                        /* @__PURE__ */ jsx(
+                          DatePicker,
+                          {
+                            onChange: (date) => {
+                              const isoFormatDate = date ? formatISO(date, { representation: "date" }) : null;
+                              setFieldValue("date", isoFormatDate);
+                            },
+                            clearLabel: formatMessage({
+                              id: "content-releases.modal.form.input.clearLabel",
+                              defaultMessage: "Clear"
+                            }),
+                            onClear: () => {
+                              setFieldValue("date", null);
+                            },
+                            value: values.date ? new Date(values.date) : /* @__PURE__ */ new Date(),
+                            minDate: utcToZonedTime(/* @__PURE__ */ new Date(), values.timezone.split("&")[1])
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(Field.Error, {})
+                      ]
                     }
                   ) }),
-                  /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsx(
-                    TimePicker,
+                  /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(
+                    Field.Root,
                     {
-                      label: formatMessage({
-                        id: "content-releases.modal.form.input.label.time",
-                        defaultMessage: "Time"
-                      }),
                       name: "time",
-                      error: errors.time,
-                      onChange: (time) => {
-                        setFieldValue("time", time);
-                      },
-                      clearLabel: formatMessage({
-                        id: "content-releases.modal.form.input.clearLabel",
-                        defaultMessage: "Clear"
-                      }),
-                      onClear: () => {
-                        setFieldValue("time", "");
-                      },
-                      value: values.time || void 0,
-                      required: true
+                      error: errors.time && formatMessage({ id: errors.time, defaultMessage: errors.time }),
+                      required: true,
+                      children: [
+                        /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                          id: "content-releases.modal.form.input.label.time",
+                          defaultMessage: "Time"
+                        }) }),
+                        /* @__PURE__ */ jsx(
+                          TimePicker,
+                          {
+                            onChange: (time) => {
+                              setFieldValue("time", time);
+                            },
+                            clearLabel: formatMessage({
+                              id: "content-releases.modal.form.input.clearLabel",
+                              defaultMessage: "Clear"
+                            }),
+                            onClear: () => {
+                              setFieldValue("time", "");
+                            },
+                            value: values.time || void 0
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(Field.Error, {})
+                      ]
                     }
                   ) })
                 ] }),
                 /* @__PURE__ */ jsx(TimezoneComponent, { timezoneOptions: timezoneList })
               ] })
-            ] })
-          ] }) }),
-          /* @__PURE__ */ jsx(
-            ModalFooter,
-            {
-              startActions: /* @__PURE__ */ jsx(Button, { onClick: handleClose, variant: "tertiary", name: "cancel", children: formatMessage({ id: "cancel", defaultMessage: "Cancel" }) }),
-              endActions: /* @__PURE__ */ jsx(Button, { name: "submit", loading: isLoading, type: "submit", children: formatMessage(
+            ] }) }),
+            /* @__PURE__ */ jsxs(Modal.Footer, { children: [
+              /* @__PURE__ */ jsx(Modal.Close, { children: /* @__PURE__ */ jsx(Button, { variant: "tertiary", name: "cancel", children: formatMessage({ id: "cancel", defaultMessage: "Cancel" }) }) }),
+              /* @__PURE__ */ jsx(Button, { name: "submit", loading: isLoading, type: "submit", children: formatMessage(
                 {
                   id: "content-releases.modal.form.button.submit",
                   defaultMessage: "{isCreatingRelease, select, true {Continue} other {Save}}"
                 },
                 { isCreatingRelease }
               ) })
-            }
-          )
-        ] })
+            ] })
+          ] });
+        }
       }
     )
-  ] });
-};
-const getTimezones = (selectedDate) => {
-  const timezoneList = Intl.supportedValuesOf("timeZone").map((timezone) => {
-    const utcOffset = getTimezoneOffset(timezone, selectedDate);
-    return { offset: utcOffset, value: `${utcOffset}_${timezone}` };
-  });
-  const systemTimezone = timezoneList.find(
-    (timezone) => timezone.value.split("_")[1] === Intl.DateTimeFormat().resolvedOptions().timeZone
-  );
-  return { timezoneList, systemTimezone };
+  ] }) });
 };
 const TimezoneComponent = ({ timezoneOptions }) => {
   const { values, errors, setFieldValue } = useFormikContext();
@@ -259,42 +242,58 @@ const TimezoneComponent = ({ timezoneOptions }) => {
     if (values.date) {
       const { timezoneList: timezoneList2 } = getTimezones(new Date(values.date));
       setTimezoneList(timezoneList2);
-      const updatedTimezone = values.timezone && timezoneList2.find((tz) => tz.value.split("_")[1] === values.timezone.split("_")[1]);
+      const updatedTimezone = values.timezone && timezoneList2.find((tz) => tz.value.split("&")[1] === values.timezone.split("&")[1]);
       if (updatedTimezone) {
         setFieldValue("timezone", updatedTimezone.value);
       }
     }
   }, [setFieldValue, values.date, values.timezone]);
-  return /* @__PURE__ */ jsx(
-    Combobox,
+  return /* @__PURE__ */ jsxs(
+    Field.Root,
     {
-      label: formatMessage({
-        id: "content-releases.modal.form.input.label.timezone",
-        defaultMessage: "Timezone"
-      }),
       name: "timezone",
-      value: values.timezone || void 0,
-      textValue: values.timezone ? values.timezone.replace("_", " ") : void 0,
-      onChange: (timezone) => {
-        setFieldValue("timezone", timezone);
-      },
-      onTextValueChange: (timezone) => {
-        setFieldValue("timezone", timezone);
-      },
-      onClear: () => {
-        setFieldValue("timezone", "");
-      },
-      error: errors.timezone,
+      error: errors.timezone && formatMessage({ id: errors.timezone, defaultMessage: errors.timezone }),
       required: true,
-      children: timezoneList.map((timezone) => /* @__PURE__ */ jsx(ComboboxOption, { value: timezone.value, children: timezone.value.replace("_", " ") }, timezone.value))
+      children: [
+        /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+          id: "content-releases.modal.form.input.label.timezone",
+          defaultMessage: "Timezone"
+        }) }),
+        /* @__PURE__ */ jsx(
+          Combobox,
+          {
+            autocomplete: { type: "list", filter: "contains" },
+            value: values.timezone || void 0,
+            textValue: values.timezone ? values.timezone.replace(/&/, " ") : void 0,
+            onChange: (timezone) => {
+              setFieldValue("timezone", timezone);
+            },
+            onTextValueChange: (timezone) => {
+              setFieldValue("timezone", timezone);
+            },
+            onClear: () => {
+              setFieldValue("timezone", "");
+            },
+            children: timezoneList.map((timezone) => /* @__PURE__ */ jsx(ComboboxOption, { value: timezone.value, children: timezone.value.replace(/&/, " ") }, timezone.value))
+          }
+        ),
+        /* @__PURE__ */ jsx(Field.Error, {})
+      ]
     }
   );
 };
+const useTypedDispatch = useDispatch;
+const isBaseQueryError = (error) => {
+  return typeof error !== "undefined" && error.name !== void 0;
+};
 const LinkCard = styled(Link)`
   display: block;
 `;
-const CapitalizeRelativeTime = styled(RelativeTime)`
-  text-transform: capitalize;
+const RelativeTime = styled(RelativeTime$1)`
+  display: inline-block;
+  &::first-letter {
+    text-transform: uppercase;
+  }
 `;
 const getBadgeProps = (status) => {
   let color;
@@ -323,7 +322,6 @@ const getBadgeProps = (status) => {
 };
 const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
   const { formatMessage } = useIntl();
-  const IsSchedulingEnabled = window.strapi.future.isEnabled("contentReleasesScheduling");
   if (isError) {
     return /* @__PURE__ */ jsx(Page.Error, {});
   }
@@ -340,11 +338,11 @@ const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
             target: sectionTitle
           }
         ),
-        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "10rem" })
+        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "16rem" })
       }
     );
   }
-  return /* @__PURE__ */ jsx(Grid, { gap: 4, children: releases.map(({ id, name, actions, scheduledAt, status }) => /* @__PURE__ */ jsx(GridItem, { col: 3, s: 6, xs: 12, children: /* @__PURE__ */ jsx(LinkCard, { href: `content-releases/${id}`, isExternal: false, children: /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsx(Grid.Root, { gap: 4, children: releases.map(({ id, name, scheduledAt, status }) => /* @__PURE__ */ jsx(Grid.Item, { col: 3, s: 6, xs: 12, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsx(LinkCard, { tag: NavLink, to: `${id}`, isExternal: false, children: /* @__PURE__ */ jsxs(
     Flex,
     {
       direction: "column",
@@ -359,17 +357,11 @@ const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
       gap: 4,
       children: [
         /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "start", gap: 1, children: [
-          /* @__PURE__ */ jsx(Typography, { as: "h3", variant: "delta", fontWeight: "bold", children: name }),
-          /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: IsSchedulingEnabled ? scheduledAt ? /* @__PURE__ */ jsx(CapitalizeRelativeTime, { timestamp: new Date(scheduledAt) }) : formatMessage({
+          /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", tag: "h3", variant: "delta", fontWeight: "bold", children: name }),
+          /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: scheduledAt ? /* @__PURE__ */ jsx(RelativeTime, { timestamp: new Date(scheduledAt) }) : formatMessage({
             id: "content-releases.pages.Releases.not-scheduled",
             defaultMessage: "Not scheduled"
-          }) : formatMessage(
-            {
-              id: "content-releases.page.Releases.release-item.entries",
-              defaultMessage: "{number, plural, =0 {No entries} one {# entry} other {# entries}}"
-            },
-            { number: actions.meta.count }
-          ) })
+          }) })
         ] }),
         /* @__PURE__ */ jsx(Badge, { ...getBadgeProps(status), children: status })
       ]
@@ -386,34 +378,35 @@ const StyledAlert = styled(Alert)`
 `;
 const INITIAL_FORM_VALUES = {
   name: "",
-  date: null,
+  date: format(/* @__PURE__ */ new Date(), "yyyy-MM-dd"),
   time: "",
-  // Remove future flag check after Scheduling Beta release and replace with true as creating new release should include scheduling by default
-  isScheduled: window.strapi.future.isEnabled("contentReleasesScheduling"),
+  isScheduled: true,
   scheduledAt: null,
   timezone: null
 };
 const ReleasesPage = () => {
-  const tabRef = React.useRef(null);
   const location = useLocation();
   const [releaseModalShown, setReleaseModalShown] = React.useState(false);
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { formatMessage } = useIntl();
   const navigate = useNavigate();
   const { formatAPIError } = useAPIErrorHandler();
   const [{ query }, setQuery] = useQueryParams();
   const response = useGetReleasesQuery(query);
+  const { data, isLoading: isLoadingSettings } = useGetReleaseSettingsQuery();
   const [createRelease, { isLoading: isSubmittingForm }] = useCreateReleaseMutation();
   const { getFeature } = useLicenseLimits();
   const { maximumReleases = 3 } = getFeature("cms-content-releases");
   const { trackUsage } = useTracking();
-  const { isLoading, isSuccess, isError } = response;
+  const {
+    allowedActions: { canCreate }
+  } = useRBAC(PERMISSIONS);
+  const { isLoading: isLoadingReleases, isSuccess, isError } = response;
   const activeTab = response?.currentData?.meta?.activeTab || "pending";
-  const activeTabIndex = ["pending", "done"].indexOf(activeTab);
   React.useEffect(() => {
     if (location?.state?.errors) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         title: formatMessage({
           id: "content-releases.pages.Releases.notification.error.title",
           defaultMessage: "Your request could not be processed."
@@ -426,27 +419,22 @@ const ReleasesPage = () => {
       navigate("", { replace: true, state: null });
     }
   }, [formatMessage, location?.state?.errors, navigate, toggleNotification]);
-  React.useEffect(() => {
-    if (tabRef.current) {
-      tabRef.current._handlers.setSelectedTabIndex(activeTabIndex);
-    }
-  }, [activeTabIndex]);
   const toggleAddReleaseModal = () => {
     setReleaseModalShown((prev) => !prev);
   };
-  if (isLoading) {
+  if (isLoadingReleases || isLoadingSettings) {
     return /* @__PURE__ */ jsx(Page.Loading, {});
   }
   const totalPendingReleases = isSuccess && response.currentData?.meta?.pendingReleasesCount || 0;
   const hasReachedMaximumPendingReleases = totalPendingReleases >= maximumReleases;
-  const handleTabChange = (index) => {
+  const handleTabChange = (tabValue) => {
     setQuery({
       ...query,
       page: 1,
       pageSize: response?.currentData?.meta?.pagination?.pageSize || 16,
       filters: {
         releasedAt: {
-          $notNull: index === 0 ? false : true
+          $notNull: tabValue !== "pending"
         }
       }
     });
@@ -467,21 +455,21 @@ const ReleasesPage = () => {
       });
       trackUsage("didCreateRelease");
       navigate(response2.data.data.id.toString());
-    } else if (isAxiosError(response2.error)) {
+    } else if (isFetchError(response2.error)) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(response2.error)
       });
     } else {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
   };
-  return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoading, children: [
+  return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoadingReleases || isLoadingSettings, children: [
     /* @__PURE__ */ jsx(
-      HeaderLayout,
+      Layouts.Header,
       {
         title: formatMessage({
           id: "content-releases.pages.Releases.title",
@@ -491,7 +479,7 @@ const ReleasesPage = () => {
           id: "content-releases.pages.Releases.header-subtitle",
           defaultMessage: "Create and manage content updates"
         }),
-        primaryAction: /* @__PURE__ */ jsx(CheckPermissions, { permissions: PERMISSIONS.create, children: /* @__PURE__ */ jsx(
+        primaryAction: canCreate ? /* @__PURE__ */ jsx(
           Button,
           {
             startIcon: /* @__PURE__ */ jsx(Plus, {}),
@@ -502,10 +490,10 @@ const ReleasesPage = () => {
               defaultMessage: "New release"
             })
           }
-        ) })
+        ) : null
       }
     ),
-    /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
       hasReachedMaximumPendingReleases && /* @__PURE__ */ jsx(
         StyledAlert,
         {
@@ -530,21 +518,17 @@ const ReleasesPage = () => {
           })
         }
       ),
-      /* @__PURE__ */ jsxs(
-        TabGroup,
-        {
-          label: formatMessage({
-            id: "content-releases.pages.Releases.tab-group.label",
-            defaultMessage: "Releases list"
-          }),
-          variant: "simple",
-          initialSelectedTabIndex: activeTabIndex,
-          onTabChange: handleTabChange,
-          ref: tabRef,
-          children: [
-            /* @__PURE__ */ jsxs(Box, { paddingBottom: 8, children: [
-              /* @__PURE__ */ jsxs(Tabs, { children: [
-                /* @__PURE__ */ jsx(Tab, { children: formatMessage(
+      /* @__PURE__ */ jsxs(Tabs.Root, { variant: "simple", onValueChange: handleTabChange, value: activeTab, children: [
+        /* @__PURE__ */ jsxs(Box, { paddingBottom: 8, children: [
+          /* @__PURE__ */ jsxs(
+            Tabs.List,
+            {
+              "aria-label": formatMessage({
+                id: "content-releases.pages.Releases.tab-group.label",
+                defaultMessage: "Releases list"
+              }),
+              children: [
+                /* @__PURE__ */ jsx(Tabs.Trigger, { value: "pending", children: formatMessage(
                   {
                     id: "content-releases.pages.Releases.tab.pending",
                     defaultMessage: "Pending ({count})"
@@ -553,34 +537,32 @@ const ReleasesPage = () => {
                     count: totalPendingReleases
                   }
                 ) }),
-                /* @__PURE__ */ jsx(Tab, { children: formatMessage({
+                /* @__PURE__ */ jsx(Tabs.Trigger, { value: "done", children: formatMessage({
                   id: "content-releases.pages.Releases.tab.done",
                   defaultMessage: "Done"
                 }) })
-              ] }),
-              /* @__PURE__ */ jsx(Divider, {})
-            ] }),
-            /* @__PURE__ */ jsxs(TabPanels, { children: [
-              /* @__PURE__ */ jsx(TabPanel, { children: /* @__PURE__ */ jsx(
-                ReleasesGrid,
-                {
-                  sectionTitle: "pending",
-                  releases: response?.currentData?.data,
-                  isError
-                }
-              ) }),
-              /* @__PURE__ */ jsx(TabPanel, { children: /* @__PURE__ */ jsx(
-                ReleasesGrid,
-                {
-                  sectionTitle: "done",
-                  releases: response?.currentData?.data,
-                  isError
-                }
-              ) })
-            ] })
-          ]
-        }
-      ),
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsx(Divider, {})
+        ] }),
+        /* @__PURE__ */ jsx(Tabs.Content, { value: "pending", children: /* @__PURE__ */ jsx(
+          ReleasesGrid,
+          {
+            sectionTitle: "pending",
+            releases: response?.currentData?.data,
+            isError
+          }
+        ) }),
+        /* @__PURE__ */ jsx(Tabs.Content, { value: "done", children: /* @__PURE__ */ jsx(
+          ReleasesGrid,
+          {
+            sectionTitle: "done",
+            releases: response?.currentData?.data,
+            isError
+          }
+        ) })
+      ] }),
       /* @__PURE__ */ jsxs(
         Pagination.Root,
         {
@@ -593,13 +575,17 @@ const ReleasesPage = () => {
         }
       )
     ] }) }),
-    releaseModalShown && /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(
       ReleaseModal,
       {
+        open: releaseModalShown,
         handleClose: toggleAddReleaseModal,
         handleSubmit: handleAddRelease,
         isLoading: isSubmittingForm,
-        initialValues: INITIAL_FORM_VALUES
+        initialValues: {
+          ...INITIAL_FORM_VALUES,
+          timezone: data?.data.defaultTimezone ? data.data.defaultTimezone.split("&")[1] : null
+        }
       }
     )
   ] });
@@ -610,7 +596,7 @@ const ReleaseInfoWrapper = styled(Flex)`
   border-bottom-left-radius: ${({ theme }) => theme.borderRadius};
   border-top: 1px solid ${({ theme }) => theme.colors.neutral150};
 `;
-const StyledMenuItem = styled(Menu.Item)`
+const StyledMenuItem = styled(MenuItem)`
   svg path {
     fill: ${({ theme, disabled }) => disabled && theme.colors.neutral500};
   }
@@ -619,19 +605,19 @@ const StyledMenuItem = styled(Menu.Item)`
   }
 
   &:hover {
-    background: ${({ theme, variant = "neutral" }) => theme.colors[`${variant}100`]};
+    background: ${({ theme, $variant = "neutral" }) => theme.colors[`${$variant}100`]};
   }
 `;
 const PencilIcon = styled(Pencil)`
-  width: ${({ theme }) => theme.spaces[3]};
-  height: ${({ theme }) => theme.spaces[3]};
+  width: ${({ theme }) => theme.spaces[4]};
+  height: ${({ theme }) => theme.spaces[4]};
   path {
     fill: ${({ theme }) => theme.colors.neutral600};
   }
 `;
 const TrashIcon = styled(Trash)`
-  width: ${({ theme }) => theme.spaces[3]};
-  height: ${({ theme }) => theme.spaces[3]};
+  width: ${({ theme }) => theme.spaces[4]};
+  height: ${({ theme }) => theme.spaces[4]};
   path {
     fill: ${({ theme }) => theme.colors.danger600};
   }
@@ -639,44 +625,93 @@ const TrashIcon = styled(Trash)`
 const TypographyMaxWidth = styled(Typography)`
   max-width: 300px;
 `;
-const EntryValidationText = ({ action, schema, entry }) => {
+const EntryValidationText = ({ action, schema, entry, status }) => {
   const { formatMessage } = useIntl();
-  const { validate } = unstable_useDocument(
+  const { validate, isLoading } = unstable_useDocument(
     {
       collectionType: schema?.kind ?? "",
       model: schema?.uid ?? ""
     },
     {
-      skip: !schema
+      // useDocument makes a request to get more data about the entry, but we only want to have the validation function so we skip the request
+      skip: true
     }
   );
-  const errors = validate(entry) ?? {};
-  if (Object.keys(errors).length > 0) {
-    const validationErrorsMessages = Object.entries(errors).map(
-      ([key, value]) => formatMessage(
-        { id: `${value.id}.withField`, defaultMessage: value.defaultMessage },
-        { field: key }
-      )
-    ).join(" ");
-    return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-      /* @__PURE__ */ jsx(Icon, { color: "danger600", as: CrossCircle }),
-      /* @__PURE__ */ jsx(Tooltip, { description: validationErrorsMessages, children: /* @__PURE__ */ jsx(TypographyMaxWidth, { textColor: "danger600", variant: "omega", fontWeight: "semiBold", ellipsis: true, children: validationErrorsMessages }) })
-    ] });
+  const errorsToString = (errors2, prefix = "") => {
+    if (Object.keys(errors2).length === 0) {
+      return "";
+    }
+    return Object.entries(errors2).map(([key, value]) => {
+      if (value === void 0 || value === null) {
+        return "";
+      }
+      if (typeof value === "string") {
+        return formatMessage(
+          { id: value, defaultMessage: value },
+          { field: prefix ? `${prefix}.${key}` : key }
+        );
+      }
+      if (typeof value === "object" && value !== null && "id" in value && "defaultMessage" in value) {
+        return formatMessage(
+          // @ts-expect-error – TODO: default message will be a string
+          { id: `${value.id}.withField`, defaultMessage: value.defaultMessage },
+          { field: prefix ? `${prefix}.${key}` : key }
+        );
+      }
+      return errorsToString(value, key);
+    }).join(" ");
+  };
+  if (isLoading) {
+    return null;
   }
-  if (action == "publish") {
-    return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-      /* @__PURE__ */ jsx(Icon, { color: "success600", as: CheckCircle }),
-      entry.publishedAt ? /* @__PURE__ */ jsx(Typography, { textColor: "success600", fontWeight: "bold", children: formatMessage({
-        id: "content-releases.pages.ReleaseDetails.entry-validation.already-published",
-        defaultMessage: "Already published"
-      }) }) : /* @__PURE__ */ jsx(Typography, { children: formatMessage({
-        id: "content-releases.pages.ReleaseDetails.entry-validation.ready-to-publish",
-        defaultMessage: "Ready to publish"
-      }) })
-    ] });
+  const errors = validate(entry) ?? {};
+  if (action === "publish") {
+    if (Object.keys(errors).length > 0) {
+      const validationErrorsMessages = errorsToString(errors);
+      return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
+        /* @__PURE__ */ jsx(CrossCircle, { fill: "danger600" }),
+        /* @__PURE__ */ jsx(Tooltip, { description: validationErrorsMessages, children: /* @__PURE__ */ jsx(
+          TypographyMaxWidth,
+          {
+            textColor: "danger600",
+            variant: "omega",
+            fontWeight: "semiBold",
+            ellipsis: true,
+            children: validationErrorsMessages
+          }
+        ) })
+      ] });
+    }
+    if (status === "draft") {
+      return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
+        /* @__PURE__ */ jsx(CheckCircle, { fill: "success600" }),
+        /* @__PURE__ */ jsx(Typography, { children: formatMessage({
+          id: "content-releases.pages.ReleaseDetails.entry-validation.ready-to-publish",
+          defaultMessage: "Ready to publish"
+        }) })
+      ] });
+    }
+    if (status === "modified") {
+      return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
+        /* @__PURE__ */ jsx(ArrowsCounterClockwise, { fill: "alternative600" }),
+        /* @__PURE__ */ jsx(Typography, { children: formatMessage({
+          id: "content-releases.pages.ReleaseDetails.entry-validation.modified",
+          defaultMessage: "Ready to publish changes"
+        }) })
+      ] });
+    }
+    if (status === "published") {
+      return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
+        /* @__PURE__ */ jsx(CheckCircle, { fill: "success600" }),
+        /* @__PURE__ */ jsx(Typography, { children: formatMessage({
+          id: "content-releases.pages.ReleaseDetails.entry-validation.already-published",
+          defaultMessage: "Already published"
+        }) })
+      ] });
+    }
   }
   return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-    /* @__PURE__ */ jsx(Icon, { color: "success600", as: CheckCircle }),
+    /* @__PURE__ */ jsx(CheckCircle, { fill: "success600" }),
     !entry.publishedAt ? /* @__PURE__ */ jsx(Typography, { textColor: "success600", fontWeight: "bold", children: formatMessage({
       id: "content-releases.pages.ReleaseDetails.entry-validation.already-unpublished",
       defaultMessage: "Already unpublished"
@@ -696,7 +731,6 @@ const ReleaseDetailsLayout = ({
   const {
     data,
     isLoading: isLoadingDetails,
-    isError,
     error
   } = useGetReleaseQuery(
     { id: releaseId },
@@ -705,11 +739,10 @@ const ReleaseDetailsLayout = ({
     }
   );
   const [publishRelease, { isLoading: isPublishing }] = usePublishReleaseMutation();
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { formatAPIError } = useAPIErrorHandler();
-  const {
-    allowedActions: { canUpdate, canDelete }
-  } = useRBAC(PERMISSIONS);
+  const { allowedActions } = useRBAC(PERMISSIONS);
+  const { canUpdate, canDelete, canPublish } = allowedActions;
   const dispatch = useTypedDispatch();
   const { trackUsage } = useTracking();
   const release = data?.data;
@@ -729,20 +762,25 @@ const ReleaseDetailsLayout = ({
         totalPublishedEntries,
         totalUnpublishedEntries
       });
-    } else if (isAxiosError(response.error)) {
+    } else if (isFetchError(response.error)) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
   };
   const handleRefresh = () => {
-    dispatch(releaseApi.util.invalidateTags([{ type: "ReleaseAction", id: "LIST" }]));
+    dispatch(
+      releaseApi.util.invalidateTags([
+        { type: "ReleaseAction", id: "LIST" },
+        { type: "Release", id: releaseId }
+      ])
+    );
   };
   const getCreatedByUser = () => {
     if (!release?.createdBy) {
@@ -759,7 +797,7 @@ const ReleaseDetailsLayout = ({
   if (isLoadingDetails) {
     return /* @__PURE__ */ jsx(Page.Loading, {});
   }
-  if (isError || !release) {
+  if (isBaseQueryError(error) && "code" in error || !release) {
     return /* @__PURE__ */ jsx(
       Navigate,
       {
@@ -767,6 +805,7 @@ const ReleaseDetailsLayout = ({
         state: {
           errors: [
             {
+              // @ts-expect-error – TODO: fix this weird error flow
               code: error?.code
             }
           ]
@@ -776,7 +815,6 @@ const ReleaseDetailsLayout = ({
   }
   const totalEntries = release.actions.meta.count || 0;
   const hasCreatedByUser = Boolean(getCreatedByUser());
-  const IsSchedulingEnabled = window.strapi.future.isEnabled("contentReleasesScheduling");
   const isScheduled = release.scheduledAt && release.timezone;
   const numberOfEntriesText = formatMessage(
     {
@@ -807,101 +845,85 @@ const ReleaseDetailsLayout = ({
   ) : "";
   return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoadingDetails, children: [
     /* @__PURE__ */ jsx(
-      HeaderLayout,
+      Layouts.Header,
       {
         title: release.name,
         subtitle: /* @__PURE__ */ jsxs(Flex, { gap: 2, lineHeight: 6, children: [
-          /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", variant: "epsilon", children: numberOfEntriesText + (IsSchedulingEnabled && isScheduled ? ` - ${scheduledText}` : "") }),
+          /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", variant: "epsilon", children: numberOfEntriesText + (isScheduled ? ` - ${scheduledText}` : "") }),
           /* @__PURE__ */ jsx(Badge, { ...getBadgeProps(release.status), children: release.status })
         ] }),
-        navigationAction: /* @__PURE__ */ jsx(Link$1, { startIcon: /* @__PURE__ */ jsx(ArrowLeft, {}), to: "/plugins/content-releases", children: formatMessage({
-          id: "global.back",
-          defaultMessage: "Back"
-        }) }),
+        navigationAction: /* @__PURE__ */ jsx(BackButton, {}),
         primaryAction: !release.releasedAt && /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-          /* @__PURE__ */ jsxs(Menu.Root, { children: [
-            /* @__PURE__ */ jsx(
-              Menu.Trigger,
-              {
-                as: IconButton,
-                paddingLeft: 2,
-                paddingRight: 2,
-                "aria-label": formatMessage({
-                  id: "content-releases.header.actions.open-release-actions",
-                  defaultMessage: "Release edit and delete menu"
-                }),
-                icon: /* @__PURE__ */ jsx(More, {}),
-                variant: "tertiary"
-              }
-            ),
-            /* @__PURE__ */ jsxs(Menu.Content, { top: 1, popoverPlacement: "bottom-end", children: [
-              /* @__PURE__ */ jsxs(
-                Flex,
-                {
-                  alignItems: "center",
-                  justifyContent: "center",
-                  direction: "column",
-                  padding: 1,
-                  width: "100%",
-                  children: [
-                    /* @__PURE__ */ jsx(StyledMenuItem, { disabled: !canUpdate, onSelect: toggleEditReleaseModal, children: /* @__PURE__ */ jsxs(Flex, { alignItems: "center", gap: 2, hasRadius: true, width: "100%", children: [
-                      /* @__PURE__ */ jsx(PencilIcon, {}),
-                      /* @__PURE__ */ jsx(Typography, { ellipsis: true, children: formatMessage({
-                        id: "content-releases.header.actions.edit",
-                        defaultMessage: "Edit"
+          /* @__PURE__ */ jsxs(
+            SimpleMenuButton,
+            {
+              label: /* @__PURE__ */ jsx(More, {}),
+              variant: "tertiary",
+              endIcon: null,
+              paddingLeft: "7px",
+              paddingRight: "7px",
+              "aria-label": formatMessage({
+                id: "content-releases.header.actions.open-release-actions",
+                defaultMessage: "Release edit and delete menu"
+              }),
+              popoverPlacement: "bottom-end",
+              children: [
+                /* @__PURE__ */ jsx(StyledMenuItem, { disabled: !canUpdate, onSelect: toggleEditReleaseModal, children: /* @__PURE__ */ jsxs(Flex, { alignItems: "center", gap: 2, hasRadius: true, width: "100%", children: [
+                  /* @__PURE__ */ jsx(PencilIcon, {}),
+                  /* @__PURE__ */ jsx(Typography, { ellipsis: true, children: formatMessage({
+                    id: "content-releases.header.actions.edit",
+                    defaultMessage: "Edit"
+                  }) })
+                ] }) }),
+                /* @__PURE__ */ jsx(
+                  StyledMenuItem,
+                  {
+                    disabled: !canDelete,
+                    onSelect: toggleWarningSubmit,
+                    $variant: "danger",
+                    children: /* @__PURE__ */ jsxs(Flex, { alignItems: "center", gap: 2, hasRadius: true, width: "100%", children: [
+                      /* @__PURE__ */ jsx(TrashIcon, {}),
+                      /* @__PURE__ */ jsx(Typography, { ellipsis: true, textColor: "danger600", children: formatMessage({
+                        id: "content-releases.header.actions.delete",
+                        defaultMessage: "Delete"
                       }) })
-                    ] }) }),
-                    /* @__PURE__ */ jsx(
-                      StyledMenuItem,
-                      {
-                        disabled: !canDelete,
-                        onSelect: toggleWarningSubmit,
-                        variant: "danger",
-                        children: /* @__PURE__ */ jsxs(Flex, { alignItems: "center", gap: 2, hasRadius: true, width: "100%", children: [
-                          /* @__PURE__ */ jsx(TrashIcon, {}),
-                          /* @__PURE__ */ jsx(Typography, { ellipsis: true, textColor: "danger600", children: formatMessage({
-                            id: "content-releases.header.actions.delete",
-                            defaultMessage: "Delete"
-                          }) })
-                        ] })
-                      }
-                    )
-                  ]
-                }
-              ),
-              /* @__PURE__ */ jsxs(
-                ReleaseInfoWrapper,
-                {
-                  direction: "column",
-                  justifyContent: "center",
-                  alignItems: "flex-start",
-                  gap: 1,
-                  padding: 5,
-                  children: [
-                    /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: formatMessage({
-                      id: "content-releases.header.actions.created",
-                      defaultMessage: "Created"
-                    }) }),
-                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", color: "neutral300", children: [
-                      /* @__PURE__ */ jsx(RelativeTime, { timestamp: new Date(release.createdAt) }),
-                      formatMessage(
-                        {
-                          id: "content-releases.header.actions.created.description",
-                          defaultMessage: "{hasCreatedByUser, select, true { by {createdBy}} other { by deleted user}}"
-                        },
-                        { createdBy: getCreatedByUser(), hasCreatedByUser }
-                      )
                     ] })
-                  ]
-                }
-              )
-            ] })
-          ] }),
+                  }
+                ),
+                /* @__PURE__ */ jsxs(
+                  ReleaseInfoWrapper,
+                  {
+                    direction: "column",
+                    justifyContent: "center",
+                    alignItems: "flex-start",
+                    gap: 1,
+                    padding: 4,
+                    children: [
+                      /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: formatMessage({
+                        id: "content-releases.header.actions.created",
+                        defaultMessage: "Created"
+                      }) }),
+                      /* @__PURE__ */ jsxs(Typography, { variant: "pi", color: "neutral300", children: [
+                        /* @__PURE__ */ jsx(RelativeTime$1, { timestamp: new Date(release.createdAt) }),
+                        formatMessage(
+                          {
+                            id: "content-releases.header.actions.created.description",
+                            defaultMessage: "{hasCreatedByUser, select, true { by {createdBy}} other { by deleted user}}"
+                          },
+                          { createdBy: getCreatedByUser(), hasCreatedByUser }
+                        )
+                      ] })
+                    ]
+                  }
+                )
+              ]
+            }
+          ),
           /* @__PURE__ */ jsx(Button, { size: "S", variant: "tertiary", onClick: handleRefresh, children: formatMessage({
             id: "content-releases.header.actions.refresh",
             defaultMessage: "Refresh"
           }) }),
-          /* @__PURE__ */ jsx(CheckPermissions, { permissions: PERMISSIONS.publish, children: /* @__PURE__ */ jsx(
+          canPublish ? /* @__PURE__ */ jsx(
             Button,
             {
               size: "S",
@@ -914,14 +936,20 @@ const ReleaseDetailsLayout = ({
                 defaultMessage: "Publish"
               })
             }
-          ) })
+          ) : null
         ] })
       }
     ),
     children
   ] });
 };
+const SimpleMenuButton = styled(SimpleMenu)`
+  & > span {
+    display: flex;
+  }
+`;
 const GROUP_BY_OPTIONS = ["contentType", "locale", "action"];
+const GROUP_BY_OPTIONS_NO_LOCALE = ["contentType", "action"];
 const getGroupByOptionLabel = (value) => {
   if (value === "locale") {
     return {
@@ -943,17 +971,29 @@ const getGroupByOptionLabel = (value) => {
 const ReleaseDetailsBody = ({ releaseId }) => {
   const { formatMessage } = useIntl();
   const [{ query }, setQuery] = useQueryParams();
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { formatAPIError } = useAPIErrorHandler();
   const {
     data: releaseData,
     isLoading: isReleaseLoading,
-    isError: isReleaseError,
     error: releaseError
   } = useGetReleaseQuery({ id: releaseId });
   const {
     allowedActions: { canUpdate }
   } = useRBAC(PERMISSIONS);
+  const runHookWaterfall = useStrapiApp("ReleaseDetailsPage", (state) => state.runHookWaterfall);
+  const { displayedHeaders, hasI18nEnabled } = runHookWaterfall("ContentReleases/pages/ReleaseDetails/add-locale-in-releases", {
+    displayedHeaders: [
+      {
+        label: {
+          id: "content-releases.page.ReleaseDetails.table.header.label.name",
+          defaultMessage: "name"
+        },
+        name: "name"
+      }
+    ],
+    hasI18nEnabled: false
+  });
   const release = releaseData?.data;
   const selectedGroupBy = query?.groupBy || "contentType";
   const {
@@ -982,14 +1022,14 @@ const ReleaseDetailsBody = ({ releaseId }) => {
       // We are passing the action path to found the position in the cache of the action for optimistic updates
     });
     if ("error" in response) {
-      if (isAxiosError(response.error)) {
+      if (isFetchError(response.error)) {
         toggleNotification({
-          type: "warning",
+          type: "danger",
           message: formatAPIError(response.error)
         });
       } else {
         toggleNotification({
-          type: "warning",
+          type: "danger",
           message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
         });
       }
@@ -1002,14 +1042,14 @@ const ReleaseDetailsBody = ({ releaseId }) => {
   const releaseMeta = data?.meta;
   const contentTypes = releaseMeta?.contentTypes || {};
   const components = releaseMeta?.components || {};
-  if (isReleaseError || !release) {
+  if (isBaseQueryError(releaseError) || !release) {
     const errorsArray = [];
-    if (releaseError) {
+    if (releaseError && "code" in releaseError) {
       errorsArray.push({
         code: releaseError.code
       });
     }
-    if (releaseActionsError) {
+    if (releaseActionsError && "code" in releaseActionsError) {
       errorsArray.push({
         code: releaseActionsError.code
       });
@@ -1028,13 +1068,13 @@ const ReleaseDetailsBody = ({ releaseId }) => {
     return /* @__PURE__ */ jsx(Page.Error, {});
   }
   if (Object.keys(releaseActions).length === 0) {
-    return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsx(
+    return /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsx(
       EmptyStateLayout,
       {
         action: /* @__PURE__ */ jsx(
           LinkButton,
           {
-            as: Link$2,
+            tag: Link$1,
             to: {
               pathname: "/content-manager"
             },
@@ -1046,7 +1086,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
             })
           }
         ),
-        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "10rem" }),
+        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "16rem" }),
         content: formatMessage({
           id: "content-releases.pages.Details.tab.emptyEntries",
           defaultMessage: "This release is empty. Open the Content Manager, select an entry and add it to the release."
@@ -1054,14 +1094,43 @@ const ReleaseDetailsBody = ({ releaseId }) => {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(Flex, { gap: 8, direction: "column", alignItems: "stretch", children: [
+  const groupByLabel = formatMessage({
+    id: "content-releases.pages.ReleaseDetails.groupBy.aria-label",
+    defaultMessage: "Group by"
+  });
+  const headers = [
+    ...displayedHeaders,
+    {
+      label: {
+        id: "content-releases.page.ReleaseDetails.table.header.label.content-type",
+        defaultMessage: "content-type"
+      },
+      name: "content-type"
+    },
+    {
+      label: {
+        id: "content-releases.page.ReleaseDetails.table.header.label.action",
+        defaultMessage: "action"
+      },
+      name: "action"
+    },
+    ...!release.releasedAt ? [
+      {
+        label: {
+          id: "content-releases.page.ReleaseDetails.table.header.label.status",
+          defaultMessage: "status"
+        },
+        name: "status"
+      }
+    ] : []
+  ];
+  const options = hasI18nEnabled ? GROUP_BY_OPTIONS : GROUP_BY_OPTIONS_NO_LOCALE;
+  return /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Flex, { gap: 8, direction: "column", alignItems: "stretch", children: [
     /* @__PURE__ */ jsx(Flex, { children: /* @__PURE__ */ jsx(
       SingleSelect,
       {
-        "aria-label": formatMessage({
-          id: "content-releases.pages.ReleaseDetails.groupBy.aria-label",
-          defaultMessage: "Group by"
-        }),
+        placeholder: groupByLabel,
+        "aria-label": groupByLabel,
         customizeContent: (value) => formatMessage(
           {
             id: `content-releases.pages.ReleaseDetails.groupBy.label`,
@@ -1073,7 +1142,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
         ),
         value: formatMessage(getGroupByOptionLabel(selectedGroupBy)),
         onChange: (value) => setQuery({ groupBy: value }),
-        children: GROUP_BY_OPTIONS.map((option) => /* @__PURE__ */ jsx(SingleSelectOption, { value: option, children: formatMessage(getGroupByOptionLabel(option)) }, option))
+        children: options.map((option) => /* @__PURE__ */ jsx(SingleSelectOption, { value: option, children: formatMessage(getGroupByOptionLabel(option)) }, option))
       }
     ) }),
     Object.keys(releaseActions).map((key) => /* @__PURE__ */ jsxs(Flex, { gap: 4, direction: "column", alignItems: "stretch", children: [
@@ -1085,72 +1154,15 @@ const ReleaseDetailsBody = ({ releaseId }) => {
             ...item,
             id: Number(item.entry.id)
           })),
-          colCount: releaseActions[key].length,
-          isLoading,
-          isFetching,
+          headers,
+          isLoading: isLoading || isFetching,
           children: /* @__PURE__ */ jsxs(Table.Content, { children: [
-            /* @__PURE__ */ jsxs(Table.Head, { children: [
-              /* @__PURE__ */ jsx(
-                Table.HeaderCell,
-                {
-                  attribute: { type: "string" },
-                  label: formatMessage({
-                    id: "content-releases.page.ReleaseDetails.table.header.label.name",
-                    defaultMessage: "name"
-                  }),
-                  name: "name"
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                Table.HeaderCell,
-                {
-                  attribute: { type: "string" },
-                  label: formatMessage({
-                    id: "content-releases.page.ReleaseDetails.table.header.label.locale",
-                    defaultMessage: "locale"
-                  }),
-                  name: "locale"
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                Table.HeaderCell,
-                {
-                  attribute: { type: "string" },
-                  label: formatMessage({
-                    id: "content-releases.page.ReleaseDetails.table.header.label.content-type",
-                    defaultMessage: "content-type"
-                  }),
-                  name: "content-type"
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                Table.HeaderCell,
-                {
-                  attribute: { type: "string" },
-                  label: formatMessage({
-                    id: "content-releases.page.ReleaseDetails.table.header.label.action",
-                    defaultMessage: "action"
-                  }),
-                  name: "action"
-                }
-              ),
-              !release.releasedAt && /* @__PURE__ */ jsx(
-                Table.HeaderCell,
-                {
-                  attribute: { type: "string" },
-                  label: formatMessage({
-                    id: "content-releases.page.ReleaseDetails.table.header.label.status",
-                    defaultMessage: "status"
-                  }),
-                  name: "status"
-                }
-              )
-            ] }),
-            /* @__PURE__ */ jsx(Table.LoadingBody, {}),
+            /* @__PURE__ */ jsx(Table.Head, { children: headers.map(({ label, name }) => /* @__PURE__ */ jsx(Table.HeaderCell, { label: formatMessage(label), name }, name)) }),
+            /* @__PURE__ */ jsx(Table.Loading, {}),
             /* @__PURE__ */ jsx(Table.Body, { children: releaseActions[key].map(
-              ({ id, contentType, locale, type, entry }, actionIndex) => /* @__PURE__ */ jsxs(Tr, { children: [
+              ({ id, contentType, locale, type, entry, status }, actionIndex) => /* @__PURE__ */ jsxs(Tr, { children: [
                 /* @__PURE__ */ jsx(Td, { width: "25%", maxWidth: "200px", children: /* @__PURE__ */ jsx(Typography, { ellipsis: true, children: `${contentType.mainFieldValue || entry.id}` }) }),
-                /* @__PURE__ */ jsx(Td, { width: "10%", children: /* @__PURE__ */ jsx(Typography, { children: `${locale?.name ? locale.name : "-"}` }) }),
+                hasI18nEnabled && /* @__PURE__ */ jsx(Td, { width: "10%", children: /* @__PURE__ */ jsx(Typography, { children: `${locale?.name ? locale.name : "-"}` }) }),
                 /* @__PURE__ */ jsx(Td, { width: "10%", children: /* @__PURE__ */ jsx(Typography, { children: contentType.displayName || "" }) }),
                 /* @__PURE__ */ jsx(Td, { width: "20%", children: release.releasedAt ? /* @__PURE__ */ jsx(Typography, { children: formatMessage(
                   {
@@ -1177,7 +1189,8 @@ const ReleaseDetailsBody = ({ releaseId }) => {
                       action: type,
                       schema: contentTypes?.[contentType.uid],
                       components,
-                      entry
+                      entry,
+                      status
                     }
                   ) }),
                   /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(ReleaseActionMenu.Root, { children: [
@@ -1185,7 +1198,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
                       ReleaseActionMenu.ReleaseActionEntryLinkItem,
                       {
                         contentTypeUid: contentType.uid,
-                        entryId: entry.id,
+                        documentId: entry.documentId,
                         locale: locale?.code
                       }
                     ),
@@ -1220,7 +1233,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
 const ReleaseDetailsPage = () => {
   const { formatMessage } = useIntl();
   const { releaseId } = useParams();
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { formatAPIError } = useAPIErrorHandler();
   const navigate = useNavigate();
   const [releaseModalShown, setReleaseModalShown] = React.useState(false);
@@ -1235,13 +1248,24 @@ const ReleaseDetailsPage = () => {
       skip: !releaseId
     }
   );
+  const { data: dataTimezone, isLoading: isLoadingTimezone } = useGetReleaseSettingsQuery();
   const [updateRelease, { isLoading: isSubmittingForm }] = useUpdateReleaseMutation();
-  const [deleteRelease, { isLoading: isDeletingRelease }] = useDeleteReleaseMutation();
+  const [deleteRelease] = useDeleteReleaseMutation();
   const toggleEditReleaseModal = () => {
     setReleaseModalShown((prev) => !prev);
   };
+  const getTimezoneValue = () => {
+    if (releaseData?.timezone) {
+      return releaseData.timezone;
+    } else {
+      if (dataTimezone?.data.defaultTimezone) {
+        return dataTimezone.data.defaultTimezone;
+      }
+      return null;
+    }
+  };
   const toggleWarningSubmit = () => setWarningSubmit((prevState) => !prevState);
-  if (isLoadingDetails) {
+  if (isLoadingDetails || isLoadingTimezone) {
     return /* @__PURE__ */ jsx(
       ReleaseDetailsLayout,
       {
@@ -1256,10 +1280,10 @@ const ReleaseDetailsPage = () => {
   }
   const releaseData = isSuccessDetails && data?.data || null;
   const title = releaseData?.name || "";
-  const timezone = releaseData?.timezone ?? null;
+  const timezone = getTimezoneValue();
   const scheduledAt = releaseData?.scheduledAt && timezone ? utcToZonedTime(releaseData.scheduledAt, timezone) : null;
-  const date = scheduledAt ? new Date(format(scheduledAt, "yyyy-MM-dd")) : null;
-  const time = scheduledAt ? format(scheduledAt, "HH:mm") : "";
+  const date = scheduledAt ? format$1(scheduledAt, "yyyy-MM-dd") : void 0;
+  const time = scheduledAt ? format$1(scheduledAt, "HH:mm") : "";
   const handleEditRelease = async (values) => {
     const response = await updateRelease({
       id: releaseId,
@@ -1275,18 +1299,18 @@ const ReleaseDetailsPage = () => {
           defaultMessage: "Release updated."
         })
       });
-    } else if (isAxiosError(response.error)) {
+      toggleEditReleaseModal();
+    } else if (isFetchError(response.error)) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
-    toggleEditReleaseModal();
   };
   const handleDeleteRelease = async () => {
     const response = await deleteRelease({
@@ -1294,14 +1318,14 @@ const ReleaseDetailsPage = () => {
     });
     if ("data" in response) {
       navigate("..");
-    } else if (isAxiosError(response.error)) {
+    } else if (isFetchError(response.error)) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
@@ -1313,9 +1337,10 @@ const ReleaseDetailsPage = () => {
       toggleWarningSubmit,
       children: [
         /* @__PURE__ */ jsx(ReleaseDetailsBody, { releaseId }),
-        releaseModalShown && /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(
           ReleaseModal,
           {
+            open: releaseModalShown,
             handleClose: toggleEditReleaseModal,
             handleSubmit: handleEditRelease,
             isLoading: isLoadingDetails || isSubmittingForm,
@@ -1329,19 +1354,10 @@ const ReleaseDetailsPage = () => {
             }
           }
         ),
-        /* @__PURE__ */ jsx(
-          ConfirmDialog,
-          {
-            bodyText: {
-              id: "content-releases.dialog.confirmation-message",
-              defaultMessage: "Are you sure you want to delete this release?"
-            },
-            isOpen: showWarningSubmit,
-            isConfirmButtonLoading: isDeletingRelease,
-            onToggleDialog: toggleWarningSubmit,
-            onConfirm: handleDeleteRelease
-          }
-        )
+        /* @__PURE__ */ jsx(Dialog.Root, { open: showWarningSubmit, onOpenChange: toggleWarningSubmit, children: /* @__PURE__ */ jsx(ConfirmDialog, { onConfirm: handleDeleteRelease, children: formatMessage({
+          id: "content-releases.dialog.confirmation-message",
+          defaultMessage: "Are you sure you want to delete this release?"
+        }) }) })
       ]
     }
   );
@@ -1355,4 +1371,4 @@ const App = () => {
 export {
   App
 };
-//# sourceMappingURL=App-0Er6xxcq.mjs.map
+//# sourceMappingURL=App-Cne--1Z8.mjs.map