Stage Release

cypress/e2e/schema/field.spec.js

@@ -66,13 +66,27 @@ describe("Schema: Fields", () => {
         cy.waitOn("/bin/1-6c9618c-r26pt/groups", () => {
           cy.waitOn("/v1/content/models", () => {
             cy.visit("/schema/6-ce80dbfe90-ptjpm6/fields");
+
+            cy.getBySelector("create_new_content_item").click();
+
+            cy.contains("Multi Page Model").click();
+            cy.contains("Next").click();
+            cy.contains("Display Name")
+              .next()
+              .type(`Cypress Test Model ${timestamp}`);
+            cy.get(".MuiDialog-container").within(() => {
+              cy.contains("Create Model").click();
+            });
+            cy.intercept("POST", "/models");
+            cy.intercept("GET", "/models");
           });
         });
       }
     );
   });
 
   it("Opens Add Field Modal via button click", () => {
+    cy.wait(3000);
     // Open the modal
     cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
@@ -89,7 +103,9 @@ describe("Schema: Fields", () => {
     const fieldName = `text_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Text field
@@ -143,7 +159,9 @@ describe("Schema: Fields", () => {
     const fieldName = `dropdown_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Dropdown field
@@ -200,7 +218,9 @@ describe("Schema: Fields", () => {
     const fieldName = `media_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Media field
@@ -232,7 +252,9 @@ describe("Schema: Fields", () => {
     const fieldName = `boolean_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Boolean field
@@ -284,7 +306,9 @@ describe("Schema: Fields", () => {
     const fieldName = `one_to_one_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select one-to-one relationship field
@@ -301,10 +325,12 @@ describe("Schema: Fields", () => {
 
     cy.wait("@getFields");
 
+    cy.wait(3000);
+
     // Select a related field
     cy.getBySelector(SELECTORS.AUTOCOMPLETE_FIELED_ZUID)
       .should("exist")
-      .type("title");
+      .click();
     cy.get("[role=listbox] [role=option]").first().click();
 
     // Navigate to rules tab and add default value
@@ -346,7 +372,9 @@ describe("Schema: Fields", () => {
     };
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select number field
@@ -384,7 +412,9 @@ describe("Schema: Fields", () => {
 
   it("Shows error messages during field creation", () => {
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Text field
@@ -405,7 +435,7 @@ describe("Schema: Fields", () => {
     // Click end of list button
     cy.getBySelector(SELECTORS.ADD_FIELD_BTN_END_OF_LIST)
       .should("exist")
-      .click();
+      .click({ force: true });
 
     // Verify modal
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
@@ -420,7 +450,7 @@ describe("Schema: Fields", () => {
     cy.getBySelector(SELECTORS.ADD_FIELD_BTN_IN_BETWEEN)
       .first()
       .should("exist")
-      .click();
+      .click({ force: true });
 
     // Verify modal
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
@@ -432,7 +462,9 @@ describe("Schema: Fields", () => {
 
   it("Switches tabs in Add Field Modal", () => {
     // Open the modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select single text field
@@ -455,7 +487,9 @@ describe("Schema: Fields", () => {
 
   it("Can navigate back to fields selection view", () => {
     // Open the modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select single text field
@@ -475,7 +509,9 @@ describe("Schema: Fields", () => {
 
   it("Can filter fields in field selection view", () => {
     // Open the modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Verify that field selection screen is loaded
@@ -505,7 +541,9 @@ describe("Schema: Fields", () => {
     const fieldName = `field_to_filter_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select a field
@@ -554,7 +592,9 @@ describe("Schema: Fields", () => {
     const fieldName = `update_me_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Text field
@@ -610,7 +650,9 @@ describe("Schema: Fields", () => {
     const fieldName = `deactivate_me_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Text field
@@ -669,7 +711,9 @@ describe("Schema: Fields", () => {
     const fieldName = `deactivate_me_via_modal_${timestamp}`;
 
     // Open the add field modal
-    cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
+    cy.getBySelector(SELECTORS.ADD_FIELD_BTN)
+      .should("exist")
+      .click({ force: true });
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");
 
     // Select Text field

src/apps/content-editor/src/app/views/ItemCreate/ItemCreate.tsx

@@ -297,7 +297,6 @@ export const ItemCreate = () => {
     } finally {
       if (isMounted.current) {
         setSaving(false);
-        setSaveClicked(false);
       }
     }
   };

src/apps/content-editor/src/app/views/ItemEdit/ItemEdit.js

@@ -331,7 +331,6 @@ export default function ItemEdit() {
     } finally {
       if (isMounted.current) {
         setSaving(false);
-        setSaveClicked(false);
       }
     }
   }

src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/ItemEditHeaderActions.tsx

@@ -99,12 +99,14 @@ export const ItemEditHeaderActions = ({
   );
 
   const saveShortcut = useMetaKey("s", () => {
+    if (!canUpdate) return;
     if (itemState === ITEM_STATES.dirty) {
       onSave();
     }
   });
 
   const publishShortcut = useMetaKey("p", () => {
+    if (!canPublish) return;
     if (itemState === ITEM_STATES.dirty) {
       setPublishAfterSave(true);
       onSave();

src/apps/content-editor/src/app/views/ItemEdit/components/ItemEditHeader/MoreMenu.tsx

@@ -32,6 +32,7 @@ import { useGetDomainsQuery } from "../../../../../../../../shell/services/accou
 import { useFilePath } from "../../../../../../../../shell/hooks/useFilePath";
 import { DeleteItemDialog } from "./DeleteItemDialog";
 import { useGetContentModelsQuery } from "../../../../../../../../shell/services/instance";
+import { usePermission } from "../../../../../../../../shell/hooks/use-permissions";
 
 export const MoreMenu = () => {
   const { modelZUID, itemZUID } = useParams<{
@@ -56,6 +57,7 @@ export const MoreMenu = () => {
   const { data: contentModels } = useGetContentModelsQuery();
   const type =
     contentModels?.find((model) => model.ZUID === modelZUID)?.type ?? "";
+  const canDelete = usePermission("DELETE");
 
   const handleCopyClick = (data: string) => {
     navigator?.clipboard
@@ -179,18 +181,20 @@ export const MoreMenu = () => {
           </ListItemIcon>
           Edit Template
         </MenuItem>
-        <MenuItem
-          data-cy="DeleteContentItem"
-          onClick={() => {
-            setShowDeleteItemDialog(true);
-            setAnchorEl(null);
-          }}
-        >
-          <ListItemIcon>
-            <DeleteRounded />
-          </ListItemIcon>
-          Delete Item
-        </MenuItem>
+        {canDelete && (
+          <MenuItem
+            data-cy="DeleteContentItem"
+            onClick={() => {
+              setShowDeleteItemDialog(true);
+              setAnchorEl(null);
+            }}
+          >
+            <ListItemIcon>
+              <DeleteRounded />
+            </ListItemIcon>
+            Delete Item
+          </MenuItem>
+        )}
       </Menu>
       {showDuplicateItemDialog && (
         <DuplicateItemDialog

src/apps/content-editor/src/app/views/ItemList/index.tsx

@@ -89,6 +89,7 @@ export const ItemList = () => {
   const activeLangId =
     languages?.find((lang) => lang.code === activeLanguageCode)?.ID || 1;
   const [hasMounted, setHasMounted] = useState(false);
+  const allItems = useSelector((state: AppState) => state.content);
   const items = useSelector((state: AppState) =>
     selectFilteredItems(state, modelZUID, activeLangId, !hasMounted)
   );
@@ -212,14 +213,12 @@ export const ItemList = () => {
             break;
           case "internal_link":
           case "one_to_one":
-            // @ts-ignore
-            clonedItem.data[key] = items?.[value]?.web?.metaTitle || value;
+            clonedItem.data[key] = allItems?.[value]?.web?.metaTitle || value;
             break;
           case "one_to_many":
             clonedItem.data[key] = value
               ?.split(",")
-              // @ts-ignore
-              ?.map((id) => items?.[id]?.web?.metaTitle || id)
+              ?.map((id) => allItems?.[id]?.web?.metaTitle || id)
               ?.join(",");
             break;
           case "date":
@@ -241,7 +240,7 @@ export const ItemList = () => {
 
       return clonedItem;
     });
-  }, [items, fields, users, isFieldsFetching, isUsersFetching]);
+  }, [items, allItems, fields, users, isFieldsFetching, isUsersFetching]);
 
   const sortedAndFilteredItems = useMemo(() => {
     let clonedItems = [...processedItems];