@strapi/content-releases 0.0.0-experimental.defd8568ae03ef8d52f86e1f3541979f953c3941 → 0.0.0-experimental.e02b4637b3906c6d31048d00600d09a23a0edc3d

package/dist/_chunks/{App-O0ZO-S35.mjs → App-BA2xDdy0.mjs}

@@ -1,19 +1,19 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { useNotification, useAPIErrorHandler, useQueryParams, useTracking, useRBAC, Page, Pagination, ConfirmDialog, BackButton, useStrapiApp, Table } from "@strapi/admin/strapi-admin";
-import { useLocation, useNavigate, useParams, Navigate, Link as Link$1, 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 useGetReleaseActionsQuery, h as useUpdateReleaseActionMutation, R as ReleaseActionOptions, j as ReleaseActionMenu, r as releaseApi } from "./index-DjDPK8kb.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-CCFFG3Zs.mjs";
 import * as React from "react";
-import { ModalLayout, ModalHeader, Typography, ModalBody, Flex, TextInput, Box, Checkbox, DatePicker, TimePicker, ModalFooter, Button, Combobox, ComboboxOption, Link, Alert, Main, HeaderLayout, ContentLayout, TabGroup, Tabs, Tab, Divider, TabPanels, TabPanel, EmptyStateLayout, Grid, GridItem, Badge, Menu, IconButton, LinkButton, SingleSelect, SingleSelectOption, Tr, Td, Tooltip } from "@strapi/design-system";
-import { Plus, Pencil, Trash, More, CrossCircle, CheckCircle } from "@strapi/icons";
+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 { unstable_useDocument } from "@strapi/plugin-content-manager/strapi-admin";
-import format from "date-fns/format";
+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 } 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 { 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"];
@@ -46,28 +46,9 @@ const RelativeTime$1 = 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
@@ -91,8 +72,8 @@ const ReleaseModal = ({
     );
     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}}"
