Skip to content
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.

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

Fix link indicator on 'Shared via link'-page #7355

Merged
merged 5 commits into from
Jul 27, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Link indicator on "Shared via link"-page

We've fixed the icon and the sidebar for the link indicator on the "Shared via link"-page.

https://github.com/owncloud/web/pull/7355
https://github.com/owncloud/web/issues/7345
11 changes: 7 additions & 4 deletions changelog/unreleased/enhancement-update-ods
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
Enhancement: Update ODS to v14.0.0-alpha.7
Enhancement: Update ODS to v14.0.0-alpha.8

We updated the ownCloud Design System to version 14.0.0-alpha.7. Please refer to the full changelog in the ODS release (linked) for more details. Summary:
We updated the ownCloud Design System to version 14.0.0-alpha.8. Please refer to the full changelog in the ODS release (linked) for more details. Summary:

- Bugfix - Remove click event on OcIcon: #2216
- Bugfix - Lazy loading render performance: #2260
- Bugfix - Omit special characters in user avatar initials: #2267
- Bugfix - Avatar link icon: #2269
- Bugfix - Remove width shrinking of the ocAvatarItem: #2242
- Change - Remove OcAlert component: #2210
- Change - Remove transition animations: #2210
- Change - Revamp animations: #2210
Expand All @@ -13,5 +16,5 @@ We updated the ownCloud Design System to version 14.0.0-alpha.7. Please refer to
- Enhancement - Redesign notifications: #2210
- Enhancement - Use oc colors for selected background and deselect icon: #2262

https://github.com/owncloud/web/pull/7312
https://github.com/owncloud/owncloud-design-system/releases/tag/v14.0.0-alpha.7
https://github.com/owncloud/web/pull/7355
https://github.com/owncloud/owncloud-design-system/releases/tag/v14.0.0-alpha.8
Original file line number Diff line number Diff line change
Expand Up @@ -571,10 +571,10 @@ export default defineComponent({
},
openSharingSidebar(file) {
if (file.share?.shareType === ShareTypes.link.value) {
this.openWithPanel('links-item')
JammingBen marked this conversation as resolved.
Show resolved Hide resolved
this.openWithPanel('sharing-item#linkShares')
return
}
this.openWithPanel('sharing-item')
this.openWithPanel('sharing-item#peopleShares')
},
folderLink(file) {
return this.createFolderLink(file.path, file)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,6 @@ export default defineComponent({
}
return null
},
expandPeoplesPanel() {
this.setSidebarPanel('sharing-item')
},
expandLinksPanel() {
this.setSidebarPanel('links-item')
kulmann marked this conversation as resolved.
Show resolved Hide resolved
},
expandVersionsPanel() {
this.setSidebarPanel('versions-item')
},
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"luxon": "^2.4.0",
"marked": "^4.0.12",
"oidc-client-ts": "^2.0.5",
"owncloud-design-system": "14.0.0-alpha.7",
"owncloud-design-system": "14.0.0-alpha.8",
"owncloud-sdk": "~3.0.0-alpha.15",
"p-queue": "^6.6.2",
"popper-max-size-modifier": "^0.2.0",
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/pageObjects/sharedWithOthersPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ module.exports = {
},
elements: {
collaboratorsInFileRow: {
selector: '//*[contains(@class, "oc-avatars")]/span[contains(@class, "oc-avatar")]',
selector:
'//*[contains(@class, "oc-avatars")]/span[contains(@class, "oc-avatar")]|//*[contains(@class, "oc-avatars")]/div',
locateStrategy: 'xpath'
}
}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9711,9 +9711,9 @@ __metadata:
languageName: node
linkType: hard

"owncloud-design-system@npm:14.0.0-alpha.7":
version: 14.0.0-alpha.7
resolution: "owncloud-design-system@npm:14.0.0-alpha.7"
"owncloud-design-system@npm:14.0.0-alpha.8":
version: 14.0.0-alpha.8
resolution: "owncloud-design-system@npm:14.0.0-alpha.8"
peerDependencies:
"@popperjs/core": ^2.4.0
"@vue/composition-api": ^1.4.3
Expand All @@ -9730,7 +9730,7 @@ __metadata:
vue-inline-svg: ^2.0.0
vue-select: ^3.12.0
webfontloader: ^1.6.28
checksum: b799e4942c0f347b739ead8fed1020343fb5a1c1d467c4082c474e484b7025bc39ec9e880fe9ea1d0e68fbc4a4a77002be7c5cb4b1fa2dbded39f736f4a0cf6f
checksum: 2571bdfaed42626e5673a215df2b640d03aa2038ecf9b2bf5049f1b7e5f04095fbaec2be9fe0c9a2ca0a8f9d8b800f7af8718731757385c3d6d638d72a6d5411
languageName: node
linkType: hard

Expand Down Expand Up @@ -13773,7 +13773,7 @@ __metadata:
luxon: ^2.4.0
marked: ^4.0.12
oidc-client-ts: ^2.0.5
owncloud-design-system: 14.0.0-alpha.7
owncloud-design-system: 14.0.0-alpha.8
owncloud-sdk: ~3.0.0-alpha.15
p-queue: ^6.6.2
popper-max-size-modifier: ^0.2.0
Expand Down