From 372c9181fc290a1294ebe924a5d0f2a8dd599e71 Mon Sep 17 00:00:00 2001 From: Nancy Butler Date: Tue, 17 Sep 2019 16:24:18 -0700 Subject: [PATCH] sparkline in app table --- components/DiscreteProgressBar.vue | 61 ++++++ components/Random.vue | 21 ++- components/TableSparkLine.vue | 108 +++++++++++ components/formatters/BadgeState.vue | 4 +- package.json | 2 + pages/rio/apps/index.vue | 40 +++- utils/table-headers.js | 6 +- yarn.lock | 270 ++++++++++++++++++++++++++- 8 files changed, 491 insertions(+), 21 deletions(-) create mode 100644 components/DiscreteProgressBar.vue create mode 100644 components/TableSparkLine.vue diff --git a/components/DiscreteProgressBar.vue b/components/DiscreteProgressBar.vue new file mode 100644 index 0000000000..0ef9e23a26 --- /dev/null +++ b/components/DiscreteProgressBar.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/components/Random.vue b/components/Random.vue index c3405e1f16..6795a7b722 100644 --- a/components/Random.vue +++ b/components/Random.vue @@ -4,7 +4,7 @@ export default { props: { tagName: { type: String, - default: 'span', + default: 'div', }, min: { @@ -40,7 +40,7 @@ export default { }, data() { - return { label: this.update() }; + return { label: this.update(), value: 0 }; }, beforeDestroy() { @@ -57,6 +57,7 @@ export default { if ( this.label !== label ) { this.label = label; + this.value = value; } this.timer = setTimeout(() => { @@ -70,7 +71,21 @@ export default { + + diff --git a/components/TableSparkLine.vue b/components/TableSparkLine.vue new file mode 100644 index 0000000000..229a58c134 --- /dev/null +++ b/components/TableSparkLine.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/components/formatters/BadgeState.vue b/components/formatters/BadgeState.vue index f022300554..66d5a7b1bd 100644 --- a/components/formatters/BadgeState.vue +++ b/components/formatters/BadgeState.vue @@ -4,7 +4,7 @@ export default { props: { value: { type: String, - required: true + default: '' }, row: { type: Object, @@ -12,7 +12,7 @@ export default { }, col: { type: Object, - required: true + default: () => {} }, }, }; diff --git a/package.json b/package.json index 2fd7cf71a4..a055a96daa 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,13 @@ "cookie": "^0.4.0", "cookie-universal-nuxt": "^2.0.17", "cross-env": "^5.2.0", + "d3": "^5.12.0", "dayjs": "^1.8.16", "diff2html": "^2.11.2", "dotenv": "^8.0.0", "express": "^4.17.1", "file-saver": "^2.0.2", + "gsap": "^2.1.3", "jquery": "^3.4.1", "js-cookie": "^2.2.0", "js-yaml": "^3.13.1", diff --git a/pages/rio/apps/index.vue b/pages/rio/apps/index.vue index b0b0b3f8ae..2a0e73e453 100644 --- a/pages/rio/apps/index.vue +++ b/pages/rio/apps/index.vue @@ -2,6 +2,8 @@ import ResourceTable from '@/components/ResourceTable'; import BadgeState from '@/components/formatters/BadgeState'; import Random from '@/components/Random'; +import DiscreteProgressBar from '@/components/DiscreteProgressBar'; +import TableSparkLine from '@/components/TableSparkLine'; import { allHash } from '@/utils/promise'; import { get } from '@/utils/object'; @@ -14,7 +16,7 @@ const RESOURCE = RIO.APP; export default { components: { - ResourceTable, BadgeState, Random + ResourceTable, BadgeState, Random, DiscreteProgressBar, TableSparkLine }, computed: { @@ -75,13 +77,25 @@ export default { {{ scope.row.totalScale || '?' }}