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

Add details-quick-action to the spaces management table #8273

Merged
merged 1 commit into from
Jan 19, 2023
Merged

Add details-quick-action to the spaces management table #8273

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 @@ -18,4 +18,5 @@ https://github.com/owncloud/web/pull/8249
https://github.com/owncloud/web/pull/8230
https://github.com/owncloud/web/pull/8262
https://github.com/owncloud/web/pull/8247
https://github.com/owncloud/web/pull/8273
https://github.com/owncloud/web/issues/8219
20 changes: 20 additions & 0 deletions packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@
</template>
<template #actions="{ item }">
<div class="spaces-list-actions">
<oc-button
:id="`space-details-trigger-${resourceDomSelector(item)}`"
v-oc-tooltip="spaceDetailsLabel"
:aria-label="spaceDetailsLabel"
appearance="raw"
@click.stop.prevent="showDetailsForSpace(item)"
><oc-icon name="information" fill-type="line" />
</oc-button>
<oc-button
:id="`context-menu-trigger-${resourceDomSelector(item)}`"
ref="contextMenuButton"
Expand Down Expand Up @@ -140,6 +148,8 @@ import { spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from 'web-client/s
import Mark from 'mark.js'
import Fuse from 'fuse.js'
import { useGettext } from 'vue3-gettext'
import { eventBus } from 'web-pkg'
import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'

export default defineComponent({
name: 'SpacesList',
Expand Down Expand Up @@ -407,6 +417,14 @@ export default defineComponent({
displayPositionedDropdown(dropdown._tippy, event, unref(contextMenuButton))
}

const spaceDetailsLabel = computed(() => {
return $gettext('Show details')
})
const showDetailsForSpace = (space: SpaceResource) => {
selectSpace(space)
eventBus.publish(SideBarEventTopics.open)
}

return {
allSpacesSelected,
sortBy,
Expand Down Expand Up @@ -436,6 +454,8 @@ export default defineComponent({
popperOptions,
showContextMenuOnBtnClick,
showContextMenuOnRightClick,
spaceDetailsLabel,
showDetailsForSpace,
...spaceRefs
}
}
Expand Down
9 changes: 8 additions & 1 deletion packages/web-app-admin-settings/tests/unit/components/Spaces/SpacesList.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import SpacesList from '../../../../src/components/Spaces/SpacesList.vue'
import { defaultPlugins, mount, shallowMount } from 'web-test-helpers'
import Vue from 'vue'
import { displayPositionedDropdown } from 'web-pkg'
import { displayPositionedDropdown, eventBus } from 'web-pkg'
import { SideBarEventTopics } from 'web-pkg/src/composables/sideBar'

const spaceMocks = [
{
Expand Down Expand Up @@ -106,6 +107,12 @@ describe('SpacesList', () => {
await wrapper.find('.spaces-table-btn-action-dropdown').trigger('click')
expect(spyDisplayPositionedDropdown).toHaveBeenCalledTimes(1)
})
it('should show the space details on details button click', async () => {
const eventBusSpy = jest.spyOn(eventBus, 'publish')
const { wrapper } = getWrapper({ spaces: spaceMocks })
await wrapper.find(`#space-details-trigger-${spaceMocks[0].id}`).trigger('click')
expect(eventBusSpy).toHaveBeenCalledWith(SideBarEventTopics.open)
})
})

function getWrapper({ mountType = mount, spaces = [], selectedSpaces = [] } = {}) {
Expand Down
6 changes: 6 additions & 0 deletions ...web-app-admin-settings/tests/unit/components/Spaces/__snapshots__/SpacesList.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ exports[`SpacesList should render all spaces in a table 1`] = `
</td>
<td class="oc-table-cell oc-table-cell-align-right oc-table-cell-align-middle oc-table-cell-width-auto oc-td oc-table-data-cell oc-table-data-cell-actions oc-pr-s">
<div class="spaces-list-actions">
<button aria-label="Show details" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw" id="space-details-trigger-1" type="button">
<!-- @slot Content of the button -->
<span class="oc-icon oc-icon-m oc-icon-passive">
<!---->
</span>
</button>
<button aria-label="Show context menu" class="oc-button oc-rounded oc-button-m oc-button-justify-content-center oc-button-gap-m oc-button-passive oc-button-passive-raw spaces-table-btn-action-dropdown" id="context-menu-trigger-1" type="button">
<!-- @slot Content of the button -->
<span class="oc-icon oc-icon-m oc-icon-passive">
Expand Down