From ec684ee6b88a6554609227057d99f9db7bd29b64 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Sun, 6 Apr 2025 04:04:30 +0800 Subject: [PATCH] [Manager] Fix primevue severity in status messages (#3324) --- src/components/common/RefreshButton.vue | 4 ++-- .../dialog/content/manager/PackStatusMessage.vue | 11 ++++++----- src/components/maintenance/TaskListItem.vue | 4 ++-- src/types/desktop/maintenanceTypes.ts | 4 ++-- src/types/primeVueTypes.ts | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/common/RefreshButton.vue b/src/components/common/RefreshButton.vue index 5f7387c2a..80b8166cc 100644 --- a/src/components/common/RefreshButton.vue +++ b/src/components/common/RefreshButton.vue @@ -32,7 +32,7 @@ import Button from 'primevue/button' import ProgressSpinner from 'primevue/progressspinner' -import { VueSeverity } from '@/types/primeVueTypes' +import { PrimeVueSeverity } from '@/types/primeVueTypes' const { disabled, @@ -41,7 +41,7 @@ const { } = defineProps<{ disabled?: boolean outlined?: boolean - severity?: VueSeverity + severity?: PrimeVueSeverity }>() // Model diff --git a/src/components/dialog/content/manager/PackStatusMessage.vue b/src/components/dialog/content/manager/PackStatusMessage.vue index 61b601677..0ddb39ae2 100644 --- a/src/components/dialog/content/manager/PackStatusMessage.vue +++ b/src/components/dialog/content/manager/PackStatusMessage.vue @@ -20,15 +20,16 @@ import Message from 'primevue/message' import { computed } from 'vue' import { components } from '@/types/comfyRegistryTypes' -import { VueSeverity } from '@/types/primeVueTypes' type PackVersionStatus = components['schemas']['NodeVersionStatus'] type PackStatus = components['schemas']['NodeStatus'] type Status = PackVersionStatus | PackStatus +type MessageProps = InstanceType['$props'] +type MessageSeverity = MessageProps['severity'] type StatusProps = { label: string - severity: VueSeverity + severity: MessageSeverity } const { statusType } = defineProps<{ @@ -46,7 +47,7 @@ const statusPropsMap: Record = { }, NodeStatusBanned: { label: 'banned', - severity: 'danger' + severity: 'error' }, NodeVersionStatusActive: { label: 'active', @@ -62,11 +63,11 @@ const statusPropsMap: Record = { }, NodeVersionStatusFlagged: { label: 'flagged', - severity: 'danger' + severity: 'error' }, NodeVersionStatusBanned: { label: 'banned', - severity: 'danger' + severity: 'error' } } diff --git a/src/components/maintenance/TaskListItem.vue b/src/components/maintenance/TaskListItem.vue index db4a59317..11c229030 100644 --- a/src/components/maintenance/TaskListItem.vue +++ b/src/components/maintenance/TaskListItem.vue @@ -45,7 +45,7 @@ import { computed, ref } from 'vue' import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore' import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes' -import { VueSeverity } from '@/types/primeVueTypes' +import { PrimeVueSeverity } from '@/types/primeVueTypes' import { useMinLoadingDurationRef } from '@/utils/refUtil' import TaskListStatusIcon from './TaskListStatusIcon.vue' @@ -64,7 +64,7 @@ defineEmits<{ }>() // Binding -const severity = computed(() => +const severity = computed(() => runner.value.state === 'error' || runner.value.state === 'warning' ? 'primary' : 'secondary' diff --git a/src/types/desktop/maintenanceTypes.ts b/src/types/desktop/maintenanceTypes.ts index d353b51d4..b5ac20bf3 100644 --- a/src/types/desktop/maintenanceTypes.ts +++ b/src/types/desktop/maintenanceTypes.ts @@ -1,4 +1,4 @@ -import type { VueSeverity } from '../primeVueTypes' +import type { PrimeVueSeverity } from '../primeVueTypes' interface MaintenanceTaskButton { /** The text to display on the button. */ @@ -32,7 +32,7 @@ export interface MaintenanceTask { /** Called by onClick to run the actual task. */ execute: (args?: unknown[]) => boolean | Promise /** Show the button with `severity="danger"` */ - severity?: VueSeverity + severity?: PrimeVueSeverity /** Whether this task should display the terminal window when run. */ usesTerminal?: boolean /** If `true`, successful completion of this task will refresh install validation and automatically continue if successful. */ diff --git a/src/types/primeVueTypes.ts b/src/types/primeVueTypes.ts index b3fdb4608..2b836c78d 100644 --- a/src/types/primeVueTypes.ts +++ b/src/types/primeVueTypes.ts @@ -1,5 +1,5 @@ /** Button, Tag, etc severity type is 'string' instead of this list. */ -export type VueSeverity = +export type PrimeVueSeverity = | 'primary' | 'secondary' | 'success'