Changed order of arguments to applyToStateOnMount

rubenthoms · Oct 12, 2023 · ba0d6d2 · ba0d6d2
1 parent 905ca69
commit ba0d6d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/frontend/src/framework/InitialSettings.ts b/frontend/src/framework/InitialSettings.ts
@@ -61,10 +61,10 @@ export class InitialSettings {
 }
 
 export function applyToStateOnMount(
+    initialSettings: InitialSettings | undefined,
     settingName: string,
     type: keyof InitialSettingsSupportedTypes,
-    stateSetter: (value: any) => void,
-    initialSettings: InitialSettings | undefined
+    stateSetter: (value: any) => void
 ): void {
     React.useEffect(() => {
         if (initialSettings) {

diff --git a/frontend/src/modules/DistributionPlot/settings.tsx b/frontend/src/modules/DistributionPlot/settings.tsx
@@ -63,13 +63,13 @@ export function settings({ moduleContext, workbenchServices, initialSettings }:
     const [orientation, setOrientation] = moduleContext.useStoreState("orientation");
     const [crossPlottingType, setCrossPlottingType] = React.useState<BroadcastChannelKeyCategory | null>(null);
 
-    applyToStateOnMount("channelNameX", "string", setChannelNameX, initialSettings);
-    applyToStateOnMount("channelNameY", "string", setChannelNameY, initialSettings);
-    applyToStateOnMount("channelNameZ", "string", setChannelNameZ, initialSettings);
-    applyToStateOnMount("plotType", "string", setPlotType, initialSettings);
-    applyToStateOnMount("numBins", "number", setNumBins, initialSettings);
-    applyToStateOnMount("orientation", "string", setOrientation, initialSettings);
-    applyToStateOnMount("crossPlottingType", "string", setCrossPlottingType, initialSettings);
+    applyToStateOnMount(initialSettings, "channelNameX", "string", setChannelNameX);
+    applyToStateOnMount(initialSettings, "channelNameY", "string", setChannelNameY);
+    applyToStateOnMount(initialSettings, "channelNameZ", "string", setChannelNameZ);
+    applyToStateOnMount(initialSettings, "plotType", "string", setPlotType);
+    applyToStateOnMount(initialSettings, "numBins", "number", setNumBins);
+    applyToStateOnMount(initialSettings, "orientation", "string", setOrientation);
+    applyToStateOnMount(initialSettings, "crossPlottingType", "string", setCrossPlottingType);
 
     const handleChannelXChanged = (channelName: string) => {
         setChannelNameX(channelName);

diff --git a/frontend/src/modules/TornadoChart/settings.tsx b/frontend/src/modules/TornadoChart/settings.tsx
@@ -9,7 +9,7 @@ import { State } from "./state";
 export function settings({ moduleContext, workbenchServices, initialSettings }: ModuleFCProps<State>) {
     const [responseChannelName, setResponseChannelName] = moduleContext.useStoreState("responseChannelName");
 
-    applyToStateOnMount("responseChannelName", "string", setResponseChannelName, initialSettings);
+    applyToStateOnMount(initialSettings, "responseChannelName", "string", setResponseChannelName);
 
     function handleResponseChannelNameChange(channelName: string) {
         setResponseChannelName(channelName);