load attribute when open zap file (#1492)

Author: ethanzhouyc

src-electron/db/query-attribute.js

@@ -1250,13 +1250,17 @@ async function selectAttributeMappingsByPackageIds(db, packageIds) {
 
 /**
  * Get all attributes in an endpoint type cluster
+ * Disabled attributes are not loaded into ENDPOINT_TYPE_ATTRIBUTE table
+ * when opening a ZAP file, so we need to join DEVICE_TYPE_CLUSTER table
  * @param {*} db
  * @param {*} endpointTyeClusterId
+ * @param {*} deviceTypeClusterId
  * @returns all attributes in an endpoint type cluster
  */
-async function selectAttributesByEndpointTypeClusterId(
+async function selectAttributesByEndpointTypeClusterIdAndDeviceTypeClusterId(
   db,
-  endpointTyeClusterId
+  endpointTypeClusterId,
+  deviceTypeClusterId
 ) {
   let rows = await dbApi.dbAll(
     db,
@@ -1274,13 +1278,19 @@ async function selectAttributesByEndpointTypeClusterId(
     FROM
       ATTRIBUTE
     JOIN
+      DEVICE_TYPE_CLUSTER
+    ON
+      ATTRIBUTE.CLUSTER_REF = DEVICE_TYPE_CLUSTER.CLUSTER_REF
+    LEFT JOIN
       ENDPOINT_TYPE_ATTRIBUTE
     ON
-      ATTRIBUTE.ATTRIBUTE_ID = ENDPOINT_TYPE_ATTRIBUTE.ATTRIBUTE_REF
+        ATTRIBUTE.ATTRIBUTE_ID = ENDPOINT_TYPE_ATTRIBUTE.ATTRIBUTE_REF
+      AND
+        ENDPOINT_TYPE_ATTRIBUTE.ENDPOINT_TYPE_CLUSTER_REF = ?
     WHERE
-      ENDPOINT_TYPE_ATTRIBUTE.ENDPOINT_TYPE_CLUSTER_REF = ?
+      DEVICE_TYPE_CLUSTER.DEVICE_TYPE_CLUSTER_ID = ?
     `,
-    [endpointTyeClusterId]
+    [endpointTypeClusterId, deviceTypeClusterId]
   )
   return rows.map(dbMapping.map.endpointTypeAttributeExtended)
 }
@@ -1311,5 +1321,5 @@ exports.selectTokenAttributesForEndpoint = selectTokenAttributesForEndpoint
 exports.selectAllUserTokenAttributes = selectAllUserTokenAttributes
 exports.selectAttributeMappingsByPackageIds =
   selectAttributeMappingsByPackageIds
-exports.selectAttributesByEndpointTypeClusterId =
-  selectAttributesByEndpointTypeClusterId
+exports.selectAttributesByEndpointTypeClusterIdAndDeviceTypeClusterId =
+  selectAttributesByEndpointTypeClusterIdAndDeviceTypeClusterId

src-electron/db/query-command.js

@@ -2051,7 +2051,7 @@ async function selectNonManufacturerSpecificCommandDetailsFromAllEndpointTypesAn
 /**
  * Get all commands in an endpoint type cluster
  * Non-required commands are not loaded into ENDPOINT_TYPE_COMMAND table,
- * so we need to load all commands by joining DEVICE_TYPE_COMMAND table
+ * so we need to load all commands by joining DEVICE_TYPE_CLUSTER table
  * @param {*} db
  * @param {*} endpointTypeClusterId
  * @param {*} deviceTypeClusterId

src-electron/db/query-event.js

@@ -236,7 +236,7 @@ ORDER BY
 /**
  * Get all events in an endpoint type cluster
  * Disabled events are not loaded into ENDPOINT_TYPE_EVENT table,
- * so we need to load all events by joining DEVICE_TYPE_EVENT table
+ * so we need to load all events by joining DEVICE_TYPE_CLUSTER table
  *
  * @param {*} db
  * @param {*} endpointTypeClusterId

src-electron/rest/user-data.js

@@ -112,9 +112,10 @@ async function getEndpointTypeElements(
   deviceTypeClusterId
 ) {
   let [attributes, commands, events] = await Promise.all([
-    queryAttribute.selectAttributesByEndpointTypeClusterId(
+    queryAttribute.selectAttributesByEndpointTypeClusterIdAndDeviceTypeClusterId(
       db,
-      endpointTypeClusterId
+      endpointTypeClusterId,
+      deviceTypeClusterId
     ),
     queryCommand.selectCommandsByEndpointTypeClusterIdAndDeviceTypeClusterId(
       db,

test/query.test.js

@@ -623,10 +623,10 @@ describe('Endpoint Type Config Queries', () => {
       let expectedNumbers = {
         Identify: {
           server: { attributes: 2, commands: 6 },
-          client: { attributes: 1, commands: 6 }
+          client: { attributes: 2, commands: 6 }
         },
-        Basic: { server: { attributes: 3, commands: 1 } },
-        'On/off': { client: { attributes: 1, commands: 11 } }
+        Basic: { server: { attributes: 18, commands: 1 } },
+        'On/off': { client: { attributes: 9, commands: 11 } }
       }
       let deviceTypeClusters =
         await queryDeviceType.selectDeviceTypeClustersByDeviceTypeRef(
@@ -646,9 +646,10 @@ describe('Endpoint Type Config Queries', () => {
             if (deviceTypeCluster) {
               let deviceTypeClusterId = deviceTypeCluster.id
               queryAttribute
-                .selectAttributesByEndpointTypeClusterId(
+                .selectAttributesByEndpointTypeClusterIdAndDeviceTypeClusterId(
                   db,
-                  endpointTypeClusterId
+                  endpointTypeClusterId,
+                  deviceTypeClusterId
                 )
                 .then((attributes) => {
                   expect(attributes.length).toBe(