Merge pull request #1313 from revisit-studies/jay/regexBug

Fix dynamic block answer deletion regex

Author: JackWilb

src/routes/tests/utils.spec.tsx

@@ -188,6 +188,18 @@ describe('useCurrentComponent', () => {
     const { result } = renderHook(() => useCurrentComponent());
     expect(result.current).toBe('CompA');
   });
+
+  test('answer lookup matches the exact funcIndex, not a partial suffix', async () => {
+    mockParams = { studyId: 'test-study', index: '0', funcIndex: '1' };
+    mockFlatSequence = ['myFunc', 'end'];
+    mockAnswers = {
+      myFunc_0_CompEleven_11: { componentName: 'CompEleven' },
+      myFunc_0_CompOne_1: { componentName: 'CompOne' },
+    };
+    vi.mocked(getComponent).mockReturnValue(null);
+    const { result } = renderHook(() => useCurrentComponent());
+    expect(result.current).toBe('CompOne');
+  });
 });
 
 describe('useCurrentIdentifier', () => {

src/routes/utils.tsx

@@ -91,7 +91,7 @@ export function useCurrentComponent(): string {
       const decryptedFuncIndex = funcIndex ? decryptIndex(funcIndex) : 0;
 
       // Check if answer exists for this index, if so get the component name and return early
-      const currentAnswer = Object.entries(_answers).find(([key, _]) => key.startsWith(`${funcName}_${currentStep}_`) && key.endsWith(`${decryptedFuncIndex}`));
+      const currentAnswer = Object.entries(_answers).find(([key, _]) => key.startsWith(`${funcName}_${currentStep}_`) && key.endsWith(`_${decryptedFuncIndex}`));
       const answerCompName = currentAnswer ? currentAnswer[1].componentName : null;
       if (answerCompName !== null) {
         setCompName(answerCompName);

src/store/store.tsx

@@ -369,16 +369,15 @@ export async function studyStoreCreator(
       deleteDynamicBlockAnswers(state, { payload }: PayloadAction<{ currentStep: number, funcIndex: number, funcName: string }>) {
         const { currentStep, funcIndex, funcName } = payload;
 
-        // regex to match all keys that start with the current step and funcIndex
-        const regex = new RegExp(`.*_${currentStep}_.*_${funcIndex}`);
-        // delete all keys that match the regex
+        // Dynamic block keys have the form `${funcName}_${currentStep}_${componentName}_${funcIndex}`
+        const matchesDeletedIteration = (key: string) => key.startsWith(`${funcName}_${currentStep}_`) && key.endsWith(`_${funcIndex}`);
         Object.keys(state.answers).forEach((key) => {
-          if (key.match(regex)) {
+          if (matchesDeletedIteration(key)) {
             delete state.answers[key];
           }
         });
         Object.keys(state.checkAnswer).forEach((key) => {
-          if (key.match(regex)) {
+          if (matchesDeletedIteration(key)) {
             delete state.checkAnswer[key];
           }
         });

src/store/tests/store.spec.ts

@@ -456,6 +456,20 @@ describe('studyStoreCreator', () => {
     expect(store.getState().funcSequence.myFunc).toBeUndefined();
   });
 
+  test('deleteDynamicBlockAnswers only deletes the exact funcIndex, not partial matches', async () => {
+    const { store, actions } = await studyStoreCreator('test', minimalConfig, minimalSequence, metadata, emptyAnswers, modes, 'p1', false, false);
+    for (let i = 0; i <= 10; i += 1) {
+      store.dispatch(actions.pushToFuncSequence({
+        component: 'intro', funcName: 'myFunc', index: 5, funcIndex: i, parameters: {}, correctAnswer: [],
+      }));
+    }
+    expect(store.getState().answers.myFunc_5_intro_1).toBeDefined();
+    expect(store.getState().answers.myFunc_5_intro_10).toBeDefined();
+    store.dispatch(actions.deleteDynamicBlockAnswers({ currentStep: 5, funcIndex: 1, funcName: 'myFunc' }));
+    expect(store.getState().answers.myFunc_5_intro_1).toBeUndefined();
+    expect(store.getState().answers.myFunc_5_intro_10).toBeDefined();
+  });
+
   test('deleteDynamicBlockAnswers clears checkAnswer state for the deleted steps', async () => {
     const { store, actions } = await studyStoreCreator('test', minimalConfig, minimalSequence, metadata, emptyAnswers, modes, 'p1', false, false);
     store.dispatch(actions.setCheckAnswerResult({