@strapi/content-releases 0.0.0-experimental.cb311d9fcfbd8e441f790aea232f0a39bdd90e16 → 0.0.0-experimental.cf512c83e81bd5a0243ea6d6fe5f9c71796765f0

package/dist/_chunks/{App-CZe9wueI.mjs → App-jrh58sXY.mjs}

@@ -1,54 +1,45 @@
-import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-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-CPq3qdIv.mjs";
+import { jsxs, jsx, Fragment } from "react/jsx-runtime";
+import { RelativeTime as RelativeTime$1, useNotification, useAPIErrorHandler, useQueryParams, useTracking, LoadingIndicatorPage, CheckPermissions, PageSizeURLQuery, PaginationURLQuery, AnErrorOccurred, ConfirmDialog, useRBAC, useStrapiApp, NoContent, Table, CheckPagePermissions } from "@strapi/helper-plugin";
+import { useLocation, useHistory, useParams, Redirect, Link as Link$2, Switch, 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-PiOGBETy.mjs";
 import * as React from "react";
-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, Dialog, SimpleMenu, 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 { useLicenseLimits, unstable_useDocument } from "@strapi/admin/strapi-admin";
+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 { Plus, EmptyDocuments, Pencil, Trash, ArrowLeft, More, CrossCircle, CheckCircle } from "@strapi/icons";
+import format 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, format } from "date-fns";
+import styled from "styled-components";
+import { formatISO } from "date-fns";
 import { Formik, Form, useFormikContext } from "formik";
-import { R as RELEASE_SCHEMA } from "./schemas-63pFihNF.mjs";
-import { useDispatch } from "react-redux";
-import { useLicenseLimits } from "@strapi/admin/strapi-admin/ee";
-const intervals = ["years", "months", "days", "hours", "minutes", "seconds"];
-const RelativeTime$1 = React.forwardRef(
-  ({ timestamp, customIntervals = [], ...restProps }, forwardedRef) => {
-    const { formatRelativeTime, formatDate, formatTime } = useIntl();
-    const interval = intervalToDuration({
-      start: timestamp,
-      end: Date.now()
-      // see https://github.com/date-fns/date-fns/issues/2891 – No idea why it's all partial it returns it every time.
-    });
-    const unit = intervals.find((intervalUnit) => {
-      return interval[intervalUnit] > 0 && Object.keys(interval).includes(intervalUnit);
-    });
-    const relativeTime = isPast(timestamp) ? -interval[unit] : interval[unit];
-    const customInterval = customIntervals.find(
-      (custom) => interval[custom.unit] < custom.threshold
-    );
-    const displayText = customInterval ? customInterval.text : formatRelativeTime(relativeTime, unit, { numeric: "auto" });
-    return /* @__PURE__ */ jsx(
-      "time",
-      {
-        ref: forwardedRef,
-        dateTime: timestamp.toISOString(),
-        role: "time",
-        title: `${formatDate(timestamp)} ${formatTime(timestamp)}`,
-        ...restProps,
-        children: displayText
-      }
-    );
-  }
-);
+import * as yup from "yup";
+import "@reduxjs/toolkit/query";
+import "axios";
+import "@reduxjs/toolkit/query/react";
+import "react-redux";
+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
@@ -72,8 +63,8 @@ const ReleaseModal = ({
     );
     return currentTimezone?.value || systemTimezone.value;
   };
