feat: update shared

NordicSemiconductor · Feb 23, 2024 · 2ff9dfe · 2ff9dfe
1 parent 9a0ea91
commit 2ff9dfe
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 212 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
         "prepare": "husky install"
     },
     "devDependencies": {
-        "@nordicsemiconductor/pc-nrfconnect-shared": "^157.0.0",
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^160.0.0",
         "chart.js": "^4.0.1",
         "chartjs-adapter-date-fns": "^2.0.1",
         "react-chartjs-2": "^5.0.1",

diff --git a/src/appReducer.ts b/src/appReducer.ts
@@ -7,7 +7,6 @@
 import { NrfConnectState } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import { combineReducers } from 'redux';
 
-import confirmBeforeCloseReducer from './features/confirmBeforeClose/confirmBeforeCloseSlice';
 import downloadBatteryModelSlice from './features/pmicControl/downloadBatteryModelSlice';
 import pmicControlReducer from './features/pmicControl/pmicControlSlice';
 import profilingProjectsReducer from './features/pmicControl/profilingProjectsSlice.';
@@ -20,7 +19,6 @@ type AppState = ReturnType<typeof appReducer>;
 export interface RootState extends NrfConnectState<AppState> {}
 
 const appReducer = combineReducers({
-    confirmBeforeClose: confirmBeforeCloseReducer,
     profilingProjects: profilingProjectsReducer,
     profiling: profilingReducer,
     pmicControl: pmicControlReducer,

diff --git a/src/components/Cards/Buck/BuckCard.tsx b/src/components/Cards/Buck/BuckCard.tsx
@@ -9,7 +9,7 @@ import {
     Card,
     classNames,
     Dropdown,
-    NumberInputSliderWithUnit,
+    NumberInput,
     StateSelector,
     Toggle,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
@@ -160,7 +160,7 @@ export default ({
                 disabled={disabled}
             />
 
-            <NumberInputSliderWithUnit
+            <NumberInput
                 label={
                     <DocumentationTooltip card={card} item="VOUT">
                         <div>
@@ -177,10 +177,11 @@ export default ({
                 value={internalVOut}
                 onChange={setInternalVOut}
                 onChangeComplete={onVOutChange}
+                showSlider
             />
             {!summary && (
                 <>
-                    <NumberInputSliderWithUnit
+                    <NumberInput
                         label={
                             <DocumentationTooltip card={card} item="RETVOUT">
                                 <div>
@@ -197,6 +198,7 @@ export default ({
                         value={internalRetVOut}
                         onChange={setInternalRetVOut}
                         onChangeComplete={onRetVOutChange}
+                        showSlider
                     />
                     <Toggle
                         label={

diff --git a/src/components/Cards/LDO/LDOCard.tsx b/src/components/Cards/LDO/LDOCard.tsx
@@ -9,7 +9,7 @@ import {
     Card,
     classNames,
     Dropdown,
-    NumberInputSliderWithUnit,
+    NumberInput,
     StateSelector,
     Toggle,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
@@ -116,7 +116,7 @@ export default ({
                 }
             />
 
-            <NumberInputSliderWithUnit
+            <NumberInput
                 label={
                     <DocumentationTooltip card={card} item="VOUTLDO">
                         <div>
@@ -135,6 +135,7 @@ export default ({
                 onChangeComplete={value =>
                     npmDevice.setLdoVoltage(index, value)
                 }
+                showSlider
             />
 
             {!summary && (

diff --git a/src/components/Cards/Power/PowerCard.tsx b/src/components/Cards/Power/PowerCard.tsx
@@ -9,7 +9,7 @@ import {
     Card,
     classNames,
     Dropdown,
-    NumberInputSliderWithUnit,
+    NumberInput,
     Toggle,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
@@ -94,7 +94,7 @@ export default ({
                 </div>
             }
         >
-            <NumberInputSliderWithUnit
+            <NumberInput
                 label={
                     <DocumentationTooltip card={card} item="VTERM">
                         <div>
@@ -109,8 +109,9 @@ export default ({
                 value={internalVTerm}
                 onChange={setInternalVTerm}
                 onChangeComplete={v => npmDevice.setChargerVTerm(v)}
+                showSlider
             />
-            <NumberInputSliderWithUnit
+            <NumberInput
                 label={
                     <DocumentationTooltip card={card} item="ICHG">
                         <div>
@@ -125,6 +126,7 @@ export default ({
                 value={internalIChg}
                 onChange={setInternalIChg}
                 onChangeComplete={v => npmDevice.setChargerIChg(v)}
+                showSlider
             />
 
             {!summary && (

diff --git a/src/components/Charger/Jeita.tsx b/src/components/Charger/Jeita.tsx
@@ -11,7 +11,7 @@ import {
     classNames,
     Dropdown,
     NumberInlineInput,
-    NumberInputSliderWithUnit,
+    NumberInput,
     Slider,
     Toggle,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
@@ -281,7 +281,7 @@ export default ({
                     <span>{npmDevice.getChargerJeitaRange().max}°C</span>
                 </div>
             </div>
-            <NumberInputSliderWithUnit
+            <NumberInput
                 label={
                     <DocumentationTooltip card={card} item="Vtermr">
                         <div>
@@ -296,6 +296,7 @@ export default ({
                 onChange={value => setInternalVTermr(value)}
                 onChangeComplete={npmDevice.setChargerVTermR}
                 disabled={disabled}
+                showSlider
             />
             <Dropdown
                 label={

diff --git a/src/components/Profiling/Dialog/ConfigurationDialog.tsx b/src/components/Profiling/Dialog/ConfigurationDialog.tsx
@@ -13,7 +13,7 @@ import {
     Dropdown,
     GenericDialog,
     Group,
-    NumberInputSliderWithUnit,
+    NumberInput,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { selectDirectoryDialog } from '../../../actions/fileActions';
@@ -186,7 +186,8 @@ export default ({ isVisible }: { isVisible: boolean }) => {
                         value={name}
                     />
                 </div>
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <DocumentationTooltip card="charger" item="VTERM">
                             <div>
@@ -206,7 +207,8 @@ export default ({ isVisible }: { isVisible: boolean }) => {
                     onChange={setUpperVCutOff}
                 />
 
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <DocumentationTooltip card="profiling" item="Capacity">
                             <div>
@@ -225,7 +227,8 @@ export default ({ isVisible }: { isVisible: boolean }) => {
                     onChange={setLowerVCutOff}
                 />
 
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <DocumentationTooltip card="profiling" item="Capacity">
                             <div>
@@ -244,7 +247,8 @@ export default ({ isVisible }: { isVisible: boolean }) => {
                     }}
                 />
 
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <DocumentationTooltip card="charger" item="ICHG">
                             <div>
@@ -289,7 +293,8 @@ export default ({ isVisible }: { isVisible: boolean }) => {
                 {temperatures.map((temp, index) => (
                     <React.Fragment key={`temp-${index + 1}`}>
                         <div className="tw-flex tw-flex-row tw-items-center">
-                            <NumberInputSliderWithUnit
+                            <NumberInput
+                                showSlider
                                 className="tw-flex-grow"
                                 label={
                                     <DocumentationTooltip

diff --git a/src/components/Profiling/Dialog/ProfilingWizard.tsx b/src/components/Profiling/Dialog/ProfilingWizard.tsx
@@ -7,22 +7,20 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
+    addConfirmBeforeClose,
     Alert,
+    clearConfirmBeforeClose,
     clearWaitForDevice,
     ConfirmationDialog,
     describeError,
+    isConfirmCloseDialogOpen,
     logger,
     setWaitForDevice,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import { appendFileSync, writeFileSync } from 'fs';
 import path from 'path';
 
 import { closeDevice, openDevice } from '../../../actions/deviceActions';
-import {
-    addConfirmBeforeClose,
-    clearConfirmBeforeClose,
-    getShowConfirmCloseDialog,
-} from '../../../features/confirmBeforeClose/confirmBeforeCloseSlice';
 import { Profile } from '../../../features/pmicControl/npm/types';
 import {
     getBucks,
@@ -92,7 +90,7 @@ export default () => {
     const index = useSelector(getProfileIndex);
     const ccProfilingState = useSelector(getCcProfilingState);
     const abortAction = useSelector(getAbort);
-    const showCloseAppDialog = useSelector(getShowConfirmCloseDialog);
+    const confirmCloseDialogOpen = useSelector(isConfirmCloseDialogOpen);
     const pmicState = useSelector(getPmicState);
     const [initializing, setInitializing] = useState(false);
 
@@ -376,32 +374,32 @@ export default () => {
             )}
             {profilingStage === 'Configuration' && (
                 <ConfigurationDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
             {profilingStage === 'Checklist' && (
                 <ChecklistDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
             {profilingStage === 'Charging' && (
                 <ChargingDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
             {profilingStage === 'Resting' && (
                 <RestingDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
             {profilingStage === 'Profiling' && (
                 <ProfilingDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
             {profilingStage === 'Complete' && (
                 <CompleteDialog
-                    isVisible={!abortAction && !showCloseAppDialog}
+                    isVisible={!abortAction && !confirmCloseDialogOpen}
                 />
             )}
         </div>

diff --git a/src/components/Profiling/ProfilingProjects/AddEditProfileDialog.tsx b/src/components/Profiling/ProfilingProjects/AddEditProfileDialog.tsx
@@ -11,7 +11,7 @@ import {
     DialogButton,
     GenericDialog,
     Group,
-    NumberInputSliderWithUnit,
+    NumberInput,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import path from 'path';
 
@@ -102,7 +102,7 @@ export default ({
         >
             <Group>
                 <div>
-                    <NumberInputSliderWithUnit
+                    <NumberInput
                         label={
                             <div>
                                 <span>Temperature</span>
@@ -115,6 +115,7 @@ export default ({
                             max: 85,
                         }}
                         onChange={value => setTemperature(value)}
+                        showSlider
                     />
                 </div>
                 <div className="flex-column">

diff --git a/src/components/Profiling/ProfilingProjects/AddEditProjectDialog.tsx b/src/components/Profiling/ProfilingProjects/AddEditProjectDialog.tsx
@@ -11,7 +11,7 @@ import {
     DialogButton,
     GenericDialog,
     Group,
-    NumberInputSliderWithUnit,
+    NumberInput,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { showSaveDialog } from '../../../actions/fileActions';
@@ -131,7 +131,8 @@ export default ({
                         value={name}
                     />
                 </div>
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <div>
                             <span>Capacity</span>
@@ -142,7 +143,8 @@ export default ({
                     range={{ min: 32, max: 3000 }}
                     onChange={setCapacity}
                 />
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <div>
                             <span>V</span>
@@ -159,7 +161,8 @@ export default ({
                     }}
                     onChange={setUpperVCutOff}
                 />
-                <NumberInputSliderWithUnit
+                <NumberInput
+                    showSlider
                     label={
                         <DocumentationTooltip card="profiling" item="Capacity">
                             <div>

diff --git a/src/components/Profiling/ProfilingProjects/useProfilingProjects.tsx b/src/components/Profiling/ProfilingProjects/useProfilingProjects.tsx
@@ -6,11 +6,11 @@
 
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-
 import {
     addConfirmBeforeClose,
     clearConfirmBeforeClose,
-} from '../../../features/confirmBeforeClose/confirmBeforeCloseSlice';
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
+
 import {
     getProjectProfileProgress,
     getRecentProjects,