From 3ab4574155de6064f966af58614297e75c5c09d0 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 24 Oct 2024 13:35:57 +0200 Subject: [PATCH 1/3] feat: refs #8001 ticketExpeditionGrafana --- src/pages/Ticket/Card/TicketExpedition.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index bd63f259c..6a0989644 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -123,6 +123,12 @@ const columns = computed(() => [ isPrimary: true, action: (row) => showLog(row), }, + { + title: t('Grafana'), + icon: 'vn:grafana', + isPrimary: true, + action: (row) => openGrafana(row.id), + }, ], }, ]); @@ -200,6 +206,13 @@ const getExpeditionState = async (expedition) => { } }; +const openGrafana = (expeditionFk) => { + window.open( + `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`, + '_blank' + ); +}; + onMounted(async () => { stateStore.rightDrawer = true; const filteredColumns = columns.value.filter((col) => col.name !== 'history'); From 87b5af7060d6177c62df04f640f8249c1405acba Mon Sep 17 00:00:00 2001 From: robert Date: Fri, 29 Nov 2024 08:38:38 +0100 Subject: [PATCH 2/3] feat: refs #8001 change request --- src/pages/Ticket/Card/TicketExpedition.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index 3268bd7da..0e56948e7 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -17,6 +17,7 @@ import axios from 'axios'; import VnTable from 'src/components/VnTable/VnTable.vue'; import VnBtnSelect from 'src/components/common/VnBtnSelect.vue'; import FetchData from 'src/components/FetchData.vue'; +import useOpenURL from 'src/composables/useOpenURL'; const route = useRoute(); const stateStore = useStateStore(); @@ -127,7 +128,7 @@ const columns = computed(() => [ title: t('Grafana'), icon: 'vn:grafana', isPrimary: true, - action: (row) => openGrafana(row.id), + action: ({ id }) => openGrafana(id), }, ], }, @@ -199,9 +200,8 @@ const getExpeditionState = async (expedition) => { }; const openGrafana = (expeditionFk) => { - window.open( - `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`, - '_blank' + useOpenURL( + `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}` ); }; From 68c691587d3417093613f73058b2f9ee0a4bd0ea Mon Sep 17 00:00:00 2001 From: robert Date: Fri, 29 Nov 2024 09:55:22 +0100 Subject: [PATCH 3/3] feat: refs #8001 change request --- src/pages/Ticket/Card/TicketExpedition.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index 0e56948e7..43d8c34f5 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -207,8 +207,8 @@ const openGrafana = (expeditionFk) => { onMounted(async () => { stateStore.rightDrawer = true; - const filteredColumns = columns.value.filter((col) => col.name !== 'history'); - allColumnNames.value = filteredColumns.map((col) => col.name); + const filteredColumns = columns.value.filter(({ name }) => name !== 'history'); + allColumnNames.value = filteredColumns.map(({ name }) => name); }); onUnmounted(() => (stateStore.rightDrawer = false));