-  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(
+  return /* @__PURE__ */ jsxs(ModalLayout, { onClose: handleClose, labelledBy: "title", children: [
+    /* @__PURE__ */ jsx(ModalHeader, { children: /* @__PURE__ */ jsx(Typography, { id: "title", fontWeight: "bold", textColor: "neutral800", children: formatMessage(
       {
         id: "content-releases.modal.title",
         defaultMessage: "{isCreatingRelease, select, true {New release} other {Edit release}}"
@@ -96,143 +87,133 @@ const ReleaseModal = ({
         },
         validationSchema: RELEASE_SCHEMA,
         validateOnChange: false,
-        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) {
+        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: () => {
                       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", "");
-                      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(
+                    },
+                    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(
                 {
                   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();
@@ -248,44 +229,32 @@ const TimezoneComponent = ({ timezoneOptions }) => {
       }
     }
   }, [setFieldValue, values.date, values.timezone]);
-  return /* @__PURE__ */ jsxs(
-    Field.Root,
+  return /* @__PURE__ */ jsx(
+    Combobox,
     {
+      label: formatMessage({
+        id: "content-releases.modal.form.input.label.timezone",
+        defaultMessage: "Timezone"
+      }),
+      autocomplete: { type: "list", filter: "contains" },
       name: "timezone",
-      error: errors.timezone && formatMessage({ id: errors.timezone, defaultMessage: errors.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,
       required: true,
-      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, {})
-      ]
+      children: timezoneList.map((timezone) => /* @__PURE__ */ jsx(ComboboxOption, { value: timezone.value, children: timezone.value.replace(/&/, " ") }, timezone.value))
     }
   );
 };
-const useTypedDispatch = useDispatch;
-const isBaseQueryError = (error) => {
-  return typeof error !== "undefined" && error.name !== void 0;
-};
 const LinkCard = styled(Link)`
   display: block;
 `;
@@ -323,7 +292,7 @@ const getBadgeProps = (status) => {
 const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
   const { formatMessage } = useIntl();
   if (isError) {
-    return /* @__PURE__ */ jsx(Page.Error, {});
+    return /* @__PURE__ */ jsx(AnErrorOccurred, {});
   }
   if (releases?.length === 0) {
     return /* @__PURE__ */ jsx(
@@ -338,11 +307,11 @@ const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
             target: sectionTitle
           }
         ),
-        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "16rem" })
+        icon: /* @__PURE__ */ jsx(EmptyDocuments, { width: "10rem" })
       }
     );
   }
-  return /* @__PURE__ */ jsx(Grid.Root, { gap: 4, children: releases.map(({ id, name, scheduledAt, status }) => /* @__PURE__ */ jsx(Grid.Item, { col: 3, s: 6, xs: 12, children: /* @__PURE__ */ jsx(LinkCard, { tag: NavLink, to: `${id}`, isExternal: false, children: /* @__PURE__ */ jsxs(
+  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(
     Flex,
     {
       direction: "column",
@@ -357,7 +326,7 @@ const ReleasesGrid = ({ sectionTitle, releases = [], isError = false }) => {
       gap: 4,
       children: [
         /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "start", gap: 1, children: [
-          /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", tag: "h3", variant: "delta", fontWeight: "bold", children: name }),
+          /* @__PURE__ */ jsx(Typography, { as: "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"
@@ -378,35 +347,33 @@ const StyledAlert = styled(Alert)`
 `;
 const INITIAL_FORM_VALUES = {
   name: "",
-  date: format(/* @__PURE__ */ new Date(), "yyyy-MM-dd"),
+  date: null,
   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();
+  const toggleNotification = useNotification();
   const { formatMessage } = useIntl();
-  const navigate = useNavigate();
+  const { push, replace } = useHistory();
   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 {
-    allowedActions: { canCreate }
-  } = useRBAC(PERMISSIONS);
-  const { isLoading: isLoadingReleases, isSuccess, isError } = response;
+  const { isLoading, isSuccess, isError } = response;
   const activeTab = response?.currentData?.meta?.activeTab || "pending";
+  const activeTabIndex = ["pending", "done"].indexOf(activeTab);
   React.useEffect(() => {
     if (location?.state?.errors) {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         title: formatMessage({
           id: "content-releases.pages.Releases.notification.error.title",
           defaultMessage: "Your request could not be processed."
@@ -416,25 +383,30 @@ const ReleasesPage = () => {
           defaultMessage: "Please try again or open another release."
         })
       });
-      navigate("", { replace: true, state: null });
+      replace({ state: null });
+    }
+  }, [formatMessage, location?.state?.errors, replace, toggleNotification]);
+  React.useEffect(() => {
+    if (tabRef.current) {
+      tabRef.current._handlers.setSelectedTabIndex(activeTabIndex);
     }
-  }, [formatMessage, location?.state?.errors, navigate, toggleNotification]);
+  }, [activeTabIndex]);
   const toggleAddReleaseModal = () => {
     setReleaseModalShown((prev) => !prev);
   };
-  if (isLoadingReleases || isLoadingSettings) {
-    return /* @__PURE__ */ jsx(Page.Loading, {});
+  if (isLoading) {
+    return /* @__PURE__ */ jsx(Main, { "aria-busy": isLoading, children: /* @__PURE__ */ jsx(LoadingIndicatorPage, {}) });
   }
   const totalPendingReleases = isSuccess && response.currentData?.meta?.pendingReleasesCount || 0;
   const hasReachedMaximumPendingReleases = totalPendingReleases >= maximumReleases;
-  const handleTabChange = (tabValue) => {
+  const handleTabChange = (index) => {
     setQuery({
       ...query,
       page: 1,
       pageSize: response?.currentData?.meta?.pagination?.pageSize || 16,
       filters: {
         releasedAt: {
-          $notNull: tabValue !== "pending"
+          $notNull: index === 0 ? false : true
         }
       }
     });
@@ -454,22 +426,22 @@ const ReleasesPage = () => {
         })
       });
       trackUsage("didCreateRelease");
-      navigate(response2.data.data.id.toString());
-    } else if (isFetchError(response2.error)) {
+      push(`/plugins/content-releases/${response2.data.data.id}`);
+    } else if (isAxiosError(response2.error)) {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatAPIError(response2.error)
       });
     } else {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
   };
-  return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoadingReleases || isLoadingSettings, children: [
+  return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoading, children: [
     /* @__PURE__ */ jsx(
-      Layouts.Header,
+      HeaderLayout,
       {
         title: formatMessage({
           id: "content-releases.pages.Releases.title",
@@ -479,7 +451,7 @@ const ReleasesPage = () => {
           id: "content-releases.pages.Releases.header-subtitle",
           defaultMessage: "Create and manage content updates"
         }),
-        primaryAction: canCreate ? /* @__PURE__ */ jsx(
+        primaryAction: /* @__PURE__ */ jsx(CheckPermissions, { permissions: PERMISSIONS.create, children: /* @__PURE__ */ jsx(
           Button,
           {
             startIcon: /* @__PURE__ */ jsx(Plus, {}),
@@ -490,10 +462,10 @@ const ReleasesPage = () => {
               defaultMessage: "New release"
             })
           }
-        ) : null
+        ) })
       }
     ),
-    /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(Fragment, { children: [
       hasReachedMaximumPendingReleases && /* @__PURE__ */ jsx(
         StyledAlert,
         {
@@ -518,17 +490,21 @@ const ReleasesPage = () => {
           })
         }
       ),
-      /* @__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(
+      /* @__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(
                   {
                     id: "content-releases.pages.Releases.tab.pending",
                     defaultMessage: "Pending ({count})"
@@ -537,55 +513,59 @@ const ReleasesPage = () => {
                     count: totalPendingReleases
                   }
                 ) }),
-                /* @__PURE__ */ jsx(Tabs.Trigger, { value: "done", children: formatMessage({
+                /* @__PURE__ */ jsx(Tab, { children: formatMessage({
                   id: "content-releases.pages.Releases.tab.done",
                   defaultMessage: "Done"
                 }) })
-              ]
-            }
-          ),
-          /* @__PURE__ */ jsx(Divider, {})
-        ] }),
-        /* @__PURE__ */ jsx(Tabs.Content, { value: "pending", children: /* @__PURE__ */ jsx(
-          ReleasesGrid,
+              ] }),
+              /* @__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
+                }
+              ) })
+            ] })
+          ]
+        }
+      ),
+      response.currentData?.meta?.pagination?.total ? /* @__PURE__ */ jsxs(Flex, { paddingTop: 4, alignItems: "flex-end", justifyContent: "space-between", children: [
+        /* @__PURE__ */ jsx(
+          PageSizeURLQuery,
           {
-            sectionTitle: "pending",
-            releases: response?.currentData?.data,
-            isError
+            options: ["8", "16", "32", "64"],
+            defaultValue: response?.currentData?.meta?.pagination?.pageSize.toString()
           }
-        ) }),
-        /* @__PURE__ */ jsx(Tabs.Content, { value: "done", children: /* @__PURE__ */ jsx(
-          ReleasesGrid,
+        ),
+        /* @__PURE__ */ jsx(
+          PaginationURLQuery,
           {
-            sectionTitle: "done",
-            releases: response?.currentData?.data,
-            isError
+            pagination: {
+              pageCount: response?.currentData?.meta?.pagination?.pageCount || 0
+            }
           }
-        ) })
-      ] }),
-      /* @__PURE__ */ jsxs(
-        Pagination.Root,
-        {
-          ...response?.currentData?.meta?.pagination,
-          defaultPageSize: response?.currentData?.meta?.pagination?.pageSize,
-          children: [
-            /* @__PURE__ */ jsx(Pagination.PageSize, { options: ["8", "16", "32", "64"] }),
-            /* @__PURE__ */ jsx(Pagination.Links, {})
-          ]
-        }
-      )
+        )
+      ] }) : null
     ] }) }),
-    /* @__PURE__ */ jsx(
+    releaseModalShown && /* @__PURE__ */ jsx(
       ReleaseModal,
       {
-        open: releaseModalShown,
         handleClose: toggleAddReleaseModal,
         handleSubmit: handleAddRelease,
         isLoading: isSubmittingForm,
-        initialValues: {
-          ...INITIAL_FORM_VALUES,
-          timezone: data?.data.defaultTimezone ? data.data.defaultTimezone.split("&")[1] : null
-        }
+        initialValues: INITIAL_FORM_VALUES
       }
     )
   ] });
@@ -596,7 +576,7 @@ const ReleaseInfoWrapper = styled(Flex)`
   border-bottom-left-radius: ${({ theme }) => theme.borderRadius};
   border-top: 1px solid ${({ theme }) => theme.colors.neutral150};
 `;
-const StyledMenuItem = styled(MenuItem)`
+const StyledMenuItem = styled(Menu.Item)`
   svg path {
     fill: ${({ theme, disabled }) => disabled && theme.colors.neutral500};
   }
@@ -605,7 +585,7 @@ const StyledMenuItem = styled(MenuItem)`
   }
 
   &:hover {
-    background: ${({ theme, $variant = "neutral" }) => theme.colors[`${$variant}100`]};
+    background: ${({ theme, variant = "neutral" }) => theme.colors[`${variant}100`]};
   }
 `;
 const PencilIcon = styled(Pencil)`
@@ -625,75 +605,40 @@ const TrashIcon = styled(Trash)`
 const TypographyMaxWidth = styled(Typography)`
   max-width: 300px;
 `;
-const EntryValidationText = ({ action, schema, entry, status }) => {
+const EntryValidationText = ({ action, schema, components, entry }) => {
   const { formatMessage } = useIntl();
-  const { validate, isLoading } = unstable_useDocument(
-    {
-      collectionType: schema?.kind ?? "",
-      model: schema?.uid ?? ""
-    },
-    {
-      // 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
-    }
-  );
-  if (isLoading) {
-    return null;
+  const { validate } = unstable_useDocument();
+  const { errors } = validate(entry, {
+    contentType: schema,
+    components,
+    isCreatingEntry: false
+  });
+  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 errors = validate(entry) ?? {};
-  if (action === "publish") {
-    if (Object.keys(errors).length > 0) {
-      const validationErrorsMessages = Object.entries(errors).map(
-        ([key, value]) => formatMessage(
-          // @ts-expect-error – TODO: fix this will better checks
-          { 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
-          }
-        ) })
-      ] });
-    }
-    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"
-        }) })
-      ] });
-    }
+  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"
+      }) })
+    ] });
   }
   return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-    /* @__PURE__ */ jsx(CheckCircle, { fill: "success600" }),
