@nordicsemiconductor/pc-nrfconnect-shared 246.0.0 → 248.0.0

package/dist/typings/scripts/check-app-properties.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env tsx
+export declare const sameRepoURLs: (url1: string, url2: string) => boolean;
 declare const runChecks: ({ checkChangelogHasCurrentEntry, }: {
     checkChangelogHasCurrentEntry: boolean;
 }) => void;

package/dist/typings/scripts/check-app-properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-app-properties.d.ts","sourceRoot":"","sources":["../../../scripts/check-app-properties.ts"],"names":[],"mappings":";AAkLA,QAAA,MAAM,SAAS,GAAI,oCAEhB;IACC,6BAA6B,EAAE,OAAO,CAAC;CAC1C,SAKA,CAAC;AAOF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"check-app-properties.d.ts","sourceRoot":"","sources":["../../../scripts/check-app-properties.ts"],"names":[],"mappings":";AAmEA,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,MAAM,MAAM,YAUtD,CAAC;AAuGF,QAAA,MAAM,SAAS,GAAI,oCAEhB;IACC,6BAA6B,EAAE,OAAO,CAAC;CAC1C,SAKA,CAAC;AAOF,eAAe,SAAS,CAAC"}

package/dist/typings/scripts/check-app-properties.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=check-app-properties.test.d.ts.map

package/dist/typings/scripts/check-app-properties.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-app-properties.test.d.ts","sourceRoot":"","sources":["../../../scripts/check-app-properties.test.ts"],"names":[],"mappings":""}

package/dist/typings/src/ConfirmBeforeClose/ConfirmCloseDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfirmCloseDialog.d.ts","sourceRoot":"","sources":["../../../../src/ConfirmBeforeClose/ConfirmCloseDialog.tsx"],"names":[],"mappings":";AAqBA,wBAgEE"}
+{"version":3,"file":"ConfirmCloseDialog.d.ts","sourceRoot":"","sources":["../../../../src/ConfirmBeforeClose/ConfirmCloseDialog.tsx"],"names":[],"mappings":";AAuBA,wBAiEE"}

package/dist/typings/src/ConfirmBeforeClose/confirmBeforeCloseSlice.d.ts

@@ -7,12 +7,16 @@ export interface ConfirmBeforeCloseApp {
     onClose?: () => void;
 }
 export type ConfirmBeforeCloseOptionalTitle = Optional<ConfirmBeforeCloseApp, 'title'>;
+type OnCompleteAction = 'close' | 'reload';
 export interface ConfirmBeforeCloseState {
     confirmCloseApp: ConfirmBeforeCloseApp[];
     showCloseDialog: boolean;
+    actionOnAllComplete: OnCompleteAction;
 }
-export declare const reducer: import("redux").Reducer<ConfirmBeforeCloseState>, addConfirmBeforeClose: import("@reduxjs/toolkit").ActionCreatorWithPayload<ConfirmBeforeCloseOptionalTitle, "confirmBeforeCloseDialog/addConfirmBeforeClose">, setShowCloseDialog: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "confirmBeforeCloseDialog/setShowCloseDialog">, clearConfirmBeforeClose: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "confirmBeforeCloseDialog/clearConfirmBeforeClose">;
+export declare const reducer: import("redux").Reducer<ConfirmBeforeCloseState>, addConfirmBeforeClose: import("@reduxjs/toolkit").ActionCreatorWithPayload<ConfirmBeforeCloseOptionalTitle, "confirmBeforeCloseDialog/addConfirmBeforeClose">, setShowCloseDialog: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "confirmBeforeCloseDialog/setShowCloseDialog">, clearConfirmBeforeClose: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "confirmBeforeCloseDialog/clearConfirmBeforeClose">, setActionOnAllComplete: import("@reduxjs/toolkit").ActionCreatorWithPayload<OnCompleteAction, "confirmBeforeCloseDialog/setActionOnAllComplete">;
 export declare const getNextConfirmDialog: (state: RootState) => ConfirmBeforeCloseApp | undefined;
 export declare const getShowConfirmCloseDialog: (state: RootState) => boolean;
