@digital-ai/dot-components 4.22.0 → 4.23.0

package/index.esm.js

@@ -10594,6 +10594,31 @@ const dashboard6 = Object.assign(Object.assign({}, dashboard6InProgress), {
   in_progress_changes: dashboard6InProgress,
   parent_id: null
 });
+({
+  author_fullname: 'Dashboard7 Author',
+  author_id: 'id7a',
+  target_apps: ['AGILITY'],
+  external_id: '7',
+  name: 'dummy dashboard 7',
+  description: '',
+  dashboard_url: 'https://test.com',
+  server_url: 'https://test.com',
+  external_embedding_id: null,
+  created_dt: '2023-11-21T04:42:07.872000+00:00',
+  id: 'id7',
+  lifecycle_state: DashboardView.lifecycle_state.PUBLISHED,
+  application_instances: ['2'],
+  categories: [],
+  bi_type: DashboardView.bi_type.MICROSTRATEGY,
+  is_ootb_dashboard: false,
+  thumbnail: '',
+  external_object: {},
+  embed_config: {},
+  help_content_id: helpContent.id,
+  filter_configuration: [],
+  favorite: false,
+  updated_dt: '2023-11-21T04:42:07.951000+00:00'
+});
 const dummyDashboards = [dashboard1, dashboard2, dashboard3, dashboard4, dashboard5, dashboard6];
 const getCategoriesMock = {
   categories: {
@@ -10877,13 +10902,19 @@ const DotMetadataApiProvider = ({
       }
       let response;
       try {
-        if (dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED && !dashboard.in_progress_changes) {
-          response = yield DashboardsService.postInProgressDashboard(dashboard.id, accountId, updatePayload);
-        }
-        // If we're updating an in-progress dashboard, use the in-progress API
-        else if (dashboard.in_progress_changes || dashboard.parent_id) {
-          response = yield DashboardsService.patchInProgressDashboard(dashboard.id, updatePayload, accountId, isSync);
+        if (dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED && updatePayload.lifecycle_state !== DashboardPatchBody.lifecycle_state.DRAFT) {
+          if (dashboard.in_progress_changes) {
+            // If the dashboard is published and has in-progress changes, we need to update the in-progress dashboard
+            response = yield DashboardsService.patchInProgressDashboard(dashboard.id, updatePayload, accountId, isSync);
+          } else {
+            // If the dashboard is published and has no in-progress changes, we need to create an in-progress dashboard
+            response = yield DashboardsService.postInProgressDashboard(dashboard.id, accountId, updatePayload);
+          }
+        } else if (dashboard.parent_id) {
+          // If the dashboard is in progress (has a parent_id), we need to update the in-progress dashboard
+          response = yield DashboardsService.patchInProgressDashboard(dashboard.parent_id, updatePayload, accountId, isSync);
         } else {
+          // If the dashboard is in draft state, we can update it directly
           response = yield DashboardsService.patchDashboard(dashboard.id, updatePayload, accountId, isSync);
         }
         setDashboardsError(null);
@@ -12632,6 +12663,9 @@ function DotDashboardPublishConfirm({
   };
   return jsxs(Fragment, {
     children: [dashboardToPublish !== null && jsx(DotDialog, {
+      cancelButtonProps: {
+        'data-testid': 'publish-cancel-button'
+      },
       cancelButtonVisible: !published,
       closeOnSubmit: false,
       hasPrimaryAction: publishing === null || published,
@@ -12656,6 +12690,9 @@ function DotDashboardPublishConfirm({
         editInProgress: editInProgressByUser(dashboardToPublish, currentUser.id)
       })
     }), dashboardToUnpublish !== null && jsx(DotDialog, {
+      cancelButtonProps: {
+        'data-testid': 'unpublish-cancel-button'
+      },
       cancelButtonVisible: !unpublished,
       closeOnSubmit: false,
       hasPrimaryAction: unpublishing === null || unpublished,
@@ -12830,19 +12867,35 @@ function DotDashboardOptionsMenu({
       key: 'edit-props'
     });
   }
-  if (onStartStatusChange && !dashboard.is_ootb_dashboard && isDraft) {
-    menuItems.push({
-      key: 'publish',
-      children: jsx(DotButton, {
-        ariaLabel: "Publish dashboard",
-        type: "text",
-        "data-testid": `publish-dashboard-button-${dashboard.id}`,
-        startIcon: jsx(DotIcon, {
-          iconId: "send-airplane"
-        }),
-        children: "Publish"
-      })
-    });
+  if (onStartStatusChange && !dashboard.is_ootb_dashboard) {
+    if (isDraft) {
+      menuItems.push({
+        key: 'publish',
+        children: jsx(DotButton, {
+          ariaLabel: "Publish dashboard",
+          type: "text",
+          "data-testid": `publish-dashboard-button-${dashboard.id}`,
+          startIcon: jsx(DotIcon, {
+            iconId: "send-airplane"
+          }),
+          children: "Publish"
+        })
+      });
+    }
+    if (dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED && !dashboard.in_progress_changes) {
+      menuItems.push({
+        key: 'unpublish',
+        children: jsx(DotButton, {
+          ariaLabel: "Unpublish dashboard",
+          type: "text",
+          "data-testid": `unpublish-dashboard-button-${dashboard.id}`,
+          startIcon: jsx(DotIcon, {
+            iconId: "undo"
+          }),
+          children: "Unpublish"
+        })
+      });
+    }
   }
   if (onStartDuplicate) {
     menuItems.push({
@@ -12971,6 +13024,9 @@ function DotDashboardOptionsMenu({
       case 'publish':
         onStartStatusChange(dashboard, DashboardView.lifecycle_state.PUBLISHED);
         break;
+      case 'unpublish':
+        onStartStatusChange(dashboard, DashboardView.lifecycle_state.DRAFT);
+        break;
     }
     handleMenuClose();
   }, [menuItems, handleMenuClose]);
@@ -13185,9 +13241,14 @@ function DotDashboardActions({
     setDashboardToPublish(null);
     setDashboardToUnpublish(null);
   }, []);
-  const handleStartStatusChange = useCallback(() => {
-    setDashboardToUnpublish(null);
-    setDashboardToPublish(dashboard);
+  const handleStartStatusChange = useCallback((dashboardView, newStatus) => {
+    if (newStatus === DashboardView.lifecycle_state.DRAFT) {
+      setDashboardToUnpublish(dashboard);
+      setDashboardToPublish(null);
+    } else {
+      setDashboardToPublish(dashboard);
+      setDashboardToUnpublish(null);
+    }
   }, [dashboard]);
   const handleDeleteClose = useCallback(() => {
     setDashboardToDelete(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digital-ai/dot-components",
-  "version": "4.22.0",
+  "version": "4.23.0",
   "private": false,
   "license": "SEE LICENSE IN <LICENSE.md>",
   "contributors": [