Skip to content

Commit 2c9c0be

Browse files
committed
fix: check for adminMode, not isAdmin
1 parent f817c71 commit 2c9c0be

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

app/components/probe/ProbeFilters/MobileProbeListFilters.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</div>
8686
</div>
8787

88-
<AdminFilterSettings v-if="auth.isAdmin" v-model:filter="draftFilter"/>
88+
<AdminFilterSettings v-if="auth.adminMode" v-model:filter="draftFilter"/>
8989

9090
<div class="mt-4 flex justify-end gap-2">
9191
<Button label="Cancel" severity="secondary" text @click="emit('cancel')"/>

app/components/probe/ProbeFilters/ProbeListFilters.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</IconField>
4444
</InputGroup>
4545

46-
<div v-if="auth.isAdmin" class="flex size-9 items-stretch justify-between rounded-md border border-surface-300 text-bluegray-700 focus-within:border-primary hover:border-surface-400 dark:border-dark-600 dark:bg-dark-900 dark:text-dark-0 dark:hover:border-dark-400">
46+
<div v-if="auth.adminMode" class="flex size-9 items-stretch justify-between rounded-md border border-surface-300 text-bluegray-700 focus-within:border-primary hover:border-surface-400 dark:border-dark-600 dark:bg-dark-900 dark:text-dark-0 dark:hover:border-dark-400">
4747
<Button
4848
class="relative hover:bg-white focus:ring-primary dark:hover:bg-dark-900 dark:focus:ring-primary"
4949
severity="secondary"

app/composables/useProbeFilters.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
8282
...!isDefault('by') && { by: filter.value.by },
8383
...filter.value.desc && { desc: 'true' },
8484
...!isDefault('status') && { status: filter.value.status },
85-
...auth.isAdmin && !isDefault('adoption') && { adoption: filter.value.adoption },
86-
...auth.isAdmin && !isDefault('probeType') && { type: filter.value.probeType },
85+
...auth.adminMode && !isDefault('adoption') && { adoption: filter.value.adoption },
86+
...auth.adminMode && !isDefault('probeType') && { type: filter.value.probeType },
8787
});
8888

8989
const onParamChange = () => {
@@ -123,10 +123,10 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
123123
...filterValue.search && { searchIndex: { _icontains: filterValue.search } },
124124
...!ignoredFields.includes('status') && !isDefault('status', filter) && { status: { _in: STATUS_MAP[filterValue.status].options } },
125125
...!ignoredFields.includes('status') && filterValue.status === 'online-outdated' && { isOutdated: { _eq: true } },
126-
...!ignoredFields.includes('adoption') && auth.isAdmin && !isDefault('adoption', filter) && {
126+
...!ignoredFields.includes('adoption') && auth.adminMode && !isDefault('adoption', filter) && {
127127
userId: filterValue.adoption === 'adopted' ? { _neq: null } : { _eq: null },
128128
},
129-
...!ignoredFields.includes('probeType') && auth.isAdmin && !isDefault('probeType', filter) && {
129+
...!ignoredFields.includes('probeType') && auth.adminMode && !isDefault('probeType', filter) && {
130130
hardwareDevice: filterValue.probeType === 'hardware' ? { _neq: null } : { _eq: null },
131131
},
132132
};
@@ -172,13 +172,13 @@ export const useProbeFilters = ({ active = () => true }: ProbeFiltersOptions = {
172172
filter.value.status = DEFAULT_FILTER.status;
173173
}
174174

175-
if (typeof adoption === 'string' && ADOPTION_OPTIONS.includes(adoption) && auth.isAdmin) {
175+
if (typeof adoption === 'string' && ADOPTION_OPTIONS.includes(adoption) && auth.adminMode) {
176176
filter.value.adoption = adoption as AdoptionOption;
177177
} else {
178178
filter.value.adoption = DEFAULT_FILTER.adoption;
179179
}
180180

181-
if (typeof probeType === 'string' && PROBE_TYPE_OPTIONS.includes(probeType) && auth.isAdmin) {
181+
if (typeof probeType === 'string' && PROBE_TYPE_OPTIONS.includes(probeType) && auth.adminMode) {
182182
filter.value.probeType = probeType as ProbeTypeOption;
183183
} else {
184184
filter.value.probeType = DEFAULT_FILTER.probeType;

0 commit comments

Comments
 (0)