+export declare const getActionOnComplete: (state: RootState) => OnCompleteAction;
 export declare const preventAppCloseUntilComplete: (dialogInfo: Omit<ConfirmBeforeCloseOptionalTitle, "id">, promise: Promise<unknown>, abortController?: AbortController) => AppThunk;
+export {};
 //# sourceMappingURL=confirmBeforeCloseSlice.d.ts.map

package/dist/typings/src/ConfirmBeforeClose/confirmBeforeCloseSlice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"confirmBeforeCloseSlice.d.ts","sourceRoot":"","sources":["../../../../src/ConfirmBeforeClose/confirmBeforeCloseSlice.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGpD,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,+BAA+B,GAAG,QAAQ,CAClD,qBAAqB,EACrB,OAAO,CACV,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,eAAe,EAAE,OAAO,CAAC;CAC5B;AAyCD,eAAO,MACH,OAAO,oDAEH,qBAAqB,0IACrB,kBAAkB,+GAClB,uBAAuB,iHAEtB,CAAC;AAEV,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,sCAGlC,CAAC;AAEpB,eAAO,MAAM,yBAAyB,GAAI,OAAO,SAAS,YACR,CAAC;AAEnD,eAAO,MAAM,4BAA4B,GAEjC,YAAY,IAAI,CAAC,+BAA+B,EAAE,IAAI,CAAC,EACvD,SAAS,OAAO,CAAC,OAAO,CAAC,EACzB,kBAAkB,eAAe,KAClC,QAcF,CAAC"}
+{"version":3,"file":"confirmBeforeCloseSlice.d.ts","sourceRoot":"","sources":["../../../../src/ConfirmBeforeClose/confirmBeforeCloseSlice.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGpD,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,+BAA+B,GAAG,QAAQ,CAClD,qBAAqB,EACrB,OAAO,CACV,CAAC;AAEF,KAAK,gBAAgB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAC3C,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,gBAAgB,CAAC;CACzC;AA6CD,eAAO,MACH,OAAO,oDAEH,qBAAqB,0IACrB,kBAAkB,+GAClB,uBAAuB,mHACvB,sBAAsB,0HAErB,CAAC;AAEV,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,sCAGlC,CAAC;AAEpB,eAAO,MAAM,yBAAyB,GAAI,OAAO,SAAS,YACR,CAAC;AAEnD,eAAO,MAAM,mBAAmB,GAAI,OAAO,SAAS,qBACE,CAAC;AAEvD,eAAO,MAAM,4BAA4B,GAEjC,YAAY,IAAI,CAAC,+BAA+B,EAAE,IAAI,CAAC,EACvD,SAAS,OAAO,CAAC,OAAO,CAAC,EACzB,kBAAkB,eAAe,KAClC,QAcF,CAAC"}

package/dist/typings/src/ConfirmBeforeClose/effects.d.ts

@@ -0,0 +1,3 @@
+import type { AppThunk } from '../store';
+export declare const onUserConfirmAll: () => AppThunk;
+//# sourceMappingURL=effects.d.ts.map

package/dist/typings/src/ConfirmBeforeClose/effects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"effects.d.ts","sourceRoot":"","sources":["../../../../src/ConfirmBeforeClose/effects.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzC,eAAO,MAAM,gBAAgB,QAAO,QAOnC,CAAC"}

package/dist/typings/src/FactoryReset/FactoryResetButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FactoryResetButton.d.ts","sourceRoot":"","sources":["../../../../src/FactoryReset/FactoryResetButton.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,KAAK,EAAE,EAAoB,MAAM,OAAO,CAAC;AAGzD,OAAe,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAK/D,UAAU,KAAK;IACX,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD,QAAA,MAAM,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAsDjC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"FactoryResetButton.d.ts","sourceRoot":"","sources":["../../../../src/FactoryReset/FactoryResetButton.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,KAAK,EAAE,EAAoB,MAAM,OAAO,CAAC;AAIzD,OAAe,EAAE,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAM/D,UAAU,KAAK;IACX,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD,QAAA,MAAM,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAwDjC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "246.0.0",
+    "version": "248.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

package/release_notes.md

@@ -1,3 +1,4 @@
-### Changed
+### Fixed
 
-- Aligned Card component styles with old implementation.
+- In case app is executing important task application will properly reopen when
+  resetting defaults.

package/scripts/check-app-properties.test.ts

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { sameRepoURLs } from './check-app-properties';
+
+describe('sameRepoURLs', () => {
+    it('accepts equal URLs', () => {
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+            ),
+        ).toBe(true);
+    });
+
+    it('rejects different URLs', () => {
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+                'https://github.com/nordicsemi/pc-nrfconnect-shared',
+            ),
+        ).toBe(false);
+    });
+
+    it('ignores a .git postfix on either URL', () => {
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk.git',
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+            ),
+        ).toBe(true);
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk.git',
+            ),
+        ).toBe(true);
+    });
+
+    it('treats the protocol https and git as the same', () => {
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+                'git@github.com:nordicsemi/pc-nrfconnect-ppk.git',
+            ),
+        ).toBe(true);
+    });
+
+    it('ignores the host name for the git protocol', () => {
+        expect(
+            sameRepoURLs(
+                'https://github.com/nordicsemi/pc-nrfconnect-ppk',
+                'git@nordic-git:nordicsemi/pc-nrfconnect-ppk.git',
+            ),
+        ).toBe(true);
+    });
+});

