Fix issue with intersection logic

jorgenherje · jorgenherje · commit 35a4bc8d0497 · 2025-02-11T10:10:41.000+01:00
- Have no debounce time for allow identifier value intersection checkbox
- Make allow intersection flag to be a part of filter object s.t. filter data is kept within one atom. To prevent out of sync update of values. (resulted in triggering query when flag was separate atom)
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/interfaces.ts b/frontend/src/modules/InplaceVolumetricsPlot/interfaces.ts
@@ -26,7 +26,6 @@ export type SettingsToViewInterface = {
     subplotBy: SourceAndTableIdentifierUnion;
     colorBy: SourceAndTableIdentifierUnion;
     plotType: PlotType;
-    areSelectedTablesComparable: boolean;
     areTableDefinitionSelectionsValid: boolean;
 };
 
@@ -41,6 +40,7 @@ export const settingsToViewInterfaceInitialization: InterfaceInitialization<Sett
             tableNames: get(selectedTableNamesAtom),
             fluidZones: get(selectedFluidZonesAtom),
             identifiersValues: get(selectedIdentifiersValuesAtom),
+            areSelectedTablesComparable: get(areSelectedTablesComparableAtom),
         };
     },
     resultName: (get) => get(selectedResultNameAtom),
@@ -49,6 +49,5 @@ export const settingsToViewInterfaceInitialization: InterfaceInitialization<Sett
     subplotBy: (get) => get(selectedSubplotByAtom),
     colorBy: (get) => get(selectedColorByAtom),
     plotType: (get) => get(userSelectedPlotTypeAtom),
