fix: add extra parameter to condition and fix spelling errors in ZapC…

…onfig(project-chip#1385) * fix: remove wrong condition from ZapConfig * fix: add extra paramter to condition and fix spelling errors * fix: typo * feat: add cypress test for mode
tbrkollar · Aug 5, 2024 · ed938c9 · ed938c9
1 parent 9a12110
commit ed938c9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/cypress/e2e/theme/theme.cy.js b/cypress/e2e/theme/theme.cy.js
@@ -40,4 +40,11 @@ describe('Check theme functionality', () => {
     cy.rendererApi(rendApi.id.setDarkTheme, 'false')
     cy.get('body').should('have.class', 'body--light')
   })
+  it('Zigbee mode', () => {
+    cy.fixture('data').then((data) => {
+      cy.get('#Back').click()
+      cy.wait(500)
+      cy.get('#zcl-advanced-platform').contains(data.mode)
+    })
+  })
 })
diff --git a/cypress/fixtures/data.json b/cypress/fixtures/data.json
@@ -32,5 +32,6 @@
   "int8clusterpath": "0",
   "booleanclusterpath": "0",
   "booleaninputpath": "15",
-  "bitmapinputpath": "16"
+  "bitmapinputpath": "16",
+  "mode": "zigbee"
 }
diff --git a/cypress/matterFixtures/data.json b/cypress/matterFixtures/data.json
@@ -32,5 +32,6 @@
   "int8clusterpath": "0",
   "booleanclusterpath": "0",
   "booleaninputpath": "1",
-  "bitmapinputpath": "1"
+  "bitmapinputpath": "1",
+  "mode": "matter"
 }
diff --git a/src/components/ZCLToolbar.vue b/src/components/ZCLToolbar.vue
@@ -31,6 +31,7 @@
           icon="arrow_back_ios"
           to="/"
           label="Back"
+          id="Back"
           color="grey"
           data-test="go-back-button"
         />

diff --git a/src/pages/ZapConfig.vue b/src/pages/ZapConfig.vue
@@ -688,42 +688,44 @@ export default {
       this.filePath = result.data.filePath
       this.open = result.data.open
       this.currentZapFilePackages = result.data.zapFilePackages
-      let currentZapFileZclPacakges = []
-      let currentTopLevelZapFilePacakges = []
-      let currentZapFileTemplatePacakges = []
+      let currentZapFileZclPackages = []
+      let currentTopLevelZapFilePackages = []
+      let currentZapFileTemplatePackages = []
       let currentZclPackagesAbsolutePaths = []
       let currentTemplatePackagesAbsolutePaths = []
       if (this.currentZapFilePackages) {
-        currentTopLevelZapFilePacakges = this.currentZapFilePackages.filter(
+        currentTopLevelZapFilePackages = this.currentZapFilePackages.filter(
           (zfp) => zfp.type != dbEnum.packageType.zclXmlStandalone
         )
-        currentZapFileZclPacakges = this.currentZapFilePackages.filter(
+        currentZapFileZclPackages = this.currentZapFilePackages.filter(
           (zfp) => zfp.type == dbEnum.packageType.zclProperties
         )
-        currentZapFileTemplatePacakges = this.currentZapFilePackages.filter(
+
+        currentZapFileTemplatePackages = this.currentZapFilePackages.filter(
           (zfp) => zfp.type == dbEnum.packageType.genTemplatesJson
         )
-        currentZclPackagesAbsolutePaths = currentZapFileZclPacakges.map((zfp) =>
+        currentZclPackagesAbsolutePaths = currentZapFileZclPackages.map((zfp) =>
           this.createAbsolutePath(this.filePath, zfp.path)
         )
         currentTemplatePackagesAbsolutePaths =
-          currentZapFileTemplatePacakges.map((zfp) =>
+          currentZapFileTemplatePackages.map((zfp) =>
             this.createAbsolutePath(this.filePath, zfp.path)
           )
       }
 
       if (
-        this.zclPropertiesRow.length == currentZapFileZclPacakges.length ||
+        this.zclPropertiesRow.length == currentZapFileZclPackages.length ||
         this.zclPropertiesRow.length == 1
       ) {
-        // We shortcut this page, if the number of packages in the zap file
-        // and the number of packages loaded in the backend are the same.
-        if (this.zclGenRow.length == currentZapFileTemplatePacakges.length) {
+        if (
+          this.zclGenRow.length == currentZapFileTemplatePackages.length ||
+          this.zclGenRow.length == 1
+        ) {
+          this.selectedZclGenData = this.zclGenRow.map((zgr) => zgr.id)
           this.selectedZclPropertiesDataIds = this.zclPropertiesRow.map(
             (zpr) => zpr.id
           )
           this.selectedZclPropertiesData = this.zclPropertiesRow
-          this.selectedZclGenData = this.zclGenRow.map((zgr) => zgr.id)
         }
         this.customConfig = 'select'
         this.submitForm()
@@ -748,7 +750,7 @@ export default {
           this.selectedZclGenData.length > 0 &&
           this.selectedZclPropertiesData.length +
             this.selectedZclGenData.length ==
-            currentTopLevelZapFilePacakges.length
+            currentTopLevelZapFilePackages.length
         ) {
           this.submitForm()
         }