330 wrong values are transferred to data points

.changeset/honest-monkeys-doubt.md

@@ -0,0 +1,5 @@
+---
+'@boostv/process-optimizer-frontend-core': patch
+---
+
+Fix wrong variables being copied to data points

packages/core/src/context/experiment/experiment-reducers.ts

@@ -14,6 +14,7 @@ import { settings, versionInfo } from '@core/common'
 import { assertUnreachable } from '@core/common/util'
 import {
   selectActiveDataPoints,
+  selectActiveVariablesFromExperiment,
   selectNextValues,
 } from './experiment-selectors'
 import { createFetchExperimentResultRequest } from '@core/context/experiment/api'
@@ -185,14 +186,7 @@ export const experimentReducer = produce(
         break
       case 'copySuggestedToDataPoints': {
         const nextValues = selectNextValues(state)
-        const variables = state.valueVariables
-          .map(v => ({ name: v.name, type: 'numeric' }))
-          .concat(
-            state.categoricalVariables.map(c => ({
-              name: c.name,
-              type: 'categorical',
-            }))
-          )
+        const variables = selectActiveVariablesFromExperiment(state)
         const newEntries: DataEntry[] = nextValues
           .filter((_, i) => action.payload.includes(i))
           .map((n, k) => ({
@@ -214,7 +208,7 @@ export const experimentReducer = produce(
                       value: Number(v),
                       type: 'numeric',
                     }
-                  case 'categorical':
+                  case 'options':
                     return {
                       name: variable.name,
                       value: String(v),

packages/core/src/context/experiment/experiment-selectors.test.ts

@@ -1,5 +1,6 @@
 import { initialState, State } from '@core/context/experiment/store'
 import {
+  selectActiveVariablesFromExperiment,
   selectCalculatedSuggestionCount,
   selectId,
   selectIsConstraintActive,
@@ -175,4 +176,48 @@ describe('Experiment selectors', () => {
       }
     )
   })
+
+  describe('selectActiveVariablesFromExperiment', () => {
+    it('should filter out disabled variables', () => {
+      const experiment: ExperimentType = {
+        ...initialState.experiment,
+        valueVariables: [
+          {
+            name: 'Water',
+            description: '',
+            type: 'continuous',
+            min: 0,
+            max: 100,
+            enabled: true,
+          },
+          {
+            name: 'Cheese',
+            description: '',
+            type: 'discrete',
+            min: 0,
+            max: 100,
+            enabled: false,
+          },
+        ],
+        categoricalVariables: [
+          {
+            name: 'Icing',
+            description: '',
+            options: ['Vanilla', 'Chocolate'],
+            enabled: true,
+          },
+          {
+            name: 'Colour',
+            description: '',
+            options: ['Blue', 'Red'],
+            enabled: false,
+          },
+        ],
+      }
+      const activeVariables = selectActiveVariablesFromExperiment(experiment)
+      expect(activeVariables.length).toBe(2)
+      expect(activeVariables[0]?.name).toBe('Water')
+      expect(activeVariables[1]?.name).toBe('Icing')
+    })
+  })
 })

packages/core/src/context/experiment/experiment-selectors.ts

@@ -1,4 +1,4 @@
-import { ExperimentType } from 'common'
+import { CombinedVariableType, ExperimentType } from 'common'
 import { State } from './store'
 
 export const selectExperiment = (state: State) => state.experiment
@@ -55,6 +55,27 @@ export const selectActiveVariableNames = (state: State): string[] => {
     )
 }
 
+export const selectActiveVariablesFromExperiment = (
+  experiment: ExperimentType
+) => {
+  const valueVars: CombinedVariableType[] = experiment.valueVariables
+    .filter(v => v.enabled)
+    .map(v => ({
+      name: v.name,
+      description: v.description,
+      type: 'numeric',
+    }))
+  const catVars: CombinedVariableType[] = experiment.categoricalVariables
+    .filter(v => v.enabled)
+    .map(v => ({
+      name: v.name,
+      description: v.description,
+      type: 'options',
+      options: v.options,
+    }))
+  return valueVars.concat(catVars)
+}
+
 export const selectSumConstraint = (state: State) =>
   selectSumConstraintFromExperiment(selectExperiment(state))
 

packages/core/src/context/experiment/reducers.test.ts

@@ -844,6 +844,51 @@ describe('experiment reducer', () => {
         { type: 'categorical', name: 'Icing', value: 'Chocolate' },
       ])
     })
+
+    it('should only copy enabled variables to data points', () => {
+      const action: ExperimentAction = {
+        type: 'copySuggestedToDataPoints',
+        payload: [0],
+      }
+      const state: State = {
+        ...initState,
+        experiment: {
+          ...initState.experiment,
+          valueVariables: [
+            {
+              type: 'continuous',
+              name: 'Water',
+              description: 'Wet',
+              min: 100,
+              max: 200,
+              enabled: false,
+            },
+          ],
+          categoricalVariables: [
+            {
+              name: 'Icing',
+              description: '',
+              options: ['Vanilla', 'Chocolate'],
+              enabled: true,
+            },
+          ],
+          dataPoints: [],
+          results: {
+            ...initState.experiment.results,
+            next: [['Vanilla'], ['Chocolate']],
+          },
+        },
+      }
+      const newDataPoints = rootReducer(state, action).experiment.dataPoints
+      expect(newDataPoints.length).toBe(1)
+      expect(newDataPoints[0]?.data).toEqual([
+        {
+          type: 'categorical',
+          name: 'Icing',
+          value: 'Vanilla',
+        },
+      ])
+    })
   })
 
   it('should add scores to new data point for multi-objective - two scores enabled', () => {