Replaced ensembleSet with ensembles prop in ensemble selectors

rubenthoms · Dec 6, 2024 · ed5e35c · ed5e35c
1 parent 876065e
commit ed5e35c
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 104 deletions.
diff --git a/frontend/src/framework/components/EnsembleDropdown/ensembleDropdown.tsx b/frontend/src/framework/components/EnsembleDropdown/ensembleDropdown.tsx
@@ -1,29 +1,31 @@
+import React from "react";
+
 import { Ensemble } from "@framework/Ensemble";
 import { EnsembleIdent } from "@framework/EnsembleIdent";
-import { EnsembleSet } from "@framework/EnsembleSet";
 import { ColorTile } from "@lib/components/ColorTile";
 import { Dropdown, DropdownOption, DropdownProps } from "@lib/components/Dropdown";
 
 type EnsembleDropdownProps = {
-    ensembleSet?: EnsembleSet;
-    ensembles?: Ensemble[];
+    ensembles: readonly Ensemble[];
     value: EnsembleIdent | null;
     onChange: (ensembleIdent: EnsembleIdent | null) => void;
 } & Omit<DropdownProps<string>, "options" | "value" | "onChange">;
 
 export function EnsembleDropdown(props: EnsembleDropdownProps): JSX.Element {
-    const { ensembleSet, value, onChange, ...rest } = props;
-    const ensembleArr = props.ensembles ?? ensembleSet?.getEnsembleArr() ?? [];
+    const { onChange, value, ...rest } = props;
 
-    function handleSelectionChanged(selectedEnsembleIdentStr: string) {
-        const foundEnsemble = ensembleArr.find(
-            (ensemble) => ensemble.getIdent().toString() === selectedEnsembleIdentStr
-        );
-        onChange(foundEnsemble ? foundEnsemble.getIdent() : null);
-    }
+    const handleSelectionChange = React.useCallback(
+        function handleSelectionChange(selectedEnsembleIdentStr: string) {
+            const foundEnsemble = props.ensembles.find(
+                (ensemble) => ensemble.getIdent().toString() === selectedEnsembleIdentStr
+            );
+            onChange(foundEnsemble ? foundEnsemble.getIdent() : null);
+        },
+        [props.ensembles, onChange]
+    );
 
     const optionsArr: DropdownOption[] = [];
-    for (const ens of ensembleArr) {
+    for (const ens of props.ensembles) {
         optionsArr.push({
             value: ens.getIdent().toString(),
             label: ens.getDisplayName(),
@@ -35,5 +37,5 @@ export function EnsembleDropdown(props: EnsembleDropdownProps): JSX.Element {
         });
     }
 
-    return <Dropdown options={optionsArr} value={value?.toString()} onChange={handleSelectionChanged} {...rest} />;
+    return <Dropdown options={optionsArr} value={value?.toString()} onChange={handleSelectionChange} {...rest} />;
 }
diff --git a/frontend/src/framework/components/EnsembleSelect/ensembleSelect.tsx b/frontend/src/framework/components/EnsembleSelect/ensembleSelect.tsx
@@ -1,31 +1,36 @@
+import React from "react";
+
+import { Ensemble } from "@framework/Ensemble";
 import { EnsembleIdent } from "@framework/EnsembleIdent";
-import { EnsembleSet } from "@framework/EnsembleSet";
 import { ColorTile } from "@lib/components/ColorTile";
 import { Select, SelectOption, SelectProps } from "@lib/components/Select";
 
 type EnsembleSelectProps = {
-    ensembleSet: EnsembleSet;
+    ensembles: readonly Ensemble[];
     value: EnsembleIdent[];
     onChange: (ensembleIdentArr: EnsembleIdent[]) => void;
 } & Omit<SelectProps<string>, "options" | "value" | "onChange">;
 
-export function EnsembleSelect(props: EnsembleSelectProps): JSX.Element {
-    const { ensembleSet, value, onChange, multiple, ...rest } = props;
-
-    function handleSelectionChanged(selectedEnsembleIdentStrArr: string[]) {
-        const identArr: EnsembleIdent[] = [];
-        for (const identStr of selectedEnsembleIdentStrArr) {
-            const foundEnsemble = ensembleSet.findEnsembleByIdentString(identStr);
-            if (foundEnsemble) {
-                identArr.push(foundEnsemble.getIdent());
+export function EnsembleSelect(props: EnsembleSelectProps): React.ReactNode {
+    const { ensembles, value, onChange, multiple, ...rest } = props;
+
+    const handleSelectionChange = React.useCallback(
+        function handleSelectionChanged(selectedEnsembleIdentStrArr: string[]) {
+            const identArr: EnsembleIdent[] = [];
+            for (const identStr of selectedEnsembleIdentStrArr) {
+                const foundEnsemble = ensembles.find((ens) => ens.getIdent().toString() === identStr);
+                if (foundEnsemble) {
+                    identArr.push(foundEnsemble.getIdent());
+                }
             }
-        }
 
-        onChange(identArr);
-    }
+            onChange(identArr);
+        },
+        [ensembles, onChange]
+    );
 
     const optionsArr: SelectOption[] = [];
-    for (const ens of ensembleSet.getEnsembleArr()) {
+    for (const ens of ensembles) {
         optionsArr.push({
             value: ens.getIdent().toString(),
             label: ens.getDisplayName(),
@@ -48,7 +53,7 @@ export function EnsembleSelect(props: EnsembleSelectProps): JSX.Element {
         <Select
             options={optionsArr}
             value={selectedArr}
-            onChange={handleSelectionChanged}
+            onChange={handleSelectionChange}
             multiple={isMultiple}
             {...rest}
         />

diff --git a/frontend/src/modules/3DViewer/settings/settings.tsx b/frontend/src/modules/3DViewer/settings/settings.tsx
@@ -256,7 +256,7 @@ export function Settings(props: ModuleSettingsProps<Interfaces>): JSX.Element {
                 <div className="flex flex-col gap-2">
                     <Label text="Ensemble">
                         <EnsembleDropdown
-                            ensembleSet={ensembleSet}
+                            ensembles={ensembleSet.getEnsembleArr()}
                             value={selectedEnsembleIdent}
                             onChange={handleEnsembleSelectionChange}
                             showArrows

diff --git a/frontend/src/modules/FlowNetwork/settings/settings.tsx b/frontend/src/modules/FlowNetwork/settings/settings.tsx
@@ -142,7 +142,7 @@ export function Settings({ workbenchSession, settingsContext }: ModuleSettingsPr
         <div className="flex flex-col gap-2 overflow-y-auto">
             <CollapsibleGroup expanded={true} title="Ensemble">
                 <EnsembleDropdown
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     value={selectedEnsembleIdent}
                     onChange={handleEnsembleSelectionChange}
                 />

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/gridLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/gridLayer.tsx
@@ -166,7 +166,7 @@ export function GridLayerSettingsComponent(props: GridLayerSettingsComponentProp
                 <div className="table-cell">
                     <EnsembleDropdown
                         value={props.layer.getSettings().ensembleIdent}
-                        ensembleSet={props.ensembleSet}
+                        ensembles={props.ensembleSet.getEnsembleArr()}
                         onChange={handleEnsembleChange}
                         debounceTimeMs={600}
                     />

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/seismicLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/seismicLayer.tsx
@@ -198,7 +198,7 @@ export function SeismicLayerSettingsComponent(props: SeismicLayerSettingsProps):
                 <div className="table-cell">
                     <EnsembleDropdown
                         value={props.layer.getSettings().ensembleIdent}
-                        ensembleSet={props.ensembleSet}
+                        ensembles={props.ensembleSet.getEnsembleArr()}
                         onChange={handleEnsembleChange}
                         debounceTimeMs={600}
                     />

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/surfaceLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/surfaceLayer.tsx
@@ -155,7 +155,7 @@ export function SurfaceLayerSettingsComponent(props: SurfaceLayerSettingsCompone
                 <div className="table-cell">
                     <EnsembleDropdown
                         value={props.layer.getSettings().ensembleIdent}
-                        ensembleSet={props.ensembleSet}
+                        ensembles={props.ensembleSet.getEnsembleArr()}
                         onChange={handleEnsembleChange}
                         debounceTimeMs={600}
                     />

diff --git a/...d/src/modules/Intersection/settings/components/layerSettings/surfacesUncertaintyLayer.tsx b/...d/src/modules/Intersection/settings/components/layerSettings/surfacesUncertaintyLayer.tsx
@@ -156,7 +156,7 @@ export function SurfacesUncertaintyLayerSettingsComponent(
                 <div className="table-cell">
                     <EnsembleDropdown
                         value={props.layer.getSettings().ensembleIdent}
-                        ensembleSet={props.ensembleSet}
+                        ensembles={props.ensembleSet.getEnsembleArr()}
                         onChange={handleEnsembleChange}
                         debounceTimeMs={600}
                     />

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/wellpicksLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/wellpicksLayer.tsx
@@ -87,7 +87,7 @@ export function WellpicksLayerSettingsComponent(props: WellpicksLayerSettingsCom
                 <div className="table-cell">
                     <EnsembleDropdown
                         value={props.layer.getSettings().ensembleIdent}
-                        ensembleSet={props.ensembleSet}
+                        ensembles={props.ensembleSet.getEnsembleArr()}
                         onChange={handleEnsembleChange}
                         debounceTimeMs={600}
                     />

diff --git a/frontend/src/modules/Map/settings/settings.tsx b/frontend/src/modules/Map/settings/settings.tsx
@@ -227,7 +227,7 @@ export function MapSettings(props: ModuleSettingsProps<Interfaces>) {
                 labelClassName={syncHelper.isSynced(SyncSettingKey.ENSEMBLE) ? "bg-indigo-700 text-white" : ""}
             >
                 <EnsembleDropdown
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     value={computedEnsembleIdent}
                     onChange={handleEnsembleSelectionChange}
                 />

diff --git a/frontend/src/modules/ParameterDistributionMatrix/settings/settings.tsx b/frontend/src/modules/ParameterDistributionMatrix/settings/settings.tsx
@@ -98,7 +98,7 @@ export function Settings({ workbenchSession }: ModuleSettingsProps<Interfaces>)
             </CollapsibleGroup>
             <CollapsibleGroup title="Ensembles" expanded>
                 <EnsembleSelect
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     onChange={handleEnsembleSelectionChange}
                     value={selectedEnsembleIdents}
                     size={5}

diff --git a/frontend/src/modules/Pvt/settings/settings.tsx b/frontend/src/modules/Pvt/settings/settings.tsx
@@ -126,7 +126,7 @@ export function Settings({ workbenchSession }: ModuleSettingsProps<Interfaces>)
             </CollapsibleGroup>
             <CollapsibleGroup title="Ensembles" expanded>
                 <EnsembleSelect
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     onChange={handleEnsembleSelectionChange}
                     value={selectedEnsembleIdents}
                     size={5}

diff --git a/frontend/src/modules/Rft/settings.tsx b/frontend/src/modules/Rft/settings.tsx
@@ -1,5 +1,3 @@
-import React from "react";
-
 import { EnsembleIdent } from "@framework/EnsembleIdent";
 import { ModuleSettingsProps } from "@framework/Module";
 import { useSettingsStatusWriter } from "@framework/StatusWriter";
@@ -88,7 +86,7 @@ export function Settings({ settingsContext, workbenchSession }: ModuleSettingsPr
         <div>
             <CollapsibleGroup expanded={true} title="Ensembles">
                 <EnsembleDropdown
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     value={selectedEnsembleIdent}
                     onChange={handleEnsembleSelectionChange}
                 />

diff --git a/frontend/src/modules/SimulationTimeSeries/settings/settings.tsx b/frontend/src/modules/SimulationTimeSeries/settings/settings.tsx
@@ -249,7 +249,7 @@ export function Settings({ settingsContext, workbenchSession }: ModuleSettingsPr
             </CollapsibleGroup>
             <CollapsibleGroup expanded={true} title="Ensembles">
                 <EnsembleSelect
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     value={selectedEnsembleIdents}
                     size={5}
                     onChange={handleEnsembleSelectChange}

diff --git a/frontend/src/modules/SimulationTimeSeriesSensitivity/settings/settings.tsx b/frontend/src/modules/SimulationTimeSeriesSensitivity/settings/settings.tsx
@@ -158,7 +158,7 @@ export function Settings({ settingsContext, workbenchSession, workbenchServices
         <>
             <CollapsibleGroup expanded={true} title="Ensemble">
                 <EnsembleDropdown
-                    ensembleSet={ensembleSet}
+                    ensembles={ensembleSet.getEnsembleArr()}
                     value={computedEnsembleIdent}
                     onChange={handleEnsembleSelectionChange}
                 />

diff --git a/frontend/src/modules/SubsurfaceMap/settings/settings.tsx b/frontend/src/modules/SubsurfaceMap/settings/settings.tsx
@@ -492,7 +492,7 @@ export function Settings({ settingsContext, workbenchSession, workbenchServices
             <CollapsibleGroup expanded={true} title="Ensemble and realization">
                 <Label text="Ensemble" synced={syncHelper.isSynced(SyncSettingKey.ENSEMBLE)}>
                     <EnsembleDropdown
-                        ensembleSet={ensembleSet}
+                        ensembles={ensembleSet.getEnsembleArr()}
                         value={computedEnsembleIdent ? computedEnsembleIdent : null}
                         onChange={handleEnsembleSelectionChange}
                     />