package/scripts/check-app-properties.ts

@@ -65,6 +65,18 @@ const mustContainOneOf = (
     }
 };
 
+export const sameRepoURLs = (url1: string, url2: string) => {
+    const withoutPostfix = (gitUrl: string) => gitUrl.replace(/\.git$/, '');
+
+    const withoutProtocol = (gitUrl: string) =>
+        gitUrl.replace(/^git@[^:]+:/, 'github.com/').replace(/^https:\/\//, '');
+
+    const stripped = (gitUrl: string) =>
+        withoutProtocol(withoutPostfix(gitUrl));
+
+    return stripped(url1) === stripped(url2);
+};
+
 const checkRepoUrl = (packageJson: PackageJsonApp) => {
     if (!existsSync('./.git')) {
         return;
@@ -75,17 +87,7 @@ const checkRepoUrl = (packageJson: PackageJsonApp) => {
     }).trimEnd();
     const declaredGitUrl = packageJson.repository?.url;
 
-    const withoutPostfix = (gitUrl?: string) => gitUrl?.replace(/\.git$/, '');
-
-    const withoutProtocol = (gitUrl?: string) =>
-        gitUrl
-            ?.replace(/^git@github\.com:/, 'github.com/')
-            .replace(/^https:\/\//, '');
-
-    const stripped = (gitUrl?: string) =>
-        withoutProtocol(withoutPostfix(gitUrl));
-
-    if (stripped(realGitUrl) !== stripped(declaredGitUrl)) {
+    if (declaredGitUrl == null || !sameRepoURLs(realGitUrl, declaredGitUrl)) {
         fail(
             `package.json says the repository is located at \`${declaredGitUrl}\` but \`git remote get-url origin\` says it is at \`${realGitUrl}\`.`,
         );

package/src/ConfirmBeforeClose/ConfirmCloseDialog.tsx

@@ -16,8 +16,10 @@ import {
     type ConfirmBeforeCloseApp,
     getNextConfirmDialog,
     getShowConfirmCloseDialog,
+    setActionOnAllComplete,
     setShowCloseDialog,
 } from './confirmBeforeCloseSlice';
+import { onUserConfirmAll } from './effects';
 
 export default () => {
     const dispatch = useDispatch();
@@ -34,7 +36,7 @@ export default () => {
                 if (confirmedDialog.onClose) confirmedDialog.onClose();
             });
             setConfirmedDialogs([]);
-            getCurrentWindow().close();
+            dispatch(onUserConfirmAll());
         }
     }, [nextConfirmDialog, dispatch, showCloseDialog, confirmedDialogs]);
 
@@ -78,6 +80,7 @@ export default () => {
                     dispatch(addConfirmBeforeClose(confirmedDialog)),
                 );
                 setConfirmedDialogs([]);
+                dispatch(setActionOnAllComplete('close'));
             }}
         >
             {nextConfirmDialog?.message}

