Skip to content

Support multiple device type with primary type #1034

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

Draft
aspecter wants to merge 44 commits into
base: master
Choose a base branch
from
Draft

Support multiple device type with primary type #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
9cee127
Support multiple device type with primary input
aspecter May 19, 2023
6f23ab4
Support multiple device type with array input
aspecter May 22, 2023
5d2081e
Enabling multiple zcl device types per endpoint draft commit. Edit th…
brdandu May 24, 2023
041d798
Unify array usage for DeviceType and DeviceIndentifier
aspecter May 25, 2023
89fea30
Updating updateEndpoint and duplicateEndpoint based on the schema cha…
brdandu May 31, 2023
b47e73c
Updating import/export endpoint type apis to handle multiple zcl devi…
brdandu May 31, 2023
19a02a4
Updating selectAllEndpointTypes and selectEndpointType such that they…
brdandu Jun 1, 2023
acd213c
Minor cleanup
brdandu Jun 1, 2023
c7945ee
Add primary device type selection logic
aspecter Jun 2, 2023
442b3e5
Add multi device type modification warning dialog
aspecter Jun 2, 2023
97eb6a7
Generalize the warning message
aspecter Jun 2, 2023
9c6460a
Maintain specific device type ref name, device type code and device t…
brdandu Jun 2, 2023
74733ee
Removing the warning dialog and making sure the the zcl device types …
brdandu Jun 5, 2023
7e6d38e
Minor cleanup
brdandu Jun 6, 2023
ee417b6
Removing the UI pieces for this and the tests since this is not reall…
brdandu Jun 6, 2023
48e0117
Making sure that the device type clusters are added when an endpoint …
brdandu Jun 7, 2023
70a9b9a
When loading the old zap files and editing the endpoint the selected …
brdandu Jun 8, 2023
abe2ad7
Support multiple device type with primary input
aspecter May 19, 2023
1786f0b
Support multiple device type with array input
aspecter May 22, 2023
456a56e
Enabling multiple zcl device types per endpoint draft commit. Edit th…
brdandu May 24, 2023
64e8936
Unify array usage for DeviceType and DeviceIndentifier
aspecter May 25, 2023
b6f0a9b
Updating updateEndpoint and duplicateEndpoint based on the schema cha…
brdandu May 31, 2023
7298ada
Updating import/export endpoint type apis to handle multiple zcl devi…
brdandu May 31, 2023
b3412d1
Updating selectAllEndpointTypes and selectEndpointType such that they…
brdandu Jun 1, 2023
ab3ca36
Minor cleanup
brdandu Jun 1, 2023
06dddcb
Add primary device type selection logic
aspecter Jun 2, 2023
95f21fe
Add multi device type modification warning dialog
aspecter Jun 2, 2023
95f06e0
Generalize the warning message
aspecter Jun 2, 2023
c66475c
Merge remote-tracking branch 'brdandu/feature/addMultipleDeviceTypesP…
aspecter Jun 12, 2023
85af9a0
Text adjustment to the new design
aspecter Jun 12, 2023
b28057f
Remove warning dialog code chunks
aspecter Jun 12, 2023
1ba99fd
Add device type identifier and device type revision to endpoint_type_…
brdandu Jun 13, 2023
6e2547b
Merge remote-tracking branch 'brdandu/feature/addMultipleDeviceTypesP…
aspecter Jun 14, 2023
f72c4af
Add multi version option to endpoint card
aspecter Jun 14, 2023
93a0603
Add multi version option to endpoint card
aspecter Jun 14, 2023
9a2a642
Updating device version and device identifier to be in endpoint type …
brdandu Jun 23, 2023
cacf4be
Fix import issues with the new schema for multiple zcl device types a…
brdandu Jun 29, 2023
6a34f38
Fixing import and export of .zap files such that saving and re-openin…
brdandu Jun 30, 2023
1b81993
Merge branch 'feature/addMultipleDeviceTypesPerEndpoint/ZAP#862' into…
aspecter Jul 3, 2023
cb88c37
Update Cypress tests to support multi device types
aspecter Jul 3, 2023
e944c9e
Update Cypress tests to support multi device types
aspecter Jul 3, 2023
e360bc1
Adding tests for adding multiple zcl device types per endpoint. The t…
brdandu Jul 6, 2023
3043fb9
Merge commit 'e360bc1ae518c3ce90d66037f589550a96f66a7c' into multiple…
aspecter Jul 7, 2023
5aa29ec
Make device select show selected item at edit mode
aspecter Jul 7, 2023
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
49 changes: 0 additions & 49 deletions cypress/integration/check_summary/enabled-attributes.spec.js
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions cypress/integration/check_summary/enabled-clusters.spec.js
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions cypress/integration/clusters/dimmable-light.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,9 @@ describe(
cy.visit(data.baseurl)
})
cy.setZclProperties()
cy.get('[data-test="add-new-endpoint"]').click()
cy.fixture('data').then((data) => {
cy.get('[data-test="select-endpoint-input"]')
.click()
.clear({ force: true })
.type('dimmable', { force: true })
cy.get('div').contains(data.endpoint6).click({ force: true })
cy.addEndpoint(data.endpoint6)
})
cy.get('button').contains('Create').click()
})
it('Search for the cluster', () => {
cy.fixture('data').then((data) => {
Expand Down
8 changes: 5 additions & 3 deletions cypress/integration/endpoints/delete-endpoint.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ describe('Testing Deleting Endpoints', () => {
})
})
it('delete endpoint', { retries: { runMode: 2, openMode: 2 } }, () => {
cy.get('[data-test="delete-endpoint"]').click()
cy.wait(300)
cy.get('#delete_endpoint').click()
cy.get('[data-test="delete-endpoint"]').each(() => {
cy.get('[data-test="delete-endpoint"]').last().click()
cy.wait(300)
cy.get('#delete_endpoint').click()
})
cy.wait(300)
cy.get('#delete_last_endpoint').click()
})
Expand Down
1 change: 1 addition & 0 deletions cypress/integration/endpoints/edit-endpoint.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('Testing Editing endpoints', () => {
cy.wait(500)
cy.get('div').contains(data.endpoint2).click({ force: true })
})
cy.get('[data-test="endpoint-title"]').click() // it makes sure that the previous input field has been unselected
cy.get('button').contains('Save').click()
})
it(
Expand Down
5 changes: 3 additions & 2 deletions cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ Cypress.Commands.add('addEndpoint', (name) => {
cy.get('[data-test="select-endpoint-input"]')
.click()
.type(name.substring(0, 5), { force: true })
cy.wait(500)
cy.get('div').contains(name).click({ force: true })
cy.wait(1000)
cy.get('.q-menu').contains(name).click({ force: true })
cy.get('[data-test="endpoint-title"]').click() // it makes sure that the previous input field has been unselected
cy.get('button').contains('Create').click()
})

Expand Down
Loading