Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing CMP GUI so it does not always react + bug fix #1434

Merged
merged 2 commits into from
Sep 26, 2024
Merged

fixing CMP GUI so it does not always react + bug fix #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b6f533
fixing CMP GUI so it does not always react + fixing bug where user cl…
paulr34 Sep 25, 2024
9a7711b
update to dbEnum reference
paulr34 Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ZclCreateModifyEndpoint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
33 changes: 29 additions & 4 deletions src/components/ZclEndpointCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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: {
Expand Down Expand Up @@ -491,11 +500,27 @@ export default {
return this.$store.state.zap.endpointView.parentEndpointIdentifier
}
},
showParentEndpointIdentifier: {
get() {
return (
this.getDeviceCategory(this.deviceType[0].packageRef) === 'matter'
paulr34 marked this conversation as resolved.
Show resolved Hide resolved
)
}
},
profileId: {
get() {
return this.$store.state.zap.endpointView.profileId
}
},
showProfileId: {
get() {
return (
this.getDeviceCategory(this.deviceType[0].packageRef) === 'zigbee' &&
paulr34 marked this conversation as resolved.
Show resolved Hide resolved
this.$store.state.zap.isProfileIdShown &&
this.enableProfileId
)
}
},
deviceId: {
get() {
return this.$store.state.zap.endpointTypeView.deviceIdentifier
Expand Down
Loading