fix: remove action calculation logic from UI

Author: Akos Kitta

arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx

@@ -13,8 +13,6 @@ import { boardIdentifierLabel, Port } from '../../common/protocol';
 import {
   BoardListItem,
   BoardListItemUI,
-  InferredBoardListItem,
-  isInferredBoardListItem,
 } from '../../common/protocol/board-list';
 import { assertUnreachable } from '../../common/utils';
 import { BoardListUI, BoardsServiceProvider } from './boards-service-provider';
@@ -108,7 +106,7 @@ export class BoardListDropDown extends React.Component<
 
   private readonly onDefaultAction = (item: BoardListItemUI): unknown => {
     const { boardList } = this.props;
-    const { type, params } = boardList.defaultAction(item);
+    const { type, params } = item.defaultAction;
     switch (type) {
       case 'select-boards-config': {
         return boardList.onSelect(params);
@@ -162,61 +160,63 @@ export class BoardListDropDown extends React.Component<
             {portLabel}
           </div>
         </div>
-        {isInferredBoardListItem(item) && this.renderActions(item)}
+        {this.renderActions(item)}
       </div>
     );
   }
 
-  private renderActions(inferredItem: InferredBoardListItem): React.ReactNode {
-    const { port } = inferredItem;
-    const edit = (
-      <div
-        id="edit"
-        className={codicon('pencil', true)}
-        title={nls.localize(
-          'arduino/board/editBoardsConfig',
-          'Edit Board and Port...'
-        )}
-        onClick={(event) => {
-          event.preventDefault();
-          event.stopPropagation();
-          this.props.boardList.onEdit({
-            query: inferredItem.inferredBoard.name,
-            boardToSelect: inferredItem.inferredBoard,
-            portToSelect: port,
-          });
-        }}
-      />
-    );
-    const revert =
-      inferredItem.type === 'board-overridden' ? (
-        <div
-          id="revert"
-          className={codicon('discard', true)}
-          title={nls.localize(
-            'arduino/board/revertBoardsConfig',
-            "Use '{0}' discovered on '{1}'",
-            boardIdentifierLabel(inferredItem.inferredBoard),
-            port.address
-          )}
-          onClick={(event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            this.props.boardList.onSelect({
-              selectedBoard: inferredItem.board,
-              selectedPort: port,
-            });
-          }}
-        />
-      ) : undefined;
+  private renderActions(item: BoardListItemUI): React.ReactNode {
+    const { boardList } = this.props;
+    const { revert, edit } = item.otherActions;
+    if (!edit && !revert) {
+      return undefined;
+    }
     return (
       <div className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR}>
-        <div className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}>
-          {edit}
-        </div>
-        <div className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}>
-          {revert}
-        </div>
+        {edit && (
+          <div
+            className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}
+          >
+            {
+              <div
+                id="edit"
+                className={codicon('pencil', true)}
+                title={nls.localize(
+                  'arduino/board/editBoardsConfig',
+                  'Edit Board and Port...'
+                )}
+                onClick={(event) => {
+                  event.preventDefault();
+                  event.stopPropagation();
+                  boardList.onEdit(edit.params);
+                }}
+              />
+            }
+          </div>
+        )}
+        {revert && (
+          <div
+            className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}
+          >
+            {
+              <div
+                id="revert"
+                className={codicon('discard', true)}
+                title={nls.localize(
+                  'arduino/board/revertBoardsConfig',
+                  "Use '{0}' discovered on '{1}'",
+                  boardIdentifierLabel(revert.params.selectedBoard),
+                  item.labels.portLabel
+                )}
+                onClick={(event) => {
+                  event.preventDefault();
+                  event.stopPropagation();
+                  boardList.onSelect(revert.params);
+                }}
+              />
+            }
+          </div>
+        )}
       </div>
     );
   }