@nordicsemiconductor/pc-nrfconnect-shared 221.0.0 → 224.0.0

package/nrfutil/version/jlinkVersion.ts

@@ -34,7 +34,7 @@ export const hasExpectedVersionFormat = (
 
     if (!result && logFailure) {
         console.error(
-            `The J-Link version was not reported in the expected format. ` +
+            `The SEGGER J-Link version was not reported in the expected format. ` +
                 `Format: ${dependency.versionFormat}, ` +
                 `version: ${JSON.stringify(dependency)}, `
         );
@@ -99,7 +99,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
                 ? strippedVersionName(jlinkVersionDependency.expectedVersion)
                 : nrfutilDeviceToJLink(moduleVersion.version);
         return {
-            kind: 'No J-Link installed',
+            kind: 'No SEGGER J-Link installed',
             requiredJlink: requiredVersion,
             actualJlink: 'none',
         } as const;
@@ -115,7 +115,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
         const actualJlink = strippedVersionName(jlinkVersionDependency);
 
         return {
-            kind: 'Outdated J-Link',
+            kind: 'Outdated SEGGER J-Link',
             requiredJlink,
             actualJlink,
         } as const;
@@ -127,7 +127,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
             jlinkVersionDependency.expectedVersion.version
     ) {
         return {
-            kind: 'Tested J-Link is used',
+            kind: 'Tested SEGGER J-Link is used',
         } as const;
     }
 
@@ -137,7 +137,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
     const actualJlink = strippedVersionName(jlinkVersionDependency);
 
     return {
-        kind: 'Newer J-Link is used',
+        kind: 'Newer SEGGER J-Link is used',
         requiredJlink,
         actualJlink,
     } as const;

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "221.0.0",
+    "version": "224.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-shared.git"
     },
     "author": "Nordic Semiconductor ASA",
