diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js index b412e6ed3..a32e555ff 100644 --- a/cypress/e2e/cardFeatures.js +++ b/cypress/e2e/cardFeatures.js @@ -84,7 +84,7 @@ describe('Card', function () { cy.get('.modal-mask.card-selector .multiselect-list').should('be.visible').click() cy.get('.vs__dropdown-menu span[title="TestList"]').should('be.visible').click() - cy.get('.modal-mask.card-selector button.button-vue--vue-primary').should('be.visible').click() + cy.get('.modal-mask.card-selector button.button-vue--primary').contains('Create card').should('be.visible').click() cy.wait('@save', { timeout: 7000 }) cy.reload() @@ -187,7 +187,7 @@ describe('Card', function () { cy.get('.file-picker__main').should('be.visible') cy.get('.file-picker__main [data-filename="welcome.txt"]', { timeout: 30000 }).should('be.visible') .click() - cy.get('.dialog__actions button.button-vue--vue-primary').click() + cy.get('.dialog__actions button.button-vue--primary').click() cy.get('.attachment-list .filename').contains('welcome') cy.get('.attachment-list .filename .extension').contains('txt') }) @@ -302,8 +302,10 @@ describe('Card', function () { .first().click() cy.get(`.card:contains("${newCardTitle}")`).should('be.visible').click() - cy.get('#app-sidebar-vue [data-test="tag-selector"] .vs__dropdown-toggle').should('be.visible').click() + cy.get('#app-sidebar-vue [data-test="tag-selector"] .vs__dropdown-toggle .vs__actions').should('be.visible').click() cy.get('.vs__dropdown-menu .tag:contains("Action needed")').should('be.visible').click() + cy.get('.vs__dropdown-menu .tag:contains("Later")').should('not.exist') + cy.get('#app-sidebar-vue [data-test="tag-selector"] .vs__dropdown-toggle .vs__actions').should('be.visible').click() cy.get('.vs__dropdown-menu .tag:contains("Later")').should('be.visible').click() cy.get('.vs__selected .tag:contains("Action needed")').should('be.visible') diff --git a/cypress/e2e/deckDashboard.js b/cypress/e2e/deckDashboard.js index a5027c50e..8868f12ed 100644 --- a/cypress/e2e/deckDashboard.js +++ b/cypress/e2e/deckDashboard.js @@ -27,7 +27,7 @@ describe('Deck dashboard', function() { const defaultBoard = 'Welcome to Nextcloud Deck!' - cy.get('.app-navigation-entry-wrapper[icon=icon-deck]') + cy.get('#deck-navigation-all') .find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + defaultBoard + ')') .first() .contains(defaultBoard) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index f06c2340d..cc9025038 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -93,7 +93,7 @@ Cypress.Commands.add('createExampleBoard', ({ user, board }) => { }) Cypress.Commands.add('getNavigationEntry', (boardTitle) => { - return cy.get('.app-navigation-entry-wrapper[icon=icon-deck]') + return cy.get('#deck-navigation-all') .find('ul.app-navigation-entry__children .app-navigation-entry:contains(' + boardTitle + ')') .find('a.app-navigation-entry-link') }) diff --git a/package-lock.json b/package-lock.json index 4892164dc..a0332e1fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@nextcloud/moment": "^1.3.2", "@nextcloud/notify_push": "^1.3.0", "@nextcloud/router": "^3.0.1", - "@nextcloud/vue": "^9.0.0-alpha.7", + "@nextcloud/vue": "^9.0.0-rc.3", "@vue/compiler-sfc": "^3.5.13", "@vue/vue3-jest": "^29.2.6", "@vueuse/core": "^13.1.0", @@ -3895,9 +3895,9 @@ } }, "node_modules/@nextcloud/vue": { - "version": "9.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-9.0.0-rc.2.tgz", - "integrity": "sha512-/YDkNt81zwAixP7H52LrqXGMwa0goPtH4jPlUqPiNaco65avQDdn125W3w/Tk6bznhVQpN3y8y3Y5gpVGNrIGQ==", + "version": "9.0.0-rc.3", + "resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-9.0.0-rc.3.tgz", + "integrity": "sha512-80eW36oUZIYwcwCQX58Aubao8ZXZS2ms0+tyYmkTCpVait9/eT9BmbwmvVxqD8y966572CSyyZf0DCsScLxqVQ==", "license": "AGPL-3.0-or-later", "dependencies": { "@ckpack/vue-color": "^1.6.0", diff --git a/package.json b/package.json index c9f0ea36c..0017b0b23 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@nextcloud/moment": "^1.3.2", "@nextcloud/notify_push": "^1.3.0", "@nextcloud/router": "^3.0.1", - "@nextcloud/vue": "^9.0.0-alpha.7", + "@nextcloud/vue": "^9.0.0-rc.3", "@vue/compiler-sfc": "^3.5.13", "@vue/vue3-jest": "^29.2.6", "@vueuse/core": "^13.1.0", diff --git a/src/components/navigation/AppNavigationBoardCategory.vue b/src/components/navigation/AppNavigationBoardCategory.vue index f0f56433d..d5d0c8025 100644 --- a/src/components/navigation/AppNavigationBoardCategory.vue +++ b/src/components/navigation/AppNavigationBoardCategory.vue @@ -31,10 +31,6 @@ export default { type: String, default: '', }, - id: { - type: String, - required: true, - }, text: { type: String, required: true, diff --git a/src/store/card.js b/src/store/card.js index a60728476..6d8735a24 100644 --- a/src/store/card.js +++ b/src/store/card.js @@ -343,7 +343,6 @@ export default { commit('removeUserFromCard', user) }, async addLabel({ commit }, data) { - alert('hello world') await apiClient.assignLabelToCard(data) commit('updateCardProperty', { property: 'labels', card: data.card }) }, diff --git a/src/store/main.js b/src/store/main.js index e1a9234e1..69af518f4 100644 --- a/src/store/main.js +++ b/src/store/main.js @@ -131,7 +131,7 @@ const store = createStore({ state.isFullApp = isFullApp }, setHasCardSaveError(state, hasCardSaveError) { - Vue.set(state, 'hasCardSaveError', hasCardSaveError) + state.hasCardSaveError = hasCardSaveError }, SET_CONFIG(state, { key, value }) { const [scope, id, configKey] = key.split(':', 3)