+    /* @__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-unpublished",
       defaultMessage: "Already unpublished"
@@ -713,23 +658,20 @@ const ReleaseDetailsLayout = ({
   const {
     data,
     isLoading: isLoadingDetails,
+    isError,
     error
-  } = useGetReleaseQuery(
-    { id: releaseId },
-    {
-      skip: !releaseId
-    }
-  );
+  } = useGetReleaseQuery({ id: releaseId });
   const [publishRelease, { isLoading: isPublishing }] = usePublishReleaseMutation();
-  const { toggleNotification } = useNotification();
+  const toggleNotification = useNotification();
   const { formatAPIError } = useAPIErrorHandler();
-  const { allowedActions } = useRBAC(PERMISSIONS);
-  const { canUpdate, canDelete, canPublish } = allowedActions;
+  const {
+    allowedActions: { canUpdate, canDelete }
+  } = useRBAC(PERMISSIONS);
   const dispatch = useTypedDispatch();
   const { trackUsage } = useTracking();
   const release = data?.data;
-  const handlePublishRelease = (id) => async () => {
-    const response = await publishRelease({ id });
+  const handlePublishRelease = async () => {
+    const response = await publishRelease({ id: releaseId });
     if ("data" in response) {
       toggleNotification({
         type: "success",
@@ -744,14 +686,14 @@ const ReleaseDetailsLayout = ({
         totalPublishedEntries,
         totalUnpublishedEntries
       });
-    } else if (isFetchError(response.error)) {
+    } else if (isAxiosError(response.error)) {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
@@ -777,20 +719,21 @@ const ReleaseDetailsLayout = ({
     return release.createdBy.email;
   };
   if (isLoadingDetails) {
-    return /* @__PURE__ */ jsx(Page.Loading, {});
+    return /* @__PURE__ */ jsx(Main, { "aria-busy": isLoadingDetails, children: /* @__PURE__ */ jsx(LoadingIndicatorPage, {}) });
   }
