Ying/navfixes (#476)

* add column for model for module identity; fix nav regression * bump version * fix broken tests
Azure · Oct 27, 2021 · 7b2cef8 · 7b2cef8
1 parent 1e1515f
commit 7b2cef8
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-iot-explorer",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "This project welcomes contributions and suggestions. Most contributions require you to agree to a\r Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us\r the rights to use your contribution. For details, visit https://cla.microsoft.com.",
   "main": "host/electron.js",
   "build": {

diff --git a/src/app/api/models/moduleIdentity.ts b/src/app/api/models/moduleIdentity.ts
@@ -15,4 +15,5 @@ export interface ModuleIdentity {
     lastActivityTime?: string;
     managedBy?: string;
     moduleId: string;
+    modelId?: string;
 }
diff --git a/src/app/api/services/moduleService.spec.ts b/src/app/api/services/moduleService.spec.ts
@@ -81,10 +81,13 @@ describe('moduleService', () => {
             const connectionInformation = mockDataPlaneConnectionHelper();
             const dataPlaneRequest: DataplaneService.DataPlaneRequest = {
                 apiVersion:  HUB_DATA_PLANE_API_VERSION,
+                body: JSON.stringify({
+                    query: `SELECT * FROM devices.modules WHERE deviceId in ['${parameters.deviceId}']`,
+                }),
                 hostName: connectionInformation.connectionInfo.hostName,
-                httpMethod: HTTP_OPERATION_TYPES.Get,
-                path: `devices/${deviceId}/modules`,
-                sharedAccessSignature: connectionInformation.sasToken
+                httpMethod: HTTP_OPERATION_TYPES.Post,
+                path: 'devices/query',
+                sharedAccessSignature: connectionInformation.sasToken,
             };
 
             const result = await ModuleService.fetchModuleIdentities(parameters);

diff --git a/src/app/api/services/moduleService.ts b/src/app/api/services/moduleService.ts
@@ -31,9 +31,12 @@ export const fetchModuleIdentities = async (parameters: FetchModuleIdentitiesPar
 
     const dataPlaneRequest: DataPlaneRequest = {
         apiVersion:  HUB_DATA_PLANE_API_VERSION,
+        body: JSON.stringify({
+            query: `SELECT * FROM devices.modules WHERE deviceId in ['${parameters.deviceId}']`,
+        }),
         hostName: connectionInformation.connectionInfo.hostName,
-        httpMethod: HTTP_OPERATION_TYPES.Get,
-        path: `devices/${parameters.deviceId}/modules`,
+        httpMethod: HTTP_OPERATION_TYPES.Post,
+        path: 'devices/query',
         sharedAccessSignature: connectionInformation.sasToken,
     };
 

diff --git a/src/app/css/_deviceContent.scss b/src/app/css/_deviceContent.scss
@@ -67,7 +67,6 @@ $nav-width: 20%;
         transition: all 0.5s;
     }
     .device-content-detail {
-        margin: 0;
         .form-group {
             .fieldChildren {
                 display: flex;

diff --git a/...vices/module/moduleIdentityList/components/__snapshots__/moduleIdentityList.spec.tsx.snap b/...vices/module/moduleIdentityList/components/__snapshots__/moduleIdentityList.spec.tsx.snap
@@ -74,12 +74,21 @@ exports[`ModuleIdentityList snapshot matches snapshot when fetch failed 1`] = `
             Object {
               "ariaLabel": "moduleIdentity.columns.lastActivityTime",
               "fieldName": "lastActivityTime",
+              "isResizable": true,
               "key": "lastActivityTime",
               "maxWidth": 250,
               "minWidth": 150,
               "name": "moduleIdentity.columns.lastActivityTime",
               "onRender": [Function],
             },
+            Object {
+              "ariaLabel": "moduleIdentity.columns.modelId",
+              "fieldName": "modelId",
+              "key": "modelId",
+              "maxWidth": 250,
+              "minWidth": 150,
+              "name": "moduleIdentity.columns.modelId",
+            },
           ]
         }
         items={Array []}
@@ -165,12 +174,21 @@ exports[`ModuleIdentityList snapshot matches snapshot while loading 1`] = `
             Object {
               "ariaLabel": "moduleIdentity.columns.lastActivityTime",
               "fieldName": "lastActivityTime",
+              "isResizable": true,
               "key": "lastActivityTime",
               "maxWidth": 250,
               "minWidth": 150,
               "name": "moduleIdentity.columns.lastActivityTime",
               "onRender": [Function],
             },
+            Object {
+              "ariaLabel": "moduleIdentity.columns.modelId",
+              "fieldName": "modelId",
+              "key": "modelId",
+              "maxWidth": 250,
+              "minWidth": 150,
+              "name": "moduleIdentity.columns.modelId",
+            },
           ]
         }
         items={Array []}
@@ -256,12 +274,21 @@ exports[`ModuleIdentityList snapshot matches snapshot with moduleIdentityList 1`
             Object {
               "ariaLabel": "moduleIdentity.columns.lastActivityTime",
               "fieldName": "lastActivityTime",
+              "isResizable": true,
               "key": "lastActivityTime",
               "maxWidth": 250,
               "minWidth": 150,
               "name": "moduleIdentity.columns.lastActivityTime",
               "onRender": [Function],
             },
+            Object {
+              "ariaLabel": "moduleIdentity.columns.modelId",
+              "fieldName": "modelId",
+              "key": "modelId",
+              "maxWidth": 250,
+              "minWidth": 150,
+              "name": "moduleIdentity.columns.modelId",
+            },
           ]
         }
         items={

diff --git a/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx b/src/app/devices/module/moduleIdentityList/components/moduleIdentityList.tsx
@@ -134,11 +134,20 @@ export const ModuleIdentityList: React.FC = () => {
             {
                 ariaLabel: t(ResourceKeys.moduleIdentity.columns.lastActivityTime),
                 fieldName: 'lastActivityTime',
+                isResizable: true,
                 key: 'lastActivityTime',
                 maxWidth: 250,
                 minWidth: 150,
                 name: t(ResourceKeys.moduleIdentity.columns.lastActivityTime),
                 onRender: item => parseDateTimeString(item.lastActivityTime) || '--'
+            },
+            {
+                ariaLabel: t(ResourceKeys.moduleIdentity.columns.modelId),
+                fieldName: 'modelId',
+                key: 'modelId',
+                maxWidth: 250,
+                minWidth: 150,
+                name: t(ResourceKeys.moduleIdentity.columns.modelId)
             }];
 
         return columns;

diff --git a/src/localization/locales/en.json b/src/localization/locales/en.json
@@ -750,7 +750,8 @@
             "moduleId": "Module Id",
             "connectionState": "Connection state",
             "connectionStateLastUpdated": "Connection state last updated time",
-            "lastActivityTime": "Last activity time"
+            "lastActivityTime": "Last activity time",
+            "modelId": "IoT Plug and Play module"
         },
         "noModules": "There are no module identities for this device.",
         "errorFetching": "An error prevented this information from being loaded.",

diff --git a/src/localization/resourceKeys.ts b/src/localization/resourceKeys.ts
@@ -816,6 +816,7 @@ export class ResourceKeys {
          connectionState : "moduleIdentity.columns.connectionState",
          connectionStateLastUpdated : "moduleIdentity.columns.connectionStateLastUpdated",
          lastActivityTime : "moduleIdentity.columns.lastActivityTime",
+         modelId : "moduleIdentity.columns.modelId",
          moduleId : "moduleIdentity.columns.moduleId",
       },
       command : {