-    "license": "ISC",
+    "license": "SEE LICENSE IN LICENSE",
     "bin": {
         "check-for-typescript": "scripts/check-for-typescript.ts",
         "check-app-properties": "scripts/check-app-properties.ts",

package/release_notes.md

@@ -1,10 +1,7 @@
-### Added
+### Fixed
 
--   Custom tailwind font-size `text-2xs` (0.625rem/10px).
--   Narrower Dropdown variant.
--   Automatic character limit derivation for number input components based on
-    their range constraints.
+-   Apps did not reload after restoring the default settings.
 
-### Fixed
+### Removed
 
--   Running build scripts failed on Windows.
+-   Removed the `isSkipUpdate*` properties from the launcher config.

package/scripts/is-releasable.ts

@@ -18,7 +18,7 @@ import getReleaseNumbers from './get-release-numbers';
 import { getLatestEntry } from './latest-changelog-entry';
 
 const fail = (message: string) => {
-    console.log(`::error::${message}`);
+    console.log(message);
     process.exit(1);
 };
 

package/scripts/latest-changelog-entry.test.ts

@@ -7,7 +7,7 @@
 import { getLatestEntry } from './latest-changelog-entry';
 
 describe('getLatestEntry', () => {
-    it('should extract the latest changelog entry correctly', () => {
+    it('extracts the latest changelog entry', () => {
         const changelog = `# Changelog
 
 All notable changes to this project will be documented in this file.
@@ -29,7 +29,7 @@ All notable changes to this project will be documented in this file.
         expect(result.content).toBe('### Changed\n\n-   Something');
     });
 
-    it('should handle changelog with only one entry', () => {
+    it('handles changelog with only one entry', () => {
         const changelog = `# Changelog
 
 All notable changes to this project will be documented in this file.
@@ -46,7 +46,7 @@ All notable changes to this project will be documented in this file.
         expect(result.content).toBe('### Added\n\n-   Something else');
     });
 
-    it('should handle changelog with empty content', () => {
+    it('handles changelog with empty content', () => {
         const changelog = `# Changelog
 
 All notable changes to this project will be documented in this file.
@@ -65,7 +65,7 @@ All notable changes to this project will be documented in this file.
         expect(result.content).toBe('');
     });
 
-    it('should handle changelog with nothing before the first entry', () => {
+    it('handles changelog with nothing before the first entry', () => {
         const changelog = `## 33.0.0 - 2022-02-01
 
 ### Added

package/src/Device/DeviceSelector/DeviceSelector.test.tsx

@@ -105,7 +105,7 @@ const validFirmware = {
 };
 
 describe('DeviceSelector', () => {
-    it('should have no device selected by default', () => {
+    it('has no device selected by default', () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -119,7 +119,7 @@ describe('DeviceSelector', () => {
         expect(screen.getByText('Select device')).toBeInTheDocument();
     });
 
-    it('should show no connected devices', () => {
+    it('shows an information when no devices are connected', () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -134,7 +134,7 @@ describe('DeviceSelector', () => {
         expect(screen.getByText('Nordic development kit')).toBeInTheDocument();
     });
 
-    it('should list connected devices', () => {
+    it('shows a list of connected devices', () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -149,7 +149,7 @@ describe('DeviceSelector', () => {
         expect(screen.getByText(DEVICE_SERIAL_NUMBER)).toBeInTheDocument();
     });
 
-    it('should unlist disconnected devices', () => {
+    it('does not show disconnected devices', () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -164,7 +164,7 @@ describe('DeviceSelector', () => {
         expect(screen.queryByText(DEVICE_SERIAL_NUMBER)).toBeNull();
     });
 
-    it('should show more device info when selecting the expand button', () => {
+    it('shows more device info when selecting the expand button', () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -181,7 +181,7 @@ describe('DeviceSelector', () => {
         expect(screen.getAllByText(/COM/)).toHaveLength(2);
     });
 
-    it('can select connected devices', async () => {
+    it('allows selecting a device', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -203,7 +203,7 @@ describe('DeviceSelector', () => {
         expect(screen.getAllByText(DEVICE_SERIAL_NUMBER)).toHaveLength(2);
     });
 
-    it('can deselect selected devices', async () => {
+    it('allows disconnecting a device', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -223,7 +223,7 @@ describe('DeviceSelector', () => {
         expect(screen.getByText('Select device')).toBeInTheDocument();
     });
 
-    it('should allow device selection when custom devices are enabled and no valid firmware is defined', async () => {
+    it('allows selecting a device when custom devices are enabled and no valid firmware is defined', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -259,7 +259,7 @@ describe('DeviceSelector', () => {
         expect(screen.getAllByText(DEVICE_SERIAL_NUMBER)).toHaveLength(2);
     });
 
-    it('should deselect device when custom devices are disabled and no valid firmware is defined', async () => {
+    it('allows deselecting a device when custom devices are disabled and no valid firmware is defined', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -295,7 +295,7 @@ describe('DeviceSelector', () => {
         await screen.findByText('Select device');
     });
 
-    it('should show firmware prompt when a valid firmware is defined', async () => {
+    it('shows firmware prompt when a valid firmware is defined', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -317,7 +317,7 @@ describe('DeviceSelector', () => {
         );
     });
 
-    it('should select device when cancelling firmware prompt', async () => {
+    it('selects a device when cancelling firmware prompt', async () => {
         render(
             <DeviceSelector
                 deviceListing={{

package/src/Device/deviceLister.ts

@@ -162,7 +162,7 @@ const removeDeviceFromList =
         }
     };
 /*
- * Starts watching for devices with the given traits. See the nrfutil-device
+ * Starts watching for devices with the given traits. See the nrfutil device
  * library for available traits. Whenever devices are attached/detached, this
  * will dispatch AddDevice or removeDevice and trigger events.
  */

package/src/Dialog/Dialog.test.tsx

@@ -28,18 +28,17 @@ describe('Dialog', () => {
         </Dialog>
     );
 
-    test('is rendered when visible', () => {
+    it('is rendered when visible', () => {
         render(dialog());
         expect(screen.getByRole('dialog')).toBeInTheDocument();
-        test;
     });
 
-    test('is not rendered when not visible', () => {
+    it('is not rendered when not visible', () => {
         render(dialog(false));
         expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
-    test('shows the expected content', () => {
+    it('shows the expected content', () => {
         render(dialog());
 
         expect(screen.getByText('Test Title')).toBeInTheDocument();
@@ -55,7 +54,7 @@ describe('InfoDialog creator', () => {
         </InfoDialog>
     );
 
-    test('shows the expected content', () => {
+    it('shows the expected content', () => {
         render(dialog());
 
         expect(screen.getByText('Info')).toBeInTheDocument();
@@ -63,7 +62,7 @@ describe('InfoDialog creator', () => {
         expect(screen.getByText('Close')).toBeInTheDocument();
     });
 
-    test('invokes the expected action', () => {
+    it('invokes the expected action', () => {
         render(dialog());
 
         const closeButton = screen.getByText('Close');
@@ -80,7 +79,7 @@ describe('ErrorDialog creator', () => {
         </ErrorDialog>
     );
 
-    test('shows the expected content', () => {
+    it('shows the expected content', () => {
         render(dialog());
 
         expect(screen.getByText('Error')).toBeInTheDocument();
@@ -88,7 +87,7 @@ describe('ErrorDialog creator', () => {
         expect(screen.getByText('Close')).toBeInTheDocument();
     });
 
-    test('invokes the expected action', () => {
+    it('invokes the expected action', () => {
         render(dialog());
 
         const closeButton = screen.getByText('Close');
@@ -111,7 +110,7 @@ describe('ConfirmationDialog creator', () => {
         </ConfirmationDialog>
     );
 
-    test('shows the expected content', () => {
+    it('shows the expected content', () => {
         render(dialog());
 
         expect(screen.getByText('Confirm')).toBeInTheDocument();
@@ -121,7 +120,7 @@ describe('ConfirmationDialog creator', () => {
         expect(screen.getByText('Cancel')).toBeInTheDocument();
     });
 
-    test('invokes the expected action', () => {
+    it('invokes the expected action', () => {
         render(dialog());
 
         fireEvent.click(screen.getByText('Optional'));

package/src/Dropdown/Dropdown.test.tsx

@@ -22,7 +22,7 @@ const items = [
 ];
 
 describe('Dropdown', () => {
-    it('renders a list of items', () => {
+    it('shows a list of items', () => {
         render(
             <Dropdown
                 items={items}
@@ -34,7 +34,7 @@ describe('Dropdown', () => {
         expect(screen.getByText('Bar')).toBeInTheDocument();
     });
 
-    it('calls onSelect when item is clicked', () => {
+    it('calls onSelect', () => {
         const onSelect = jest.fn();
         const item = items[1];
         render(
@@ -49,7 +49,7 @@ describe('Dropdown', () => {
         expect(onSelect).toHaveBeenCalledWith(item);
     });
 
-    it('correct item is selected', () => {
+    it('selects the correct item', () => {
         render(
             <Dropdown
                 items={items}

package/src/Dropdown/DropdownHelpers.test.ts

@@ -10,40 +10,39 @@ import {
     getSelectedDropdownItem,
 } from './DropdownHelpers';
 
+const itemList = [
+    { label: 'foo label', value: 'foo' },
+    { label: 'bar label', value: 'bar' },
+];
+
 describe('getSelectedDropdownItem', () => {
+    it('returns the item with the correct value', () => {
+        expect(getSelectedDropdownItem(itemList, 'bar')).toBe(itemList[1]);
+    });
+
     it('returns the first item if value is undefined', () => {
-        const itemList = [{ label: 'foo', value: 'foo' }];
         expect(getSelectedDropdownItem(itemList, undefined)).toBe(itemList[0]);
     });
 
     it('returns the first item if value is not found', () => {
-        const itemList = [{ label: 'foo', value: 'foo' }];
-        expect(getSelectedDropdownItem(itemList, 'bar')).toBe(itemList[0]);
-    });
-
-    it('returns the item with the correct value', () => {
-        const itemList = [
-            { label: 'foo', value: 'foo' },
-            { label: 'bar', value: 'bar' },
-        ];
-        expect(getSelectedDropdownItem(itemList, 'bar')).toBe(itemList[1]);
-    });
-
-    it('returns the item with the correct value when value is a boolean', () => {
-        const itemList = [
-            { label: 'on', value: 'on' },
-            { label: 'off', value: 'off' },
-        ];
-        expect(getSelectedDropdownItem(itemList, true)).toBe(itemList[0]);
+        expect(getSelectedDropdownItem(itemList, 'unknown')).toBe(itemList[0]);
     });
 
     it('returns the notFound item if value is not found', () => {
-        const itemList = [{ label: 'foo', value: 'foo' }];
         const notFound = { label: 'not found', value: 'not found' };
-        expect(getSelectedDropdownItem(itemList, 'bar', notFound)).toBe(
+        expect(getSelectedDropdownItem(itemList, 'unknown', notFound)).toBe(
             notFound
         );
     });
+
+    it('handles booleans as the strings `on` and `off`', () => {
+        const booleanList = [
+            { label: 'on label', value: 'on' },
+            { label: 'off label', value: 'off' },
+        ];
+        expect(getSelectedDropdownItem(booleanList, true).value).toBe('on');
+        expect(getSelectedDropdownItem(booleanList, false).value).toBe('off');
+    });
 });
 
 describe('convertToDropDownItems', () => {

package/src/ErrorBoundary/ErrorBoundary.test.tsx

@@ -43,7 +43,7 @@ describe('ErrorBoundary', () => {
         jest.clearAllMocks();
     });
 
-    it('can take custom reporting functions', () => {
+    it('accepts custom reporting functions', () => {
         const sendTelemetryEvent = jest.fn();
 
         render(
@@ -54,7 +54,7 @@ describe('ErrorBoundary', () => {
         expect(sendTelemetryEvent).toHaveBeenCalled();
     });
 
-    it('should render error boundary component when there is an error', () => {
+    it('renders error boundary component when there is an error', () => {
         render(
             <ErrorBoundary>
                 <Child />
@@ -64,7 +64,7 @@ describe('ErrorBoundary', () => {
         expect(errorMessage).toBeDefined();
     });
 
-    it('should clear store if factory reset', async () => {
+    it('clears store on factory reset', async () => {
         render(
             <ErrorBoundary>
                 <Child />
@@ -76,7 +76,7 @@ describe('ErrorBoundary', () => {
         expect(store().clear).toHaveBeenCalled();
     });
 
-    it('should present system information', async () => {
+    it('presents system information', async () => {
         render(
             <ErrorBoundary>
                 <Child />

package/src/ErrorDialog/ErrorDialog.test.tsx

@@ -21,14 +21,14 @@ describe('ErrorDialog', () => {
         expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
-    it('should render visible dialog with one message', () => {
+    it('renders visible dialog with one message', () => {
         render(<ErrorDialog />, [showDialog('An error occured')]);
 
         expect(screen.getByRole('dialog')).toBeInTheDocument();
         expect(screen.getByText('An error occured')).toBeInTheDocument();
     });
 
-    it('should render visible dialog with two messages', () => {
+    it('renders visible dialog with two messages', () => {
         render(<ErrorDialog />, [
             showDialog('An error occured'),
             showDialog('Another error occured'),
@@ -54,7 +54,7 @@ describe('ErrorDialog', () => {
         });
     });
 
-    it('can have a custom error resolutions', () => {
+    it('can have custom error resolutions', () => {
         const specialHandling = jest.fn();
 
         render(<ErrorDialog />, [

package/src/ErrorDialog/errorDialogSlice.test.ts

@@ -11,13 +11,13 @@ const anErrorMessage = 'An error occurred';
 const anotherErrorMessage = 'Another error occurred';
 
 describe('errorDialogReducer', () => {
-    it('should be hidden by default', () => {
+    it('is hidden by default', () => {
         const initialState = dispatchTo(reducer);
 
         expect(initialState.isVisible).toEqual(false);
     });
 
-    it('should be visible and have the supplied message after show action has been dispatched', () => {
+    it('shows a message', () => {
         const withAnError = dispatchTo(reducer, [
             showDialog(anErrorMessage, {}),
         ]);
@@ -27,7 +27,7 @@ describe('errorDialogReducer', () => {
         });
     });
 
-    it('should be visible and have all messages after multiple show actions have been dispatched', () => {
+    it('shows multiple messages', () => {
         const withTwoErrors = dispatchTo(reducer, [
             showDialog(anErrorMessage, {}),
             showDialog(anotherErrorMessage, {}),
@@ -41,7 +41,7 @@ describe('errorDialogReducer', () => {
         });
     });
 
-    it('should not add message if it already exists in list', () => {
+    it('does not show duplicate messages', () => {
         const withAnError = dispatchTo(reducer, [
             showDialog(anErrorMessage, {}),
             showDialog(anErrorMessage, {}),
@@ -52,7 +52,7 @@ describe('errorDialogReducer', () => {
         ]);
     });
 
-    it('should set dialog to invisible and clear message list when hide action has been dispatched', () => {
+    it('can be hidden and cleared', () => {
         const withAClearedError = dispatchTo(reducer, [
             showDialog(anErrorMessage, {}),
             hideDialog(),

package/src/FactoryReset/FactoryResetButton.test.tsx

@@ -11,36 +11,42 @@ import render from '../../test/testrenderer';
 import { getAppSpecificStore as store } from '../utils/persistentStore';
 import FactoryResetButton from './FactoryResetButton';
 
-const LABEL = 'Factory reset';
-const OKBUTTONTEXT = 'Restore';
+const FACTORY_RESET = 'Factory reset';
+const OK = 'Restore';
+const CANCEL = 'Cancel';
 
 describe('FactoryReset', () => {
     afterEach(() => {
         jest.resetAllMocks();
     });
 
-    it('should clear store when confirmed', async () => {
-        render(<FactoryResetButton label={LABEL} />);
-        fireEvent.click(screen.getByText(LABEL));
-        await screen.findByText(OKBUTTONTEXT);
-        fireEvent.click(screen.getByText(OKBUTTONTEXT));
+    it('clears the store', async () => {
+        render(<FactoryResetButton label={FACTORY_RESET} />);
+        fireEvent.click(screen.getByText(FACTORY_RESET));
+        await screen.findByText(OK);
+        fireEvent.click(screen.getByText(OK));
         expect(store().clear).toHaveBeenCalled();
     });
 
-    it('should not clear store when cancelled', async () => {
-        render(<FactoryResetButton label={LABEL} />);
-        fireEvent.click(screen.getByText(LABEL));
-        await screen.findByText('Cancel');
-        fireEvent.click(screen.getByText('Cancel'));
+    it('does not clear the store when cancelled', async () => {
+        render(<FactoryResetButton label={FACTORY_RESET} />);
+        fireEvent.click(screen.getByText(FACTORY_RESET));
+        await screen.findByText(CANCEL);
+        fireEvent.click(screen.getByText(CANCEL));
         expect(store().clear).not.toHaveBeenCalled();
     });
 
-    it('is possible to override reset function', async () => {
+    it('allows overriding the reset function', async () => {
         const overrideResetFn = jest.fn();
-        render(<FactoryResetButton label={LABEL} resetFn={overrideResetFn} />);
-        fireEvent.click(screen.getByText(LABEL));
-        await screen.findByText(OKBUTTONTEXT);
-        fireEvent.click(screen.getByText(OKBUTTONTEXT));
+        render(
+            <FactoryResetButton
+                label={FACTORY_RESET}
+                resetFn={overrideResetFn}
+            />
+        );
+        fireEvent.click(screen.getByText(FACTORY_RESET));
+        await screen.findByText(OK);
+        fireEvent.click(screen.getByText(OK));
         expect(overrideResetFn).toHaveBeenCalled();
     });
 });

package/src/FactoryReset/FactoryResetButton.tsx

@@ -5,6 +5,7 @@
  */
 
 import React, { FC, useRef, useState } from 'react';
+import { getCurrentWindow } from '@electron/remote';
 
 import Button, { ButtonVariants } from '../Button/Button';
 import { Dialog, DialogButton } from '../Dialog/Dialog';
@@ -21,7 +22,7 @@ interface Props {
 }
 
 const DEFAULT_MODAL_TEXT =
-    'By restoring defaults, all stored app-specific configuration values will be lost. This does not include configurations such as device renames and favorites. Are you sure you want to proceed?';
+    'By restoring the default settings, all locally stored, app-specific configuration values will be lost. This does not include configurations such as device renames and favorites. The app will be reloaded. Are you sure you want to proceed?';
 
 const FactoryResetButton: FC<Props> = ({
     resetFn,
@@ -36,6 +37,7 @@ const FactoryResetButton: FC<Props> = ({
     const defaultResetFn = () => {
         store().clear();
         logger.info('Successfully restored defaults');
+        getCurrentWindow().reload();
     };
 
     return (

package/src/Slider/Factor.test.ts

@@ -7,7 +7,7 @@
 import { isFactor } from './factor';
 
 describe('Factor', () => {
-    it('Test valid integer factors ', () => {
+    test('Valid integer factors ', () => {
         expect(isFactor(20, 5)).toBe(true);
         expect(isFactor(28, 2)).toBe(true);
         expect(isFactor(27, 3)).toBe(true);
@@ -16,7 +16,7 @@ describe('Factor', () => {
         expect(isFactor(21, 7)).toBe(true);
     });
 
-    it('Test invalid integer factors ', () => {
+    test('Invalid integer factors ', () => {
         expect(isFactor(20, 6)).toBe(false);
         expect(isFactor(28, 3)).toBe(false);
         expect(isFactor(27, 4)).toBe(false);
@@ -25,7 +25,7 @@ describe('Factor', () => {
         expect(isFactor(21, 8)).toBe(false);
     });
 
-    it('Test valid decimal factors ', () => {
+    test('Valid decimal factors ', () => {
         expect(isFactor(0.15, 0.05)).toBe(true);
         expect(isFactor(0.2331, 0.0001)).toBe(true);
         expect(isFactor(0.22, 0.02)).toBe(true);
@@ -36,7 +36,7 @@ describe('Factor', () => {
         expect(isFactor(0.2331, 0.1)).toBe(true);
     });
 
-    it('Test invalid decimal factors ', () => {
+    test('Invalid decimal factors ', () => {
         expect(isFactor(0.16, 0.05)).toBe(false);
         expect(isFactor(0.2331, 0.0002)).toBe(false);
         expect(isFactor(0.22, 0.03)).toBe(false);

package/src/index.ts

@@ -196,12 +196,10 @@ export {
     inMain as apps,
     type App as AppType,
     type AppSpec,
-    type AppWithError,
     type DownloadableApp,
     type InstalledDownloadableApp,
     type LaunchableApp,
     type LocalApp,
-    type SourceWithError,
     type UninstalledDownloadableApp,
     type WithdrawnApp,
 } from '../ipc/apps';