-  if (isBaseQueryError(error) && "code" in error || !release) {
+  if (isError || !release) {
     return /* @__PURE__ */ jsx(
-      Navigate,
+      Redirect,
       {
-        to: "..",
-        state: {
-          errors: [
-            {
-              // @ts-expect-error – TODO: fix this weird error flow
-              code: error?.code
-            }
-          ]
+        to: {
+          pathname: "/plugins/content-releases",
+          state: {
+            errors: [
+              {
+                code: error?.code
+              }
+            ]
+          }
         }
       }
     );
@@ -827,90 +770,106 @@ const ReleaseDetailsLayout = ({
   ) : "";
   return /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoadingDetails, children: [
     /* @__PURE__ */ jsx(
-      Layouts.Header,
+      HeaderLayout,
       {
         title: release.name,
         subtitle: /* @__PURE__ */ jsxs(Flex, { gap: 2, lineHeight: 6, children: [
           /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", variant: "epsilon", children: numberOfEntriesText + (isScheduled ? ` - ${scheduledText}` : "") }),
           /* @__PURE__ */ jsx(Badge, { ...getBadgeProps(release.status), children: release.status })
         ] }),
-        navigationAction: /* @__PURE__ */ jsx(BackButton, {}),
+        navigationAction: /* @__PURE__ */ jsx(Link$1, { startIcon: /* @__PURE__ */ jsx(ArrowLeft, {}), to: "/plugins/content-releases", children: formatMessage({
+          id: "global.back",
+          defaultMessage: "Back"
+        }) }),
         primaryAction: !release.releasedAt && /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-          /* @__PURE__ */ jsxs(
-            SimpleMenu,
-            {
-              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__ */ 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__ */ 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: 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__ */ jsx(Button, { size: "S", variant: "tertiary", onClick: handleRefresh, children: formatMessage({
             id: "content-releases.header.actions.refresh",
             defaultMessage: "Refresh"
           }) }),
-          canPublish ? /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx(CheckPermissions, { permissions: PERMISSIONS.publish, children: /* @__PURE__ */ jsx(
             Button,
             {
               size: "S",
               variant: "default",
-              onClick: handlePublishRelease(release.id.toString()),
+              onClick: handlePublishRelease,
               loading: isPublishing,
               disabled: release.actions.meta.count === 0,
               children: formatMessage({
@@ -918,7 +877,7 @@ const ReleaseDetailsLayout = ({
                 defaultMessage: "Publish"
               })
             }
-          ) : null
+          ) })
         ] })
       }
     ),
@@ -945,32 +904,47 @@ const getGroupByOptionLabel = (value) => {
     defaultMessage: "Content-Types"
   };
 };
-const ReleaseDetailsBody = ({ releaseId }) => {
+const DEFAULT_RELEASE_DETAILS_HEADER = [
+  {
+    key: "__name__",
+    fieldSchema: { type: "string" },
+    metadatas: {
+      label: {
+        id: "content-releases.page.ReleaseDetails.table.header.label.name",
+        defaultMessage: "name"
+      },
+      searchable: false,
+      sortable: false
+    },
+    name: "name"
+  }
+];
+const ReleaseDetailsBody = () => {
   const { formatMessage } = useIntl();
+  const { releaseId } = useParams();
   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 { runHookWaterfall } = useStrapiApp();
+  const {
+    displayedHeaders,
+    hasI18nEnabled
+  } = runHookWaterfall(
+    "ContentReleases/pages/ReleaseDetails/add-locale-in-releases",
+    {
+      displayedHeaders: DEFAULT_RELEASE_DETAILS_HEADER,
+      hasI18nEnabled: false
+    }
+  );
   const release = releaseData?.data;
   const selectedGroupBy = query?.groupBy || "contentType";
   const {
@@ -999,59 +973,65 @@ 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 (isFetchError(response.error)) {
+      if (isAxiosError(response.error)) {
         toggleNotification({
-          type: "danger",
+          type: "warning",
           message: formatAPIError(response.error)
         });
       } else {
         toggleNotification({
-          type: "danger",
+          type: "warning",
           message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
         });
       }
     }
   };
   if (isLoading || isReleaseLoading) {
-    return /* @__PURE__ */ jsx(Page.Loading, {});
+    return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsx(LoadingIndicatorPage, {}) });
   }
   const releaseActions = data?.data;
   const releaseMeta = data?.meta;
   const contentTypes = releaseMeta?.contentTypes || {};
   const components = releaseMeta?.components || {};
-  if (isBaseQueryError(releaseError) || !release) {
+  if (isReleaseError || !release) {
     const errorsArray = [];
-    if (releaseError && "code" in releaseError) {
+    if (releaseError) {
       errorsArray.push({
         code: releaseError.code
       });
     }
-    if (releaseActionsError && "code" in releaseActionsError) {
+    if (releaseActionsError) {
       errorsArray.push({
         code: releaseActionsError.code
       });
     }
     return /* @__PURE__ */ jsx(
-      Navigate,
+      Redirect,
       {
-        to: "..",
-        state: {
-          errors: errorsArray
+        to: {
+          pathname: "/plugins/content-releases",
+          state: {
+            errors: errorsArray
+          }
         }
       }
     );
   }
   if (isError || !releaseActions) {
-    return /* @__PURE__ */ jsx(Page.Error, {});
+    return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsx(AnErrorOccurred, {}) });
   }
   if (Object.keys(releaseActions).length === 0) {
-    return /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsx(
-      EmptyStateLayout,
+    return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsx(
+      NoContent,
       {
+        content: {
+          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."
+        },
         action: /* @__PURE__ */ jsx(
           LinkButton,
           {
-            tag: Link$1,
+            as: Link$2,
             to: {
               pathname: "/content-manager"
             },
@@ -1062,52 +1042,19 @@ const ReleaseDetailsBody = ({ releaseId }) => {
               defaultMessage: "Open the Content Manager"
             })
           }
-        ),
-        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."
-        })
+        )
       }
     ) });
   }
-  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: [
+  return /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(Flex, { gap: 8, direction: "column", alignItems: "stretch", children: [
     /* @__PURE__ */ jsx(Flex, { children: /* @__PURE__ */ jsx(
       SingleSelect,
       {
-        placeholder: groupByLabel,
-        "aria-label": groupByLabel,
+        "aria-label": formatMessage({
+          id: "content-releases.pages.ReleaseDetails.groupBy.aria-label",
+          defaultMessage: "Group by"
+        }),
         customizeContent: (value) => formatMessage(
           {
             id: `content-releases.pages.ReleaseDetails.groupBy.label`,
@@ -1131,13 +1078,57 @@ const ReleaseDetailsBody = ({ releaseId }) => {
             ...item,
             id: Number(item.entry.id)
           })),
-          headers,
-          isLoading: isLoading || isFetching,
+          colCount: releaseActions[key].length,
+          isLoading,
+          isFetching,
           children: /* @__PURE__ */ jsxs(Table.Content, { children: [
-            /* @__PURE__ */ jsx(Table.Head, { children: headers.map(({ label, name }) => /* @__PURE__ */ jsx(Table.HeaderCell, { label: formatMessage(label), name }, name)) }),
-            /* @__PURE__ */ jsx(Table.Loading, {}),
+            /* @__PURE__ */ jsxs(Table.Head, { children: [
+              displayedHeaders.map(({ key: key2, fieldSchema, metadatas, name }) => /* @__PURE__ */ jsx(
+                Table.HeaderCell,
+                {
+                  fieldSchemaType: fieldSchema.type,
+                  label: formatMessage(metadatas.label),
+                  name
+                },
+                key2
+              )),
+              /* @__PURE__ */ jsx(
+                Table.HeaderCell,
+                {
+                  fieldSchemaType: "string",
+                  label: formatMessage({
+                    id: "content-releases.page.ReleaseDetails.table.header.label.content-type",
+                    defaultMessage: "content-type"
+                  }),
+                  name: "content-type"
+                }
+              ),
+              /* @__PURE__ */ jsx(
+                Table.HeaderCell,
+                {
+                  fieldSchemaType: "string",
+                  label: formatMessage({
+                    id: "content-releases.page.ReleaseDetails.table.header.label.action",
+                    defaultMessage: "action"
+                  }),
+                  name: "action"
+                }
+              ),
+              !release.releasedAt && /* @__PURE__ */ jsx(
+                Table.HeaderCell,
+                {
+                  fieldSchemaType: "string",
+                  label: formatMessage({
+                    id: "content-releases.page.ReleaseDetails.table.header.label.status",
+                    defaultMessage: "status"
+                  }),
+                  name: "status"
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsx(Table.LoadingBody, {}),
             /* @__PURE__ */ jsx(Table.Body, { children: releaseActions[key].map(
-              ({ id, contentType, locale, type, entry, status }, actionIndex) => /* @__PURE__ */ jsxs(Tr, { children: [
+              ({ id, contentType, locale, type, entry }, 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 || "" }) }),
@@ -1166,8 +1157,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
                       action: type,
                       schema: contentTypes?.[contentType.uid],
                       components,
-                      entry,
-                      status
+                      entry
                     }
                   ) }),
                   /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(ReleaseActionMenu.Root, { children: [
@@ -1175,7 +1165,7 @@ const ReleaseDetailsBody = ({ releaseId }) => {
                       ReleaseActionMenu.ReleaseActionEntryLinkItem,
                       {
                         contentTypeUid: contentType.uid,
-                        documentId: entry.documentId,
+                        entryId: entry.id,
                         locale: locale?.code
                       }
                     ),
@@ -1194,73 +1184,54 @@ const ReleaseDetailsBody = ({ releaseId }) => {
         }
       )
     ] }, `releases-group-${key}`)),
-    /* @__PURE__ */ jsxs(
-      Pagination.Root,
-      {
-        ...releaseMeta?.pagination,
-        defaultPageSize: releaseMeta?.pagination?.pageSize,
-        children: [
-          /* @__PURE__ */ jsx(Pagination.PageSize, {}),
-          /* @__PURE__ */ jsx(Pagination.Links, {})
-        ]
-      }
-    )
+    /* @__PURE__ */ jsxs(Flex, { paddingTop: 4, alignItems: "flex-end", justifyContent: "space-between", children: [
+      /* @__PURE__ */ jsx(PageSizeURLQuery, { defaultValue: releaseMeta?.pagination?.pageSize.toString() }),
+      /* @__PURE__ */ jsx(
+        PaginationURLQuery,
+        {
+          pagination: {
+            pageCount: releaseMeta?.pagination?.pageCount || 0
+          }
+        }
+      )
+    ] })
   ] }) });
 };
 const ReleaseDetailsPage = () => {
   const { formatMessage } = useIntl();
   const { releaseId } = useParams();
-  const { toggleNotification } = useNotification();
+  const toggleNotification = useNotification();
   const { formatAPIError } = useAPIErrorHandler();
-  const navigate = useNavigate();
+  const { replace } = useHistory();
   const [releaseModalShown, setReleaseModalShown] = React.useState(false);
   const [showWarningSubmit, setWarningSubmit] = React.useState(false);
   const {
     isLoading: isLoadingDetails,
     data,
     isSuccess: isSuccessDetails
-  } = useGetReleaseQuery(
-    { id: releaseId },
-    {
-      skip: !releaseId
-    }
-  );
-  const { data: dataTimezone, isLoading: isLoadingTimezone } = useGetReleaseSettingsQuery();
+  } = useGetReleaseQuery({ id: releaseId });
   const [updateRelease, { isLoading: isSubmittingForm }] = useUpdateReleaseMutation();
-  const [deleteRelease] = useDeleteReleaseMutation();
+  const [deleteRelease, { isLoading: isDeletingRelease }] = 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 || isLoadingTimezone) {
+  if (isLoadingDetails) {
     return /* @__PURE__ */ jsx(
       ReleaseDetailsLayout,
       {
         toggleEditReleaseModal,
         toggleWarningSubmit,
-        children: /* @__PURE__ */ jsx(Page.Loading, {})
+        children: /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsx(LoadingIndicatorPage, {}) })
       }
     );
   }
-  if (!releaseId) {
-    return /* @__PURE__ */ jsx(Navigate, { to: ".." });
-  }
   const releaseData = isSuccessDetails && data?.data || null;
   const title = releaseData?.name || "";
-  const timezone = getTimezoneValue();
+  const timezone = releaseData?.timezone ?? null;
   const scheduledAt = releaseData?.scheduledAt && timezone ? utcToZonedTime(releaseData.scheduledAt, timezone) : null;
-  const date = scheduledAt ? format$1(scheduledAt, "yyyy-MM-dd") : void 0;
-  const time = scheduledAt ? format$1(scheduledAt, "HH:mm") : "";
+  const date = scheduledAt ? format(scheduledAt, "yyyy-MM-dd") : null;
+  const time = scheduledAt ? format(scheduledAt, "HH:mm") : "";
   const handleEditRelease = async (values) => {
     const response = await updateRelease({
       id: releaseId,
@@ -1277,14 +1248,14 @@ const ReleaseDetailsPage = () => {
         })
       });
       toggleEditReleaseModal();
-    } else if (isFetchError(response.error)) {
+    } else if (isAxiosError(response.error)) {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
@@ -1294,15 +1265,15 @@ const ReleaseDetailsPage = () => {
       id: releaseId
     });
     if ("data" in response) {
-      navigate("..");
-    } else if (isFetchError(response.error)) {
+      replace("/plugins/content-releases");
+    } else if (isAxiosError(response.error)) {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatAPIError(response.error)
       });
     } else {
       toggleNotification({
-        type: "danger",
+        type: "warning",
         message: formatMessage({ id: "notification.error", defaultMessage: "An error occurred" })
       });
     }
@@ -1313,11 +1284,10 @@ const ReleaseDetailsPage = () => {
       toggleEditReleaseModal,
       toggleWarningSubmit,
       children: [
-        /* @__PURE__ */ jsx(ReleaseDetailsBody, { releaseId }),
-        /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(ReleaseDetailsBody, {}),
+        releaseModalShown && /* @__PURE__ */ jsx(
           ReleaseModal,
           {
-            open: releaseModalShown,
             handleClose: toggleEditReleaseModal,
             handleSubmit: handleEditRelease,
             isLoading: isLoadingDetails || isSubmittingForm,
@@ -1331,21 +1301,30 @@ const ReleaseDetailsPage = () => {
             }
           }
         ),
-        /* @__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?"
-        }) }) })
+        /* @__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
+          }
+        )
       ]
     }
   );
 };
 const App = () => {
-  return /* @__PURE__ */ jsx(Page.Protect, { permissions: PERMISSIONS.main, children: /* @__PURE__ */ jsxs(Routes, { children: [
-    /* @__PURE__ */ jsx(Route, { index: true, element: /* @__PURE__ */ jsx(ReleasesPage, {}) }),
-    /* @__PURE__ */ jsx(Route, { path: ":releaseId", element: /* @__PURE__ */ jsx(ReleaseDetailsPage, {}) })
+  return /* @__PURE__ */ jsx(CheckPagePermissions, { permissions: PERMISSIONS.main, children: /* @__PURE__ */ jsxs(Switch, { children: [
+    /* @__PURE__ */ jsx(Route, { exact: true, path: `/plugins/${pluginId}`, component: ReleasesPage }),
+    /* @__PURE__ */ jsx(Route, { exact: true, path: `/plugins/${pluginId}/:releaseId`, component: ReleaseDetailsPage })
   ] }) });
 };
 export {
   App
 };
-//# sourceMappingURL=App-CZe9wueI.mjs.map
+//# sourceMappingURL=App-jrh58sXY.mjs.map