YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: update ColorVariant => DEFAULT_STATUS_ICON

Browse source
This commit is contained in:
axolotle 2024-07-25 17:39:17 +02:00
parent 3c6f4f3e3c
commit a875d6f74e
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/components/globals/YAlert.vue
View file

@ -1,4 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ColorVariant } from 'bootstrap-vue-next'
import { computed } from 'vue' import { computed } from 'vue'
import { DEFAULT_STATUS_ICON } from '@/helpers/yunohostArguments' import { DEFAULT_STATUS_ICON } from '@/helpers/yunohostArguments'
@ -6,7 +7,7 @@ import { DEFAULT_STATUS_ICON } from '@/helpers/yunohostArguments'
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
alert?: boolean alert?: boolean
variant?: keyof typeof DEFAULT_STATUS_ICON variant?: ColorVariant
icon?: string icon?: string
}>(), }>(),
{ {
@ -30,7 +31,7 @@ const icon = computed(() => {
:class="{ ['alert alert-' + variant]: !alert }" :class="{ ['alert alert-' + variant]: !alert }"
class="yuno-alert d-flex flex-column flex-md-row align-items-center" class="yuno-alert d-flex flex-column flex-md-row align-items-center"
> >
<YIcon :iname="icon" class="me-md-3 mb-md-0 mb-2 md" /> <YIcon v-if="icon" :iname="icon" class="me-md-3 mb-md-0 mb-2 md" />
<div class="w-100"> <div class="w-100">
<slot name="default" /> <slot name="default" />

10
app/src/helpers/yunohostArguments.ts
View file

@ -12,12 +12,14 @@ import type { AdressModelValue, FileModelValue } from '@/types/form'
import { isAdressModelValue, isFileModelValue } from '@/types/form' import { isAdressModelValue, isFileModelValue } from '@/types/form'
export const DEFAULT_STATUS_ICON = { export const DEFAULT_STATUS_ICON = {
[null]: null, primary: null,
danger: 'times', secondary: null,
error: 'times',
info: 'info',
success: 'check', success: 'check',
danger: 'times',
warning: 'warning', warning: 'warning',
info: 'info',
light: null,
dark: null,
} }
// FORMAT FROM CORE // FORMAT FROM CORE

4
app/src/views/diagnosis/DiagnosisView.vue
View file

@ -32,7 +32,6 @@ function onQueriesResponse(_: any, reportsData: any) {
for (const item of report.items) { for (const item of report.items) {
const status = (item.variant = item.status.toLowerCase()) const status = (item.variant = item.status.toLowerCase())
item.icon = DEFAULT_STATUS_ICON[status]
item.issue = false item.issue = false
if (item.ignored) { if (item.ignored) {
@ -50,6 +49,9 @@ function onQueriesResponse(_: any, reportsData: any) {
report.errors++ report.errors++
} }
} }
item.icon =
DEFAULT_STATUS_ICON[item.variant as 'success' | 'warning' | 'danger']
} }
report.noIssues = report.warnings + report.errors === 0 report.noIssues = report.warnings + report.errors === 0