-    areSelectedTablesComparable: (get) => get(areSelectedTablesComparableAtom),
     areTableDefinitionSelectionsValid: (get) => get(areTableDefinitionSelectionsValidAtom),
 };
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/settings/atoms/derivedAtoms.ts b/frontend/src/modules/InplaceVolumetricsPlot/settings/atoms/derivedAtoms.ts
@@ -5,14 +5,14 @@ import { FixupSelection, fixupUserSelection } from "@lib/utils/fixupUserSelectio
 import { fixupUserSelectedIdentifierValues } from "@modules/_shared/InplaceVolumetrics/fixupUserSelectedIdentifierValues";
 import { RealSelector, SelectorColumn, SourceAndTableIdentifierUnion } from "@modules/_shared/InplaceVolumetrics/types";
 import {
-    IdentifierValueCriteria,
     TableDefinitionsAccessor,
     makeUniqueTableNamesIntersection,
 } from "@modules_shared/InplaceVolumetrics/TableDefinitionsAccessor";
 
 import { atom } from "jotai";
 
 import {
+    selectedIdentifierValueCriteriaAtom,
     userSelectedColorByAtom,
     userSelectedEnsembleIdentsAtom,
     userSelectedFluidZonesAtom,
@@ -50,11 +50,12 @@ export const selectedEnsembleIdentsAtom = atom((get) => {
 export const tableDefinitionsAccessorAtom = atom<TableDefinitionsAccessor>((get) => {
     const selectedTableNames = get(selectedTableNamesAtom);
     const tableDefinitions = get(tableDefinitionsQueryAtom);
+    const selectedIdentifierValueCriteria = get(selectedIdentifierValueCriteriaAtom);
 
     return new TableDefinitionsAccessor(
         tableDefinitions.isLoading ? [] : tableDefinitions.data,
         selectedTableNames,
-        IdentifierValueCriteria.REQUIRE_EQUALITY
+        selectedIdentifierValueCriteria
     );
 });
 
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/settings/settings.tsx b/frontend/src/modules/InplaceVolumetricsPlot/settings/settings.tsx
@@ -178,7 +178,7 @@ export function Settings(props: ModuleSettingsProps<Interfaces>): React.ReactNod
             selectedFluidZones={selectedFluidZones}
             selectedIdentifiersValues={selectedIdentifiersValues}
             selectedTableNames={selectedTableNames}
-            selectedAllowIdentifierValueIntersection={
+            selectedAllowIdentifierValuesIntersection={
                 selectedIdentifierValueCriteria === IdentifierValueCriteria.ALLOW_INTERSECTION
             }
             onChange={handleFilterChange}
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/typesAndEnums.ts b/frontend/src/modules/InplaceVolumetricsPlot/typesAndEnums.ts
@@ -21,4 +21,6 @@ export const plotTypeToStringMapping: Record<PlotType, string> = {
 export type InplaceVolumetricsFilterSelections = Omit<
     InplaceVolumetricsFilterSettings,
     "allowIdentifierValuesIntersection"
->;
+> & {
+    areSelectedTablesComparable: boolean;
+};
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/baseAtoms.ts b/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/baseAtoms.ts
@@ -13,12 +13,12 @@ export const filterAtom = atom<InplaceVolumetricsFilterSelections>({
     tableNames: [],
     fluidZones: [],
     identifiersValues: [],
+    areSelectedTablesComparable: false,
 });
 export const resultNameAtom = atom<InplaceVolumetricResultName_api | null>(null);
 export const resultName2Atom = atom<InplaceVolumetricResultName_api | null>(null);
 export const selectorColumnAtom = atom<SelectorColumn | null>(null);
 export const subplotByAtom = atom<SourceAndTableIdentifierUnion>(SourceIdentifier.ENSEMBLE);
 export const plotTypeAtom = atom<PlotType>(PlotType.HISTOGRAM);
 export const colorByAtom = atom<SourceAndTableIdentifierUnion>(SourceIdentifier.TABLE_NAME);
-export const areSelectedTablesComparableAtom = atom(false);
 export const areTableDefinitionSelectionsValidAtom = atom(false);
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/derivedAtoms.ts b/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/derivedAtoms.ts
@@ -22,6 +22,11 @@ export const identifiersValuesAtom = atom((get) => {
     return filter?.identifiersValues ?? [];
 });
 
+export const areSelectedTablesComparableAtom = atom((get) => {
+    const filter = get(filterAtom);
+    return filter?.areSelectedTablesComparable ?? false;
+});
+
 export const doAccumulateFluidZonesAtom = atom((get) => {
     const subplotBy = get(subplotByAtom);
     const colorBy = get(colorByAtom);
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/interfaceEffects.ts b/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/interfaceEffects.ts
@@ -2,7 +2,6 @@ import { InterfaceEffects } from "@framework/Module";
 import { SettingsToViewInterface } from "@modules/InplaceVolumetricsPlot/interfaces";
 
 import {
-    areSelectedTablesComparableAtom,
     areTableDefinitionSelectionsValidAtom,
     colorByAtom,
     filterAtom,
@@ -42,10 +41,6 @@ export const settingsToViewInterfaceEffects: InterfaceEffects<SettingsToViewInte
         const colorBy = getInterfaceValue("colorBy");
         setAtomValue(colorByAtom, colorBy);
     },
-    (getInterfaceValue, setAtomValue) => {
-        const areSelectedTablesComparable = getInterfaceValue("areSelectedTablesComparable");
-        setAtomValue(areSelectedTablesComparableAtom, areSelectedTablesComparable);
-    },
     (getInterfaceValue, setAtomValue) => {
         const areTableDefinitionSelectionsValid = getInterfaceValue("areTableDefinitionSelectionsValid");
         setAtomValue(areTableDefinitionSelectionsValidAtom, areTableDefinitionSelectionsValid);
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/queryAtoms.ts b/frontend/src/modules/InplaceVolumetricsPlot/view/atoms/queryAtoms.ts
@@ -2,13 +2,9 @@ import { InplaceVolumetricResultName_api } from "@api";
 import { atomWithQueries } from "@framework/utils/atomUtils";
 import { useGetAggregatedPerRealizationTableDataQueries } from "@modules/_shared/InplaceVolumetrics/queryHooks";
 
+import { areTableDefinitionSelectionsValidAtom, resultName2Atom, resultNameAtom } from "./baseAtoms";
 import {
     areSelectedTablesComparableAtom,
-    areTableDefinitionSelectionsValidAtom,
-    resultName2Atom,
-    resultNameAtom,
-} from "./baseAtoms";
-import {
     doAccumulateFluidZonesAtom,
     ensembleIdentsWithRealizationsAtom,
     fluidZonesAtom,
diff --git a/frontend/src/modules/InplaceVolumetricsPlot/view/view.tsx b/frontend/src/modules/InplaceVolumetricsPlot/view/view.tsx
@@ -9,7 +9,8 @@ import { useElementBoundingRect } from "@lib/hooks/useElementBoundingRect";
 
 import { useAtomValue } from "jotai";
 
-import { areSelectedTablesComparableAtom, resultNameAtom } from "./atoms/baseAtoms";
+import { resultNameAtom } from "./atoms/baseAtoms";
+import { areSelectedTablesComparableAtom } from "./atoms/derivedAtoms";
 import { aggregatedTableDataQueriesAtom } from "./atoms/queryAtoms";
 import { useMakeViewStatusWriterMessages } from "./hooks/useMakeViewStatusWriterMessages";
 import { useBuildPlotAndTable } from "./hooks/usePlotBuilder";
diff --git a/frontend/src/modules/InplaceVolumetricsTable/interfaces.ts b/frontend/src/modules/InplaceVolumetricsTable/interfaces.ts
@@ -17,7 +17,6 @@ import { InplaceVolumetricsFilterSelections } from "./types";
 
 export type SettingsToViewInterface = {
     filter: InplaceVolumetricsFilterSelections;
-    areSelectedTablesComparable: boolean;
     resultNames: InplaceVolumetricResultName_api[];
     accumulationOptions: Omit<SourceAndTableIdentifierUnion, SourceIdentifier.ENSEMBLE | SourceIdentifier.TABLE_NAME>[];
     tableType: TableType;
@@ -36,9 +35,9 @@ export const settingsToViewInterfaceInitialization: InterfaceInitialization<Sett
             tableNames: get(selectedTableNamesAtom),
             fluidZones: get(selectedFluidZonesAtom),
             identifiersValues: get(selectedIdentifiersValuesAtom),
+            areSelectedTablesComparable: get(areSelectedTablesComparableAtom),
         };
     },
-    areSelectedTablesComparable: (get) => get(areSelectedTablesComparableAtom),
     resultNames: (get) => get(selectedResultNamesAtom),
     accumulationOptions: (get) => get(selectedAccumulationOptionsAtom),
     tableType: (get) => get(selectedTableTypeAtom),
diff --git a/frontend/src/modules/InplaceVolumetricsTable/settings/settings.tsx b/frontend/src/modules/InplaceVolumetricsTable/settings/settings.tsx
@@ -177,7 +177,7 @@ export function Settings(props: ModuleSettingsProps<Interfaces>): React.ReactNod
             selectedFluidZones={selectedFluidZones}
             selectedIdentifiersValues={selectedIdentifiersValues}
             selectedTableNames={selectedTableNames}
-            selectedAllowIdentifierValueIntersection={
+            selectedAllowIdentifierValuesIntersection={
                 selectedIdentifierValueCriteria === IdentifierValueCriteria.ALLOW_INTERSECTION
             }
             onChange={handleFilterChange}
diff --git a/frontend/src/modules/InplaceVolumetricsTable/types.ts b/frontend/src/modules/InplaceVolumetricsTable/types.ts
@@ -3,4 +3,6 @@ import { InplaceVolumetricsFilterSettings } from "@framework/types/inplaceVolume
 export type InplaceVolumetricsFilterSelections = Omit<
     InplaceVolumetricsFilterSettings,
     "allowIdentifierValuesIntersection"
->;
+> & {
+    areSelectedTablesComparable: boolean;
+};
diff --git a/frontend/src/modules/InplaceVolumetricsTable/view/atoms/baseAtoms.ts b/frontend/src/modules/InplaceVolumetricsTable/view/atoms/baseAtoms.ts
@@ -9,8 +9,8 @@ export const filterAtom = atom<InplaceVolumetricsFilterSelections>({
     tableNames: [],
     fluidZones: [],
     identifiersValues: [],
+    areSelectedTablesComparable: false,
 });
-export const areSelectedTablesComparableAtom = atom<boolean>(false);
 export const resultNamesAtom = atom<InplaceVolumetricResultName_api[]>([]);
 export const accumulationOptionsAtom = atom<
     Omit<SourceAndTableIdentifierUnion, SourceIdentifier.ENSEMBLE | SourceIdentifier.TABLE_NAME>[]
diff --git a/frontend/src/modules/InplaceVolumetricsTable/view/atoms/derivedAtoms.ts b/frontend/src/modules/InplaceVolumetricsTable/view/atoms/derivedAtoms.ts
@@ -23,6 +23,11 @@ export const identifiersValuesAtom = atom((get) => {
     return filter?.identifiersValues ?? [];
 });
 
+export const areSelectedTablesComparableAtom = atom((get) => {
+    const filter = get(filterAtom);
+    return filter?.areSelectedTablesComparable ?? false;
+});
+
 export const ensembleIdentsWithRealizationsAtom = atom((get) => {
     const filter = get(filterAtom);
     const ensemblIdents = filter?.ensembleIdents ?? [];
@@ -68,7 +73,7 @@ export const isQueryFetchingAtom = atom((get) => {
     return activeQueriesResult.isFetching;
 });
 
-export const hasAllQueriesFailedAtom = atom((get) => {
+export const haveAllQueriesFailedAtom = atom((get) => {
     const tableType = get(tableTypeAtom);
     const perRealizationTableDataResults = get(perRealizationTableDataResultsAtom);
     const statisticalTableDataResults = get(statisticalTableDataResultsAtom);
diff --git a/frontend/src/modules/InplaceVolumetricsTable/view/atoms/interfaceEffects.ts b/frontend/src/modules/InplaceVolumetricsTable/view/atoms/interfaceEffects.ts
@@ -3,7 +3,6 @@ import { SettingsToViewInterface } from "@modules/InplaceVolumetricsTable/interf
 
 import {
     accumulationOptionsAtom,
-    areSelectedTablesComparableAtom,
     areTableDefinitionSelectionsValidAtom,
     filterAtom,
     resultNamesAtom,
@@ -16,10 +15,6 @@ export const settingsToViewInterfaceEffects: InterfaceEffects<SettingsToViewInte
         const filter = getInterfaceValue("filter");
         setAtomValue(filterAtom, filter);
     },
-    (getInterfaceValue, setAtomValue) => {
-        const areSelectedTablesComparable = getInterfaceValue("areSelectedTablesComparable");
-        setAtomValue(areSelectedTablesComparableAtom, areSelectedTablesComparable);
-    },
     (getInterfaceValue, setAtomValue) => {
         const resultNames = getInterfaceValue("resultNames");
         setAtomValue(resultNamesAtom, resultNames);
diff --git a/frontend/src/modules/InplaceVolumetricsTable/view/atoms/queryAtoms.ts b/frontend/src/modules/InplaceVolumetricsTable/view/atoms/queryAtoms.ts
@@ -5,14 +5,10 @@ import {
 } from "@modules/_shared/InplaceVolumetrics/queryHooks";
 import { TableType } from "@modules/_shared/InplaceVolumetrics/types";
 
-import {
-    areSelectedTablesComparableAtom,
-    areTableDefinitionSelectionsValidAtom,
-    resultNamesAtom,
-    tableTypeAtom,
-} from "./baseAtoms";
+import { areTableDefinitionSelectionsValidAtom, resultNamesAtom, tableTypeAtom } from "./baseAtoms";
 import {
     accumulateFluidZonesAtom,
+    areSelectedTablesComparableAtom,
     ensembleIdentsWithRealizationsAtom,
     fluidZonesAtom,
     groupByIdentifiersAtom,
diff --git a/frontend/src/modules/InplaceVolumetricsTable/view/view.tsx b/frontend/src/modules/InplaceVolumetricsTable/view/view.tsx
@@ -11,8 +11,7 @@ import { useElementBoundingRect } from "@lib/hooks/useElementBoundingRect";
 
 import { useAtomValue } from "jotai";
 
-import { areSelectedTablesComparableAtom } from "./atoms/baseAtoms";
-import { hasAllQueriesFailedAtom as haveAllQueriesFailedAtom, isQueryFetchingAtom } from "./atoms/derivedAtoms";
+import { areSelectedTablesComparableAtom, haveAllQueriesFailedAtom, isQueryFetchingAtom } from "./atoms/derivedAtoms";
 import { useMakeViewStatusWriterMessages } from "./hooks/useMakeViewStatusWriterMessages";
 import { useTableBuilder } from "./hooks/useTableBuilder";
 
diff --git a/frontend/src/modules/_shared/InplaceVolumetrics/TableDefinitionsAccessor.ts b/frontend/src/modules/_shared/InplaceVolumetrics/TableDefinitionsAccessor.ts
@@ -141,12 +141,14 @@ export class TableDefinitionsAccessor {
 
                 // Tables are not comparable when identifier values are not equal
                 if (this._identifierValueCriteria === IdentifierValueCriteria.ALLOW_INTERSECTION) {
-                    const values = Array.from(
-                        new Set(identifierWithValues.values.concat(currentIdentifierWithValues.values))
+                    const valuesIntersection = identifierWithValues.values.filter((value) =>
+                        currentIdentifierWithValues.values.includes(value)
                     );
+
+                    // Set or update existing identifier with intersected values
                     commonIdentifiersWithValuesMap.set(identifier, {
                         identifier,
-                        values,
+                        values: valuesIntersection,
                     });
                 } else if (!isEqual(identifierWithValues.values.sort(), currentIdentifierWithValues.values.sort())) {
                     this._tablesNotComparable = true;
@@ -164,6 +166,7 @@ export class TableDefinitionsAccessor {
         this._resultNamesIntersection = sortResultNames(Array.from(resultNames));
         this._commonIdentifiersWithValues = Array.from(commonIdentifiersWithValuesMap.values());
 
+        // Not comparable if there are no common identifiers
         if (this._commonIdentifiersWithValues.length === 0) {
             this._tablesNotComparable = true;
         }
diff --git a/frontend/src/modules/_shared/components/InplaceVolumetricsFilterComponent/inplaceVolumetricsFilterComponent.tsx b/frontend/src/modules/_shared/components/InplaceVolumetricsFilterComponent/inplaceVolumetricsFilterComponent.tsx

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ export function Settings(props: ModuleSettingsProps<Interfaces>): React.ReactNod`
`178`	`178`	`selectedFluidZones={selectedFluidZones}`
`179`	`179`	`selectedIdentifiersValues={selectedIdentifiersValues}`
`180`	`180`	`selectedTableNames={selectedTableNames}`
`181`		`- selectedAllowIdentifierValueIntersection={`
	`181`	`+ selectedAllowIdentifierValuesIntersection={`
`182`	`182`	`selectedIdentifierValueCriteria === IdentifierValueCriteria.ALLOW_INTERSECTION`
`183`	`183`	`}`
`184`	`184`	`onChange={handleFilterChange}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ export function Settings(props: ModuleSettingsProps<Interfaces>): React.ReactNod`
`177`	`177`	`selectedFluidZones={selectedFluidZones}`
`178`	`178`	`selectedIdentifiersValues={selectedIdentifiersValues}`
`179`	`179`	`selectedTableNames={selectedTableNames}`
`180`		`- selectedAllowIdentifierValueIntersection={`
	`180`	`+ selectedAllowIdentifierValuesIntersection={`
`181`	`181`	`selectedIdentifierValueCriteria === IdentifierValueCriteria.ALLOW_INTERSECTION`
`182`	`182`	`}`
`183`	`183`	`onChange={handleFilterChange}`