complement option uses filtered ids now

Signed-off-by: stefanbabukov <[email protected]>

src/components/data-exploration/cell-sets-tool/CellSetsTool.jsx

@@ -156,7 +156,7 @@ const CellSetsTool = (props) => {
           <CellSetOperation
             icon={<SplitCellsOutlined />}
             onCreate={(name, color) => {
-              dispatch(createCellSet(experimentId, name, color, complement(selectedCellSetKeys, properties)));
+              dispatch(createCellSet(experimentId, name, color, complement(selectedCellSetKeys, cellSets)));
             }}
             ariaLabel='Complement of selected'
             helpTitle='Create new cell set from the complement of the selected sets in the current tab.'

src/utils/cellSetOperations.js

@@ -22,11 +22,7 @@ const union = (listOfSets, properties) => {
 
   const sets = listOfSets.map((key) => properties[key]?.cellIds || []);
   const unionSet = new Set(
-    [].concat(
-      ...sets.map(
-        (set) => [...set],
-      ),
-    ),
+    sets.flatMap(set => [...set]),
   );
 
   return unionSet;
@@ -54,29 +50,29 @@ const intersection = (listOfSets, properties) => {
   return intersectionSet;
 };
 
-const complement = (listOfSets, properties) => {
+const complement = (listOfSets, cellSets) => {
   if (!listOfSets) {
     return new Set();
   }
-
+  const { properties, hierarchy } = cellSets;
   // get the ids of all selected cells
   const selectedCells = listOfSets.map(
     (key) => properties[key]?.cellIds || null,
   ).filter(
     (set) => set && set.size > 0,
-  ).reduce(
-    (acc, curr) => new Set([...acc, ...curr]),
-  );
+  ).flatMap((set) => [...set]);
+
+  const filteredCellIds = hierarchy.filter((rootCluster) => rootCluster.key === 'louvain')[0]
+    .children
+    .map((child) => child.key);
 
   // get the ids of all cells in the dataset
   // All cells are assumed to be included in at least 1 cluster
-  const complementSet = Object.values(properties).map(
-    (cluster) => cluster.cellIds,
+  const complementSet = filteredCellIds.map(
+    (cluster) => properties[cluster].cellIds,
   ).filter(
     (set) => set && set.size > 0,
-  ).reduce(
-    (acc, curr) => new Set([...acc, ...curr]),
-  );
+  ).flatMap((set) => [...set]);
 
   // remove all cells that are selected
   if (selectedCells.size > 0) {