Skip to content

feat: implement team search functionality in admin view #3042

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

Open
Fin-c wants to merge 1 commit into
base: master
Choose a base branch
from
+100 −41
Open

feat: implement team search functionality in admin view #3042

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
113 changes: 72 additions & 41 deletions src/components/AdminTeamFolders.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ const updatingQuotaTeamIds = ref<Set<string>>(new Set())
const loadingTeamFolders = ref(true)
const sortKey = ref<TeamFolderSortKey>('teamName')
const sortAscending = ref(true)
const teamSearch = ref('')
const selectedTeam = ref<AdminTeamFolder | null>(null)
const folderName = ref('')
const assigningFolder = ref(false)
Expand All @@ -120,17 +121,20 @@ const quotaRows = computed(() => [...rows.value, ...groupRows.value]

const sortedTeamFolders = computed(() => {
const direction = sortAscending.value ? 1 : -1
return [...teamFolders.value].sort((a, b) => {
const left = getSortValue(a, sortKey.value)
const right = getSortValue(b, sortKey.value)
if (left < right) {
return -1 * direction
}
if (left > right) {
return direction
}
return 0
})
const query = teamSearch.value.trim().toLocaleLowerCase()
return teamFolders.value
.filter((teamFolder) => teamFolder.teamName.toLocaleLowerCase().includes(query))
.sort((a, b) => {
const left = getSortValue(a, sortKey.value)
const right = getSortValue(b, sortKey.value)
if (left < right) {
return -1 * direction
}
if (left > right) {
return direction
}
return 0
})
})

/**
Expand Down Expand Up @@ -528,33 +532,41 @@ onMounted(() => Promise.all([loadTeamFolders(), loadGroupQuotas()]))
<p class="team-folders__description">
{{ t('circles', 'Configure default storage quotas and manage team folders.') }}
</p>
<div class="team-folders__tabs" role="tablist" :aria-label="t('circles', 'Team folder settings')">
<button
id="team-folder-folders-tab"
type="button"
role="tab"
:aria-selected="activeTab === 'teamFolders'"
aria-controls="team-folder-folders-panel"
:tabindex="activeTab === 'teamFolders' ? 0 : -1"
:class="{ 'team-folders__tab--active': activeTab === 'teamFolders' }"
class="team-folders__tab"
@click="activeTab = 'teamFolders'"
@keydown="onTabKeydown">
{{ t('circles', 'Team folders') }}
</button>
<button
id="team-folder-default-quotas-tab"
type="button"
role="tab"
:aria-selected="activeTab === 'defaultQuotas'"
aria-controls="team-folder-default-quotas-panel"
:tabindex="activeTab === 'defaultQuotas' ? 0 : -1"
:class="{ 'team-folders__tab--active': activeTab === 'defaultQuotas' }"
class="team-folders__tab"
@click="activeTab = 'defaultQuotas'"
@keydown="onTabKeydown">
{{ t('circles', 'Default quotas') }}
</button>
<div class="team-folders__tabbar">
<div class="team-folders__tabs" role="tablist" :aria-label="t('circles', 'Team folder settings')">
<button
id="team-folder-folders-tab"
type="button"
role="tab"
:aria-selected="activeTab === 'teamFolders'"
aria-controls="team-folder-folders-panel"
:tabindex="activeTab === 'teamFolders' ? 0 : -1"
:class="{ 'team-folders__tab--active': activeTab === 'teamFolders' }"
class="team-folders__tab"
@click="activeTab = 'teamFolders'"
@keydown="onTabKeydown">
{{ t('circles', 'Team folders') }}
</button>
<button
id="team-folder-default-quotas-tab"
type="button"
role="tab"
:aria-selected="activeTab === 'defaultQuotas'"
aria-controls="team-folder-default-quotas-panel"
:tabindex="activeTab === 'defaultQuotas' ? 0 : -1"
:class="{ 'team-folders__tab--active': activeTab === 'defaultQuotas' }"
class="team-folders__tab"
@click="activeTab = 'defaultQuotas'"
@keydown="onTabKeydown">
{{ t('circles', 'Default quotas') }}
</button>
</div>
<NcTextField
v-if="activeTab === 'teamFolders'"
v-model="teamSearch"
:label="t('circles', 'Search team by name')"
type="search"
class="team-folders__search" />
</div>

<NcSettingsSection
Expand Down Expand Up @@ -694,7 +706,7 @@ onMounted(() => Promise.all([loadTeamFolders(), loadGroupQuotas()]))
<tbody>
<tr v-if="sortedTeamFolders.length === 0" class="team-folders__empty">
<td colspan="4">
{{ t('circles', 'No team folders found.') }}
{{ teamSearch.trim() ? t('circles', 'No teams match your search.') : t('circles', 'No teams found.') }}
</td>
</tr>
<tr v-for="teamFolder in sortedTeamFolders" v-else :key="teamFolder.teamId">
Expand Down Expand Up @@ -806,13 +818,21 @@ onMounted(() => Promise.all([loadTeamFolders(), loadGroupQuotas()]))
color: var(--color-text-maxcontrast);
}

.team-folders__tabs {
.team-folders__tabbar {
display: flex;
gap: 24px;
flex-wrap: wrap;
align-items: flex-end;
justify-content: space-between;
gap: 8px 16px;
margin-bottom: 24px;
border-bottom: 1px solid var(--color-border);
}

.team-folders__tabs {
display: flex;
gap: 24px;
}

.team-folders__tab {
position: relative;
padding: 10px 4px 9px;
Expand Down Expand Up @@ -977,6 +997,11 @@ onMounted(() => Promise.all([loadTeamFolders(), loadGroupQuotas()]))
font-weight: 600;
}

.team-folders__search {
flex: 0 1 320px;
margin-bottom: 4px;
}

.team-folders__scroll {
overflow-x: auto;
}
Expand Down Expand Up @@ -1079,4 +1104,10 @@ onMounted(() => Promise.all([loadTeamFolders(), loadGroupQuotas()]))
min-width: 640px;
}
}

@media (max-width: 600px) {
.team-folders__search {
flex-basis: 100%;
}
}
</style>
28 changes: 28 additions & 0 deletions tests/playwright/e2e/admin-settings.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,32 @@ test.describe('Admin settings', () => {

await expect(page.getByRole('heading', { name: 'Federated Teams' })).toBeVisible()
})

test('filters teams by name', async ({ page }) => {
const matchingTeam = 'Search match'
const otherTeam = 'Search other'
await page.route('**/ocs/v2.php/apps/circles/admin/teamfolders', (route) => route.fulfill({
contentType: 'application/json',
body: JSON.stringify({
ocs: {
data: [
{ teamId: 'matching-team', teamName: matchingTeam, defaultQuota: null, folder: null },
{ teamId: 'other-team', teamName: otherTeam, defaultQuota: null, folder: null },
],
},
}),
}))

await page.goto('settings/admin/teams', { waitUntil: 'networkidle' })
const search = page.getByRole('searchbox', { name: 'Search team by name' })
await expect(page.getByRole('cell', { name: matchingTeam })).toBeVisible()
await expect(page.getByRole('cell', { name: otherTeam })).toBeVisible()

await search.fill('match')
await expect(page.getByRole('cell', { name: matchingTeam })).toBeVisible()
await expect(page.getByRole('cell', { name: otherTeam })).not.toBeVisible()

await search.fill('no matching team')
await expect(page.getByText('No teams match your search.')).toBeVisible()
})
})
Loading