Skip to content

Graph collapse/group tree: show indent lines #2276

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

Open
wants to merge 3 commits into
base: graph-group-collapse
Choose a base branch
from
+17 −20
Open

Graph collapse/group tree: show indent lines #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8c215a
fix(deps): update dependency vuetify to v3.9.5 (#2267)
renovate[bot] Aug 13, 2025
1a14e40
Merge upstream/master into tree-view
MetRonnie Aug 13, 2025
9f34bb3
Graph collapse/group tree: show indent lines
MetRonnie Aug 13, 2025
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
View file
Open in desktop
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.0",
"vuetify": "3.9.5",
"vuex": "4.1.0"
},
"devDependencies": {
Expand Down
7 changes: 2 additions & 5 deletions src/components/cylc/ViewToolbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
item-value="name"
selectable
open-all
indent-lines
separate-roots
></v-treeview>
</v-menu>
<v-btn v-else
Expand All @@ -72,15 +74,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

<script>
import { btnProps } from '@/utils/viewToolbar'
import { VTreeview } from 'vuetify/labs/VTreeview'

export default {
name: 'ViewToolbar',

components: {
VTreeview,
},

emits: [
'setOption'
],
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/specs/analysis.cy.js
View file
Open in desktop
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', '-1')
.should('have.value', 'All')
cy
.get('input#c-analysis-filter-task-timings')
.should('have.value', 'totalTimes')
.should('have.value', 'Total times')
})

it('Should filter by task name', () => {
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', -1)
.should('not.have.value', 'All')
.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', -1)
.should('have.value', 'All')
// 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', -1)
.should('have.value', 'All')
})

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,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', -1)
.should('not.have.value', 'All')
.get('@itemsPerPage')
.click()
.get('[role="listbox"] .v-list-item')
Expand All @@ -192,7 +192,7 @@ describe('State saving', () => {
// Wait for menu to close
.should('not.exist')
.get('@itemsPerPage').find('input')
.should('have.value', -1)
.should('have.value', 'All')
// Navigate away
cy.visit('/#/')
.get('.c-dashboard')
Expand All @@ -201,7 +201,7 @@ describe('State saving', () => {
cy.get('@platformCol')
.should('have.class', sortedClass)
cy.get('@itemsPerPage').find('input')
.should('have.value', -1)
.should('have.value', 'All')
})

describe('Flow nums', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/specs/toolbar.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ describe('N-window selector', () => {
cy.get('[data-cy=n-win-selector]')
.click()
.get('[data-cy=n-win-popup]')
.find('[role=combobox]')
.find('.v-field[role=combobox]')
.click()
.invoke('attr', 'aria-controls').then((dropdownID) => {
cy.get(`#${dropdownID}`)
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4478,7 +4478,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.0"
vuetify: "npm:3.9.5"
vuex: "npm:4.1.0"
peerDependenciesMeta:
react:
Expand Down Expand Up @@ -11668,9 +11668,9 @@ __metadata:
languageName: node
linkType: hard

"vuetify@npm:3.9.0":
version: 3.9.0
resolution: "vuetify@npm:3.9.0"
"vuetify@npm:3.9.5":
version: 3.9.5
resolution: "vuetify@npm:3.9.5"
peerDependencies:
typescript: ">=4.7"
vite-plugin-vuetify: ">=2.1.0"
Expand All @@ -11683,7 +11683,7 @@ __metadata:
optional: true
webpack-plugin-vuetify:
optional: true
checksum: 10c0/4a70a856dbd980439ca9766bed0cd950713982c028c1e0923b5ca3da38f609329e2761b2efaeb549984a8b28c26d3861dcaffde80636c968726f2da8d54dac21
checksum: 10c0/fc8e96c8fd1394b68121ec803a10d17f8ca4a8f68ac77bd2e9c583f3c16aac554e83df07ca86133d34bf286395d44cb41d9a50933c930c050a89bae025236b40
languageName: node
linkType: hard

Expand Down