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.

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

[full-ci] Fix: Sharing Panel - Show label instead of description #7364

Merged
merged 8 commits into from
Jul 28, 2022
Merged

[full-ci] Fix: Sharing Panel - Show label instead of description #7364

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e9959c0
Show label instead of description
Jul 28, 2022
9964931
Cleanup unit tests
Jul 28, 2022
cb0cc02
Add changelog item
Jul 28, 2022
5851040
Fix l10n
Jul 28, 2022
075bcdb
Fix e2e
Jul 28, 2022
69f4496
Fix acceptance tests
Jul 28, 2022
b8829be
Fix tests
Jul 28, 2022
a31141e
Remove console.log
Jul 28, 2022
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
6 changes: 5 additions & 1 deletion packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@
/>
</div>
<div v-else-if="share.role">
<span class="oc-mr-xs" v-text="share.role.label" />
<span
v-oc-tooltip="share.role.description(false)"
class="oc-mr-xs"
v-text="share.role.label"
/>
</div>
</div>
<div class="oc-flex oc-flex-between oc-flex-middle oc-pl-s">
Expand Down
8 changes: 3 additions & 5 deletions packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
class="edit-public-link-role-dropdown-toggl oc-text-left"
gap-size="none"
>
<span class="oc-invisible-sr" v-text="currentLinkRoleLabel" />
<span v-text="visibilityHint" />
<span v-text="currentLinkRoleLabel" />
<oc-icon name="arrow-down-s" />
</oc-button>
<oc-drop
Expand Down Expand Up @@ -56,8 +55,7 @@
</oc-drop>
</div>
<p v-else class="oc-my-rm">
<span class="oc-invisible-sr" v-text="currentLinkRoleLabel" />
<span v-text="visibilityHint" />
<span v-oc-tooltip="currentLinkRoleDescription" v-text="currentLinkRoleLabel" />
</p>
<div :class="{ 'oc-pr-s': !isModifiable }" class="details-buttons">
<oc-button
Expand Down Expand Up @@ -187,7 +185,7 @@ export default {
}
},
computed: {
visibilityHint() {
currentLinkRoleDescription() {
return LinkShareRoles.getByBitmask(
parseInt(this.link.permissions),
this.isFolderShare
Expand Down
4 changes: 2 additions & 2 deletions ...iles/tests/unit/components/SideBar/Shares/Links/__snapshots__/DetailsAndEdit.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`DetailsAndEdit component if user can edit renders dropdown and edit button 1`] = `
<div class="link-details oc-flex oc-flex-between oc-flex-middle oc-pl-s">
<div>
<oc-button-stub id="edit-public-link-role-dropdown-toggl-undefined" appearance="raw" gap-size="none" class="edit-public-link-role-dropdown-toggl oc-text-left"><span class="oc-invisible-sr">Viewer</span> <span>Recipients can view and download contents.</span>
<oc-button-stub id="edit-public-link-role-dropdown-toggl-undefined" appearance="raw" gap-size="none" class="edit-public-link-role-dropdown-toggl oc-text-left"><span>Viewer</span>
<oc-icon-stub name="arrow-down-s"></oc-icon-stub>
</oc-button-stub>
<oc-drop-stub drop-id="edit-public-link-role-dropdown" toggle="#edit-public-link-role-dropdown-toggl-undefined" padding-size="remove" mode="click">
Expand Down Expand Up @@ -52,7 +52,7 @@ exports[`DetailsAndEdit component if user can edit renders dropdown and edit but

exports[`DetailsAndEdit component if user can not edit does not render dropdown or edit button 1`] = `
<div class="link-details oc-flex oc-flex-between oc-flex-middle oc-pl-s">
<p class="oc-my-rm"><span class="oc-invisible-sr">Viewer</span> <span>Recipients can view and download contents.</span></p>
<p class="oc-my-rm"><span>Viewer</span></p>
<div class="details-buttons oc-pr-s">
<!---->
<!---->
Expand Down
3 changes: 2 additions & 1 deletion packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ function getWrapper() {
currentRoute: createLocationSpaces('files-spaces-projects'),
resolve: (r) => {
return { href: r.name }
}
},
push: jest.fn()
},
$gettext: jest.fn()
},
Expand Down
1 change: 1 addition & 0 deletions packages/web-app-user-management/tests/unit/components/Groups/GroupsList.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ function getMountedWrapper({ propsData = {} } = {}) {
propsData: {
groups: [],
selectedGroups: [],
headerPosition: 0,
...propsData
},
stubs: {
Expand Down
1 change: 1 addition & 0 deletions packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ function getWrapper({ propsData = {} } = {}) {
propsData: {
users: [],
selectedUsers: [],
headerPosition: 0,
...propsData
},
stubs: {
Expand Down