Merge branch 'test/seed-data-content-actions' into test/seed-data-content-list-item-table

Author: geodem127

cypress.config.js

@@ -7,7 +7,6 @@ module.exports = defineConfig({
   viewportHeight: 1080,
   video: false,
   defaultCommandTimeout: 15000,
-  experimentalInteractiveRunEvents: true,
   env: {
     API_AUTH: "https://auth.api.dev.zesty.io",
     COOKIE_NAME: "DEV_APP_SID",
@@ -27,14 +26,6 @@ module.exports = defineConfig({
 
         return launchOptions;
       });
-      // Get spec info to be used for the model's label/name
-      on("before:spec", (spec) => {
-        const pathPart = spec.relative.split("/");
-        config.env.SPEC = {
-          folder: pathPart[pathPart?.length - 2],
-          file: pathPart[pathPart?.length - 1].replace(/\.spec\.js/g, ""),
-        };
-      });
 
       return require("./cypress/plugins/index.js")(on, config);
     },

cypress/fixtures/content.json

@@ -1,7 +1,7 @@
 {
   "model": {
-    "label": "E2E: Content",
-    "metaTitle": "E2E: Content",
+    "label": "Content",
+    "metaTitle": "Content",
     "type": "pageset",
     "listed": true
   },
@@ -358,8 +358,8 @@
         "sort": 0
       },
       "web": {
-        "metaLinkText": "E2E: Content",
-        "metaTitle": "E2E: Content"
+        "metaLinkText": "Content",
+        "metaTitle": "Content"
       },
       "data": {
         "internal_link": "7-a2c992ecb6-v6j9zt",

cypress/plugins/seeds/content.ts

@@ -23,14 +23,12 @@ module.exports = function content(config) {
     const json = JSON.parse(jsonString);
 
     const sdk = await getSDK(config);
-    const { COMMIT_ID, SPEC } = config?.env;
-    const SPEC_ID = `${COMMIT_ID} | ${Date.now()}`;
+    const timeStamp = Date.now();
 
     // 1) Create Schema
     // Append commit id for spec tracking
     // append timestamp to prevent naming conflicts
-    const specLabel = !SPEC?.file ? "" : `${SPEC?.folder}-${SPEC?.file}`;
-    const modelLabel = `E2E: ${specLabel || json?.model?.label} | ${SPEC_ID}`;
+    const modelLabel = `E2E: ${json.model.label} | ${config.env.COMMIT_ID} | ${timeStamp}`;
     const modelPayload = {
       ...json.model,
       label: modelLabel,
@@ -55,7 +53,7 @@ module.exports = function content(config) {
       json.items.map((item, index) => {
         // Append commit id to item labels for spec tracking
         // append timestamp to prevent naming conflicts
-        const itemLabel = `${item?.web?.metaTitle} | ${SPEC_ID}`;
+        const itemLabel = `E2E: ${item.web.metaTitle} | ${config.env.COMMIT_ID} | ${timeStamp}`;
         const payload = {
           ...item,
           meta: {

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

@@ -286,7 +286,7 @@ export const SideBar: FC<SideBarProps> = ({
 const NoResults = ({ keyword }: { keyword: string }) => (
   <Stack gap={1.5} alignItems="center" justifyContent="center" p={1.5}>
     <img
-      src="/noSearchResults.svg"
+      src="/images/noSearchResults.svg"
       alt="No search results"
       width="70"
       height="64"

src/apps/schema/src/app/components/AddFieldModal/views/FieldForm.tsx

@@ -647,10 +647,14 @@ export const FieldForm = ({
             fieldStateOnSaveAction === "deactivate" &&
             !fieldData?.deletedAt
           ) {
-            deleteContentModelField({
-              modelZUID: id,
-              fieldZUID: fieldData?.ZUID,
-            });
+            // added a delay to temporarily fix an issue with field not being deleted properly
+            // likely related to api response caching
+            setTimeout(() => {
+              deleteContentModelField({
+                modelZUID: id,
+                fieldZUID: fieldData?.ZUID,
+              });
+            }, 1000);
           }
         })
         .catch((error) => {

src/shell/components/FieldTypeDateTime/util.ts

@@ -1482,8 +1482,14 @@ export const toISOString = (timeString: string) => {
 
 /** Converts "HH:mm:ss.SSSSSS" to "h:mm a" */
 export const to12HrTime = (isoTime: string) => {
-  const d = parse(isoTime, "HH:mm:ss.SSSSSS", REF_DATE);
-  return format(d, "h:mm a");
+  try {
+    const d = parse(isoTime, "HH:mm:ss.SSSSSS", REF_DATE);
+    return format(d, "h:mm a");
+  } catch (error) {
+    console.error(error);
+
+    return "";
+  }
 };
 
 const generateTimeOptions = () => {