package/src/ConfirmBeforeClose/confirmBeforeCloseSlice.ts

@@ -24,14 +24,17 @@ export type ConfirmBeforeCloseOptionalTitle = Optional<
     'title'
 >;
 
+type OnCompleteAction = 'close' | 'reload';
 export interface ConfirmBeforeCloseState {
     confirmCloseApp: ConfirmBeforeCloseApp[];
     showCloseDialog: boolean;
+    actionOnAllComplete: OnCompleteAction;
 }
 
 const initialState: ConfirmBeforeCloseState = {
     confirmCloseApp: [],
     showCloseDialog: false,
+    actionOnAllComplete: 'close',
 };
 
 const slice = createSlice({
@@ -65,6 +68,9 @@ const slice = createSlice({
         setShowCloseDialog(state, action: PayloadAction<boolean>) {
             state.showCloseDialog = action.payload;
         },
+        setActionOnAllComplete(state, action: PayloadAction<OnCompleteAction>) {
+            state.actionOnAllComplete = action.payload;
+        },
     },
 });
 
@@ -74,6 +80,7 @@ export const {
         addConfirmBeforeClose,
         setShowCloseDialog,
         clearConfirmBeforeClose,
+        setActionOnAllComplete,
     },
 } = slice;
 
@@ -85,6 +92,9 @@ export const getNextConfirmDialog = (state: RootState) =>
 export const getShowConfirmCloseDialog = (state: RootState) =>
     state.confirmBeforeCloseDialog.showCloseDialog;
 
+export const getActionOnComplete = (state: RootState) =>
+    state.confirmBeforeCloseDialog.actionOnAllComplete;
+
 export const preventAppCloseUntilComplete =
     (
         dialogInfo: Omit<ConfirmBeforeCloseOptionalTitle, 'id'>,

package/src/ConfirmBeforeClose/effects.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { getCurrentWindow } from '@electron/remote';
+
+import type { AppThunk } from '../store';
+import { getActionOnComplete } from './confirmBeforeCloseSlice';
+
+export const onUserConfirmAll = (): AppThunk => (_, getState) => {
+    const actionType = getActionOnComplete(getState());
+    if (actionType === 'close') {
+        getCurrentWindow().close();
+    } else {
+        getCurrentWindow().reload();
+    }
+};

package/src/FactoryReset/FactoryResetButton.tsx

@@ -5,9 +5,11 @@
  */
 
 import React, { type FC, useRef, useState } from 'react';
+import { useDispatch } from 'react-redux';
 import { getCurrentWindow } from '@electron/remote';
 
 import Button, { type ButtonVariants } from '../Button/Button';
+import { setActionOnAllComplete } from '../ConfirmBeforeClose/confirmBeforeCloseSlice';
 import { Dialog, DialogButton } from '../Dialog/Dialog';
 import logger from '../logging';
 import { getAppSpecificStore as store } from '../utils/persistentStore';
@@ -32,11 +34,13 @@ const FactoryResetButton: FC<Props> = ({
     classNames,
     large = false,
 }) => {
+    const dispatch = useDispatch();
     const [showDialog, setShowDialog] = useState(false);
     useRef(); // showdialog
     const defaultResetFn = () => {
         store().clear();
         logger.info('Successfully restored defaults');
+        dispatch(setActionOnAllComplete('reload'));
         getCurrentWindow().reload();
     };