From dd32fa15149549b1a29278fe47fa30b0fab1aebc Mon Sep 17 00:00:00 2001 From: cptran777 Date: Fri, 7 Sep 2018 12:29:19 -0700 Subject: [PATCH 1/3] Change UX for metadata health score tab --- .../components/datasets/containers/dataset-health.ts | 2 +- .../app/components/datasets/health/score-table.ts | 12 ++++++++---- .../components/dataset-health/_score-table.scss | 8 ++++++++ .../components/datasets/health/metrics-charts.hbs | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/wherehows-web/app/components/datasets/containers/dataset-health.ts b/wherehows-web/app/components/datasets/containers/dataset-health.ts index 2f96c93fee..0c458139c7 100644 --- a/wherehows-web/app/components/datasets/containers/dataset-health.ts +++ b/wherehows-web/app/components/datasets/containers/dataset-health.ts @@ -14,7 +14,7 @@ import { IObject } from 'wherehows-web/typings/generic'; */ export enum HealthDataFields { category = 'Category', - severity = 'Severity', + severity = 'Priority', description = 'Description', score = 'Score' } diff --git a/wherehows-web/app/components/datasets/health/score-table.ts b/wherehows-web/app/components/datasets/health/score-table.ts index 254c89098f..47faffc789 100644 --- a/wherehows-web/app/components/datasets/health/score-table.ts +++ b/wherehows-web/app/components/datasets/health/score-table.ts @@ -76,11 +76,11 @@ export default class DatasetsHealthScoreTable extends Component { headers = computed('dropdownOptions', function(this: DatasetsHealthScoreTable): Array { const { dropdownOptions, onDropdownSelect } = getProperties(this, 'dropdownOptions', 'onDropdownSelect'); - return ['Category', 'Description', 'Score', 'Severity'].map(header => ({ - label: header, + return (['category', 'description', 'score', 'severity'] as Array).map(header => ({ + label: HealthDataFields[header], class: `dataset-health__score-table__${header.toLowerCase()}`, dropdownOptions: dropdownOptions[header.toLowerCase()], - initialDropdown: { label: header, value: '' }, + initialDropdown: { label: HealthDataFields[header], value: '' }, onDropdownSelect: onDropdownSelect.bind(this, header) })); }); @@ -145,12 +145,16 @@ export default class DatasetsHealthScoreTable extends Component { 'currentCategoryFilter', 'currentSeverityFilter' ); + return tableData.map(healthScore => ({ ...healthScore, isHidden: (!!categoryFilter && healthScore.category !== categoryFilter) || (!!severityFilter && healthScore.severity !== severityFilter), - highlightClass: `dataset-health__score-table__row--${(healthScore.severity || 'normal').toLowerCase()}` + highlightClass: + healthScore.score < 100 + ? `dataset-health__score-table__row--${(healthScore.severity || 'normal').toLowerCase()}` + : 'dataset-health__score-table__row--successful' })); } ); diff --git a/wherehows-web/app/styles/components/dataset-health/_score-table.scss b/wherehows-web/app/styles/components/dataset-health/_score-table.scss index 861e7b0dda..9af7e804a2 100644 --- a/wherehows-web/app/styles/components/dataset-health/_score-table.scss +++ b/wherehows-web/app/styles/components/dataset-health/_score-table.scss @@ -23,6 +23,14 @@ } } + &--successful { + .dataset-health__score-table { + &__score { + color: get-color(green5); + } + } + } + & .dataset-health__score-table { &__category { color: get-color(blue5); diff --git a/wherehows-web/app/templates/components/datasets/health/metrics-charts.hbs b/wherehows-web/app/templates/components/datasets/health/metrics-charts.hbs index fe9aeec09a..6d3f41f49e 100644 --- a/wherehows-web/app/templates/components/datasets/health/metrics-charts.hbs +++ b/wherehows-web/app/templates/components/datasets/health/metrics-charts.hbs @@ -11,7 +11,7 @@ {{#if (and isActiveTab severityData)}} {{visualization/charts/horizontal-bar-chart class="severity-chart" - title="Severity" + title="Priority Level" series=severityData labelAppendValue="%" onBarSelect=(action onSeveritySelect)}} From d0517d6107db859e97c7276eb062673da30ee6b3 Mon Sep 17 00:00:00 2001 From: cptran777 Date: Fri, 7 Sep 2018 14:09:03 -0700 Subject: [PATCH 2/3] Minor cleanup for health score ux adjustment --- .../app/components/datasets/containers/dataset-health.ts | 4 ++-- wherehows-web/app/components/datasets/health/score-table.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wherehows-web/app/components/datasets/containers/dataset-health.ts b/wherehows-web/app/components/datasets/containers/dataset-health.ts index 0c458139c7..df623d077a 100644 --- a/wherehows-web/app/components/datasets/containers/dataset-health.ts +++ b/wherehows-web/app/components/datasets/containers/dataset-health.ts @@ -14,9 +14,9 @@ import { IObject } from 'wherehows-web/typings/generic'; */ export enum HealthDataFields { category = 'Category', - severity = 'Priority', description = 'Description', - score = 'Score' + score = 'Score', + severity = 'Priority' } /** diff --git a/wherehows-web/app/components/datasets/health/score-table.ts b/wherehows-web/app/components/datasets/health/score-table.ts index 47faffc789..3661218a2a 100644 --- a/wherehows-web/app/components/datasets/health/score-table.ts +++ b/wherehows-web/app/components/datasets/health/score-table.ts @@ -76,7 +76,7 @@ export default class DatasetsHealthScoreTable extends Component { headers = computed('dropdownOptions', function(this: DatasetsHealthScoreTable): Array { const { dropdownOptions, onDropdownSelect } = getProperties(this, 'dropdownOptions', 'onDropdownSelect'); - return (['category', 'description', 'score', 'severity'] as Array).map(header => ({ + return (Object.keys(HealthDataFields) as Array).map(header => ({ label: HealthDataFields[header], class: `dataset-health__score-table__${header.toLowerCase()}`, dropdownOptions: dropdownOptions[header.toLowerCase()], From 5720c9c83cdf4df5a39bcf31077999d0a66487c5 Mon Sep 17 00:00:00 2001 From: cptran777 Date: Fri, 7 Sep 2018 14:30:59 -0700 Subject: [PATCH 3/3] Make xport policy all lowercase for api call --- wherehows-web/app/utils/api/datasets/compliance.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wherehows-web/app/utils/api/datasets/compliance.ts b/wherehows-web/app/utils/api/datasets/compliance.ts index 0bb3871992..a8faa59a6b 100644 --- a/wherehows-web/app/utils/api/datasets/compliance.ts +++ b/wherehows-web/app/utils/api/datasets/compliance.ts @@ -58,7 +58,7 @@ const datasetComplianceSuggestionFeedbackUrlByUrn = (urn: string): string => * @param {string} urn * @return {string} */ -const datasetExportPolicyByUrn = (urn: string): string => `${datasetUrlByUrn(urn)}/exportPolicy`; +const datasetExportPolicyByUrn = (urn: string): string => `${datasetUrlByUrn(urn)}/exportpolicy`; /** * Describes the properties on a map generated by reading the compliance policy for a dataset