diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 7b6068bb8..975ad4b11 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "dependencies": { - "@cloudron/pankow": "^3.3.1", + "@cloudron/pankow": "^3.4.0", "@fontsource/inter": "^5.2.8", "@fortawesome/fontawesome-free": "^7.0.1", "@vitejs/plugin-vue": "^6.0.1", @@ -76,9 +76,9 @@ } }, "node_modules/@cloudron/pankow": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@cloudron/pankow/-/pankow-3.3.1.tgz", - "integrity": "sha512-2IpUQzl+A6kGisI0cUXi0bMlzzdHHw5qjWuRo8vU8AAolKAplAHaU+4T5/UT21kOg2d2wD+uMmEgqS6tPdGGxA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@cloudron/pankow/-/pankow-3.4.0.tgz", + "integrity": "sha512-lHEfCOAmQHttdpciyaC7UdKbqUj6UcDx5DJzkS4/Rc4AtDw6E3lPuNOIuYVJSSxD7fa+0RJV8ooZkU/FADsyVg==", "license": "ISC", "dependencies": { "@fontsource/inter": "^5.2.8", @@ -2639,9 +2639,9 @@ } }, "@cloudron/pankow": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@cloudron/pankow/-/pankow-3.3.1.tgz", - "integrity": "sha512-2IpUQzl+A6kGisI0cUXi0bMlzzdHHw5qjWuRo8vU8AAolKAplAHaU+4T5/UT21kOg2d2wD+uMmEgqS6tPdGGxA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@cloudron/pankow/-/pankow-3.4.0.tgz", + "integrity": "sha512-lHEfCOAmQHttdpciyaC7UdKbqUj6UcDx5DJzkS4/Rc4AtDw6E3lPuNOIuYVJSSxD7fa+0RJV8ooZkU/FADsyVg==", "requires": { "@fontsource/inter": "^5.2.8", "@fortawesome/fontawesome-free": "^7.0.1", diff --git a/dashboard/package.json b/dashboard/package.json index 0d7e61d82..911adb710 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -7,7 +7,7 @@ }, "type": "module", "dependencies": { - "@cloudron/pankow": "^3.3.1", + "@cloudron/pankow": "^3.4.0", "@fontsource/inter": "^5.2.8", "@fortawesome/fontawesome-free": "^7.0.1", "@vitejs/plugin-vue": "^6.0.1", diff --git a/dashboard/src/components/GraphItem.vue b/dashboard/src/components/GraphItem.vue index fefd274a0..35a71eb52 100644 --- a/dashboard/src/components/GraphItem.vue +++ b/dashboard/src/components/GraphItem.vue @@ -4,7 +4,7 @@ import moment from 'moment-timezone'; import { onMounted, onUnmounted, useTemplateRef, watch } from 'vue'; import Chart from 'chart.js/auto'; -import { prettyDecimalSize, prettyLongDate, prettyShortDate } from '@cloudron/pankow/utils'; +import { prettyDecimalSize, formatDate } from '@cloudron/pankow/utils'; import annotationPlugin from 'chartjs-plugin-annotation'; Chart.register(annotationPlugin); @@ -100,7 +100,7 @@ function createGraphOptions({ yscale, period, highMark }) { tooltip: { enabled: false, callbacks: { // passed as title,body to the tooltip renderer - title: (tooltipItem) => period.tooltipFormat === 'long' ? prettyLongDate(tooltipItem[0].raw.x) : prettyShortDate(tooltipItem[0].raw.x), + title: (tooltipItem) => formatDate(period.tooltipFormat, tooltipItem[0].raw.x), label: (tooltipItem) => { const datasetLabel = tooltipItem.chart.data.datasets[tooltipItem.datasetIndex].label; return `${datasetLabel}: ${yscale.ticks.callback(tooltipItem.raw.y)}`;