fixing CMP GUI so it does not always react + bug fix (project-chip#1434)

* fixing CMP GUI so it does not always react + fixing bug where user clicks on endpoint then state has to be updated * update to dbEnum reference
paulr34 · Sep 26, 2024 · 323ad2e · 323ad2e
1 parent 8c50f6e
commit 323ad2e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/components/ZclCreateModifyEndpoint.vue b/src/components/ZclCreateModifyEndpoint.vue
@@ -453,7 +453,7 @@ export default {
 
         // Set / unset multiple device option in mcp
         if (this.$store.state.zap.isMultiConfig) {
-          if (categoryTmp === 'zigbee') {
+          if (categoryTmp === DbEnum.helperCategory.zigbee) {
             this.$store.state.zap.cmpEnableZigbeeFeatures = true
             this.$store.state.zap.cmpEnableMatterFeatures = false
           } else {

diff --git a/src/components/ZclEndpointCard.vue b/src/components/ZclEndpointCard.vue
@@ -164,7 +164,7 @@ limitations under the License.
               }}</strong>
             </div>
           </q-item>
-          <q-item class="row" v-if="enableNetworkId">
+          <q-item class="row">
             <div class="col-6">
               <strong>Network</strong>
             </div>
@@ -173,14 +173,14 @@ limitations under the License.
             </div>
           </q-item>
           <q-item class="row">
-            <div class="col-6" v-if="enableParentEndpoint">
+            <div class="col-6" v-if="showParentEndpointIdentifier">
               <strong>Parent Endpoint</strong>
             </div>
-            <div class="col-6" v-if="enableParentEndpoint">
+            <div class="col-6" v-if="showParentEndpointIdentifier">
               <strong>{{ parentEndpointIdentifier[endpointReference] }}</strong>
             </div>
           </q-item>
-          <q-item class="row" v-if="enableProfileId">
+          <q-item class="row" v-if="showProfileId">
             <div class="col-6">
               <strong>Profile ID</strong>
             </div>
@@ -419,6 +419,15 @@ export default {
       if (this.$route.path !== '/') {
         this.$router.push({ path: '/' })
       }
+      if (this.$store.state.zap.isMultiConfig) {
+        if (categoryTmp === dbEnum.helperCategory.zigbee) {
+          this.$store.state.zap.cmpEnableZigbeeFeatures = true
+          this.$store.state.zap.cmpEnableMatterFeatures = false
+        } else {
+          this.$store.state.zap.cmpEnableZigbeeFeatures = false
+          this.$store.state.zap.cmpEnableMatterFeatures = true
+        }
+      }
     }
   },
   computed: {
@@ -491,11 +500,27 @@ export default {
         return this.$store.state.zap.endpointView.parentEndpointIdentifier
       }
     },
+    showParentEndpointIdentifier: {
+      get() {
+        return (
+          this.getDeviceCategory(this.deviceType[0].packageRef) === 'matter'
+        )
+      }
+    },
     profileId: {
       get() {
         return this.$store.state.zap.endpointView.profileId
       }
     },
+    showProfileId: {
+      get() {
+        return (
+          this.getDeviceCategory(this.deviceType[0].packageRef) === 'zigbee' &&
+          this.$store.state.zap.isProfileIdShown &&
+          this.enableProfileId
+        )
+      }
+    },
     deviceId: {
       get() {
         return this.$store.state.zap.endpointTypeView.deviceIdentifier