From e4ca6672c5d0e15de7b579cdbc6fe8ba033060d5 Mon Sep 17 00:00:00 2001
From: jorgenherje <jorgen.herje@ceetronsolutions.com>
Date: Tue, 26 Sep 2023 11:35:11 +0200
Subject: [PATCH] Minor fixes after review

---
 .../SimulationTimeSeriesMatrix/settings.tsx   | 28 +++++++++++--------
 .../utils/ensemblesVectorListHelper.ts        |  6 ++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/src/modules/SimulationTimeSeriesMatrix/settings.tsx b/frontend/src/modules/SimulationTimeSeriesMatrix/settings.tsx
index feaa5343e..7bd8d34b0 100644
--- a/frontend/src/modules/SimulationTimeSeriesMatrix/settings.tsx
+++ b/frontend/src/modules/SimulationTimeSeriesMatrix/settings.tsx
@@ -76,7 +76,6 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps<Stat
         setPreviousEnsembleSet(ensembleSet);
     }
 
-    // Queries
     const vectorListQueries = useVectorListQueries(selectedEnsembleIdents);
     const ensembleVectorListsHelper = new EnsembleVectorListsHelper(selectedEnsembleIdents, vectorListQueries);
     const selectedVectorNamesHasHistorical = ensembleVectorListsHelper.hasAnyHistoricalVector(selectedVectorNames);
@@ -101,8 +100,8 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps<Stat
     ]);
 
     // Await update of vectorSelectorData until all vector lists are retrieved
-    const hasVectorListQueriesErrorOrLoading = vectorListQueries.some((query) => query.isLoading || query.isError);
-    if (!hasVectorListQueriesErrorOrLoading && !isEqual(currentVectorSelectorData, vectorSelectorData)) {
+    const hasVectorListQueriesErrorOrFetching = vectorListQueries.some((query) => query.isFetching || query.isError);
+    if (!hasVectorListQueriesErrorOrFetching && !isEqual(currentVectorSelectorData, vectorSelectorData)) {
         setVectorSelectorData(currentVectorSelectorData);
     }
 
@@ -134,11 +133,17 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps<Stat
                 return;
             }
 
+            // Try/catch as ParameterIdent.fromString() can throw
             try {
                 const newParameterIdent = ParameterIdent.fromString(selectedParameterIdentStr);
-                continuousAndNonConstantParametersUnion.some((parameter) => parameter.equals(newParameterIdent))
-                    ? setParameterIdent(newParameterIdent)
-                    : setParameterIdent(null);
+                const isParameterInUnion = continuousAndNonConstantParametersUnion.some((parameter) =>
+                    parameter.equals(newParameterIdent)
+                );
+                if (isParameterInUnion) {
+                    setParameterIdent(newParameterIdent);
+                } else {
+                    setParameterIdent(null);
+                }
             } catch {
                 setParameterIdent(null);
             }
@@ -300,12 +305,11 @@ export function settings({ moduleContext, workbenchSession }: ModuleFCProps<Stat
                     }}
                 />
                 <div
-                    className={resolveClassNames(
-                        "mt-4 ml-6 mb-4",
-                        colorRealizationsByParameter && visualizationMode === VisualizationMode.INDIVIDUAL_REALIZATIONS
-                            ? ""
-                            : "pointer-events-none opacity-70"
-                    )}
+                    className={resolveClassNames("mt-4 ml-6 mb-4", {
+                        ["pointer-events-none opacity-70"]:
+                            !colorRealizationsByParameter ||
+                            visualizationMode !== VisualizationMode.INDIVIDUAL_REALIZATIONS,
+                    })}
                 >
                     <Dropdown
                         options={continuousAndNonConstantParametersUnion.map((elm) => {
diff --git a/frontend/src/modules/SimulationTimeSeriesMatrix/utils/ensemblesVectorListHelper.ts b/frontend/src/modules/SimulationTimeSeriesMatrix/utils/ensemblesVectorListHelper.ts
index c0bb2947d..c94644400 100644
--- a/frontend/src/modules/SimulationTimeSeriesMatrix/utils/ensemblesVectorListHelper.ts
+++ b/frontend/src/modules/SimulationTimeSeriesMatrix/utils/ensemblesVectorListHelper.ts
@@ -37,9 +37,9 @@ export class EnsembleVectorListsHelper {
 
             // Add vector if name is not already in vectorUnion
             for (const vector of query.data) {
-                if (!vectorUnion.some((v) => v === vector.name)) {
-                    vectorUnion.push(vector.name);
-                }
+                if (vectorUnion.includes(vector.name)) continue;
+
+                vectorUnion.push(vector.name);
             }
         }
         return vectorUnion;