Stage Release (#3000)

Created by Github action --------- Co-authored-by: Andres Galindo <agalin920@gmail.com> Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com> Co-authored-by: Stuart Runyan <shrunyan@gmail.com> Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
zesty-io · Oct 8, 2024 · a07b40a · a07b40a
1 parent 4c5c596
commit a07b40a
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 27 deletions.
diff --git a/cypress/e2e/content/meta.spec.js b/cypress/e2e/content/meta.spec.js
@@ -1,9 +1,11 @@
+const today = Date.now();
+
 describe("Content Meta", () => {
-  before(() => {
-    cy.waitOn("/v1/content/models*", () => {
-      cy.visit("/content/6-556370-8sh47g/7-b939a4-457q19/meta");
-    });
-  });
+  // before(() => {
+  //   cy.waitOn("/v1/content/models*", () => {
+  //     cy.visit("/content/6-556370-8sh47g/7-b939a4-457q19/meta");
+  //   });
+  // });
 
   // skipping failing test in preparation for CI.
   it.skip("Modifies and saves Meta fields", () => {
@@ -63,4 +65,39 @@ describe("Content Meta", () => {
     cy.get("#SaveItemButton").click();
     cy.contains("Saved a new ").should("exist");
   });
+
+  it("Does not validate meta description for dataset items", () => {
+    cy.waitOn("/v1/content/models*", () => {
+      cy.waitOn("/v1/env/nav", () => {
+        cy.waitOn("/v1/search/items*", () => {
+          cy.visit("/content/6-675028-84dq4s/new");
+        });
+      });
+    });
+
+    cy.get("#12-7893a0-w4j9gk", { timeout: 5000 }).find("input").type(today);
+    cy.getBySelector("CreateItemSaveButton").click();
+    cy.get("[data-cy=toast]").contains("Created Item");
+  });
+
+  it("Does validate meta description for non-dataset items", () => {
+    cy.waitOn("/v1/content/models*", () => {
+      cy.waitOn("/v1/env/nav", () => {
+        cy.waitOn("/v1/search/items*", () => {
+          cy.visit("/content/6-556370-8sh47g/7-b939a4-457q19/meta");
+        });
+      });
+    });
+
+    cy.getBySelector("metaDescription", { timeout: 10000 })
+      .find("textarea")
+      .first()
+      .type("test");
+    cy.getBySelector("metaDescription")
+      .find("textarea")
+      .first()
+      .type("{selectall}{del}");
+    cy.get("#SaveItemButton").click();
+    cy.getBySelector("FieldErrorsList").should("exist");
+  });
 });
diff --git a/cypress/e2e/schema/field.spec.js b/cypress/e2e/schema/field.spec.js
@@ -784,7 +784,7 @@ describe("Schema: Fields", () => {
     cy.getBySelector(SELECTORS.ADD_FIELD_MODAL_DEACTIVATE_REACTIVATE)
       .should("exist")
       .click();
-    cy.getBySelector(SELECTORS.ADD_FIELD_MODAL_CLOSE).should("exist").click();
+    cy.getBySelector(SELECTORS.SAVE_FIELD_BUTTON).should("exist").click();
 
     cy.wait("@updateField");
     cy.wait("@getFields");

diff --git a/src/apps/schema/src/app/components/AddFieldModal/views/FieldForm.tsx b/src/apps/schema/src/app/components/AddFieldModal/views/FieldForm.tsx
@@ -29,7 +29,7 @@ import RuleRoundedIcon from "@mui/icons-material/RuleRounded";
 import MenuBookRoundedIcon from "@mui/icons-material/MenuBookRounded";
 import SaveRoundedIcon from "@mui/icons-material/SaveRounded";
 import PauseCircleOutlineRoundedIcon from "@mui/icons-material/PauseCircleOutlineRounded";
-import PlayCircleOutlineRoundedIcon from "@mui/icons-material/PlayCircleOutlineRounded";
+import PlayCircleFilledRoundedIcon from "@mui/icons-material/PlayCircleFilledRounded";
 
 import { FieldIcon } from "../../Field/FieldIcon";
 import {
@@ -112,6 +112,9 @@ export const FieldForm = ({
 }: Props) => {
   const [activeTab, setActiveTab] = useState<ActiveTab>("details");
   const [isSubmitClicked, setIsSubmitClicked] = useState(false);
+  const [fieldStateOnSaveAction, setFieldStateOnSaveAction] = useState<
+    "deactivate" | "reactivate"
+  >(fieldData?.deletedAt ? "reactivate" : "reactivate");
   const [isAddAnotherFieldClicked, setIsAddAnotherFieldClicked] =
     useState(false);
   const { mediaFoldersOptions } = useMediaRules();
@@ -650,7 +653,25 @@ export const FieldForm = ({
         modelZUID: id,
         fieldZUID: fieldData.ZUID,
         body: updateBody,
-      });
+      })
+        .unwrap()
+        .then(() => {
+          // Update the field state after field changes are done
+          if (fieldStateOnSaveAction === "reactivate" && fieldData?.deletedAt) {
+            undeleteContentModelField({
+              modelZUID: id,
+              fieldZUID: fieldData?.ZUID,
+            });
+          } else if (
+            fieldStateOnSaveAction === "deactivate" &&
+            !fieldData?.deletedAt
+          ) {
+            deleteContentModelField({
+              modelZUID: id,
+              fieldZUID: fieldData?.ZUID,
+            });
+          }
+        });
     } else {
       // We want to skip field cache invalidation when creating an in-between field
       // We'll let the bulk update rtk query do the invalidation after this call
@@ -915,33 +936,25 @@ export const FieldForm = ({
               <Grid item xs={12}>
                 <LoadingButton
                   data-cy="DeactivateReactivateFieldUpdateModal"
-                  variant={fieldData?.deletedAt ? "contained" : "outlined"}
-                  color={fieldData?.deletedAt ? "primary" : "inherit"}
+                  variant="outlined"
+                  color="inherit"
                   startIcon={
-                    fieldData?.deletedAt ? (
-                      <PlayCircleOutlineRoundedIcon />
+                    fieldStateOnSaveAction === "deactivate" ? (
+                      <PlayCircleFilledRoundedIcon color="action" />
                     ) : (
-                      <PauseCircleOutlineRoundedIcon
-                        color={isDeletingField ? "inherit" : "action"}
-                      />
+                      <PauseCircleOutlineRoundedIcon color="action" />
                     )
                   }
                   onClick={() => {
-                    if (fieldData?.deletedAt) {
-                      undeleteContentModelField({
-                        modelZUID: id,
-                        fieldZUID: fieldData?.ZUID,
-                      });
-                    } else {
-                      deleteContentModelField({
-                        modelZUID: id,
-                        fieldZUID: fieldData?.ZUID,
-                      });
-                    }
+                    setFieldStateOnSaveAction(
+                      fieldStateOnSaveAction === "deactivate"
+                        ? "reactivate"
+                        : "deactivate"
+                    );
                   }}
                   loading={isDeletingField || isUndeletingField}
                 >
-                  {fieldData?.deletedAt
+                  {fieldStateOnSaveAction === "deactivate"
                     ? "Reactivate Field"
                     : "Deactivate Field"}
                 </LoadingButton>