Merge pull request #1260 from NordicSemiconductor/feat/jlink-compatibility-warning

Feat/jlink compatibility warning

Author: boundlesscalm

src/launcher/features/apps/App/AppIcon.tsx

@@ -9,6 +9,8 @@ import path from 'path';
 
 import { type App, isInstalled } from '../../../../ipc/apps';
 import appCompatibilityWarning from '../../../util/appCompatibilityWarning';
+import { useLauncherSelector } from '../../../util/hooks';
+import { isJLinkFinishedInstalling } from '../../jlinkUpdate/jlinkUpdateSlice';
 import { type DisplayedApp, isInProgress } from '../appsSlice';
 
 const warning = (altText: string) => (
@@ -33,12 +35,14 @@ const appBadge = async (app: App) => {
 const AppIcon: React.FC<{ app: DisplayedApp }> = ({ app }) => {
     const [badge, setBadge] =
         useState<Awaited<ReturnType<typeof appBadge>>>(null);
+    const jlinkInstalled = useLauncherSelector(isJLinkFinishedInstalling);
 
     useEffect(() => {
         if (!isInProgress(app)) {
             appBadge(app).then(setBadge);
         }
-    }, [app]);
+        // Trigger this once more after JLink was successfully installed or updated
+    }, [app, jlinkInstalled]);
 
     return (
         <div className="core-app-icon">

src/launcher/features/jlinkUpdate/JLinkUpdateProgressDialog.tsx

@@ -11,11 +11,13 @@ import {
     GenericDialog,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
+import { resetJlinkCompatibilityCache } from '../../util/appCompatibilityWarning';
 import { useLauncherDispatch, useLauncherSelector } from '../../util/hooks';
 import { continueUpdateProcess } from '../process/updateProcess';
 import {
     getInstalledJLinkVersion,
     getJLinkUpdateProgress,
+    isJLinkFinishedInstalling,
     isJLinkUpdateProgressDialogVisible,
     reset,
 } from './jlinkUpdateSlice';
@@ -25,8 +27,7 @@ export default () => {
     const isJLinkInstalled = !!useLauncherSelector(getInstalledJLinkVersion);
     const isVisible = useLauncherSelector(isJLinkUpdateProgressDialogVisible);
     const progress = useLauncherSelector(getJLinkUpdateProgress);
-    const finished =
-        progress?.step === 'install' && progress.percentage === 100;
+    const finished = useLauncherSelector(isJLinkFinishedInstalling);
 
     return (
         <GenericDialog
@@ -39,6 +40,7 @@ export default () => {
                 <DialogButton
                     onClick={() => {
                         dispatch(reset());
+                        resetJlinkCompatibilityCache();
                         dispatch(continueUpdateProcess());
                     }}
                     disabled={!finished}

src/launcher/features/jlinkUpdate/jlinkUpdateSlice.ts

@@ -72,3 +72,6 @@ export const getJLinkVersionToBeInstalled = (state: RootState) =>
     state.jlinkUpdate.versionToBeInstalled;
 export const getInstalledJLinkVersion = (state: RootState) =>
     state.jlinkUpdate.installedVersion;
+export const isJLinkFinishedInstalling = (state: RootState) =>
+    state.jlinkUpdate.updateProgress?.step === 'install' &&
+    state.jlinkUpdate.updateProgress?.percentage === 100;

src/launcher/util/appCompatibilityWarning.tsx

@@ -193,6 +193,10 @@ const getJlinkCompatibility = memoize(
     },
 );
 
+export const resetJlinkCompatibilityCache = () => {
+    getJlinkCompatibility.cache.clear?.();
+};
+
 export const checkJLinkRequirements: AppCompatibilityChecker = async (
     app: LaunchableApp,
 ) => {