@nordicsemiconductor/pc-nrfconnect-shared 141.0.0 → 143.0.0

package/Changelog.md

@@ -7,6 +7,24 @@ 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.
 
+## 143.0.0 - 2023-12-14
+
+### Changed
+
+-   Run eslint or prettier on all Markdown (.md) files except the ones in
+    `doc/docs` folder.
+
+### Fixed
+
+-   `NRF9160` and `NRF9161` now show modem trait as true when using external
+    jLink
+
+## 142.0.0 - 2023-12-13
+
+### Fixed
+
+-   `UsageData` sends common app metadata
+
 ## 141.0.0 - 2023-12-12
 
 ### Added

package/config/eslintrc.js

@@ -23,7 +23,7 @@ module.exports = {
         'prettier',
     ],
     ignorePatterns: [
-        'docs/',
+        'doc/docs/',
         'package-lock.json',
         'scripts/nordic-publish.js',
         'typings/generated',

package/package.json

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

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

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { fireEvent, screen, waitFor } from '@testing-library/react';
+import { act, fireEvent, screen, waitFor } from '@testing-library/react';
 
 import render from '../../../test/testrenderer';
 import { addDevice, Device, removeDevice } from '../deviceSlice';
@@ -168,7 +168,7 @@ describe('DeviceSelector', () => {
         expect(screen.getAllByText(/COM/)).toHaveLength(2);
     });
 
-    it('can select connected devices', () => {
+    it('can select connected devices', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -182,7 +182,11 @@ describe('DeviceSelector', () => {
         );
 
         fireEvent.click(screen.getByText('Select device'));
-        fireEvent.click(screen.getByText(DEVICE_SERIAL_NUMBER));
+        // eslint-disable-next-line testing-library/no-unnecessary-act
+        await act(async () => {
+            await fireEvent.click(screen.getByText(DEVICE_SERIAL_NUMBER));
+        });
+
         expect(screen.getAllByText(DEVICE_SERIAL_NUMBER)).toHaveLength(2);
     });
 
@@ -206,7 +210,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', () => {
+    it('should allow device selection when custom devices are enabled and no valid firmware is defined', async () => {
         render(
             <DeviceSelector
                 deviceListing={{
@@ -232,7 +236,11 @@ describe('DeviceSelector', () => {
             [addDevice(testDevice)]
         );
         fireEvent.click(screen.getByText('Select device'));
-        fireEvent.click(screen.getByText(DEVICE_SERIAL_NUMBER));
+
+        // eslint-disable-next-line testing-library/no-unnecessary-act
+        await act(async () => {
+            await fireEvent.click(screen.getByText(DEVICE_SERIAL_NUMBER));
+        });
 
         expect(screen.queryByText('OK')).toBeNull();
         expect(screen.getAllByText(DEVICE_SERIAL_NUMBER)).toHaveLength(2);

package/src/Device/DeviceSelector/DeviceSelector.tsx

@@ -18,7 +18,11 @@ import {
     getWaitingToAutoReselect,
     setAutoSelectDevice,
 } from '../deviceAutoSelectSlice';
-import { startWatchingDevices, stopWatchingDevices } from '../deviceLister';
+import {
+    hasModem,
+    startWatchingDevices,
+    stopWatchingDevices,
+} from '../deviceLister';
 import { DeviceSetupConfig, setupDevice } from '../deviceSetup';
 import DeviceSetupView from '../DeviceSetup/DeviceSetupView';
 import {
@@ -102,6 +106,17 @@ export default ({
                 abortController.current
             );
             abortController.current = undefined;
+
+            // Modem might be set to false when using external jLink or custom PCBs
+            if (!device.traits.modem && hasModem(device, deviceInfo)) {
+                const newDevice = {
+                    ...device,
+                    traits: { ...device.traits, modem: true },
+                };
+                dispatch(selectDevice(newDevice));
+                dispatch(setAutoSelectDevice(newDevice));
+            }
+
             dispatch(setSelectedDeviceInfo(deviceInfo));
             onDeviceSelected(device, autoReselected);
 

package/src/Device/deviceLister.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
+import { DeviceInfo } from '../../nrfutil';
 import { DeviceTraits, NrfutilDevice } from '../../nrfutil/device/common';
 import NrfutilDeviceLib from '../../nrfutil/device/device';
 import logger from '../logging';
@@ -81,6 +82,13 @@ const shouldAutoReselect = (
     return globalAutoReselect;
 };
 
+export const hasModem = (device: Device, deviceInfo?: DeviceInfo) =>
+    !!(
+        device.traits.modem ||
+        deviceInfo?.jlink?.deviceVersion?.toUpperCase().includes('NRF9160') ||
+        deviceInfo?.jlink?.deviceVersion?.toUpperCase().includes('NRF9161')
+    );
+
 const initAutoReconnectTimeout =
     (onTimeout: () => void, waitForDevice: WaitForDevice): AppThunk =>
     dispatch => {
@@ -298,6 +306,23 @@ export const startWatchingDevices =
                                             device
                                         );
                                     dispatch(setSelectedDeviceInfo(deviceInfo));
+
+                                    // Modem might be set to false when using external jLink or custom PCBs
+                                    if (
+                                        !deviceWithPersistedData.traits.modem &&
+                                        hasModem(
+                                            deviceWithPersistedData,
+                                            deviceInfo
+                                        )
+                                    ) {
+                                        deviceWithPersistedData.traits.modem =
+                                            true;
+                                        dispatch(
+                                            selectDevice(
+                                                deviceWithPersistedData
+                                            )
+                                        );
+                                    }
                                 }
 
                                 if (waitForDevice.onSuccess)

package/src/utils/usageDataMain.ts

@@ -52,12 +52,14 @@ const init = () => {
             envelope.data.baseData = { name: envelope.data?.baseData.name };
         } else {
             envelope.tags['ai.cloud.roleInstance'] = undefined; // remove PC name
-            envelope.data.baseData = {
-                applicationName,
-                applicationVersion,
-                isDevelopment,
-                ...envelope.data.baseData,
-            };
+            if (envelope.data.baseData) {
+                envelope.data.baseData.properties = {
+                    applicationName,
+                    applicationVersion,
+                    isDevelopment,
+                    ...envelope.data.baseData.properties,
+                };
+            }
         }
 
         return true;

package/src/utils/usageDataRenderer.ts

@@ -66,12 +66,12 @@ const init = async () => {
                 name: applicationName,
             };
             envelope.ext = { ...envelope.ext, trace };
-            envelope.baseData = {
+            envelope.data = {
+                ...envelope.data,
                 applicationName,
                 applicationVersion,
                 isDevelopment,
                 source,
-                ...envelope.baseData,
             };
         }
     });

package/typings/generated/src/Device/DeviceSelector/DeviceSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAW9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;IACrE,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;CAC9C;8KAYE,KAAK;AATR,wBA8JE"}
+{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAe9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;IACrE,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;CAC9C;8KAYE,KAAK;AATR,wBAyKE"}

package/typings/generated/src/Device/deviceLister.d.ts

@@ -1,6 +1,8 @@
+import { DeviceInfo } from '../../nrfutil';
 import { DeviceTraits } from '../../nrfutil/device/common';
 import type { AppThunk, RootState } from '../store';
 import { Device } from './deviceSlice';
+export declare const hasModem: (device: Device, deviceInfo?: DeviceInfo) => boolean;
 export declare const hasValidDeviceTraits: (deviceTraits: DeviceTraits, requiredTraits: DeviceTraits) => boolean;
 export declare const startWatchingDevices: (deviceListing: DeviceTraits, onDeviceConnected: (device: Device) => void, onDeviceDisconnected: (device: Device) => void, onDeviceDeselected: () => void, doSelectDevice: (device: Device, autoReselected: boolean) => void) => AppThunk<RootState, void>;
 export declare const stopWatchingDevices: (callback?: () => void) => void;

package/typings/generated/src/Device/deviceLister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceLister.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLister.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAiB,MAAM,6BAA6B,CAAC;AAG1E,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAcpD,OAAO,EAEH,MAAM,EAIT,MAAM,eAAe,CAAC;AAkFvB,eAAO,MAAM,oBAAoB,iBACf,YAAY,kBACV,YAAY,YAS3B,CAAC;AAkCN,eAAO,MAAM,oBAAoB,kBAEV,YAAY,8BACC,MAAM,KAAK,IAAI,iCACZ,MAAM,KAAK,IAAI,sBAC1B,MAAM,IAAI,2BACL,MAAM,kBAAkB,OAAO,KAAK,IAAI,KAClE,SAAS,SAAS,EAAE,IAAI,CAyO1B,CAAC;AAwDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}
+{"version":3,"file":"deviceLister.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLister.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAiB,MAAM,6BAA6B,CAAC;AAG1E,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAcpD,OAAO,EAEH,MAAM,EAIT,MAAM,eAAe,CAAC;AAsDvB,eAAO,MAAM,QAAQ,WAAY,MAAM,eAAe,UAAU,YAK3D,CAAC;AA8BN,eAAO,MAAM,oBAAoB,iBACf,YAAY,kBACV,YAAY,YAS3B,CAAC;AAkCN,eAAO,MAAM,oBAAoB,kBAEV,YAAY,8BACC,MAAM,KAAK,IAAI,iCACZ,MAAM,KAAK,IAAI,sBAC1B,MAAM,IAAI,2BACL,MAAM,kBAAkB,OAAO,KAAK,IAAI,KAClE,SAAS,SAAS,EAAE,IAAI,CA0P1B,CAAC;AAwDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}

package/typings/generated/src/utils/usageDataMain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usageDataMain.d.ts","sourceRoot":"","sources":["../../../../src/utils/usageDataMain.ts"],"names":[],"mappings":"AAUA,OAAwB,EAEpB,QAAQ,EACX,MAAM,mBAAmB,CAAC;;;;;;;;AAiG3B,wBAME"}
+{"version":3,"file":"usageDataMain.d.ts","sourceRoot":"","sources":["../../../../src/utils/usageDataMain.ts"],"names":[],"mappings":"AAUA,OAAwB,EAEpB,QAAQ,EACX,MAAM,mBAAmB,CAAC;;;;;;;;AAmG3B,wBAME"}