@digital-ai/dot-components 3.25.0 → 3.26.0

package/index.esm.js

@@ -9512,25 +9512,34 @@ class HelpContentService {
 
 function DotDashboardStatusPill({
   dashboard,
-  currentUser
+  currentUser,
+  modifiedAuthorUser
 }) {
   if (dashboard.lifecycle_state === DashboardView.lifecycle_state.DRAFT) {
-    return jsx(DotPill, {
-      label: "Draft",
-      size: "small",
-      variant: "outlined",
-      status: "in-progress"
+    return jsx(DotTooltip, {
+      title: "This dashboard has not yet been published. It is not visible to end users or in Digital.ai applications.",
+      placement: "top",
+      children: jsx(DotPill, {
+        label: "Draft",
+        size: "small",
+        variant: "outlined",
+        status: "in-progress"
+      })
     });
   } else if (dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED && dashboard.is_being_modified && currentUser) {
     if (dashboard.modified_author_id === currentUser.id) {
-      return jsx(DotPill, {
-        label: "Edit in progress",
-        size: "small",
-        variant: "outlined",
-        status: "success"
+      return jsx(DotTooltip, {
+        title: "You are currently editing this dashboard and the latest changes have not yet been published. Other users cannot edit this dashboard while you are editing it.",
+        placement: "top",
+        children: jsx(DotPill, {
+          label: "Edit in progress",
+          size: "small",
+          variant: "outlined",
+          status: "success"
+        })
       });
     } else {
-      return jsx(DotPill, {
+      const lockedPublished = jsx(DotPill, {
         label: "Published",
         icon: jsx(DotIcon, {
           iconId: "lock"
@@ -9539,13 +9548,27 @@ function DotDashboardStatusPill({
         variant: "outlined",
         status: "success"
       });
+      if (modifiedAuthorUser) {
+        const modifiedAuthorUserFullName = `${modifiedAuthorUser.given_name} ${modifiedAuthorUser.family_name}`;
+        return jsx(DotTooltip, {
+          title: `${modifiedAuthorUserFullName} is currently editing this dashboard and it is locked for editing by other users.`,
+          placement: "top",
+          children: lockedPublished
+        });
+      } else {
+        return lockedPublished;
+      }
     }
   } else {
-    return jsx(DotPill, {
-      status: "success",
-      label: "Published",
-      size: "small",
-      variant: "outlined"
+    return jsx(DotTooltip, {
+      title: "The latest version of this dashboard is published and visible to end users.",
+      placement: "top",
+      children: jsx(DotPill, {
+        status: "success",
+        label: "Published",
+        size: "small",
+        variant: "outlined"
+      })
     });
   }
 }
@@ -10468,7 +10491,8 @@ const DotDashboardDetailsView = ({
   open,
   yOffset = 56,
   zIndex = 990,
-  currentUser
+  currentUser,
+  modifiedAuthorUser
 }) => {
   var _a, _b;
   const rootClasses = useStylesWithRootClass(rootClassName$E, className);
@@ -10554,7 +10578,8 @@ const DotDashboardDetailsView = ({
             label: "Status",
             children: jsx(DotDashboardStatusPill, {
               dashboard: dashboard,
-              currentUser: currentUser ? currentUser : null
+              currentUser: currentUser ? currentUser : null,
+              modifiedAuthorUser: modifiedAuthorUser ? modifiedAuthorUser : null
             })
           }), jsx(DashboardDetailsField, {
             className: "dashboard-details-category",
@@ -10599,9 +10624,10 @@ const DotDashboardDetails = _a => {
       dashboard,
       onClose,
       onFavorite,
-      currentUser
+      currentUser,
+      modifiedAuthorUser
     } = _a,
-    commonProps = __rest(_a, ["dashboard", "onClose", "onFavorite", "currentUser"]);
+    commonProps = __rest(_a, ["dashboard", "onClose", "onFavorite", "currentUser", "modifiedAuthorUser"]);
   const [_openedDashboard, _setOpenedDashboard] = useState(dashboard);
   const metadataApiContext = useDotMetadataApiContext();
   const {
@@ -10642,7 +10668,8 @@ const DotDashboardDetails = _a => {
       open: true,
       onFavorite: favoriteHandler,
       onClose: closeHandler,
-      currentUser: currentUser ? currentUser : null
+      currentUser: currentUser ? currentUser : null,
+      modifiedAuthorUser: modifiedAuthorUser ? modifiedAuthorUser : null
     }));
   }
   return null;
@@ -11798,7 +11825,7 @@ function DotDashboardOptionsMenu({
       onclick: handleDuplicateClick
     });
   }
-  if (onStartDelete && !dashboard.is_ootb_dashboard) {
+  if (onStartDelete && !dashboard.is_ootb_dashboard && !dashboardLocked) {
     const handleDeleteClick = () => {
       handleMenuClose();
       onStartDelete(dashboard);
@@ -12121,19 +12148,17 @@ function DotDashboardActions({
       onViewMode && onViewMode(result, 'view');
     });
   }), [dashboardToRevert, onRevertChanges, onStatusChanged]);
-  const handleStartViewOriginal = useCallback(() => __awaiter(this, void 0, void 0, function* () {
+  const handleViewOriginal = useCallback(() => __awaiter(this, void 0, void 0, function* () {
     const dashboardId = dashboard.id;
     return cancelablePromise(getDashboard(dashboardId, false)).then(result => {
-      onStatusChanged && onStatusChanged(result);
-      onViewMode && onViewMode(result, 'view');
       onViewOriginal && onViewOriginal(result);
     });
-  }), [dashboard, onViewOriginal, onStatusChanged]);
+  }), [dashboard, onViewOriginal]);
   const handleStartDelete = useCallback(dashboardToDel => {
     setDashboardToDelete(dashboardToDel);
   }, []);
-  const handleStartRevert = useCallback(dashboard => {
-    setDashboardToRevert(dashboard);
+  const handleStartRevert = useCallback(dashboardToRev => {
+    setDashboardToRevert(dashboardToRev);
   }, []);
   const handleRevertClose = useCallback(() => {
     setDashboardToRevert(null);
@@ -12146,7 +12171,6 @@ function DotDashboardActions({
   const handleStartDeleteIfConfig = onDeleted ? handleStartDelete : undefined;
   const handleViewModeIfConfig = onViewMode && canEdit ? onViewMode : undefined;
   const handleRevertChangesIfConfig = onRevertChanges ? handleStartRevert : undefined;
-  const handleViewOriginalIfConfig = onViewOriginal ? handleStartViewOriginal : undefined;
   return jsxs(StyledDashboardActions, {
     "data-testid": "dot-dashboard-actions",
     children: [jsx(DotDashboardPublishConfirm, {
@@ -12186,7 +12210,7 @@ function DotDashboardActions({
       dashboard: dashboard,
       isEdit: isEdit,
       menuPlacement: "bottom-start",
-      onViewOriginal: handleViewOriginalIfConfig,
+      onViewOriginal: handleViewOriginal,
       onViewMode: handleViewModeIfConfig,
       onStartStatusChange: handleStartStatusChangeIfConfig,
       onStartDuplicate: handleStartDuplicateIfConfig,
@@ -12278,7 +12302,7 @@ function getDashboardBanner(dashboard, isEdit, onExitEditMode, onPublishChanges,
         return jsx(DotDashboardBanner, {
           bannerSeverity: "warning",
           bannerText: jsx(DotTypography, {
-            children: "The Dashboard is currently in edit mode and only you can make changes. Publish the changes for other users to see."
+            children: "The Dashboard is currently in edit mode and only you can make changes. Publish the changes for other users to see the updated dashboard."
           }),
           buttonText: "Publish changes",
           buttonAction: () => {
@@ -12286,18 +12310,6 @@ function getDashboardBanner(dashboard, isEdit, onExitEditMode, onPublishChanges,
           }
         });
       }
-    } else {
-      // We're in Edit mode for a published dashboard, but there are no staged changes saved yet.
-      return jsx(DotDashboardBanner, {
-        bannerSeverity: "info",
-        bannerText: jsx(DotTypography, {
-          children: "You are currently in Edit Mode. Any changes you make will not be visible to others until you publish the updated dashboard."
-        }),
-        buttonText: "Exit edit mode",
-        buttonAction: () => {
-          onExitEditMode(dashboard);
-        }
-      });
     }
   } else {
     if (currentUser && dashboard.is_being_modified && dashboard.modified_author_id !== currentUser.id && modifiedAuthorUser) {
@@ -12310,7 +12322,7 @@ function getDashboardBanner(dashboard, isEdit, onExitEditMode, onPublishChanges,
         })
       });
       return jsx(DotDashboardBanner, {
-        bannerSeverity: "info",
+        bannerSeverity: "warning",
         bannerText: bannerText
       });
     }
@@ -12389,7 +12401,8 @@ function DotDashboardHeader({
           children: [backButton, dashboard === null || dashboard === void 0 ? void 0 : dashboard.name]
         }), showStatus && dashboard && jsx(DotDashboardStatusPill, {
           dashboard: dashboard,
-          currentUser: currentUser ? currentUser : null
+          currentUser: currentUser ? currentUser : null,
+          modifiedAuthorUser: modifiedAuthorUser ? modifiedAuthorUser : null
         })]
       }), jsx(DotDashboardActions, {
         applications: applications,

package/package.json

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

package/src/lib/components/analytics/dashboard-details/DashboardDetails.d.ts

@@ -11,12 +11,14 @@ interface CommonDashboardDetailsProps extends CommonProps {
 interface DashboardDetailsViewProps extends CommonDashboardDetailsProps {
     currentUser?: UserModel;
     dashboard: DashboardView;
+    modifiedAuthorUser?: UserModel;
     open: boolean;
 }
-export declare const DotDashboardDetailsView: ({ className, dashboard, onClose, onFavorite, open, yOffset, zIndex, currentUser, }: DashboardDetailsViewProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DotDashboardDetailsView: ({ className, dashboard, onClose, onFavorite, open, yOffset, zIndex, currentUser, modifiedAuthorUser, }: DashboardDetailsViewProps) => import("react/jsx-runtime").JSX.Element;
 export interface DashboardDetailsProps extends CommonDashboardDetailsProps {
     currentUser?: UserModel;
     dashboard?: DashboardView;
+    modifiedAuthorUser?: UserModel;
 }
-export declare const DotDashboardDetails: ({ dashboard, onClose, onFavorite, currentUser, ...commonProps }: DashboardDetailsProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DotDashboardDetails: ({ dashboard, onClose, onFavorite, currentUser, modifiedAuthorUser, ...commonProps }: DashboardDetailsProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/src/lib/components/analytics/dashboard-details/DashboardStatusPill.d.ts

@@ -3,6 +3,7 @@ import { UserModel } from '../../core-api/openapi';
 interface DashboardStatusPillProps {
     currentUser?: UserModel;
     dashboard: DashboardView;
+    modifiedAuthorUser?: UserModel;
 }
-declare function DotDashboardStatusPill({ dashboard, currentUser, }: Readonly<DashboardStatusPillProps>): import("react/jsx-runtime").JSX.Element;
+declare function DotDashboardStatusPill({ dashboard, currentUser, modifiedAuthorUser, }: Readonly<DashboardStatusPillProps>): import("react/jsx-runtime").JSX.Element;
 export { DashboardStatusPillProps, DotDashboardStatusPill };