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

Show loading spinner while searching or filtering users in the admin … #10874

Merged
merged 4 commits into from
May 6, 2024
Merged

Show loading spinner while searching or filtering users in the admin … #10874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
185fc4e
Show loading spinner while searching or filtering users in the admin …
AlexAndBear May 6, 2024
f2525db
Enhance changelog item
AlexAndBear May 6, 2024
f7fd787
lint
AlexAndBear May 6, 2024
aff1b9f
Move loading spinner to users list, otherwise the filters become unac…
AlexAndBear May 6, 2024
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
7 changes: 7 additions & 0 deletions changelog/unreleased/enhancement-show-loading-spinner-while-searching-or-filtering-users
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Show loading spinner while searching or filtering users

While searching or filtering users in the admin settings, there will be shown a loading spinner,
to indicate the request is processing.

https://github.com/owncloud/web/pull/10874
https://github.com/owncloud/web/issues/10821
194 changes: 102 additions & 92 deletions packages/web-app-admin-settings/src/components/Users/UsersList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,106 +3,112 @@
<div class="user-filters oc-flex oc-flex-between oc-flex-wrap oc-flex-bottom oc-mx-m oc-mb-m">
<slot name="filter" />
</div>
<slot v-if="!users.length" name="noResults" />
<oc-table
v-else
class="users-table"
:sort-by="sortBy"
:sort-dir="sortDir"
:fields="fields"
:data="paginatedItems"
:highlighted="highlighted"
:sticky="true"
:header-position="fileListHeaderY"
:hover="true"
@sort="handleSort"
@contextmenu-clicked="showContextMenuOnRightClick"
@highlight="rowClicked"
>
<template #selectHeader>
<oc-checkbox
size="large"
class="oc-ml-s"
:label="$gettext('Select all users')"
:model-value="allUsersSelected"
hide-label
@update:model-value="allUsersSelected ? unselectAllUsers() : selectUsers(paginatedItems)"
/>
</template>
<template #select="{ item }">
<oc-checkbox
class="oc-ml-s"
size="large"
:model-value="isUserSelected(item)"
:option="item"
:label="getSelectUserLabel(item)"
hide-label
@update:model-value="selectUser(item)"
@click.stop="rowClicked([item, $event])"
/>
</template>
<template #avatar="{ item }">
<avatar-image :width="32" :userid="item.id" :user-name="item.displayName" />
</template>
<template #role="{ item }">
<template v-if="item.appRoleAssignments">{{ getRoleDisplayNameByUser(item) }}</template>
</template>
<template #accountEnabled="{ item }">
<span v-if="item.accountEnabled === false" class="oc-flex oc-flex-middle">
<oc-icon name="stop-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Forbidden')"
<app-loading-spinner v-if="isLoading" />
<div v-else>
<slot v-if="!users.length" name="noResults" />
<oc-table
v-else
class="users-table"
:sort-by="sortBy"
:sort-dir="sortDir"
:fields="fields"
:data="paginatedItems"
:highlighted="highlighted"
:sticky="true"
:header-position="fileListHeaderY"
:hover="true"
@sort="handleSort"
@contextmenu-clicked="showContextMenuOnRightClick"
@highlight="rowClicked"
>
<template #selectHeader>
<oc-checkbox
size="large"
class="oc-ml-s"
:label="$gettext('Select all users')"
:model-value="allUsersSelected"
hide-label
@update:model-value="
allUsersSelected ? unselectAllUsers() : selectUsers(paginatedItems)
"
/>
</span>
<span v-else class="oc-flex oc-flex-middle">
<oc-icon name="play-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Allowed')"
</template>
<template #select="{ item }">
<oc-checkbox
class="oc-ml-s"
size="large"
:model-value="isUserSelected(item)"
:option="item"
:label="getSelectUserLabel(item)"
hide-label
@update:model-value="selectUser(item)"
@click.stop="rowClicked([item, $event])"
/>
</span>
</template>
<template #actions="{ item }">
<oc-button
v-oc-tooltip="$gettext('Show details')"
:aria-label="$gettext('Show details')"
appearance="raw"
class="oc-mr-xs quick-action-button oc-p-xs users-table-btn-details"
@click="showDetails(item)"
>
<oc-icon name="information" fill-type="line" />
</oc-button>
<oc-button
v-oc-tooltip="$gettext('Edit')"
:aria-label="$gettext('Edit')"
appearance="raw"
class="oc-mr-xs quick-action-button oc-p-xs users-table-btn-edit"
@click="showEditPanel(item)"
>
<oc-icon name="pencil" fill-type="line" />
</oc-button>
<context-menu-quick-action
ref="contextMenuButtonRef"
:item="item"
class="users-table-btn-action-dropdown"
@quick-action-clicked="showContextMenuOnBtnClick($event, item)"
>
<template #contextMenu>
<slot name="contextMenu" :user="item" />
</template>
</context-menu-quick-action>
</template>
<template #footer>
<pagination :pages="totalPages" :current-page="currentPage" />
<div class="oc-text-nowrap oc-text-center oc-width-1-1 oc-my-s">
<p class="oc-text-muted">{{ footerTextTotal }}</p>
</div>
</template>
</oc-table>
</template>
<template #avatar="{ item }">
<avatar-image :width="32" :userid="item.id" :user-name="item.displayName" />
</template>
<template #role="{ item }">
<template v-if="item.appRoleAssignments">{{ getRoleDisplayNameByUser(item) }}</template>
</template>
<template #accountEnabled="{ item }">
<span v-if="item.accountEnabled === false" class="oc-flex oc-flex-middle">
<oc-icon name="stop-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Forbidden')"
/>
</span>
<span v-else class="oc-flex oc-flex-middle">
<oc-icon name="play-circle" fill-type="line" class="oc-mr-s" /><span
v-text="$gettext('Allowed')"
/>
</span>
</template>
<template #actions="{ item }">
<oc-button
v-oc-tooltip="$gettext('Show details')"
:aria-label="$gettext('Show details')"
appearance="raw"
class="oc-mr-xs quick-action-button oc-p-xs users-table-btn-details"
@click="showDetails(item)"
>
<oc-icon name="information" fill-type="line" />
</oc-button>
<oc-button
v-oc-tooltip="$gettext('Edit')"
:aria-label="$gettext('Edit')"
appearance="raw"
class="oc-mr-xs quick-action-button oc-p-xs users-table-btn-edit"
@click="showEditPanel(item)"
>
<oc-icon name="pencil" fill-type="line" />
</oc-button>
<context-menu-quick-action
ref="contextMenuButtonRef"
:item="item"
class="users-table-btn-action-dropdown"
@quick-action-clicked="showContextMenuOnBtnClick($event, item)"
>
<template #contextMenu>
<slot name="contextMenu" :user="item" />
</template>
</context-menu-quick-action>
</template>
<template #footer>
<pagination :pages="totalPages" :current-page="currentPage" />
<div class="oc-text-nowrap oc-text-center oc-width-1-1 oc-my-s">
<p class="oc-text-muted">{{ footerTextTotal }}</p>
</div>
</template>
</oc-table>
</div>
</div>
</template>

<script lang="ts">
import { useGettext } from 'vue3-gettext'
import { ComponentPublicInstance, defineComponent, PropType, ref, unref, computed } from 'vue'
import {
AppLoadingSpinner,
ContextMenuBtnClickEventData,
displayPositionedDropdown,
eventBus,
Expand All @@ -125,11 +131,15 @@ import { findIndex } from 'lodash-es'

export default defineComponent({
name: 'UsersList',
components: { ContextMenuQuickAction, Pagination },
components: { AppLoadingSpinner, ContextMenuQuickAction, Pagination },
props: {
roles: {
type: Array as PropType<AppRole[]>,
required: true
},
isLoading: {
type: Boolean,
default: false
}
},
setup(props) {
Expand Down
Loading