fix: startup task arg changes on data store change

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/boards/boards-data-store.ts

@@ -91,6 +91,13 @@ export class BoardsDataStore
           this.fireChanged(...changes);
         }
       }),
+      this.onDidChange((event) => {
+        const selectedFqbn =
+          this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn;
+        if (event.changes.find((change) => change.fqbn === selectedFqbn)) {
+          this.updateSelectedBoardData(selectedFqbn);
+        }
+      }),
     ]);
 
     Promise.all([

arduino-ide-extension/src/node/boards-service-impl.ts

@@ -10,9 +10,9 @@ import {
   BoardWithPackage,
   BoardsPackage,
   BoardsService,
+  CheckDebugEnabledParams,
   ConfigOption,
   ConfigValue,
-  CheckDebugEnabledParams,
   DetectedPorts,
   Installable,
   NotificationServiceServer,

arduino-ide-extension/src/test/browser/boards-data-store.test.ts

@@ -84,7 +84,7 @@ describe('boards-data-store', function () {
   it('should update board details of selected board (selected with FQBN)', async () => {
     const updated = boardsServiceProvider.updateConfig(board);
     expect(updated).to.be.ok;
-    await wait(50);
+    await wait(1);
 
     const selectedBoardData = boardsDataStore['_selectedBoardData'];
     expect(selectedBoardData).to.be.deep.equal({
@@ -102,7 +102,7 @@ describe('boards-data-store', function () {
     const board = { name, fqbn };
     const updated = boardsServiceProvider.updateConfig(board);
     expect(updated).to.ok;
-    await wait(50);
+    await wait(1);
 
     const selectedBoardData = boardsDataStore['_selectedBoardData'];
     expect(selectedBoardData).to.be.undefined;
@@ -111,7 +111,7 @@ describe('boards-data-store', function () {
   it('should unset the the board details of selected board when no board was selected', async () => {
     let updated = boardsServiceProvider.updateConfig(board);
     expect(updated).to.ok;
-    await wait(50);
+    await wait(1);
 
     let selectedBoardData = boardsDataStore['_selectedBoardData'];
     expect(selectedBoardData).to.be.deep.equal({
@@ -124,18 +124,18 @@ describe('boards-data-store', function () {
 
     updated = boardsServiceProvider.updateConfig('unset-board');
     expect(updated).to.be.true;
-    await wait(50);
+    await wait(1);
 
     selectedBoardData = boardsDataStore['_selectedBoardData'];
     expect(selectedBoardData).to.be.undefined;
   });
 
   it('should provide startup tasks when the data is available for the selected board', async () => {
-    const updated = boardsServiceProvider.updateConfig(board);
+    let updated = boardsServiceProvider.updateConfig(board);
     expect(updated).to.be.true;
-    await wait(50);
+    await wait(1);
 
-    const tasks = boardsDataStore.tasks();
+    let tasks = boardsDataStore.tasks();
     expect(tasks).to.be.deep.equal([
       {
         command: 'arduino-use-inherited-boards-data',
@@ -150,13 +150,156 @@ describe('boards-data-store', function () {
         ],
       },
     ]);
+
+    updated = boardsServiceProvider.updateConfig('unset-board');
+    expect(updated).to.be.true;
+    await wait(1);
+
+    tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.empty;
   });
 
   it('should not provide any startup tasks when no data is available for the selected board', async () => {
     const tasks = boardsDataStore.tasks();
     expect(tasks).to.be.empty;
   });
 
+  it('should update the startup task arg when the selected programmer changes', async () => {
+    let tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.empty;
+
+    let data = await boardsDataStore.getData(fqbn);
+    expect(data).to.be.deep.equal({
+      configOptions: [configOption1],
+      programmers: [edbg, jlink],
+    });
+
+    const updated = boardsServiceProvider.updateConfig(board);
+    expect(updated).to.be.ok;
+    await wait(1);
+
+    tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.deep.equal([
+      {
+        command: 'arduino-use-inherited-boards-data',
+        args: [
+          {
+            fqbn,
+            data: {
+              configOptions: [configOption1],
+              programmers: [edbg, jlink],
+            },
+          },
+        ],
+      },
+    ]);
+
+    const result = await boardsDataStore.selectProgrammer({
+      fqbn,
+      selectedProgrammer: edbg,
+    });
+    expect(result).to.be.ok;
+
+    data = await boardsDataStore.getData(fqbn);
+    expect(data).to.be.deep.equal({
+      configOptions: [configOption1],
+      programmers: [edbg, jlink],
+      selectedProgrammer: edbg,
+    });
+    tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.deep.equal([
+      {
+        command: 'arduino-use-inherited-boards-data',
+        args: [
+          {
+            fqbn,
+            data: {
+              configOptions: [configOption1],
+              programmers: [edbg, jlink],
+              selectedProgrammer: edbg,
+            },
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('should update the startup task arg when the config options change', async () => {
+    let tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.empty;
+
+    let data = await boardsDataStore.getData(fqbn);
+    expect(data).to.be.deep.equal({
+      configOptions: [configOption1],
+      programmers: [edbg, jlink],
+    });
+
+    const updated = boardsServiceProvider.updateConfig(board);
+    expect(updated).to.be.ok;
+    await wait(1);
+
+    tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.deep.equal([
+      {
+        command: 'arduino-use-inherited-boards-data',
+        args: [
+          {
+            fqbn,
+            data: {
+              configOptions: [configOption1],
+              programmers: [edbg, jlink],
+            },
+          },
+        ],
+      },
+    ]);
+
+    const result = await boardsDataStore.selectConfigOption({
+      fqbn,
+      option: configOption1.option,
+      selectedValue: configOption1.values[1].value,
+    });
+    expect(result).to.be.ok;
+
+    data = await boardsDataStore.getData(fqbn);
+    expect(data).to.be.deep.equal({
+      configOptions: [
+        {
+          ...configOption1,
+          values: [
+            { label: 'C1V1', selected: false, value: 'v1' },
+            { label: 'C1V2', selected: true, value: 'v2' },
+          ],
+        },
+      ],
+      programmers: [edbg, jlink],
+    });
+
+    tasks = boardsDataStore.tasks();
+    expect(tasks).to.be.deep.equal([
+      {
+        command: 'arduino-use-inherited-boards-data',
+        args: [
+          {
+            fqbn,
+            data: {
+              configOptions: [
+                {
+                  ...configOption1,
+                  values: [
+                    { label: 'C1V1', selected: false, value: 'v1' },
+                    { label: 'C1V2', selected: true, value: 'v2' },
+                  ],
+                },
+              ],
+              programmers: [edbg, jlink],
+            },
+          },
+        ],
+      },
+    ]);
+  });
+
   it('should select the default programmer', async () => {
     const storedData = await getStoredData(fqbn);
     expect(storedData).to.be.undefined;
@@ -349,7 +492,7 @@ describe('boards-data-store', function () {
       boardsDataStore.onDidChange(() => didChangeCounter++)
     );
     notificationCenter.notifyPlatformDidInstall({ item: boardsPackage });
-    await wait(50);
+    await wait(1);
     expect(didChangeCounter).to.be.equal(0);
 
     storedData = await getStoredData(fqbn);
@@ -369,7 +512,7 @@ describe('boards-data-store', function () {
       boardsDataStore.onDidChange(() => didChangeCounter++)
     );
     notificationCenter.notifyPlatformDidInstall({ item: boardsPackage });
-    await wait(50);
+    await wait(1);
     expect(didChangeCounter).to.be.equal(1);
 
     storedData = await getStoredData(fqbn);
@@ -402,7 +545,7 @@ describe('boards-data-store', function () {
       boardsDataStore.onDidChange(() => didChangeCounter++)
     );
     notificationCenter.notifyPlatformDidInstall({ item: boardsPackage });
-    await wait(50);
+    await wait(1);
     expect(didChangeCounter).to.be.equal(1);
 
     storedData = await boardsDataStore.getData(fqbn);