Merge branch 'dev' into feature/2132-workflow-status

Author: finnar-bin

cypress/e2e/settings/actions.spec.js

@@ -22,7 +22,11 @@ describe("Settings Actions", () => {
     cy.get("[data-cy=SubApp] .MuiSelect-select").first().click();
     cy.get(".MuiList-root li[aria-selected=false]").last().click();
     cy.get("#SaveSettings").click();
-    cy.contains(SAVED_MESSAGE).should("exist");
+    cy.get('[data-cy="ConfirmSaveSettings"]').should("exist");
+    cy.get('[data-cy="ConfirmSaveSettings"]').click();
+    cy.contains(SAVED_MESSAGE, { matchCase: false, timeout: 15_000 }).should(
+      "exist"
+    );
   });
 
   // skipping flakey test in preparation for CI

cypress/e2e/settings/instance.spec.js

@@ -10,7 +10,9 @@ describe("Instance", () => {
   it("General", () => {
     cy.get("[data-cy=SubApp] textarea").first().clear().type("example");
 
-    cy.get("#saveSettings").click();
+    cy.get("#SaveSettings").click();
+    cy.get('[data-cy="ConfirmSaveSettings"]').should("exist");
+    cy.get('[data-cy="ConfirmSaveSettings"]').click();
 
     cy.contains(SAVED_MESSAGE).should("exist");
   });
@@ -26,9 +28,10 @@ describe("Instance", () => {
       .type("test test test")
       .clear();
 
-    cy.get("#saveSettings").click({ force: true });
-
-    cy.get("#saveSettings").click({ force: true });
+    cy.get("#SaveSettings").should("exist");
+    cy.get("#SaveSettings").click();
+    cy.get('[data-cy="ConfirmSaveSettings"]').should("exist");
+    cy.get('[data-cy="ConfirmSaveSettings"]').click();
     cy.contains(SAVED_MESSAGE).should("exist");
   });
 
@@ -40,7 +43,9 @@ describe("Instance", () => {
       .click();
     cy.get("[data-cy=SubApp] input").last().type("[email protected]");
 
-    cy.get("#saveSettings").click();
+    cy.get("#SaveSettings").click();
+    cy.get('[data-cy="ConfirmSaveSettings"]').should("exist");
+    cy.get('[data-cy="ConfirmSaveSettings"]').click();
     cy.contains(SAVED_MESSAGE).should("exist");
   });
 

src/apps/blocks/views/AllBlocks.tsx

@@ -220,6 +220,7 @@ export const AllBlocks = () => {
       {showCreateModelDialogue && (
         <CreateModelDialogue
           modelType="block"
+          typeIsSet={true}
           onClose={() => setShowCreateModelDialogue(false)}
         />
       )}

src/apps/code-editor/src/app/components/BottomDrawer/FileCard.tsx

@@ -31,7 +31,7 @@ const FileCard: React.FC<FileCardProps> = ({
       sx={{
         boxSizing: "border-box",
         // Temporary: will be updated once the design is final
-        bgcolor: "#2f2f2f",
+        bgcolor: "#0D1116",
         color: "grey.400",
         width: "100%",
         px: 2,
@@ -68,6 +68,7 @@ const FileCard: React.FC<FileCardProps> = ({
         flexGrow={0}
         width="100%"
         boxSizing="border-box"
+        overflow="hidden"
       >
         <Box
           component={Icon}
@@ -76,9 +77,11 @@ const FileCard: React.FC<FileCardProps> = ({
         <Typography
           variant="h6"
           color="grey.300"
+          width="100%"
           sx={{
             pl: "35px",
             boxSizing: "border-box",
+            wordWrap: "break-word",
           }}
         >
           {title}

src/apps/code-editor/src/app/components/BottomDrawer/FileStatus.tsx

@@ -6,9 +6,9 @@ import FlashOnIcon from "@mui/icons-material/FlashOn";
 import { FileCard, FileCardListItem } from "./FileCard";
 import { List, Divider } from "@mui/material";
 import { Link as RouterLink } from "react-router-dom";
-import { NavCodeTypes } from "../SideBar/constants";
 import Typography from "@mui/material/Typography";
 import Link from "@mui/material/Link";
+import { NavCodeTypes } from "../constants";
 interface ItemWeb {
   path: string;
 }

src/apps/code-editor/src/app/components/BottomDrawer/LinkedContent.tsx

@@ -3,8 +3,8 @@ import EditIcon from "@mui/icons-material/Edit";
 import { FileCard, FileCardListItem } from "./FileCard";
 import { NavLink } from "react-router-dom";
 import VisibilityIcon from "@mui/icons-material/Visibility";
-import { NavCodeTypes } from "../SideBar/constants";
 import LaunchIcon from "@mui/icons-material/Launch";
+import { NavCodeTypes } from "../constants";
 
 interface Meta {
   ZUID: string;

src/apps/code-editor/src/app/components/BottomDrawer/LinkedSchema.tsx

@@ -1,9 +1,8 @@
-import StorageIcon from "@mui/icons-material/Storage";
 import Link from "@mui/material/Link";
 import { List, Typography, Divider } from "@mui/material";
 import { FileCardListItem, FileCard } from "./FileCard";
-import { NavCodeTypes } from "../SideBar/constants";
 import { Database } from "@zesty-io/material";
+import { NavCodeTypes } from "../constants";
 
 interface Field {
   ZUID: string;

src/apps/code-editor/src/app/components/BottomDrawer/index.tsx

@@ -14,7 +14,7 @@ import { fetchFields } from "../../../../../../shell/store/fields";
 import { fetchAuditTrail } from "../../../store/auditTrail";
 import { useMetaKey } from "../../../../../../shell/hooks/useMetaKey";
 import { fetchItems } from "../../../../../../shell/store/content";
-import { NavCodeTypes } from "../SideBar/constants";
+import { NavCodeTypes } from "../constants";
 
 interface Field {
   ZUID: string;
@@ -157,7 +157,7 @@ const BottomDrawer = memo(function BottomDrawer({ file }: BottomDrawerProps) {
           bgcolor="background.editor"
           color="grey.300"
           height="40vh"
-          sx={{ overflowY: "auto", bgcolor: "background.editor" }}
+          sx={{ overflowY: "auto" }}
         >
           <WithLoader
             condition={!loading}

src/apps/code-editor/src/app/components/SideBar/CreateFile.tsx renamed to src/apps/code-editor/src/app/components/CreateFile.tsx

@@ -15,9 +15,10 @@ import {
 } from "@mui/material";
 import LoadingButton from "@mui/lab/LoadingButton";
 import CloseIcon from "@mui/icons-material/Close";
-import { createFile, fetchFiles } from "../../../store/files";
-import { notify } from "../../../../../../shell/store/notifications";
+
 import { fileTypeOptions, scripts, stylesheets } from "./constants";
+import { notify } from "../../../../../shell/store/notifications";
+import { createFile, fetchFiles } from "../../store/files";
 
 export type CreateFileProps = {
   open: boolean;
@@ -75,25 +76,14 @@ const CreateFile = memo(function CreateFile({
     }
 
     setLoading(true);
-
-    dispatch(createFile(name, type) as any)
+    let redirectPage = "";
+    Promise.resolve(dispatch(createFile(name, type)))
       .then((res: any) => {
-        if (res.status === 201) {
+        if (!res?.error) {
           history.push(`/code/file/${res.pathPart}/${res.data.ZUID}`);
-
-          const fileType = scripts.includes(type)
-            ? "scripts"
-            : stylesheets?.includes(type)
-            ? "stylesheets"
-            : "views";
-
-          dispatch(fetchFiles(fileType));
           handleClearForm();
         }
       })
-      .catch((err: any) => {
-        console.error(err);
-      })
       .finally(() => {
         setLoading(false);
         onClose();

src/apps/code-editor/src/app/components/Differ/Differ.js

@@ -39,6 +39,7 @@ export const Differ = memo(
           isLoading={loading}
           synced={props?.synced}
           code={props?.currentCode}
+          icon={props.icon}
           isDiffer={true}
         />
         <Box