[refactor] Simplify conflict acknowledgment system and enhance UX (#4599)

This commit is contained in:
Jin Yi
2025-07-31 08:20:58 +09:00
parent 38e2fa8399
commit b67ace5195
15 changed files with 304 additions and 861 deletions

View File

@@ -142,7 +142,7 @@ import {
import { useI18n } from 'vue-i18n'
import PuzzleIcon from '@/components/icons/PuzzleIcon.vue'
import { useConflictBannerState } from '@/composables/useConflictBannerState'
import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
import { useDialogService } from '@/services/dialogService'
import { type ReleaseNote } from '@/services/releaseService'
import { useCommandStore } from '@/stores/commandStore'
@@ -215,10 +215,9 @@ const moreMenuItem = computed(() =>
menuItems.value.find((item) => item.key === 'more')
)
// Use conflict banner state from composable
const conflictBannerState = useConflictBannerState()
const { shouldShowConflictRedDot: shouldShowManagerRedDot } =
conflictBannerState
// Use conflict acknowledgment state from composable
const { shouldShowRedDot: shouldShowManagerRedDot } =
useConflictAcknowledgment()
const menuItems = computed<MenuItem[]>(() => {
const moreItems: MenuItem[] = [