diff --git a/changelog/unreleased/enhancement-redesign-breadcrumb b/changelog/unreleased/enhancement-redesign-breadcrumb new file mode 100644 index 00000000000..3eb1da48c6f --- /dev/null +++ b/changelog/unreleased/enhancement-redesign-breadcrumb @@ -0,0 +1,7 @@ +Enhancement: Redesign OcBreadcrumb + +We've adjustet the look of the OcBreadcrumb +to fit the Redesign + +https://github.com/owncloud/web/issues/6218 +https://github.com/owncloud/web/pull/6472 diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/unreleased/enhancement-update-ods new file mode 100644 index 00000000000..eea70692a25 --- /dev/null +++ b/changelog/unreleased/enhancement-update-ods @@ -0,0 +1,11 @@ +Enhancement: Update ODS to v12.1.1-rc.2 + +We updated the ownCloud Design System to version 12.1.1-rc.2. Please refer to the full changelog in the ODS release (linked) for more details. Summary: + +- Enhancement - Apply outstanding background color to oc-card: https://github.com/owncloud/owncloud-design-system/pull/1974 +- Enhancement - Redesign OcBreadcrumb: https://github.com/owncloud/web/issues/6218 +- Enhancement - Redesign files table related components: https://github.com/owncloud/owncloud-design-system/pull/1958 + +https://github.com/owncloud/web/pull/6450 +https://github.com/owncloud/web/pull/6472 +https://github.com/owncloud/owncloud-design-system/releases/tag/v12.1.1-rc.2 diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json index 181a9c308e9..f2231c0dc85 100644 --- a/packages/web-runtime/package.json +++ b/packages/web-runtime/package.json @@ -17,7 +17,7 @@ "lodash-es": "^4.17.21", "luxon": "^2.3.0", "oidc-client": "1.11.5", - "owncloud-design-system": "12.1.1-rc1", + "owncloud-design-system": "12.1.1-rc.2", "owncloud-sdk": "~2.0.0", "p-queue": "^6.1.1", "popper-max-size-modifier": "^0.2.0", diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js index 7097cacf1e1..8109ad11c2b 100644 --- a/tests/acceptance/pageObjects/personalPage.js +++ b/tests/acceptance/pageObjects/personalPage.js @@ -360,7 +360,7 @@ module.exports = { }, resourceBreadcrumb: { selector: - '//nav[@id="files-breadcrumb"]//*[(self::a or self::button) and contains(text(),%s)]', + '//nav[@id="files-breadcrumb"]//*[(self::a or self::button)]/span[contains(text(),%s)]', locateStrategy: 'xpath' }, resourceBreadcrumbNonClickable: { diff --git a/tests/e2e/support/page/files/allFiles.ts b/tests/e2e/support/page/files/allFiles.ts index 4371b163ded..71ea787e92a 100644 --- a/tests/e2e/support/page/files/allFiles.ts +++ b/tests/e2e/support/page/files/allFiles.ts @@ -229,7 +229,7 @@ export class AllFilesPage { await page.locator(`//*[@data-test-resource-name="${resourceBase}"]`).click({ button: 'right' }) await page.locator(`.oc-files-actions-${action}-trigger`).first().click() - await page.locator('//ol[@class="oc-breadcrumb-list"]/li/*[1]').first().click() + await page.locator('//nav[contains(@class, "oc-breadcrumb")]/ol/li[1]/a').click() if (newLocation !== 'All files') { await filesCta.navigateToFolder({ page: page, path: newLocation }) diff --git a/yarn.lock b/yarn.lock index 3e24e967a11..f514034802f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9514,9 +9514,9 @@ __metadata: languageName: node linkType: hard -"owncloud-design-system@npm:12.1.1-rc1": - version: 12.1.1-rc1 - resolution: "owncloud-design-system@npm:12.1.1-rc1" +"owncloud-design-system@npm:12.1.1-rc.2": + version: 12.1.1-rc.2 + resolution: "owncloud-design-system@npm:12.1.1-rc.2" peerDependencies: "@popperjs/core": ^2.4.0 "@vue/composition-api": ^1.4.3 @@ -9533,7 +9533,7 @@ __metadata: vue-inline-svg: ^2.0.0 vue-select: ^3.12.0 webfontloader: ^1.6.28 - checksum: a0cde35bdda5cece6c68cb2ae79f00cc6b26156e8d1e0957892972b1a46f6e81c9f1e44e2d8e5f9121e0e93cc00efd2ee179d7365bf7d6f21731897448239ffb + checksum: 2ff65957ddfc9095613481b1135680e743149a302a0c76d6fdcdd4d8904911e0019386fd17a798dfaa840a9d6c1c5ab6bc23a062a54c16c0f12ac5e0754ee474 languageName: node linkType: hard @@ -13474,7 +13474,7 @@ __metadata: lodash-es: ^4.17.21 luxon: ^2.3.0 oidc-client: 1.11.5 - owncloud-design-system: 12.1.1-rc1 + owncloud-design-system: 12.1.1-rc.2 owncloud-sdk: ~2.0.0 p-queue: ^6.1.1 popper-max-size-modifier: ^0.2.0