188104291 v3 DI Return Table to Normal after Sharing (#1406)

* Remove managingController when dataset is updated with unrecognized id. * Disable delete menu item when attribute is not deleteable.
concord-consortium · Aug 15, 2024 · f0767c4 · f0767c4
1 parent 3bcce62
commit f0767c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/v3/src/components/case-table/attribute-menu/attribute-menu-list.tsx b/v3/src/components/case-table/attribute-menu/attribute-menu-list.tsx
@@ -148,7 +148,7 @@ const AttributeMenuListComp = forwardRef<HTMLDivElement, IProps>(
     {
       itemKey: "DG.TableController.headerMenuItems.deleteAttribute",
       isEnabled: () => {
-        if (!data) return false
+        if (!attribute?.deleteable || !data) return false
 
         // If preventTopLevelReorg is true...
         if (preventTopLevelReorg(data)) {

diff --git a/v3/src/data-interactive/handlers/data-context-handler.test.ts b/v3/src/data-interactive/handlers/data-context-handler.test.ts
@@ -99,5 +99,8 @@ describe("DataInteractive DataContextHandler", () => {
     expect(dataset.title).toEqual(title)
     expect(dataset.description).toEqual(description)
     expect(dataset.managingControllerId).toBe(tile.id)
+
+    expect(handler.update?.({ dataContext: dataset }, { managingController: "__none__" }).success).toBe(true)
+    expect(dataset.managingControllerId).toBe("")
   })
 })
diff --git a/v3/src/data-interactive/handlers/data-context-handler.ts b/v3/src/data-interactive/handlers/data-context-handler.ts
@@ -88,7 +88,7 @@ export const diDataContextHandler: DIHandler = {
 
         if (managingController) {
           const tile = findTileFromNameOrId(managingController)
-          if (tile) dataContext.setManagingControllerId(tile.id)
+          dataContext.setManagingControllerId(tile?.id)
         }
 
         if (sort?.attr) {

diff --git a/v3/src/models/data/data-set.ts b/v3/src/models/data/data-set.ts
@@ -423,8 +423,8 @@ export const DataSet = V2Model.named("DataSet").props({
   }
 })
 .actions(self => ({
-  setManagingControllerId(id: string) {
-    self.managingControllerId = id
+  setManagingControllerId(id?: string) {
+    self.managingControllerId = id ?? ""
   },
   moveAttribute(attributeID: string, options?: IMoveAttributeCollectionOptions): IAttributeChangeResult {
     let removedCollectionId: string | undefined