@@ -115,133 +96,143 @@ 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
-              }
-            ),
-            /* @__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) {
-                    setFieldValue("date", null);
-                    setFieldValue("time", "");
-                    setFieldValue("timezone", null);
-                  } else {
-                    setFieldValue("date", initialValues.date);
-                    setFieldValue("time", initialValues.time);
-                    setFieldValue("timezone", initialValues.timezone ?? systemTimezone?.value);
-                  }
-                },
-                children: /* @__PURE__ */ jsx(
-                  Typography,
-                  {
-                    textColor: values.isScheduled ? "primary600" : "neutral800",
-                    fontWeight: values.isScheduled ? "semiBold" : "regular",
-                    children: formatMessage({
-                      id: "modal.form.input.label.schedule-release",
-                      defaultMessage: "Schedule release"
-                    })
-                  }
-                )
-              }
-            ) }),
-            values.isScheduled && /* @__PURE__ */ jsxs(Fragment, { children: [
-              /* @__PURE__ */ jsxs(Flex, { gap: 4, alignItems: "start", children: [
-                /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsx(
-                  DatePicker,
-                  {
-                    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: () => {
+        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",
+                  checked: values.isScheduled,
+                  onCheckedChange: (checked) => {
+                    setFieldValue("isScheduled", checked);
+                    if (!checked) {
                       setFieldValue("date", null);
-                    },
-                    selectedDate: values.date || void 0,
-                    required: true,
-                    minDate: utcToZonedTime(/* @__PURE__ */ new Date(), values.timezone.split("&")[1])
-                  }
-                ) }),
-                /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsx(
-                  TimePicker,
-                  {
-                    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
-                  }
-                ) })
-              ] }),
-              /* @__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(
+                      setFieldValue("timezone", null);
+                    } else {
+                      setFieldValue("date", initialValues.date);
+                      setFieldValue("time", initialValues.time);
+                      setFieldValue(
+                        "timezone",
+                        initialValues.timezone ?? systemTimezone?.value
+                      );
+                    }
+                  },
+                  children: /* @__PURE__ */ jsx(
+                    Typography,
+                    {
+                      textColor: values.isScheduled ? "primary600" : "neutral800",
+                      fontWeight: values.isScheduled ? "semiBold" : "regular",
+                      children: formatMessage({
+                        id: "modal.form.input.label.schedule-release",
+                        defaultMessage: "Schedule release"
+                      })
+                    }
+                  )
+                }
+              ) }),
+              values.isScheduled && /* @__PURE__ */ jsxs(Fragment, { children: [
+                /* @__PURE__ */ jsxs(Flex, { gap: 4, alignItems: "start", children: [
+                  /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(
+                    Field.Root,
+                    {
+                      name: "date",
+                      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__ */ jsxs(
+                    Field.Root,
+                    {
+                      name: "time",
+                      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__ */ 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();
@@ -257,33 +248,44 @@ const TimezoneComponent = ({ timezoneOptions }) => {
       }
     }
   }, [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"
-      }),
-      autocomplete: { type: "list", filter: "contains" },
       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;
 `;
@@ -340,7 +342,7 @@ const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
       }
     );
   }
-  return /* @__PURE__ */ jsx(Grid, { gap: 4, children: releases.map(({ id, name, 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",
@@ -355,7 +357,7 @@ 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, { 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"
@@ -376,14 +378,13 @@ const StyledAlert = styled(Alert)`
 `;
 const INITIAL_FORM_VALUES = {
   name: "",
-  date: null,
+  date: format(/* @__PURE__ */ new Date(), "yyyy-MM-dd"),
   time: "",
   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();
@@ -392,6 +393,7 @@ const ReleasesPage = () => {
   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");
@@ -399,9 +401,8 @@ const ReleasesPage = () => {
   const {
     allowedActions: { canCreate }
   } = useRBAC(PERMISSIONS);
-  const { isLoading, isSuccess, isError } = response;
+  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({
@@ -418,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"
         }
       }
     });
@@ -459,7 +455,7 @@ const ReleasesPage = () => {
       });
       trackUsage("didCreateRelease");
       navigate(response2.data.data.id.toString());
-    } else if (isAxiosError(response2.error)) {
+    } else if (isFetchError(response2.error)) {
       toggleNotification({
         type: "danger",
         message: formatAPIError(response2.error)
@@ -471,9 +467,9 @@ const ReleasesPage = () => {
       });
     }
   };
-  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",
@@ -497,7 +493,7 @@ const ReleasesPage = () => {
         ) : null
       }
     ),
-    /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
       hasReachedMaximumPendingReleases && /* @__PURE__ */ jsx(
         StyledAlert,
         {
@@ -522,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})"
@@ -545,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,
         {
@@ -585,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
+        }
       }
     )
   ] });
@@ -602,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};
   }
@@ -611,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};
   }
@@ -631,41 +625,90 @@ 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(CrossCircle, { fill: "danger600" }),
-      /* @__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(CheckCircle, { fill: "success600" }),
-      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(CheckCircle, { fill: "success600" }),
@@ -688,7 +731,6 @@ const ReleaseDetailsLayout = ({
   const {
     data,
     isLoading: isLoadingDetails,
-    isError,
     error
   } = useGetReleaseQuery(
     { id: releaseId },
@@ -720,7 +762,7 @@ const ReleaseDetailsLayout = ({
         totalPublishedEntries,
         totalUnpublishedEntries
       });
-    } else if (isAxiosError(response.error)) {
+    } else if (isFetchError(response.error)) {
       toggleNotification({
         type: "danger",
         message: formatAPIError(response.error)
@@ -755,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,
       {
@@ -763,6 +805,7 @@ const ReleaseDetailsLayout = ({
         state: {
           errors: [
             {
+              // @ts-expect-error – TODO: fix this weird error flow
               code: error?.code
             }
           ]
@@ -802,7 +845,7 @@ 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: [
@@ -811,84 +854,71 @@ const ReleaseDetailsLayout = ({
         ] }),
         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", maxHeight: void 0, 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$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__ */ 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"
@@ -913,6 +943,11 @@ const ReleaseDetailsLayout = ({
     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) => {
@@ -941,26 +976,24 @@ const ReleaseDetailsBody = ({ releaseId }) => {
   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 { hasI18nEnabled } = runHookWaterfall(
-    "ContentReleases/pages/ReleaseDetails/add-locale-in-releases",
-    {
-      displayedHeaders: {
-        label: formatMessage({
-          id: "content-releases.page.ReleaseDetails.table.header.label.locale",
-          defaultMessage: "locale"
-        }),
-        name: "locale"
-      },
-      hasI18nEnabled: false
-    }
-  );
+  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 {
@@ -989,7 +1022,7 @@ 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: "danger",
           message: formatAPIError(response.error)
@@ -1009,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
       });
@@ -1035,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$1,
+            tag: Link$1,
             to: {
               pathname: "/content-manager"
             },
@@ -1066,40 +1099,33 @@ const ReleaseDetailsBody = ({ releaseId }) => {
     defaultMessage: "Group by"
   });
   const headers = [
-    // ...displayedHeaders,
-    {
-      label: formatMessage({
-        id: "content-releases.page.ReleaseDetails.table.header.label.name",
-        defaultMessage: "name"
-      }),
-      name: "name"
-    },
+    ...displayedHeaders,
     {
-      label: formatMessage({
+      label: {
         id: "content-releases.page.ReleaseDetails.table.header.label.content-type",
         defaultMessage: "content-type"
-      }),
+      },
       name: "content-type"
     },
     {
-      label: formatMessage({
+      label: {
         id: "content-releases.page.ReleaseDetails.table.header.label.action",
         defaultMessage: "action"
-      }),
+      },
       name: "action"
     },
     ...!release.releasedAt ? [
       {
-        label: formatMessage({
+        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(ContentLayout, { children: /* @__PURE__ */ jsxs(Flex, { gap: 8, direction: "column", alignItems: "stretch", children: [
+  return /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Flex, { gap: 8, direction: "column", alignItems: "stretch", children: [
     /* @__PURE__ */ jsx(Flex, { children: /* @__PURE__ */ jsx(
       SingleSelect,
       {
@@ -1131,10 +1157,10 @@ const ReleaseDetailsBody = ({ releaseId }) => {
           headers,
           isLoading: isLoading || isFetching,
           children: /* @__PURE__ */ jsxs(Table.Content, { children: [
-            /* @__PURE__ */ jsx(Table.Head, { children: headers.map((header) => /* @__PURE__ */ jsx(Table.HeaderCell, { ...header }, header.name)) }),
+            /* @__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}` }) }),
                 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 || "" }) }),
