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

Fix member display in space details sidebar panel #8477

Merged
merged 1 commit into from
Feb 21, 2023
Merged

Fix member display in space details sidebar panel #8477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions changelog/unreleased/enhancement-spaces-list-in-admin-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ https://github.com/owncloud/web/pull/8268
https://github.com/owncloud/web/pull/8233
https://github.com/owncloud/web/pull/8333
https://github.com/owncloud/web/pull/8334
https://github.com/owncloud/web/pull/8477
https://github.com/owncloud/web/issues/8219
https://github.com/owncloud/web/issues/8267
84 changes: 25 additions & 59 deletions packages/web-pkg/src/components/sideBar/Spaces/Details/SpaceDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="oc-space-details-sidebar-image oc-text-center">
<oc-spinner v-if="loadImageTask.isRunning" />
<div v-else-if="spaceImage" class="oc-position-relative">
<img :src="spaceImage" alt="" class="oc-mb-m" />
<img :src="spaceImage" alt="" class="oc-mb-s" />
</div>
<oc-icon
v-else
Expand All @@ -14,7 +14,7 @@
</div>
<div
v-if="showShareIndicators && hasShares"
class="oc-flex oc-flex-middle oc-space-details-sidebar-members oc-mb-m oc-text-small"
class="oc-flex oc-flex-middle oc-space-details-sidebar-members oc-mb-s oc-text-small"
style="gap: 15px"
>
<oc-button
Expand Down Expand Up @@ -153,26 +153,19 @@ export default defineComponent({

switch (this.memberShareCount) {
case 1:
return this.$gettextInterpolate(
this.$ngettext(
'This space has one member and %{linkShareCount} link.',
'This space has one member and %{linkShareCount} links.',
this.linkShareCount
),
{
linkShareCount: this.linkShareCount
}
return this.$ngettext(
'This space has one member and %{linkShareCount} link.',
'This space has one member and %{linkShareCount} links.',
this.linkShareCount,
{ linkShareCount: this.linkShareCount }
)
default:
if (this.linkShareCount === 1) {
return this.$gettextInterpolate(
'This space has %{memberShareCount} members and one link.',
{
memberShareCount: this.memberShareCount
}
)
return this.$gettext('This space has %{memberShareCount} members and one link.', {
memberShareCount: this.memberShareCount
})
}
return this.$gettextInterpolate(
return this.$gettext(
'This space has %{memberShareCount} members and %{linkShareCount} links.',
{
memberShareCount: this.memberShareCount,
Expand All @@ -197,31 +190,12 @@ export default defineComponent({
return formatDateFromISO(this.resource.mdate, this.$language.current)
},
ownerUsernames() {
/* TODO: Find a better solution for reactiveness
Why: Currently we use a different logic for the admin-panel and we need a solution that works for both
*/
if (this.spaceResource) {
return this.resource.spaceRoles[spaceRoleManager.name]
.map((share) => {
if (share.displayName === this.user?.displayName) {
return this.$gettextInterpolate(this.$gettext('%{displayName} (me)'), {
displayName: share.displayName
})
}
return share.displayName
})
.join(', ')
}
const userId = this.user?.id
return this.spaceMembers
.filter((share) => share.role.name === spaceRoleManager.name)
return this.resource.spaceRoles[spaceRoleManager.name]
.map((share) => {
if (share.collaborator.name === userId) {
return this.$gettextInterpolate(this.$gettext('%{displayName} (me)'), {
displayName: share.collaborator.displayName
})
if (share.id === this.user?.uuid) {
return this.$gettext('%{displayName} (me)', { displayName: share.displayName })
}
return share.collaborator.displayName
return share.displayName
})
.join(', ')
},
Expand All @@ -238,27 +212,19 @@ export default defineComponent({
return this.currentFileOutgoingLinks.length
},
memberShareLabel() {
return this.$gettextInterpolate(
this.$ngettext(
'This space has %{memberShareCount} member.',
'This space has %{memberShareCount} members.',
this.memberShareCount
),
{
memberShareCount: this.memberShareCount
}
return this.$ngettext(
'This space has %{memberShareCount} member.',
'This space has %{memberShareCount} members.',
this.memberShareCount,
{ memberShareCount: this.memberShareCount }
)
},
linkShareLabel() {
return this.$gettextInterpolate(
this.$ngettext(
'%{linkShareCount} link giving access.',
'%{linkShareCount} links giving access.',
this.linkShareCount
),
{
linkShareCount: this.linkShareCount
}
return this.$ngettext(
'%{linkShareCount} link giving access.',
'%{linkShareCount} links giving access.',
this.linkShareCount,
{ linkShareCount: this.linkShareCount }
)
}
},
Expand Down
4 changes: 2 additions & 2 deletions packages/web-pkg/tests/unit/components/sidebar/Spaces/Details/SpaceDetails.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const spaceMock = {
id: '1',
mdate: 'Wed, 21 Oct 2015 07:28:00 GMT',
spaceRoles: {
manager: [],
manager: [{ id: '1', displayName: 'alice' }],
editor: [],
viewer: []
},
Expand Down Expand Up @@ -60,7 +60,7 @@ describe('Details SideBar Panel', () => {

function createWrapper({ spaceResource = spaceMock, props = {} } = {}) {
const storeOptions = defaultStoreMockOptions
storeOptions.getters.user.mockImplementation(() => ({ id: 'marie' }))
storeOptions.getters.user.mockImplementation(() => ({ id: 'marie', uuid: '1' }))
storeOptions.modules.runtime.modules.spaces.getters.spaceMembers.mockImplementation(() => [
spaceShare
])
Expand Down
4 changes: 2 additions & 2 deletions ...-pkg/tests/unit/components/sidebar/Spaces/Details/__snapshots__/SpaceDetails.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Details SideBar Panel displays the details side panel 1`] = `
<div class="oc-space-details-sidebar-image oc-text-center">
<oc-icon-stub accessiblelabel="" class="space-default-image oc-px-m oc-py-m" color="" filltype="fill" name="layout-grid" size="xxlarge" type="span" variation="passive"></oc-icon-stub>
</div>
<div class="oc-flex oc-flex-middle oc-space-details-sidebar-members oc-mb-m oc-text-small" style="gap: 15px;">
<div class="oc-flex oc-flex-middle oc-space-details-sidebar-members oc-mb-s oc-text-small" style="gap: 15px;">
<oc-button-stub appearance="raw" arialabel="Open member list in share panel" disabled="false" gapsize="medium" justifycontent="center" size="medium" submit="button" type="button" variation="passive"></oc-button-stub>
<!--v-if-->
<p>This space has 1 member.</p>
Expand All @@ -21,7 +21,7 @@ exports[`Details SideBar Panel displays the details side panel 1`] = `
<tr>
<th class="oc-pr-s" scope="col">Manager</th>
<td>
<span>alice</span>
<span>alice (me)</span>
</td>
</tr>
<tr>
Expand Down