@digital-ai/dot-components 4.17.0 → 4.17.1

package/index.esm.js

@@ -9436,12 +9436,13 @@ class DashboardsService {
   /**
    * Get a list of Dashboards.
    * Return a list of Dashboard definitions, filtered by query parameters.
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param start Offset of the first fetched item.
    * @param count Maximum number of fetched items.
    * @param sort Sort ordering to apply to the query.
    * @param filter List of filters (each filter is a separate query param, and they are OR'ed).
    *
-   * * **Filterable field names**: author_fullname, author_id, bi_type, categories, created_dt, description, external_embedding_id, external_id, id, is_ootb_dashboard, lifecycle_state, modified_parent_id, name, target_apps, updated_by_fullname, updated_by_id, updated_dt
+   * * **Filterable field names**: author_fullname, author_id, bi_type, categories, created_dt, dataset_id, description, external_embedding_id, external_id, id, is_ootb_dashboard, lifecycle_state, name, target_apps, updated_by_fullname, updated_by_id, updated_dt
    * * **Searchable field names**: author_fullname, categories, description, name, updated_by_fullname
    *
    * @param favorite Boolean flag to only return dashboards marked as favorites.
@@ -9455,15 +9456,19 @@ class DashboardsService {
    * @param lifecycleState String match on Dashboard lifecycle state - 'DRAFT' or 'PUBLISHED'.
    * @param name String match on Dashboard name.
    * @param targetApp String match on the Dashboard target application - 'AGILITY', 'CONTINUOUSTEST', 'DEPLOY', 'RELEASE', 'TEAMFORGE', 'CHANGERISKPREDICTION', or APPLICATIONSECURITY.
+   * @param viewModified Return dashboards with modified changes if they exist for this user.
    * @returns DashboardViewPagedResponse OK
    * @returns Error Default error response
    * @throws ApiError
    */
-  static getDashboardsService(start, count = 20, sort = 'id', filter, favorite = null, q = null, authorFullname = null, authorId = null, biType = 'MICROSTRATEGY', description = null, id = null, isOotbDashboard = null, lifecycleState = null, name = null, targetApp = null) {
+  static getDashboards(xDigitalaiAccountId = null, start, count = 20, sort = 'id', filter, favorite = null, q = null, authorFullname = null, authorId = null, biType = 'MICROSTRATEGY', description = null, id = null, isOotbDashboard = null, lifecycleState = null, name = null, targetApp = null, viewModified = false) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'GET',
         path: `/metadata/bi/dashboards`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         query: {
           start: start,
           count: count,
@@ -9479,7 +9484,8 @@ class DashboardsService {
           is_ootb_dashboard: isOotbDashboard,
           lifecycle_state: lifecycleState,
           name: name,
-          target_app: targetApp
+          target_app: targetApp,
+          view_modified: viewModified
         },
         errors: {
           400: `An unknown parameter was specified.`,
@@ -9494,15 +9500,19 @@ class DashboardsService {
    * Create a Dashboard definition.
    * Creates a Dashboard definition.
    * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns DashboardView Dashboard created.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static postDashboardsService(requestBody) {
+  static postDashboards(requestBody, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'POST',
         path: `/metadata/bi/dashboards`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         body: requestBody,
         mediaType: 'application/json',
         errors: {
@@ -9518,24 +9528,23 @@ class DashboardsService {
    * Get one Dashboard definition.
    * Return a single Dashboard definition, selected by ID.
    * @param dashboardId
-   * @param viewModified Return the dashboard with modified changes if they exist for this user.
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns DashboardView OK
    * @returns Error Default error response
    * @throws ApiError
    */
-  static getDashboardsService1(dashboardId, viewModified = false) {
+  static getDashboard(dashboardId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'GET',
         path: `/metadata/bi/dashboards/${dashboardId}`,
-        query: {
-          view_modified: viewModified
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
         },
         errors: {
           400: `An unknown parameter was specified.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`,
-          404: `The dashboard could not be found.`,
-          422: `Unprocessable Entity`
+          404: `The dashboard could not be found.`
         }
       });
       return result.body;
@@ -9546,16 +9555,20 @@ class DashboardsService {
    * Sets a Dashboard definition, selected by ID.
    * @param dashboardId
    * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param isSync Sync the dashboard with BI
    * @returns DashboardView Dashboard updated.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static putDashboardsService(dashboardId, requestBody, isSync = null) {
+  static putDashboard(dashboardId, requestBody, xDigitalaiAccountId = null, isSync = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'PUT',
         path: `/metadata/bi/dashboards/${dashboardId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         query: {
           is_sync: isSync
         },
@@ -9577,16 +9590,20 @@ class DashboardsService {
    * Updates a Dashboard definition, selected by ID.
    * @param dashboardId
    * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param isSync Sync the dashboard with BI
    * @returns DashboardView Dashboard updated.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static patchDashboardsService(dashboardId, requestBody, isSync = null) {
+  static patchDashboard(dashboardId, requestBody, xDigitalaiAccountId = null, isSync = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'PATCH',
         path: `/metadata/bi/dashboards/${dashboardId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         query: {
           is_sync: isSync
         },
@@ -9607,33 +9624,97 @@ class DashboardsService {
    * Delete a Dashboard definition.
    * Deletes a single Dashboard definition, selected by ID.
    * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns Error Default error response
    * @throws ApiError
    */
-  static deleteDashboardsService(dashboardId) {
+  static deleteDashboard(dashboardId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'DELETE',
-        path: `/metadata/bi/dashboards/${dashboardId}`
+        path: `/metadata/bi/dashboards/${dashboardId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        }
       });
       return result.body;
     });
   }
   /**
-   * Publish modifications to a dashboard
-   * Publish modifications to a dashboard
+   * Get one in-progress Dashboard definition.
+   * Return a single Dashboard definition with pending changes, selected by ID.
    * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
+   * @returns DashboardView OK
+   * @returns Error Default error response
+   * @throws ApiError
+   */
+  static getInProgressDashboard(dashboardId, xDigitalaiAccountId = null) {
+    return __awaiter(this, void 0, void 0, function* () {
+      const result = yield request({
+        method: 'GET',
+        path: `/metadata/bi/dashboards/${dashboardId}/inprogress`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
+        errors: {
+          400: `An unknown parameter was specified.`,
+          401: `Could not resolve a valid Tenant from the provided API Token.`,
+          404: `The dashboard could not be found.`
+        }
+      });
+      return result.body;
+    });
+  }
+  /**
+   * Create an edit-in-progress version of the dashboard
+   * Create an edit-in-progress version of the dashboard while leaving the original unchanged.
+   * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param requestBody
-   * @param isSync Sync the dashboard with BI
-   * @returns DashboardView Dashboard published.
+   * @returns DashboardView Edit-in-progress dashboard created.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static postDashboardsService1(dashboardId, requestBody, isSync = null) {
+  static postInProgressDashboard(dashboardId, xDigitalaiAccountId = null, requestBody) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'POST',
-        path: `/metadata/bi/dashboards/${dashboardId}/publish`,
+        path: `/metadata/bi/dashboards/${dashboardId}/inprogress`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
+        body: requestBody,
+        mediaType: 'application/json',
+        errors: {
+          400: `The provided data is not valid.`,
+          404: `The dashboard could not be found.`,
+          409: `Unable to update object because IDs are different.`,
+          422: `Unprocessable Entity`
+        }
+      });
+      return result.body;
+    });
+  }
+  /**
+   * Sets a single Dashboard in-progress definition.
+   * Sets a Dashboard definition with pending changes, selected by ID.
+   * @param dashboardId
+   * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
+   * @param isSync Sync the dashboard with BI
+   * @returns DashboardView Dashboard updated.
+   * @returns Error Default error response
+   * @throws ApiError
+   */
+  static putInProgressDashboard(dashboardId, requestBody, xDigitalaiAccountId = null, isSync = null) {
+    return __awaiter(this, void 0, void 0, function* () {
+      const result = yield request({
+        method: 'PUT',
+        path: `/metadata/bi/dashboards/${dashboardId}/inprogress`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         query: {
           is_sync: isSync
         },
@@ -9643,6 +9724,7 @@ class DashboardsService {
           400: `The provided data is not valid.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`,
           404: `The dashboard could not be found.`,
+          409: `Unable to update object because IDs are different.`,
           422: `Unprocessable Entity`
         }
       });
@@ -9650,22 +9732,62 @@ class DashboardsService {
     });
   }
   /**
-   * Revert modifications to a dashboard
-   * Revert modifications to a dashboard
+   * Updates a single Dashboard in-progress definition.
+   * Updates a Dashboard definition with pending changes, selected by ID.
    * @param dashboardId
-   * @returns DashboardView Dashboard changes reverted.
+   * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
+   * @param isSync Sync the dashboard with BI
+   * @returns DashboardView Dashboard updated.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static postDashboardsService2(dashboardId) {
+  static patchInProgressDashboard(dashboardId, requestBody, xDigitalaiAccountId = null, isSync = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
-        method: 'POST',
-        path: `/metadata/bi/dashboards/${dashboardId}/revert`,
+        method: 'PATCH',
+        path: `/metadata/bi/dashboards/${dashboardId}/inprogress`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
+        query: {
+          is_sync: isSync
+        },
+        body: requestBody,
+        mediaType: 'application/json',
         errors: {
           400: `The provided data is not valid.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`,
-          404: `The dashboard could not be found.`
+          404: `The dashboard could not be found.`,
+          409: `Unable to update object because IDs are different.`,
+          422: `Unprocessable Entity`
+        }
+      });
+      return result.body;
+    });
+  }
+  /**
+   * Revert in-progress changes.
+   * Discards edit in progress dashboard changes.
+   * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
+   * @param publish Publish changes to the original dashboard and delete the in-progress version.
+   * @returns Error Default error response
+   * @throws ApiError
+   */
+  static deleteInProgressDashboard(dashboardId, xDigitalaiAccountId = null, publish = false) {
+    return __awaiter(this, void 0, void 0, function* () {
+      const result = yield request({
+        method: 'DELETE',
+        path: `/metadata/bi/dashboards/${dashboardId}/inprogress`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
+        query: {
+          publish: publish
+        },
+        errors: {
+          422: `Unprocessable Entity`
         }
       });
       return result.body;
@@ -9675,16 +9797,20 @@ class DashboardsService {
    * Create a copy of existing dashboard
    * Create a copy of existing dashboard
    * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param requestBody
    * @returns DashboardView Dashboard copied.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static postDashboardsService3(dashboardId, requestBody) {
+  static copyDashboard(dashboardId, xDigitalaiAccountId = null, requestBody) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'POST',
         path: `/metadata/bi/dashboards/${dashboardId}/copy`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         body: requestBody,
         mediaType: 'application/json',
         errors: {
@@ -9700,15 +9826,19 @@ class DashboardsService {
    * Favorite a dashboard
    * Favorite a dashboard
    * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns DashboardView Dashboard favorited.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static postDashboardsService4(dashboardId) {
+  static favoriteDashboard(dashboardId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'POST',
         path: `/metadata/bi/dashboards/${dashboardId}/favorite`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         errors: {
           400: `The provided data is not valid.`,
           404: `The dashboard could not be found.`
@@ -9721,15 +9851,19 @@ class DashboardsService {
    * Un-favorite a dashboard
    * Un-favorite a dashboard
    * @param dashboardId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns DashboardView Dashboard un-favorited.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static deleteDashboardsService1(dashboardId) {
+  static unfavoriteDashboard(dashboardId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'DELETE',
         path: `/metadata/bi/dashboards/${dashboardId}/favorite`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         errors: {
           400: `The provided data is not valid.`,
           404: `The dashboard could not be found.`
@@ -9741,6 +9875,7 @@ class DashboardsService {
   /**
    * Get Metadata (categories and authors)
    * Return all Metadata for dashboards optionally filtered by the given parameters
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @param filter List of filters (each filter is a separate query param, and they are OR'ed).
    *
    * * **Filterable field names**: author_fullname, bi_type, categories, created_dt, description, is_ootb_dashboard, lifecycle_state, name, updated_by_fullname, updated_dt
@@ -9754,11 +9889,14 @@ class DashboardsService {
    * @returns Error Default error response
    * @throws ApiError
    */
-  static getDashboardsMetadata(filter, targetApp = null, biType = 'MICROSTRATEGY', isOotbDashboard = null, lifecycleState = null) {
+  static getDashboardsMetadata(xDigitalaiAccountId = null, filter, targetApp = null, biType = 'MICROSTRATEGY', isOotbDashboard = null, lifecycleState = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'GET',
         path: `/metadata/bi/dashboards/metadata`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         query: {
           filter: filter,
           target_app: targetApp,
@@ -9781,15 +9919,19 @@ class HelpContentService {
   /**
    * Gets help content definitions.
    * Return help content definitions.
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns HelpContentPagedResponse OK
    * @returns Error Default error response
    * @throws ApiError
    */
-  static getHelpContent() {
+  static getHelpContent(xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'GET',
         path: `/metadata/bi/helpcontent`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         errors: {
           400: `An unknown parameter was specified.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`
@@ -9802,15 +9944,19 @@ class HelpContentService {
    * Upload an HTML file to be displayed as help content.
    * Upload help content.
    * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns HelpContent Content uploaded.
    * @returns Error Default error response
    * @throws ApiError
    */
-  static createHelpContent(requestBody) {
+  static createHelpContent(requestBody, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'POST',
         path: `/metadata/bi/helpcontent`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         body: requestBody,
         errors: {
           400: `The provided data is not valid.`,
@@ -9825,15 +9971,19 @@ class HelpContentService {
    * Get a help content definition.
    * Return a single help content definition, selected by ID.
    * @param helpContentId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns HelpContent OK
    * @returns Error Default error response
    * @throws ApiError
    */
-  static getHelpContentById(helpContentId) {
+  static getHelpContentById(helpContentId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'GET',
         path: `/metadata/bi/helpcontent/${helpContentId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         errors: {
           400: `An unknown parameter was specified.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`,
@@ -9848,15 +9998,19 @@ class HelpContentService {
    * Update a single help content definition, selected by ID.
    * @param helpContentId
    * @param requestBody
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns HelpContent OK
    * @returns Error Default error response
    * @throws ApiError
    */
-  static putHelpContentById(helpContentId, requestBody) {
+  static putHelpContentById(helpContentId, requestBody, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'PUT',
         path: `/metadata/bi/helpcontent/${helpContentId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         body: requestBody,
         errors: {
           400: `An unknown parameter was specified.`,
@@ -9872,14 +10026,18 @@ class HelpContentService {
    * Delete a help content definition.
    * Delete a single help content definition, selected by ID.
    * @param helpContentId
+   * @param xDigitalaiAccountId Perform the requested operation in the context of the Digital.ai account represented by this GUID.  <em>Requires elevated permissions.</em>
    * @returns Error Default error response
    * @throws ApiError
    */
-  static deleteHelpContentById(helpContentId) {
+  static deleteHelpContentById(helpContentId, xDigitalaiAccountId = null) {
     return __awaiter(this, void 0, void 0, function* () {
       const result = yield request({
         method: 'DELETE',
         path: `/metadata/bi/helpcontent/${helpContentId}`,
+        headers: {
+          'X-Digitalai-Account-ID': xDigitalaiAccountId
+        },
         errors: {
           400: `An unknown parameter was specified.`,
           401: `Could not resolve a valid Tenant from the provided API Token.`,
@@ -9897,69 +10055,76 @@ function DotDashboardStatusPill({
   currentUser,
   modifiedAuthorUser
 }) {
-  if (dashboard.lifecycle_state === DashboardView.lifecycle_state.DRAFT) {
-    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 && canEdit) {
-      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: "warning"
-        })
-      });
-    } else {
-      const lockedPublished = jsx(DotPill, {
-        label: "Published",
-        icon: jsx(DotIcon, {
+  let tooltipTitle;
+  let pillLabel;
+  let pillStatus;
+  let pillIcon;
+  const isInProgressDashboard = dashboard.in_progress_changes || dashboard.parent_id;
+  if (isInProgressDashboard) {
+    const authorIsCurrentUser = dashboard.in_progress_changes ? dashboard.in_progress_changes.author_id === (currentUser === null || currentUser === void 0 ? void 0 : currentUser.id) : dashboard.author_id === (currentUser === null || currentUser === void 0 ? void 0 : currentUser.id);
+    if (authorIsCurrentUser) {
+      // AUTHOR IS USER, DASHBOARD IS EDIT IN PROGRESS, USER IS EDITING
+      if (canEdit) {
+        tooltipTitle = '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.';
+        pillLabel = 'Edit in progress';
+        pillStatus = 'warning';
+        pillIcon = null;
+      }
+      // AUTHOR IS USER, DASHBOARD IS EDIT IN PROGRESS, USER IS VIEWING
+      else {
+        tooltipTitle = 'You are viewing the published version of this dashboard which you are currently editing.';
+        pillLabel = 'Published';
+        pillStatus = 'success';
+        pillIcon = jsx(DotIcon, {
           iconId: "lock"
-        }),
-        size: "small",
-        variant: "outlined",
-        status: "success"
-      });
-      if (modifiedAuthorUser) {
-        const modifiedAuthorUserFullName = `${modifiedAuthorUser.given_name} ${modifiedAuthorUser.family_name}`;
-        const tooltip = dashboard.modified_author_id === currentUser.id ? 'You are viewing the published version of this dashboard which you are currently editing.' : `${modifiedAuthorUserFullName} is currently editing this dashboard and it is locked for editing by other users.`;
-        return jsx(DotTooltip, {
-          title: tooltip,
-          placement: "top",
-          children: lockedPublished
-        });
-      } else {
-        // If we don't have the user and the dashboard is being modified, we assume that the user is a Digital.ai
-        // Support or Admin user.
-        return jsx(DotTooltip, {
-          title: `This dashboard is currently being edited by Digital.ai and it is locked for editing by other users.`,
-          placement: "top",
-          children: lockedPublished
         });
       }
     }
+    // AUTHOR IS NOT USER, DASHBOARD IS EDIT IN PROGRESS
+    else if (modifiedAuthorUser) {
+      tooltipTitle = `${modifiedAuthorUser.given_name} ${modifiedAuthorUser.family_name} is currently editing this dashboard and it is locked for editing by other users.`;
+      pillLabel = 'Published';
+      pillStatus = 'success';
+      pillIcon = jsx(DotIcon, {
+        iconId: "lock"
+      });
+    }
+    // AUTHOR IS UNKNOWN, DASHBOARD IS EDIT IN PROGRESS
+    else {
+      tooltipTitle = 'This dashboard is currently being edited by Digital.ai and it is locked for editing by other users.';
+      pillLabel = 'Published';
+      pillStatus = 'success';
+      pillIcon = jsx(DotIcon, {
+        iconId: "lock"
+      });
+    }
   } else {
-    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"
-      })
-    });
+    // DASHBOARD IS DRAFT
+    if (dashboard.lifecycle_state === DashboardView.lifecycle_state.DRAFT) {
+      tooltipTitle = 'This dashboard has not yet been published. It is not visible to end users or in Digital.ai applications.';
+      pillLabel = 'Draft';
+      pillStatus = 'in-progress';
+      pillIcon = null;
+    }
+    // DASHBOARD IS PUBLISHED
+    else {
+      tooltipTitle = 'The latest version of this dashboard is published and visible to end users.';
+      pillLabel = 'Published';
+      pillStatus = 'success';
+      pillIcon = null;
+    }
   }
+  return jsx(DotTooltip, {
+    title: tooltipTitle,
+    placement: "top",
+    children: jsx(DotPill, {
+      label: pillLabel,
+      icon: pillIcon,
+      size: "small",
+      variant: "outlined",
+      status: pillStatus
+    })
+  });
 }
 
 const helpContent = {
@@ -9991,8 +10156,7 @@ const dashboard1 = {
   help_content_id: helpContent.id,
   filter_configuration: [],
   favorite: false,
-  updated_dt: '2023-11-22T06:42:07.952000+00:00',
-  is_being_modified: false
+  updated_dt: '2023-11-22T06:42:07.952000+00:00'
 };
 const dashboard2 = {
   author_fullname: 'Dashboard2 Author',
@@ -10032,7 +10196,7 @@ const dashboard3 = {
   created_dt: '2023-11-21T04:42:07.872000+00:00',
   id: 'id3',
   lifecycle_state: DashboardView.lifecycle_state.PUBLISHED,
-  application_instances: [],
+  application_instances: ['2'],
   categories: [],
   bi_type: DashboardView.bi_type.MICROSTRATEGY,
   is_ootb_dashboard: true,
@@ -10094,20 +10258,19 @@ const dashboard5 = {
   favorite: false,
   updated_dt: '2023-11-21T04:42:07.951000+00:00'
 };
-// Dashboard with in-progress edits
-const dashboard6 = {
+const dashboard6InProgress = {
   author_fullname: 'Dashboard6 Author',
-  author_id: 'id6a',
+  author_id: 'id123',
   target_apps: ['AGILITY'],
   external_id: '6',
-  name: 'Test dashboard 6',
+  name: 'Test dashboard 6 (modified)',
   description: '',
   dashboard_url: 'https://test.com',
   server_url: 'https://test.com',
   external_embedding_id: null,
   created_dt: '2023-11-22T06:42:07.872000+00:00',
   id: 'id6',
-  lifecycle_state: DashboardView.lifecycle_state.PUBLISHED,
+  lifecycle_state: DashboardView.lifecycle_state.DRAFT,
   application_instances: [],
   categories: [],
   bi_type: DashboardView.bi_type.MICROSTRATEGY,
@@ -10121,9 +10284,17 @@ const dashboard6 = {
   filter_configuration: [],
   favorite: false,
   updated_dt: '2023-11-22T06:42:07.952000+00:00',
-  is_being_modified: true,
-  modified_author_id: 'id123'
+  parent_id: 'id6'
 };
+// Dashboard with in-progress edits
+const dashboard6 = Object.assign(Object.assign({}, dashboard6InProgress), {
+  author_id: 'id6a',
+  name: 'Test dashboard 6',
+  id: 'id6',
+  lifecycle_state: DashboardView.lifecycle_state.PUBLISHED,
+  in_progress_changes: dashboard6InProgress,
+  parent_id: null
+});
 const dummyDashboards = [dashboard1, dashboard2, dashboard3, dashboard4, dashboard5, dashboard6];
 const getCategoriesMock = {
   categories: {
@@ -10217,19 +10388,6 @@ const handleUpdateDashboard = (dashboards, updatedDashboard) => {
   return dashboards ? [...dashboards] : dashboards;
 };
 const DotMetadataApiContext = createContext(null);
-const accountHeaderKey = 'X-Digitalai-Account-ID';
-function setAccountIdHeader(accountId) {
-  const headers = OpenAPI.HEADERS;
-  if (accountId) {
-    if (!headers || accountHeaderKey in headers && headers[accountHeaderKey] !== accountId) {
-      OpenAPI.HEADERS = {
-        [accountHeaderKey]: accountId
-      };
-    }
-  } else if (headers) {
-    OpenAPI.HEADERS = null;
-  }
-}
 const DotMetadataApiProvider = ({
   accountOverrideId,
   apiUrl,
@@ -10252,8 +10410,7 @@ const DotMetadataApiProvider = ({
   const MOCK_API_URL = 'https://demo-mock-api';
   const retrieveMetadata = useCallback((appType, isPublishedOnly) => {
     setMetadataLoading(true);
-    setAccountIdHeader(accountId);
-    return cancelablePromise(DashboardsService.getDashboardsMetadata(undefined, appType, undefined, undefined, isPublishedOnly ? 'PUBLISHED' : undefined)).then(response => {
+    return cancelablePromise(DashboardsService.getDashboardsMetadata(accountId, undefined, appType, undefined, undefined, isPublishedOnly ? 'PUBLISHED' : undefined)).then(response => {
       setMetadataLoading(false);
       setDashboardsError(null);
       const key = metadataKey(isPublishedOnly);
@@ -10310,9 +10467,8 @@ const DotMetadataApiProvider = ({
         const results = dummyDashboards.filter(dashboard => (name === null || name === void 0 ? void 0 : name.toLowerCase()) === dashboard.name.toLowerCase());
         return Promise.resolve(results);
       }
-      setAccountIdHeader(accountId);
       setDashboardSearchLoading(true);
-      return cancelablePromise(DashboardsService.getDashboardsService(start, count, sort, filter, favorite, q, authorFullname, authorId, biType, description, id, isOotbDashboard, lifecycleState, name, targetApp)).then(response => {
+      return cancelablePromise(DashboardsService.getDashboards(accountId, start, count, sort, filter, favorite, q, authorFullname, authorId, biType, description, id, isOotbDashboard, lifecycleState, name, targetApp)).then(response => {
         setDashboardsError(null);
         return response.results;
       }).catch(error => {
@@ -10326,12 +10482,23 @@ const DotMetadataApiProvider = ({
         }
       }).finally(() => setDashboardSearchLoading(false));
     },
-    deleteDashboard: dashboardId => {
-      setAccountIdHeader(accountId);
-      return cancelablePromise(DashboardsService.deleteDashboardsService(dashboardId)).then(() => {
+    deleteDashboard: dashboardToDelete => {
+      let deletePromise;
+      // If we're dealing with an in-progress dashboard, we need to delete in-progress dashboard first, then delete
+      // the parent dashboard.
+      if (dashboardToDelete.in_progress_changes || dashboardToDelete.parent_id) {
+        // Use the parent ID if it exists (in-progress dashboard) or the current ID (published dashboard)
+        const dashboardId = dashboardToDelete.parent_id ? dashboardToDelete.parent_id : dashboardToDelete.id;
+        deletePromise = cancelablePromise(DashboardsService.deleteInProgressDashboard(dashboardId, accountOverrideId, false).then(() => {
+          return DashboardsService.deleteDashboard(dashboardId, accountOverrideId);
+        }));
+      } else {
+        deletePromise = cancelablePromise(DashboardsService.deleteDashboard(dashboardToDelete.id, accountOverrideId));
+      }
+      return deletePromise.then(() => {
         setDashboardsError(null);
         if (dashboards) {
-          setDashboards(dashboards.filter(dashboard => dashboard.id !== dashboardId));
+          setDashboards(dashboards.filter(dashboard => dashboard.id !== dashboardToDelete.id));
         }
         return true;
       }).catch(error => {
@@ -10340,8 +10507,7 @@ const DotMetadataApiProvider = ({
       });
     },
     duplicateDashboard: (dashboardId, dashboard) => {
-      setAccountIdHeader(accountId);
-      return cancelablePromise(DashboardsService.postDashboardsService3(dashboardId, dashboard)).then(response => {
+      return cancelablePromise(DashboardsService.copyDashboard(dashboardId, accountId, dashboard)).then(response => {
         setDashboardsError(null);
         setMetadata(null);
         if (dashboards) {
@@ -10356,33 +10522,35 @@ const DotMetadataApiProvider = ({
         return null;
       });
     },
-    publishDashboardChanges: (dashboardId, dashboard, isSync) => __awaiter(void 0, void 0, void 0, function* () {
-      setAccountIdHeader(accountId);
-      return cancelablePromise(DashboardsService.postDashboardsService1(dashboardId, dashboard, isSync)).then(response => {
+    publishDashboardChanges: (dashboardId, updatePayload, isSync) => __awaiter(void 0, void 0, void 0, function* () {
+      return cancelablePromise(DashboardsService.patchInProgressDashboard(dashboardId, updatePayload, accountId, isSync).then(() => {
+        return DashboardsService.deleteInProgressDashboard(dashboardId, accountId, true);
+      }).then(() => {
+        return DashboardsService.getDashboard(dashboardId, accountId);
+      })).then(dashboard => {
         setDashboardsError(null);
-        setDashboards(orig => handleUpdateDashboard(orig, response));
-        return response;
+        setDashboards(orig => handleUpdateDashboard(orig, dashboard));
+        return dashboard;
       }).catch(error => setDashboardsError(error));
     }),
     revertDashboardChanges: dashboardId => __awaiter(void 0, void 0, void 0, function* () {
-      setAccountIdHeader(accountId);
-      return cancelablePromise(DashboardsService.postDashboardsService2(dashboardId)).then(response => {
+      return cancelablePromise(DashboardsService.deleteInProgressDashboard(dashboardId, accountId, false).then(() => {
+        return DashboardsService.getDashboard(dashboardId, accountId);
+      })).then(dashboard => {
         setDashboardsError(null);
-        setDashboards(orig => handleUpdateDashboard(orig, response));
-        return response;
+        setDashboards(orig => handleUpdateDashboard(orig, dashboard));
+        return dashboard;
       }).catch(error => setDashboardsError(error));
     }),
-    getDashboard: (dashboardId, viewModified) => {
-      setAccountIdHeader(accountOverrideId);
-      return cancelablePromise(viewModified === undefined ? DashboardsService.getDashboardsService1(dashboardId) : DashboardsService.getDashboardsService1(dashboardId, viewModified)).then(response => {
+    getDashboard: dashboardId => {
+      return cancelablePromise(DashboardsService.getDashboard(dashboardId, accountId)).then(response => {
         setDashboardsError(null);
         return response;
       }).catch(error => setDashboardsError(error));
     },
     favoriteDashboard: (dashboardId, favoriteValue) => {
-      setAccountIdHeader(accountId);
       if (favoriteValue) {
-        return cancelablePromise(DashboardsService.postDashboardsService4(dashboardId)).then(response => {
+        return cancelablePromise(DashboardsService.favoriteDashboard(dashboardId, accountId)).then(response => {
           setDashboardsError(null);
           setDashboards(orig => handleUpdateDashboard(orig, response));
           return response;
@@ -10391,7 +10559,7 @@ const DotMetadataApiProvider = ({
           return null;
         });
       } else {
-        return cancelablePromise(DashboardsService.deleteDashboardsService1(dashboardId)).then(response => {
+        return cancelablePromise(DashboardsService.unfavoriteDashboard(dashboardId)).then(response => {
           setDashboardsError(null);
           setDashboards(orig => handleUpdateDashboard(orig, response));
           return response;
@@ -10401,15 +10569,40 @@ const DotMetadataApiProvider = ({
         });
       }
     },
-    updateDashboard: (dashboardId, dashboard, isSync = false) => __awaiter(void 0, void 0, void 0, function* () {
+    updateDashboard: (dashboard, updatePayload, isSync = false) => __awaiter(void 0, void 0, void 0, function* () {
+      if (OpenAPI.BASE === MOCK_API_URL) {
+        setDashboardsError(null);
+        return Promise.resolve(Object.assign(Object.assign({}, dashboard), {
+          id: dashboard.id
+        }));
+      }
+      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);
+        } else {
+          response = yield DashboardsService.patchDashboard(dashboard.id, updatePayload, accountId, isSync);
+        }
+        setDashboardsError(null);
+        setMetadata(null);
+        setDashboards(orig => handleUpdateDashboard(orig, response));
+        return response;
+      } catch (error) {
+        setDashboardsError(error);
+      }
+    }),
+    createInProgressDashboard: (dashboardId, dashboard) => __awaiter(void 0, void 0, void 0, function* () {
       if (OpenAPI.BASE === MOCK_API_URL) {
         setDashboardsError(null);
         return Promise.resolve(Object.assign(Object.assign({}, dashboard), {
           id: dashboardId
         }));
       }
-      setAccountIdHeader(accountId);
-      return cancelablePromise(DashboardsService.patchDashboardsService(dashboardId, dashboard, isSync)).then(response => {
+      return cancelablePromise(DashboardsService.postInProgressDashboard(dashboardId, accountId, dashboard)).then(response => {
         setDashboardsError(null);
         setMetadata(null);
         setDashboards(orig => handleUpdateDashboard(orig, response));
@@ -10462,8 +10655,7 @@ const DotMetadataApiProvider = ({
         setHelpContentLoading(false);
         return helpContent;
       } else {
-        setAccountIdHeader(accountId);
-        return cancelablePromise(HelpContentService.getHelpContentById(helpContentId)).then(response => {
+        return cancelablePromise(HelpContentService.getHelpContentById(helpContentId, accountId)).then(response => {
           setHelpContentLoading(false);
           return response.content;
         }).catch(error => {
@@ -11368,10 +11560,13 @@ function DotDashboardDialog({
   }, []);
   const handleSubmit = useCallback(isDone => __awaiter(this, void 0, void 0, function* () {
     setIsLoadingSubmit(true);
+    // If this dashboard has a parent_id set, it means we are in an in-progress state and we need to use the ID
+    // of the parent dashboard when updating
     const useFormValues = Object.assign(Object.assign({}, formValues), {
-      id: editDashboard === null || editDashboard === void 0 ? void 0 : editDashboard.id
+      id: (editDashboard === null || editDashboard === void 0 ? void 0 : editDashboard.parent_id) ? editDashboard === null || editDashboard === void 0 ? void 0 : editDashboard.parent_id : editDashboard === null || editDashboard === void 0 ? void 0 : editDashboard.id
     });
     const validName = yield validateName(useFormValues.name);
+    // If we fail name validation, set the nameError and don't call the submit function because it will fail.
     if (validName) {
       yield onSubmit(useFormValues, isDone);
     }
@@ -11694,6 +11889,16 @@ const DotImpactDialog = ({
   });
 };
 
+// Check if the dashboard has edit in progress changes for the current user.
+const editInProgressByUser = (dashboard, userId) => {
+  if (dashboard.in_progress_changes) {
+    return dashboard.in_progress_changes.author_id === userId;
+  } else if (dashboard.parent_id) {
+    return dashboard.author_id === userId;
+  }
+  return false;
+};
+
 const InlineMessage = styled(DotTypography)`
   ${({
   theme
@@ -11755,6 +11960,7 @@ const productNameCategoryMap = {
  */
 function ActivePublishMessage({
   applicationList,
+  dashboardDefaultAppInstanceId,
   dashboardName,
   initialCategories,
   published,
@@ -11798,7 +12004,15 @@ function ActivePublishMessage({
             title: category
           }));
           setCategoryOptions(newCategoryOptions);
-          selectedCategoryOptions.push(...newCategoryOptions.filter(o => initialCategories.includes(o.title)));
+          // If we're editing an edit in progress dashboard, don't compare the categories passed in to the ones on the
+          // server.  These categories will not exist there until the dashboard is published.
+          if (editInProgress) {
+            selectedCategoryOptions.push(...initialCategories.map(category => ({
+              title: category
+            })));
+          } else {
+            selectedCategoryOptions.push(...newCategoryOptions.filter(o => initialCategories.includes(o.title)));
+          }
           setSelectedCategories(selectedCategoryOptions);
         });
       } else {
@@ -11809,8 +12023,14 @@ function ActivePublishMessage({
     }
   }, [selectedApp]);
   useEffect(() => {
-    const selectedAppCategories = selectedCategories.map(c => c.title);
-    onChange(selectedApp, selectedAppCategories);
+    // NOTE:  selectedCategories is set to an empty list by default, so if pass in a default value for the application,
+    // it will trigger selectedApp to update and this will get triggered before selectedCategories is set.  The onChange
+    // callback updates the `initialCategories` param, which triggers a re-render with any selected categories cleared
+    // out, which is why we need this check.
+    if (selectedCategories.length > 0) {
+      const selectedAppCategories = selectedCategories.map(c => c.title);
+      onChange(selectedApp, selectedAppCategories);
+    }
   }, [selectedApp, selectedCategories]);
   const handleApplicationSelect = useCallback((_event, value, _reason) => {
     if (value === null) {
@@ -11834,6 +12054,13 @@ function ActivePublishMessage({
       title: newCategory
     }]);
   }, [selectedCategories]);
+  const getApplicationSelectDefaultValue = (appList, targetAppId) => {
+    if (targetAppId) {
+      const app = appList.find(a => a.id === targetAppId);
+      return app ? app.name : undefined;
+    }
+    return appList.length > 0 ? appList[0].name : undefined;
+  };
   if (published) {
     return jsxs(StyledPublishConfirmDiv, {
       children: [jsxs(DotAlertBanner, {
@@ -11883,7 +12110,7 @@ function ActivePublishMessage({
       }), requiresApplication && jsxs(StyledAppSelectDiv, {
         children: [jsx(StyledAppSelectDotAutoComplete, {
           "data-testid": "publish-app-select",
-          defaultValue: applicationList.length > 0 ? applicationList[0].name : undefined,
+          defaultValue: getApplicationSelectDefaultValue(applicationList, dashboardDefaultAppInstanceId),
           freesolo: false,
           multiple: false,
           filterSelectedOptions: true,
@@ -12020,7 +12247,7 @@ function DotDashboardPublishConfirm({
       setPublishing(null);
       setPublished(false);
     } else {
-      setPublishCategories(dashboardToPublish.categories || []);
+      setPublishCategories((dashboardToPublish.in_progress_changes ? dashboardToPublish.in_progress_changes.categories : dashboardToPublish.categories) || []);
       setRequiresApplication(dashboardToPublish.target_apps.includes('AGILITY') || dashboardToPublish.target_apps.includes('RELEASE') || dashboardToPublish.target_apps.includes('CONTINUOUSTEST') || dashboardToPublish.target_apps.includes('TEAMFORGE') || dashboardToPublish.target_apps.includes('DEPLOY'));
       setRequiresCategories(dashboardToPublish.target_apps.includes('AGILITY') || dashboardToPublish.target_apps.includes('RELEASE') || dashboardToPublish.target_apps.includes('CONTINUOUSTEST') || dashboardToPublish.target_apps.includes('TEAMFORGE'));
     }
@@ -12031,9 +12258,6 @@ function DotDashboardPublishConfirm({
       setUnpublished(false);
     }
   }, [dashboardToUnpublish]);
-  const editInProgressByCurrentUser = dashboard => {
-    return currentUser && dashboard.is_being_modified && dashboard.modified_author_id === currentUser.id;
-  };
   const handlePublish = useCallback(() => {
     const patchDashboard = {
       lifecycle_state: DashboardView.lifecycle_state.PUBLISHED,
@@ -12042,8 +12266,8 @@ function DotDashboardPublishConfirm({
     };
     // If we're publishing a dashboard that is being modified by the current user, we need to use the
     // publishDashboardChanges method to commit the changes to the published dashboard.
-    const publishMethod = editInProgressByCurrentUser(dashboardToPublish) ? publishDashboardChanges : updateDashboard;
-    setPublishing(cancelablePromise(publishMethod(dashboardToPublish.id, patchDashboard).then(updatedDashboard => {
+    const publishMethod = editInProgressByUser(dashboardToPublish, currentUser.id) ? publishDashboardChanges(dashboardToPublish.id, patchDashboard) : updateDashboard(dashboardToPublish, patchDashboard);
+    setPublishing(cancelablePromise(publishMethod.then(updatedDashboard => {
       setPublished(true);
       onStatusChanged(updatedDashboard);
       enqueueMessage('Dashboard has been published!', 'success');
@@ -12058,7 +12282,7 @@ function DotDashboardPublishConfirm({
     onClose();
   }, [publishing, onClose]);
   const handleUnpublish = useCallback(() => {
-    setUnpublishing(cancelablePromise(updateDashboard(dashboardToUnpublish.id, {
+    setUnpublishing(cancelablePromise(updateDashboard(dashboardToUnpublish, {
       lifecycle_state: DashboardView.lifecycle_state.DRAFT
     }).then(updatedDashboard => {
       setUnpublished(true);
@@ -12074,9 +12298,9 @@ function DotDashboardPublishConfirm({
     }
     onClose();
   }, [unpublishing, onClose]);
-  const handlePublishChange = useCallback((selectedApplication, selectedCategories) => {
-    setPublishAppInstance(selectedApplication);
-    setPublishCategories(selectedCategories);
+  const handlePublishChange = useCallback((_selectedApplication, _selectedCategories) => {
+    setPublishAppInstance(_selectedApplication);
+    setPublishCategories(_selectedCategories);
   }, []);
   const canSubmit = useCallback(() => {
     if (requiresApplication && publishAppInstance === null) {
@@ -12087,7 +12311,7 @@ function DotDashboardPublishConfirm({
   const getPublishButtonLabel = dashboard => {
     if (published) {
       return 'Got it';
-    } else if (editInProgressByCurrentUser(dashboard)) {
+    } else if (editInProgressByUser(dashboard, currentUser.id)) {
       return 'Yes, publish changes';
     } else {
       return 'Publish';
@@ -12099,7 +12323,7 @@ function DotDashboardPublishConfirm({
       closeOnSubmit: false,
       hasPrimaryAction: publishing === null || published,
       open: dashboardToPublish !== null,
-      title: editInProgressByCurrentUser(dashboardToPublish) ? 'Publish changes' : 'Publish to application',
+      title: editInProgressByUser(dashboardToPublish, currentUser.id) ? 'Publish changes' : 'Publish to application',
       submitButtonProps: {
         'data-testid': 'publish-confirm-button',
         disabled: !canSubmit(),
@@ -12109,13 +12333,14 @@ function DotDashboardPublishConfirm({
       onSubmit: published ? handleCancelPublish : handlePublish,
       children: jsx(ActivePublishMessage, {
         applicationList: filteredApplications,
+        dashboardDefaultAppInstanceId: (dashboardToPublish === null || dashboardToPublish === void 0 ? void 0 : dashboardToPublish.application_instances) ? dashboardToPublish === null || dashboardToPublish === void 0 ? void 0 : dashboardToPublish.application_instances[0] : null,
         dashboardName: dashboardToPublish === null || dashboardToPublish === void 0 ? void 0 : dashboardToPublish.name,
         initialCategories: publishCategories,
         published: published,
         publishing: publishing !== null,
         onChange: handlePublishChange,
         requiresApplication: requiresApplication,
-        editInProgress: editInProgressByCurrentUser(dashboardToPublish)
+        editInProgress: editInProgressByUser(dashboardToPublish, currentUser.id)
       })
     }), dashboardToUnpublish !== null && jsx(DotDialog, {
       cancelButtonVisible: !unpublished,
@@ -12172,7 +12397,19 @@ const StyledDotMenu = styled(DotMenu)`
 `;
 
 const disabledPropsMessage = 'Dashboard properties cannot be modified while the dashboard editor is active. If you need to make property changes, please close the editor.';
-const inProgressEditMessage = 'This is a published dashboard; changes will not be visible to other users until you publish the updated dashboard.';
+const inProgressEditMessage = 'This is a published dashboard. Changes will not be visible to other users until you publish the updated dashboard.';
+// This component could be dealing with either a Dashboard with in_progress_changes set, or the actual
+// in_progress_changes object itself, which will have parent_id set.
+// The Dashboard Table/Grid will always give the parent dashboard, while in the editor we will be dealing with the
+// in_progress_changes object.  This function accounts for both cases
+const dashboardLocked = (dashboard, userId) => {
+  if (dashboard.in_progress_changes) {
+    return dashboard.in_progress_changes.author_id !== userId;
+  } else if (dashboard.parent_id) {
+    return dashboard.author_id !== userId;
+  }
+  return false;
+};
 function DotDashboardOptionsMenu({
   dashboard,
   currentUser,
@@ -12224,7 +12461,7 @@ function DotDashboardOptionsMenu({
     }
   }, [dashboard, isEdit]);
   const handleSubmitEditProperties = useCallback((data, isDone) => __awaiter(this, void 0, void 0, function* () {
-    return updateDashboard(dashboard.id, {
+    return updateDashboard(dashboard, {
       name: data.name,
       description: data.description,
       categories: data.categories,
@@ -12236,11 +12473,12 @@ function DotDashboardOptionsMenu({
       }
     });
   }), [dashboard, onUpdatedProperties, updateDashboard]);
-  const isDraft = dashboard.lifecycle_state === DashboardView.lifecycle_state.DRAFT;
-  const isPublished = dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED;
-  const dashboardLocked = isPublished && currentUser && dashboard.is_being_modified && dashboard.modified_author_id !== currentUser.id;
+  // NOTE:  Edit in Progress dashboards with parent_id are always in a DRAFT state, even though
+  //        the parent is in a PUBLISHED state.  We need to treat it like a published dashboard.
+  const isDraft = !dashboard.parent_id && dashboard.lifecycle_state === DashboardView.lifecycle_state.DRAFT;
+  const isPublished = dashboard.parent_id || dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED;
   const menuItems = [];
-  if (!isEdit && onViewMode && !dashboard.is_ootb_dashboard && !dashboardLocked) {
+  if (!isEdit && onViewMode && !dashboard.is_ootb_dashboard && !dashboardLocked(dashboard, currentUser.id)) {
     menuItems.push({
       children: jsx(DotButton, {
         ariaLabel: "Edit dashboard",
@@ -12253,7 +12491,7 @@ function DotDashboardOptionsMenu({
       key: 'edit'
     });
   }
-  if (onUpdatedProperties && !dashboard.is_ootb_dashboard && !dashboardLocked) {
+  if (onUpdatedProperties && !dashboard.is_ootb_dashboard && !dashboardLocked(dashboard, currentUser.id)) {
     let menuItem = jsx(DotButton, {
       ariaLabel: "Edit dashboard properties",
       className: isEdit ? 'disabled-menu-item' : '',
@@ -12304,7 +12542,7 @@ function DotDashboardOptionsMenu({
       key: 'duplicate'
     });
   }
-  if (onStartDelete && !dashboard.is_ootb_dashboard && !dashboardLocked) {
+  if (onStartDelete && !dashboard.is_ootb_dashboard && !dashboardLocked(dashboard, currentUser.id)) {
     menuItems.push({
       children: jsx(DotButton, {
         ariaLabel: "Delete dashboard",
@@ -12319,7 +12557,7 @@ function DotDashboardOptionsMenu({
   }
   // If this is a published dashboard, with in-progress changes, and the user is the author of the changes,
   // show the republish, revert, and view original options.
-  if (isPublished && currentUser && dashboard.is_being_modified && dashboard.modified_author_id === currentUser.id) {
+  if (isPublished && currentUser && editInProgressByUser(dashboard, currentUser.id)) {
     if (onStartStatusChange) {
       menuItems.push({
         children: jsx(DotButton, {
@@ -12425,7 +12663,8 @@ function DotDashboardOptionsMenu({
     setIsEditPropertiesDialogOpen(false);
   }, []);
   const messages = [];
-  if (dashboard.is_being_modified || dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED) {
+  // Show a message if we're editing an in-progress or Published dashboard (that will be moved to in-progress)
+  if (dashboard.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED || dashboard.in_progress_changes || dashboard.parent_id) {
     messages.push(inProgressEditMessage);
   }
   return menuItems.length > 0 ? jsxs(Fragment, {
@@ -12440,7 +12679,7 @@ function DotDashboardOptionsMenu({
       open: isEditPropertiesDialogOpen,
       onClose: handleCloseEditProperties,
       onSubmit: handleSubmitEditProperties,
-      editDashboard: dashboard
+      editDashboard: editInProgressByUser(dashboard, currentUser.id) && dashboard.in_progress_changes ? dashboard.in_progress_changes : dashboard
     }), jsx(DotIconButton, {
       className: "expand-button",
       "data-testid": "card-header-action-button",
@@ -12560,6 +12799,19 @@ function FullscreenButton({
     onClick: () => onToggleFullscreen(true)
   });
 }
+function getDashboardDeleteMessage(dashboard) {
+  // Use a custom message to show if there are in-progress edits to warn the user that their data will be lost.
+  if (dashboard.in_progress_changes || dashboard.parent_id) {
+    return jsxs(Fragment, {
+      children: [jsxs(DotTypography, {
+        children: ["This dashboard has in-progress edits. This will permanently DELETE", ' ', jsx("strong", {
+          children: dashboard.name
+        }), " and any in-progress edits. Some data may be lost."]
+      }), jsx("br", {})]
+    });
+  }
+  return null;
+}
 function DotDashboardActions({
   applications,
   dashboard,
@@ -12625,8 +12877,8 @@ function DotDashboardActions({
     setDashboardToDelete(null);
   }, []);
   const handleDeleteSubmit = useCallback(() => __awaiter(this, void 0, void 0, function* () {
-    const dashboardId = dashboardToDelete.id;
-    return cancelablePromise(deleteDashboard(dashboardId)).then(deleted => {
+    const dashboardId = dashboardToDelete.parent_id ? dashboardToDelete.parent_id : dashboardToDelete.id;
+    return cancelablePromise(deleteDashboard(dashboardToDelete)).then(deleted => {
       setDashboardToDelete(null);
       onDeleted(dashboardId, deleted);
     });
@@ -12641,14 +12893,15 @@ function DotDashboardActions({
       description: data.description,
       categories: data.categories
     };
-    return duplicateDashboard(dashboard.id, copyData).then(result => {
+    const dashboardId = dashboard.parent_id ? dashboard.parent_id : dashboard.id;
+    return duplicateDashboard(dashboardId, copyData).then(result => {
       if (result && 'id' in result) {
         onDuplicated && onDuplicated(result, isDone);
       }
     });
   }, [dashboard, onDuplicated]);
   const handleRevertSubmit = useCallback(() => __awaiter(this, void 0, void 0, function* () {
-    const dashboardId = dashboardToRevert.id;
+    const dashboardId = dashboardToRevert.parent_id ? dashboardToRevert.parent_id : dashboardToRevert.id;
     return cancelablePromise(revertDashboardChanges(dashboardId)).then(result => {
       setDashboardToRevert(null);
       onRevertChanges && onRevertChanges(result);
@@ -12657,8 +12910,9 @@ function DotDashboardActions({
     });
   }), [dashboardToRevert, onRevertChanges, onStatusChanged]);
   const handleViewOriginal = useCallback(() => __awaiter(this, void 0, void 0, function* () {
-    const dashboardId = dashboard.id;
-    return cancelablePromise(getDashboard(dashboardId, false)).then(result => {
+    // If we're viewing an in-progress dashboard we need to use the parent_id to get the original
+    const dashboardId = dashboard.parent_id ? dashboard.parent_id : dashboard.id;
+    return cancelablePromise(getDashboard(dashboardId)).then(result => {
       onViewOriginal && onViewOriginal(result);
     });
   }), [dashboard, onViewOriginal]);
@@ -12699,7 +12953,8 @@ function DotDashboardActions({
       onCancel: handleDeleteClose,
       onSubmit: handleDeleteSubmit,
       record: dashboardToDelete.name,
-      impact: dashboardToDelete.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED ? 'high' : 'medium',
+      message: getDashboardDeleteMessage(dashboardToDelete),
+      impact: dashboardToDelete.lifecycle_state === DashboardView.lifecycle_state.PUBLISHED || dashboardToDelete.parent_id ? 'high' : 'medium',
       open: true
     }), dashboardToRevert && jsx(DotImpactDialog, {
       onCancel: handleRevertClose,
@@ -12804,8 +13059,10 @@ function DotDashboardBanner({
   });
 }
 function getDashboardBanner(dashboard, isEdit, onExitEditMode, onPublishChanges, currentUser, modifiedAuthorUser) {
-  if (dashboard.is_being_modified && currentUser && isEdit) {
-    if (dashboard.modified_author_id === currentUser.id) {
+  // If we're editing an In-Progress dashboard, show the publish message
+  // NOTE:  This will be the In-progess dashboard with the parent_id set.
+  if (dashboard.parent_id && currentUser) {
+    if (dashboard.author_id === currentUser.id) {
       // We're in Edit mode for a published dashboard, and the dashboard is being modified by the current user.
       return jsx(DotDashboardBanner, {
         bannerSeverity: "warning",
@@ -12817,21 +13074,25 @@ function getDashboardBanner(dashboard, isEdit, onExitEditMode, onPublishChanges,
           onPublishChanges(dashboard);
         }
       });
-    } else if (dashboard.modified_author_id !== currentUser.id && modifiedAuthorUser) {
-      // We're in View mode for a published dashboard that is being edited by someone else.
-      const bannerText = jsx(DotTypography, {
-        children: jsxs("div", {
-          children: ["This Dashboard is currently being edited by", ' ', jsxs("strong", {
-            children: [modifiedAuthorUser.given_name, " ", modifiedAuthorUser.family_name]
-          }), ". You will be able to see the updated dashboard once the changes are published."]
-        })
-      });
-      return jsx(DotDashboardBanner, {
-        bannerSeverity: "warning",
-        bannerText: bannerText
-      });
     }
   }
+  // If we're viewing another user's Locked In-progress dashboard, show the edit message
+  // NOTE:  This will be the parent dashboard with in_progress_changes set, since we don't want
+  // to show the user the in-progress changes if they're not editing the dashboard.
+  else if (dashboard.in_progress_changes && dashboard.in_progress_changes.author_id !== currentUser.id && modifiedAuthorUser) {
+    // We're in View mode for a published dashboard that is being edited by someone else.
+    const bannerText = jsx(DotTypography, {
+      children: jsxs("div", {
+        children: ["This Dashboard is currently being edited by", ' ', jsxs("strong", {
+          children: [modifiedAuthorUser.given_name, " ", modifiedAuthorUser.family_name]
+        }), ". You will be able to see the updated dashboard once the changes are published."]
+      })
+    });
+    return jsx(DotDashboardBanner, {
+      bannerSeverity: "warning",
+      bannerText: bannerText
+    });
+  }
 }
 function DotDashboardHeader({
   accountId,
@@ -12929,7 +13190,7 @@ function DotDashboardHeader({
         onViewOriginal: onViewOriginal,
         currentUser: currentUser ? currentUser : null
       })]
-    }), dashboard && dashboard.lifecycle_state === 'PUBLISHED' && getDashboardBanner(dashboard, isEdit, onExitEditMode, handleStartPublishChanges, currentUser ? currentUser : null, modifiedAuthorUser ? modifiedAuthorUser : null)]
+    }), dashboard && (dashboard.in_progress_changes || dashboard.parent_id) && getDashboardBanner(dashboard, isEdit, onExitEditMode, handleStartPublishChanges, currentUser ? currentUser : null, modifiedAuthorUser ? modifiedAuthorUser : null)]
   });
 }