diff --git a/app/components.d.ts b/app/components.d.ts index 02e15a179..76504360d 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -23,6 +23,7 @@ declare module 'vue' { BCardHeader: typeof import('bootstrap-vue-next/components/BCard')['BCardHeader'] BCardText: typeof import('bootstrap-vue-next/components/BCard')['BCardText'] BCardTitle: typeof import('bootstrap-vue-next/components/BCard')['BCardTitle'] + BCloseButton: typeof import('bootstrap-vue-next/components/BButton')['BCloseButton'] BCol: typeof import('bootstrap-vue-next/components/BContainer')['BCol'] BCollapse: typeof import('bootstrap-vue-next/components/BCollapse')['BCollapse'] BDropdown: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdown'] @@ -70,6 +71,8 @@ declare module 'vue' { BTab: typeof import('bootstrap-vue-next/components/BTabs')['BTab'] BTable: typeof import('bootstrap-vue-next/components/BTable')['BTable'] BTabs: typeof import('bootstrap-vue-next/components/BTabs')['BTabs'] + BToast: typeof import('bootstrap-vue-next/components/BToast')['BToast'] + BToastOrchestrator: typeof import('bootstrap-vue-next/components/BToast')['BToastOrchestrator'] ButtonItem: typeof import('./src/components/globals/formItems/ButtonItem.vue')['default'] CardCollapse: typeof import('./src/components/CardCollapse.vue')['default'] CardDeckFeed: typeof import('./src/components/CardDeckFeed.vue')['default'] @@ -116,6 +119,7 @@ declare module 'vue' { YListGroupItem: typeof import('./src/components/globals/YListGroupItem.vue')['default'] YListItem: typeof import('./src/components/globals/YListItem.vue')['default'] YSpinner: typeof import('./src/components/globals/YSpinner.vue')['default'] + YToast: typeof import('./src/components/YToast.vue')['default'] } export interface ComponentCustomProperties { vBModal: typeof import('bootstrap-vue-next/directives/BModal')['vBModal'] diff --git a/app/src/App.vue b/app/src/App.vue index c7b3239b0..5439c3ccf 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -1,11 +1,14 @@ @@ -29,9 +41,12 @@ const hour = computed(() => { /> - - {{ request.humanRoute }} - +
+ + {{ request.title }} + + ({{ $t('history.started_by', { caller }) }}) +
@@ -54,8 +69,8 @@ const hour = computed(() => { -
diff --git a/app/src/components/YToast.vue b/app/src/components/YToast.vue new file mode 100644 index 000000000..5f673f41d --- /dev/null +++ b/app/src/components/YToast.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/app/src/components/layouts/MainLayout.vue b/app/src/components/layouts/MainLayout.vue index 4f0c50f97..fcb0f46e9 100644 --- a/app/src/components/layouts/MainLayout.vue +++ b/app/src/components/layouts/MainLayout.vue @@ -9,18 +9,19 @@ import { ModalError, ModalReconnecting, ModalWaiting, - ModalWarning, } from '@/components/modals' import { useInfos } from '@/composables/useInfos' import { useRequests } from '@/composables/useRequests' +import { useSSE } from '@/composables/useSSE' import { useSettings } from '@/composables/useSettings' import type { CustomRoute, Skeleton, VueClass } from '@/types/commons' const { t } = useI18n() const router = useRouter() const { routerKey, hasSuspenseError } = useInfos() -const { reconnecting, currentRequest, dismissModal } = useRequests() +const { currentRequest, dismissModal } = useRequests() const { transitions, transitionName, dark } = useSettings() +const { reconnecting } = useSSE() const RootView = createReusableTemplate<{ Component: VNode @@ -47,10 +48,7 @@ const modalComponent = computed(() => { if (reconnecting.value) { return { is: ModalReconnecting, - props: { - reconnecting: reconnecting.value, - onDismiss: () => (reconnecting.value = undefined), - }, + props: { reconnecting: reconnecting.value }, } } @@ -63,11 +61,6 @@ const modalComponent = computed(() => { is: ModalError, props: { request, onDismiss: () => dismissModal(request.id) }, } - } else if (status === 'warning') { - return { - is: ModalWarning, - props: { request, onDismiss: () => dismissModal(request.id) }, - } } else { return { is: ModalWaiting, props: { request } } } diff --git a/app/src/components/modals/ModalOverlay.vue b/app/src/components/modals/ModalOverlay.vue index 7630063ee..cf7bd7b0c 100644 --- a/app/src/components/modals/ModalOverlay.vue +++ b/app/src/components/modals/ModalOverlay.vue @@ -29,7 +29,7 @@ defineSlots<{ hide-backdrop no-close-on-backdrop no-close-on-esc - :hide-footer="hideFooter" + :no-footer="hideFooter" no-fade >