@@ -1163,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: [
@@ -1171,7 +1198,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
                       ReleaseActionMenu.ReleaseActionEntryLinkItem,
                       {
                         contentTypeUid: contentType.uid,
-                        entryId: entry.id,
+                        documentId: entry.documentId,
                         locale: locale?.code
                       }
                     ),
@@ -1221,13 +1248,24 @@ const ReleaseDetailsPage = () => {
       skip: !releaseId
     }
   );
+  const { data: dataTimezone, isLoading: isLoadingTimezone } = useGetReleaseSettingsQuery();
   const [updateRelease, { isLoading: isSubmittingForm }] = useUpdateReleaseMutation();
   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,
       {
@@ -1242,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 ? 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,
@@ -1262,7 +1300,7 @@ const ReleaseDetailsPage = () => {
         })
       });
       toggleEditReleaseModal();
-    } else if (isAxiosError(response.error)) {
+    } else if (isFetchError(response.error)) {
       toggleNotification({
         type: "danger",
         message: formatAPIError(response.error)
@@ -1280,7 +1318,7 @@ const ReleaseDetailsPage = () => {
     });
     if ("data" in response) {
       navigate("..");
-    } else if (isAxiosError(response.error)) {
+    } else if (isFetchError(response.error)) {
       toggleNotification({
         type: "danger",
         message: formatAPIError(response.error)
@@ -1299,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,
@@ -1315,18 +1354,10 @@ const ReleaseDetailsPage = () => {
             }
           }
         ),
-        /* @__PURE__ */ jsx(
-          ConfirmDialog,
-          {
-            isOpen: showWarningSubmit,
-            onClose: toggleWarningSubmit,
-            onConfirm: handleDeleteRelease,
-            children: formatMessage({
-              id: "content-releases.dialog.confirmation-message",
-              defaultMessage: "Are you sure you want to delete this release?"
-            })
-          }
-        )
+        /* @__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?"
+        }) }) })
       ]
     }
   );
@@ -1340,4 +1371,4 @@ const App = () => {
 export {
   App
 };
-//# sourceMappingURL=App-O0ZO-S35.mjs.map
+//# sourceMappingURL=App-BA2xDdy0.mjs.map