Fix update graph displayOnlySelectedCases. (#1696)

concord-consortium · Dec 21, 2024 · e9e26dd · e9e26dd
1 parent d71d76a
commit e9e26dd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/v3/src/components/graph/components/inspector-panel/hide-show-menu-list.tsx b/v3/src/components/graph/components/inspector-panel/hide-show-menu-list.tsx
@@ -47,13 +47,7 @@ export const HideShowMenuList = observer(function HideShowMenuList({tile}: IProp
 
   const displayOnlySelectedCases = () => {
     dataConfig?.applyModelChange(
-      () => {
-        dataConfig?.addNewHiddenCases(dataConfig?.unselectedCases ?? [])
-        dataConfig?.setDisplayOnlySelectedCases(true)
-        if (dataConfig?.selection.length > 0) {
-          graphModel?.rescale()
-        }
-      },
+      () => graphModel?.displayOnlySelectedCases(),
       {
         undoStringKey: "DG.Undo.displayOnlySelected",
         redoStringKey: "DG.Redo.displayOnlySelected",
@@ -64,11 +58,7 @@ export const HideShowMenuList = observer(function HideShowMenuList({tile}: IProp
 
   const showAllCases = () => {
     dataConfig?.applyModelChange(
-      () => {
-        dataConfig?.clearHiddenCases()
-        dataConfig?.setDisplayOnlySelectedCases(false)
-        graphModel?.rescale()
-      },
+      () => graphModel?.showAllCases(),
       {
         undoStringKey: "DG.Undo.showAllCases",
         redoStringKey: "DG.Redo.showAllCases",

diff --git a/...nts/graph/component-handler-graph.test.ts → ...nts/graph/graph-component-handler.test.ts b/...nts/graph/component-handler-graph.test.ts → ...nts/graph/graph-component-handler.test.ts
diff --git a/v3/src/components/graph/graph-component-handler.ts b/v3/src/components/graph/graph-component-handler.ts
@@ -425,7 +425,11 @@ export const graphComponentHandler: DIComponentHandler = {
 
     // Update odd features
     if (backgroundColor != null) content.setPlotBackgroundColor(backgroundColor)
-    if (displayOnlySelectedCases != null) dataConfiguration.setDisplayOnlySelectedCases(displayOnlySelectedCases)
+    if (displayOnlySelectedCases) {
+      content.displayOnlySelectedCases()
+    } else if (displayOnlySelectedCases != null) {
+      content.showAllCases()
+    }
     if (filterFormula != null) dataConfiguration.setFilterFormula(filterFormula)
     if (hiddenCases != null) dataConfiguration.setHiddenCases(hiddenCases.map(id => toV3CaseId(id)))
     if (pointColor != null) pointDescription.setPointColor(pointColor)

diff --git a/v3/src/components/graph/models/graph-content-model.ts b/v3/src/components/graph/models/graph-content-model.ts
@@ -644,6 +644,18 @@ export const GraphContentModel = DataDisplayContentModel
     }
   }))
   .actions(self => ({
+    displayOnlySelectedCases() {
+      self.dataConfiguration.addNewHiddenCases(self.dataConfiguration.unselectedCases ?? [])
+      self.dataConfiguration.setDisplayOnlySelectedCases(true)
+      if (self.dataConfiguration.selection.length > 0) {
+        self.rescale()
+      }
+    },
+    showAllCases() {
+      self.dataConfiguration.clearHiddenCases()
+      self.dataConfiguration.setDisplayOnlySelectedCases(false)
+      self.rescale()
+    },
     setBarCountAxis() {
       const { maxOverAllCells, maxCellLength, primaryRole, secondaryRole } = self.dataConfiguration
       const { binWidth, minValue, totalNumberOfBins } = self.binDetails()
@@ -663,7 +675,7 @@ export const GraphContentModel = DataDisplayContentModel
       })
       setNiceDomain([0, maxCellCaseCount], countAxis, {clampPosMinAtZero: true})
       self.setAxis(secondaryPlace, countAxis)
-    },
+    }
   }))
   .actions(self => ({
     setPointsFusedIntoBars(fuseIntoBars: boolean) {