@nordicsemiconductor/pc-nrfconnect-shared 160.0.0 → 161.0.0

package/Changelog.md

@@ -7,7 +7,13 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
-## 159.0.0 - 2024-02-23
+## 161.0.0 - 2024-02-26
+
+### Fixed
+
+-   `ConfirmCloseDialog` title now uses app display name
+
+## 160.0.0 - 2024-02-23
 
 ### Added
 

package/package.json

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

package/src/ConfirmBeforeClose/ConfirmCloseDialog.tsx

@@ -60,7 +60,7 @@ export default () => {
     return (
         <ConfirmationDialog
             headerIcon="alert-outline"
-            title="Closing nPM PowerUP"
+            title={nextConfirmDialog?.title ?? ''}
             isVisible={showCloseDialog && !!nextConfirmDialog}
             onConfirm={() => {
                 if (nextConfirmDialog) {

package/src/ConfirmBeforeClose/confirmBeforeCloseSlice.ts

@@ -8,13 +8,22 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { v4 as uuid } from 'uuid';
 
 import type { AppThunk, RootState } from '../store';
+import { packageJsonApp } from '../utils/packageJson';
+
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 
 export interface ConfirmBeforeCloseApp {
     id: string;
+    title: string;
     message: React.ReactNode;
     onClose?: () => void;
 }
 
+export type ConfirmBeforeCloseOptionalTitle = Optional<
+    ConfirmBeforeCloseApp,
+    'title'
+>;
+
 export interface ConfirmBeforeCloseState {
     confirmCloseApp: ConfirmBeforeCloseApp[];
     showCloseDialog: boolean;
@@ -31,19 +40,21 @@ const slice = createSlice({
     reducers: {
         addConfirmBeforeClose(
             state,
-            action: PayloadAction<ConfirmBeforeCloseApp>
+            action: PayloadAction<ConfirmBeforeCloseOptionalTitle>
         ) {
             const index = state.confirmCloseApp.findIndex(
                 confirmCloseApp => confirmCloseApp.id === action.payload.id
             );
 
+            const dialog = {
+                title: `Closing ${packageJsonApp().displayName}`,
+                ...action.payload,
+            };
+
             if (index !== -1) {
-                state.confirmCloseApp[index] = action.payload;
+                state.confirmCloseApp[index] = dialog;
             } else {
-                state.confirmCloseApp = [
-                    action.payload,
-                    ...state.confirmCloseApp,
-                ];
+                state.confirmCloseApp = [dialog, ...state.confirmCloseApp];
             }
         },
         clearConfirmBeforeClose(state, action: PayloadAction<string>) {
@@ -76,7 +87,7 @@ export const getShowConfirmCloseDialog = (state: RootState) =>
 
 export const preventAppCloseUntilComplete =
     (
-        dialogInfo: Omit<ConfirmBeforeCloseApp, 'id'>,
+        dialogInfo: Omit<ConfirmBeforeCloseOptionalTitle, 'id'>,
         promise: Promise<unknown>,
         abortController?: AbortController
     ): AppThunk =>

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

@@ -1,16 +1,19 @@
 /// <reference types="react" />
 import type { AppThunk, RootState } from '../store';
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
 export interface ConfirmBeforeCloseApp {
     id: string;
+    title: string;
     message: React.ReactNode;
     onClose?: () => void;
 }
+export type ConfirmBeforeCloseOptionalTitle = Optional<ConfirmBeforeCloseApp, 'title'>;
 export interface ConfirmBeforeCloseState {
     confirmCloseApp: ConfirmBeforeCloseApp[];
     showCloseDialog: boolean;
 }
-export declare const reducer: import("redux").Reducer<ConfirmBeforeCloseState, import("redux").AnyAction>, addConfirmBeforeClose: import("@reduxjs/toolkit").ActionCreatorWithPayload<ConfirmBeforeCloseApp, "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, import("redux").AnyAction>, 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 getNextConfirmDialog: (state: RootState) => ConfirmBeforeCloseApp | undefined;
 export declare const getShowConfirmCloseDialog: (state: RootState) => boolean;
-export declare const preventAppCloseUntilComplete: (dialogInfo: Omit<ConfirmBeforeCloseApp, 'id'>, promise: Promise<unknown>, abortController?: AbortController) => AppThunk;
+export declare const preventAppCloseUntilComplete: (dialogInfo: Omit<ConfirmBeforeCloseOptionalTitle, 'id'>, promise: Promise<unknown>, abortController?: AbortController) => AppThunk;
 //# sourceMappingURL=confirmBeforeCloseSlice.d.ts.map

package/typings/generated/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;AAEpD,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,eAAe,EAAE,OAAO,CAAC;CAC5B;AAuCD,eAAO,MACH,OAAO,+EAEH,qBAAqB,gIACrB,kBAAkB,+GAClB,uBAAuB,iHAEtB,CAAC;AAEV,eAAO,MAAM,oBAAoB,UAAW,SAAS,sCAGlC,CAAC;AAEpB,eAAO,MAAM,yBAAyB,UAAW,SAAS,YACR,CAAC;AAEnD,eAAO,MAAM,4BAA4B,eAErB,KAAK,qBAAqB,EAAE,IAAI,CAAC,WACpC,QAAQ,OAAO,CAAC,oBACP,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,MAAM,WAAW,uBAAuB;IACpC,eAAe,EAAE,qBAAqB,EAAE,CAAC;IACzC,eAAe,EAAE,OAAO,CAAC;CAC5B;AAyCD,eAAO,MACH,OAAO,+EAEH,qBAAqB,0IACrB,kBAAkB,+GAClB,uBAAuB,iHAEtB,CAAC;AAEV,eAAO,MAAM,oBAAoB,UAAW,SAAS,sCAGlC,CAAC;AAEpB,eAAO,MAAM,yBAAyB,UAAW,SAAS,YACR,CAAC;AAEnD,eAAO,MAAM,4BAA4B,eAErB,KAAK,+BAA+B,EAAE,IAAI,CAAC,WAC9C,QAAQ,OAAO,CAAC,oBACP,eAAe,KAClC,QAcF,CAAC"}