fix(app-headless-cms): various full screen editor (#4480)

webiny · Jan 9, 2025 · 6bf1d8f · 6bf1d8f
1 parent eacc7af
commit 6bf1d8f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/packages/app-headless-cms/src/admin/views/contentEntries/ContentEntriesModule.tsx b/packages/app-headless-cms/src/admin/views/contentEntries/ContentEntriesModule.tsx
@@ -35,7 +35,7 @@ import { ShowConfirmationOnUnpublish } from "~/admin/components/Decorators/ShowC
 import { ShowConfirmationOnDeleteRevision } from "~/admin/components/Decorators/ShowConfirmationOnDeleteRevision";
 import { FullScreenContentEntry } from "~/admin/views/contentEntries/ContentEntry/FullScreenContentEntry";
 import { ShowRevisionList } from "~/admin/components/ContentEntryForm/Header/ShowRevisionsList";
-import { featureFlags } from "@webiny/feature-flags";
+import { cmsLegacyEntryEditor } from "~/utils/cmsLegacyEntryEditor";
 
 const { Browser } = ContentEntryListConfig;
 const { Actions } = ContentEntryEditorConfig;
@@ -116,12 +116,12 @@ export const ContentEntriesModule = () => {
                 <Actions.MenuItemAction name={"delete"} element={<DeleteEntryMenuItem />} />
                 {/*
                     The following Menu Action registration is needed
-                    only when the 'allowCmsFullScreenEditor' feature is enabled.
+                    only when the 'cmsLegacyEntryEditor' feature is NOT enabled.
                 */}
                 <Actions.MenuItemAction
                     name={"showRevisionsList"}
                     element={<ShowRevisionList />}
-                    remove={!featureFlags.allowCmsFullScreenEditor}
+                    remove={cmsLegacyEntryEditor}
                 />
             </ContentEntryEditorConfig>
             <FullScreenContentEntry />

diff --git a/...iews/contentEntries/ContentEntry/FullScreenContentEntry/FullScreenContentEntry.styled.tsx b/...iews/contentEntries/ContentEntry/FullScreenContentEntry/FullScreenContentEntry.styled.tsx
@@ -108,7 +108,7 @@ export const FullScreenContentEntryContentFormWrapper = styled.div`
 
 export const FullScreenContentEntryContentFormInner = styled.div`
     flex-shrink: 1;
-    flex-basis: 920px;
+    flex-basis: 1020px;
 `;
 
 export const FullScreenContentEntryContentFormInnerCss = css`

diff --git a/...admin/views/contentEntries/ContentEntry/FullScreenContentEntry/FullScreenContentEntry.tsx b/...admin/views/contentEntries/ContentEntry/FullScreenContentEntry/FullScreenContentEntry.tsx
@@ -1,6 +1,5 @@
 import React, { useState } from "react";
 import { createPortal } from "react-dom";
-import { featureFlags } from "@webiny/feature-flags";
 import { CircularProgress } from "@webiny/ui/Progress";
 import { useContentEntry } from "~/admin/views/contentEntries/hooks";
 import { RevisionListDrawer } from "./RevisionListDrawer";
@@ -16,6 +15,7 @@ import {
 } from "./FullScreenContentEntry.styled";
 import { FullScreenContentEntryProvider } from "./useFullScreenContentEntry";
 import { ContentEntryEditorConfig } from "~/ContentEntryEditorConfig";
+import { cmsLegacyEntryEditor } from "~/utils/cmsLegacyEntryEditor";
 
 const { ContentEntry } = ContentEntryEditorConfig;
 
@@ -79,7 +79,7 @@ const FullScreenContentEntryFormHeaderDecorator =
     });
 
 export const FullScreenContentEntry = () => {
-    if (!featureFlags.allowCmsFullScreenEditor) {
+    if (cmsLegacyEntryEditor) {
         return null;
     }
 

diff --git a/...tentEntries/ContentEntry/FullScreenContentEntry/RevisionListDrawer/RevisionListDrawer.tsx b/...tentEntries/ContentEntry/FullScreenContentEntry/RevisionListDrawer/RevisionListDrawer.tsx
@@ -3,15 +3,15 @@ import React from "react";
 import { useHotkeys } from "react-hotkeyz";
 import { DrawerContent } from "@webiny/ui/Drawer";
 import { RevisionsList } from "~/admin/views/contentEntries/ContentEntry/RevisionsList/RevisionsList";
-import { featureFlags } from "@webiny/feature-flags";
+import { cmsLegacyEntryEditor } from "~/utils/cmsLegacyEntryEditor";
 import { useFullScreenContentEntry } from "../useFullScreenContentEntry";
 import { Header } from "./Header";
 import { Drawer } from "./RevisionListDrawer.styled";
 
 export const RevisionListDrawer = () => {
     const { isRevisionListOpen, openRevisionList } = useFullScreenContentEntry();
 
-    if (!featureFlags.allowCmsFullScreenEditor) {
+    if (cmsLegacyEntryEditor) {
         return null;
     }
 

diff --git a/packages/app-headless-cms/src/utils/cmsLegacyEntryEditor.ts b/packages/app-headless-cms/src/utils/cmsLegacyEntryEditor.ts
@@ -0,0 +1,3 @@
+import { featureFlags } from "@webiny/feature-flags";
+
+export const cmsLegacyEntryEditor = featureFlags.cmsLegacyEntryEditor === true;
diff --git a/packages/feature-flags/src/index.ts b/packages/feature-flags/src/index.ts
@@ -1,7 +1,7 @@
 export type FeatureFlags<TFeatureFlags = Record<string, any>> = {
     experimentalAdminOmniSearch?: boolean;
     allowCmsLegacyRichTextInput?: boolean;
-    allowCmsFullScreenEditor?: boolean;
+    cmsLegacyEntryEditor?: boolean;
     experimentalDynamicPages?: boolean;
     newWatchCommand?: boolean;
 } & TFeatureFlags;

diff --git a/webiny.project.ts b/webiny.project.ts
@@ -57,7 +57,6 @@ export default {
     featureFlags: {
         experimentalAdminOmniSearch: true,
         newWatchCommand: true,
-        allowCmsFullScreenEditor: false,
         experimentalDynamicPages: false
     }
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { featureFlags } from "@webiny/feature-flags";

		export const cmsLegacyEntryEditor = featureFlags.cmsLegacyEntryEditor === true;