Skip to content

Commit 7ae667b

Browse files
committed
fix(ui): hide DevicesDropdown if user doesn't have namespaces
1 parent 42a5a5e commit 7ae667b

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

ui/src/components/AppBar/DevicesDropdown.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<template>
22
<v-badge
3+
v-if="hasNamespaces"
34
:model-value="pendingDevicesCount > 0"
45
:content="pendingDevicesCount"
56
offset-y="-5"
@@ -346,6 +347,7 @@ const stats = computed(() => statsStore.stats);
346347
const offlineDevices = computed(
347348
() => stats.value.registered_devices - stats.value.online_devices,
348349
);
350+
const hasNamespaces = computed(() => namespacesStore.namespaceList.length > 0);
349351
const toggleDrawer = () => {
350352
isDrawerOpen.value = !isDrawerOpen.value;
351353
};
@@ -392,7 +394,7 @@ const fetchRecentDevices = async () => {
392394
};
393395
394396
onBeforeMount(async () => {
395-
if (namespacesStore.namespaceList.length === 0) return;
397+
if (!hasNamespaces.value) return;
396398
await fetchStats();
397399
await fetchPendingDevices();
398400
await fetchRecentDevices();

ui/tests/components/AppBar/__snapshots__/AppBar.spec.ts.snap

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ exports[`AppBar Component > Renders the component 1`] = `
4343
</button>
4444
<!--teleport start-->
4545
<!--teleport end-->
46-
<div class="v-badge" size="x-small" data-test="device-dropdown-badge">
47-
<div class="v-badge__wrapper"><i class="mdi-developer-board mdi v-icon notranslate v-theme--light v-icon--size-default text-primary v-icon--clickable" role="button" aria-hidden="false" tabindex="0" aria-label="Open devices menu" data-test="devices-icon"></i>
48-
<transition-stub name="scale-rotate-transition" appear="false" persisted="false" css="true"><span class="v-badge__badge v-theme--light bg-success" style="bottom: calc(100% - 7px); left: calc(100% - 12px); display: none;" aria-atomic="true" aria-label="Badge" aria-live="polite" role="status">0</span></transition-stub>
49-
</div>
50-
</div>
46+
<!--v-if-->
5147
<!--teleport start-->
5248
<!--teleport end--><button type="button" class="v-btn v-btn--icon v-theme--light text-primary v-btn--density-default v-btn--variant-text" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-14" aria-owns="v-menu-v-14" data-test="user-menu-btn"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
5349
<!----><span class="v-btn__content" data-no-activator=""><div data-v-09753bb1="" class="v-avatar v-theme--light bg-primary v-avatar--density-default v-avatar--variant-flat border" style="width: 1.5rem; height: 1.5rem;" email="[email protected]" data-test="user-icon"><div data-v-09753bb1="" class="v-responsive v-img v-img--booting" data-test="gravatar-image"><div class="v-responsive__sizer"></div><!----><transition-stub name="fade-transition" appear="false" persisted="false" css="true"><!----></transition-stub><!----><!----><!----><!----></div><!----><span class="v-avatar__underlay"></span>

ui/tests/layouts/__snapshots__/AppLayout.spec.ts.snap

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ exports[`App Layout Component > Renders the component 1`] = `
273273
<!---->
274274
<!---->
275275
<!--teleport start-->
276-
<!--teleport end--><button type="button" class="v-btn v-btn--stacked v-theme--light v-btn--density-comfortable v-btn--size-x-large v-btn--variant-text text-none p-2 border-e-thin border-s-thin" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-8" aria-owns="v-menu-v-8"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
276+
<!--teleport end--><button type="button" class="v-btn v-btn--stacked v-theme--light v-btn--density-comfortable v-btn--size-x-large v-btn--variant-text text-none p-2 border-e-thin border-s-thin" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-6" aria-owns="v-menu-v-6"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
277277
<!----><span class="v-btn__content" data-no-activator=""><div class="d-flex align-center ga-2"><span class="v-chip v-chip--label v-theme--light text-primary v-chip--density-default v-chip--size-default v-chip--variant-tonal text-uppercase" draggable="false"><!----><span class="v-chip__underlay"></span>
278278
<!---->
279279
<!---->
@@ -294,20 +294,16 @@ exports[`App Layout Component > Renders the component 1`] = `
294294
</ul>
295295
</div>
296296
<div class="v-spacer"></div>
297-
<div class="d-flex align-center ga-4 mr-4"><button type="button" class="v-btn v-btn--icon v-theme--light text-primary v-btn--density-default v-btn--variant-text" aria-describedby="v-tooltip-v-12" aria-label="community-help-icon" data-test="support-btn"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
297+
<div class="d-flex align-center ga-4 mr-4"><button type="button" class="v-btn v-btn--icon v-theme--light text-primary v-btn--density-default v-btn--variant-text" aria-describedby="v-tooltip-v-10" aria-label="community-help-icon" data-test="support-btn"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
298298
<!----><span class="v-btn__content" data-no-activator=""><i class="mdi-help-circle mdi v-icon notranslate v-theme--light v-icon--size-default" aria-hidden="true"></i></span>
299299
<!---->
300300
<!---->
301301
</button>
302302
<!--teleport start-->
303303
<!--teleport end-->
304-
<div class="v-badge" size="x-small" data-test="device-dropdown-badge">
305-
<div class="v-badge__wrapper"><i class="mdi-developer-board mdi v-icon notranslate v-theme--light v-icon--size-default text-primary v-icon--clickable" role="button" aria-hidden="false" tabindex="0" aria-label="Open devices menu" data-test="devices-icon"></i>
306-
<transition-stub name="scale-rotate-transition" appear="false" persisted="false" css="true"><span class="v-badge__badge v-theme--light bg-success" style="bottom: calc(100% - 7px); left: calc(100% - 12px); display: none;" aria-atomic="true" aria-label="Badge" aria-live="polite" role="status">0</span></transition-stub>
307-
</div>
308-
</div>
304+
<!--v-if-->
309305
<!--teleport start-->
310-
<!--teleport end--><button type="button" class="v-btn v-btn--icon v-theme--light text-primary v-btn--density-default v-btn--variant-text" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-20" aria-owns="v-menu-v-20" data-test="user-menu-btn"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
306+
<!--teleport end--><button type="button" class="v-btn v-btn--icon v-theme--light text-primary v-btn--density-default v-btn--variant-text" aria-haspopup="menu" aria-expanded="false" aria-controls="v-menu-v-18" aria-owns="v-menu-v-18" data-test="user-menu-btn"><span class="v-btn__overlay"></span><span class="v-btn__underlay"></span>
311307
<!----><span class="v-btn__content" data-no-activator=""><div data-v-09753bb1="" class="v-avatar v-theme--light bg-primary v-avatar--density-default v-avatar--variant-flat border" style="width: 1.5rem; height: 1.5rem;" email="" data-test="user-icon"><i data-v-09753bb1="" class="mdi-account mdi v-icon notranslate v-theme--light v-icon--size-default text-surface" aria-hidden="true" data-test="gravatar-placeholder"></i><!----><span class="v-avatar__underlay"></span>
312308
</div></span>
313309
<!---->

0 commit comments

Comments
 (0)