Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"vue-router": "4.5.1",
"vue-the-mask": "0.11.1",
"vue3-apexcharts": "1.8.0",
"vuetify": "3.9.7",
"vuetify": "3.10.5",
"vuex": "4.1.0"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions src/components/cylc/analysis/TimeSeries.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
v-model="displayedTasks"
label="Select tasks"
ref="selectTasks"
data-cy="time-series-task-select"
>
<template v-slot:prepend-item>
<v-select-actions>
Expand Down
36 changes: 18 additions & 18 deletions tests/e2e/specs/analysis.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ describe('Analysis view', () => {
.should('be.empty')
cy
.get('input#c-analysis-filter-task-platforms')
.should('have.value', 'All')
.should('have.value', '-1')
cy
.get('input#c-analysis-filter-task-timings')
.should('have.value', 'Total times')
.should('have.value', 'totalTimes')
})

it('Should filter by task name', () => {
Expand Down Expand Up @@ -280,7 +280,7 @@ describe('Analysis view', () => {
// There should be three tasks in the drop down list when loaded
// Plus 2 entries for Select and Deselect all
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.its('length')
Expand Down Expand Up @@ -312,7 +312,7 @@ describe('Analysis view', () => {
it('Should select tasks from the autocomplete drop down list', () => {
// Add waiting task and check only two cycles visible on both graphs
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')
Expand All @@ -322,7 +322,7 @@ describe('Analysis view', () => {
.should('have.length', 4)
// Add eventually_succeeded task and check three cycles visible
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('eventually')
Expand All @@ -332,7 +332,7 @@ describe('Analysis view', () => {
.should('have.length', 6)
// Remove selected tasks and check no cycle points are visible
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')
Expand All @@ -348,7 +348,7 @@ describe('Analysis view', () => {
it('Should search for and add/remove tasks', () => {
// Before searching, the options to add/remove all tasks should exist
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('succeeded')
Expand All @@ -360,26 +360,26 @@ describe('Analysis view', () => {
.should('exist')
// Select all tasks that contain succeeded
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.type('succeeded')
.get('.v-card-actions')
.contains('Select all')
.click()
// Check the correct tasks have been added
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('.v-chip')
.its('length')
.should('eq', 2)
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains(/^succeeded$/)
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains('eventually_succeeded')
// Remove all tasks that contain eventually
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('input')
.clear()
.type('eventually')
Expand All @@ -388,10 +388,10 @@ describe('Analysis view', () => {
.click()
// Check only succeeded task is selected
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains(/^succeeded$/)
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.find('.v-chip')
.contains('eventually_succeeded')
.should('not.exist')
Expand All @@ -400,7 +400,7 @@ describe('Analysis view', () => {
it('Should show origin, when selected', () => {
// Add waiting task and check y-axis doesn't start at origin
cy
.get('.d-flex > .v-autocomplete')
.get('[data-cy=time-series-task-select]')
.click()
.get('.v-list-item')
.contains('waiting')
Expand Down Expand Up @@ -507,7 +507,7 @@ describe('Filters and Options save state', () => {
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
.as('itemsPerPage')
.find('input')
.should('not.have.value', 'All')
.should('not.have.value', -1)
.get('@itemsPerPage')
.click()
.get('[role="listbox"] .v-list-item')
Expand All @@ -516,7 +516,7 @@ describe('Filters and Options save state', () => {
// Wait for menu to close
.should('not.exist')
.get('@itemsPerPage').find('input')
.should('have.value', 'All')
.should('have.value', -1)
// Navigate away
cy.visit('/#/')
.get('.c-dashboard')
Expand All @@ -525,7 +525,7 @@ describe('Filters and Options save state', () => {
cy.get('@platformCol')
.should('have.class', sortedClass)
cy.get('@itemsPerPage').find('input')
.should('have.value', 'All')
.should('have.value', -1)
})

it('remembers box and whisker sorting options when switching between workflows', () => {
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/specs/table.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ describe('State saving', () => {
cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
.as('itemsPerPage')
.find('input')
.should('not.have.value', 'All')
.should('not.have.value', -1)
.get('@itemsPerPage')
.click()
.get('[role="listbox"] .v-list-item')
Expand All @@ -232,7 +232,7 @@ describe('State saving', () => {
// Wait for menu to close
.should('not.exist')
.get('@itemsPerPage').find('input')
.should('have.value', 'All')
.should('have.value', -1)
// Navigate away
cy.visit('/#/')
.get('.c-dashboard')
Expand All @@ -241,7 +241,7 @@ describe('State saving', () => {
cy.get('@platformCol')
.should('have.class', sortedClass)
cy.get('@itemsPerPage').find('input')
.should('have.value', 'All')
.should('have.value', -1)
})

describe('Flow nums', () => {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4614,7 +4614,7 @@ __metadata:
vue-router: "npm:4.5.1"
vue-the-mask: "npm:0.11.1"
vue3-apexcharts: "npm:1.8.0"
vuetify: "npm:3.9.7"
vuetify: "npm:3.10.5"
vuex: "npm:4.1.0"
peerDependenciesMeta:
react:
Expand Down Expand Up @@ -11861,9 +11861,9 @@ __metadata:
languageName: node
linkType: hard

"vuetify@npm:3.9.7":
version: 3.9.7
resolution: "vuetify@npm:3.9.7"
"vuetify@npm:3.10.5":
version: 3.10.5
resolution: "vuetify@npm:3.10.5"
peerDependencies:
typescript: ">=4.7"
vite-plugin-vuetify: ">=2.1.0"
Expand All @@ -11876,7 +11876,7 @@ __metadata:
optional: true
webpack-plugin-vuetify:
optional: true
checksum: 10c0/56d18b31c8c7791a7e4b9c7ca0969dbe3badb2b7c3b70b8b0fdab2617b3c814cb66b306aab23dee89a7ac6afaf12f7b3af05d455e64c2324b6d99e02adceaaf9
checksum: 10c0/90ed62befd9815e2b54f75e069457ff42f4005bebbc911763be71a6fc30cfab84d676ae5e5811012617fec6e410406df2f0bca623d14d5e3a351a367f22d0a06
languageName: node
linkType: hard

Expand Down