mirror of
https://github.com/datahub-project/datahub.git
synced 2025-11-02 11:49:23 +00:00
updates visual hint for dataset compliance annotations. updates wording for hints
This commit is contained in:
parent
05a1b6eb0a
commit
b0fbafd3d8
@ -71,7 +71,6 @@ import { notificationDialogActionFactory } from 'wherehows-web/utils/notificatio
|
||||
import { isMetadataObject, jsonValuesMatch } from 'wherehows-web/utils/datasets/compliance/metadata-schema';
|
||||
import { typeOf } from '@ember/utils';
|
||||
import { pick } from 'wherehows-web/utils/object';
|
||||
import { pluralize } from 'ember-inflector';
|
||||
import { service } from '@ember-decorators/service';
|
||||
|
||||
const {
|
||||
@ -295,23 +294,21 @@ export default class DatasetCompliance extends Component {
|
||||
* @type {ComputedProperty<string>}
|
||||
* @memberof DatasetCompliance
|
||||
*/
|
||||
fieldReviewHint: ComputedProperty<string> = computed('fieldReviewOption', 'changeSetReviewCount', function(
|
||||
fieldReviewHint: ComputedProperty<string> = computed('fieldReviewOption', 'foldedChangeSet.length', function(
|
||||
this: DatasetCompliance
|
||||
): string {
|
||||
type TagFilterHint = { [K in TagFilter]: string };
|
||||
|
||||
const { fieldReviewOption, changeSetReviewCount } = getProperties(this, [
|
||||
'fieldReviewOption',
|
||||
'changeSetReviewCount'
|
||||
]);
|
||||
const { fieldReviewOption, foldedChangeSet = [] } = getProperties(this, ['fieldReviewOption', 'foldedChangeSet']);
|
||||
|
||||
const hint = (<TagFilterHint>{
|
||||
[TagFilter.showAll]: `${pluralize(changeSetReviewCount, 'field')} to be reviewed`,
|
||||
[TagFilter.showReview]: 'It is required to select compliance info for all fields',
|
||||
[TagFilter.showSuggested]: 'Please review suggestions and provide feedback'
|
||||
[TagFilter.showAll]: '',
|
||||
[TagFilter.showReview]: '? Please select at least one type for each field',
|
||||
[TagFilter.showSuggested]:
|
||||
'! Please review suggestions and click thumbs up or down, based on the accuracy of the suggestion'
|
||||
})[fieldReviewOption];
|
||||
|
||||
return changeSetReviewCount ? hint : '';
|
||||
return foldedChangeSet.length ? hint : '';
|
||||
});
|
||||
|
||||
/**
|
||||
@ -519,9 +516,9 @@ export default class DatasetCompliance extends Component {
|
||||
* @memberof DatasetCompliance
|
||||
*/
|
||||
fieldReviewOptions: Array<{ value: DatasetCompliance['fieldReviewOption']; label: string }> = [
|
||||
{ value: TagFilter.showAll, label: 'Show all fields' },
|
||||
{ value: TagFilter.showReview, label: 'Show required fields' },
|
||||
{ value: TagFilter.showSuggested, label: 'Show suggested fields' }
|
||||
{ value: TagFilter.showAll, label: ' Show all fields' },
|
||||
{ value: TagFilter.showReview, label: '? Show fields missing a data type' },
|
||||
{ value: TagFilter.showSuggested, label: '! Show fields that need review' }
|
||||
];
|
||||
|
||||
didReceiveAttrs(): void {
|
||||
@ -887,7 +884,7 @@ export default class DatasetCompliance extends Component {
|
||||
* @type {Array<IdentifierFieldWithFieldChangeSetTuple>}
|
||||
* @memberof DatasetCompliance
|
||||
*/
|
||||
foldedChangeSet: Array<IdentifierFieldWithFieldChangeSetTuple>;
|
||||
foldedChangeSet: Array<IdentifierFieldWithFieldChangeSetTuple> | void;
|
||||
|
||||
/**
|
||||
* Task to retrieve platform policies and set supported policies for the current platform
|
||||
|
||||
@ -29,6 +29,23 @@
|
||||
}
|
||||
}
|
||||
|
||||
&__filter-count {
|
||||
color: $compliance-suggestion-color;
|
||||
margin-left: item-spacing(2);
|
||||
}
|
||||
|
||||
&__subtitle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: item-spacing(2 0);
|
||||
}
|
||||
|
||||
&__review-hint {
|
||||
color: $compliance-suggestion-color;
|
||||
height: item-spacing(5);
|
||||
padding-left: item-spacing(5);
|
||||
}
|
||||
|
||||
&__has-suggestions {
|
||||
color: $compliance-suggestion-color;
|
||||
margin-left: item-spacing(2);
|
||||
|
||||
@ -44,11 +44,9 @@
|
||||
selectionDidChange=(action "onFieldReviewChange")
|
||||
}}
|
||||
|
||||
{{#if fieldReviewHint}}
|
||||
<span class="dataset-compliance-fields__has-suggestions">
|
||||
{{fieldReviewHint}}
|
||||
</span>
|
||||
{{/if}}
|
||||
<span class="dataset-compliance-fields__filter-count">
|
||||
{{pluralize foldedChangeSet.length "field"}}
|
||||
</span>
|
||||
{{/if}}
|
||||
|
||||
{{#if isEditing}}
|
||||
@ -89,6 +87,11 @@
|
||||
{{/if}}
|
||||
</section>
|
||||
|
||||
<div class="dataset-compliance-fields__subtitle">
|
||||
<div class="dataset-compliance-fields__review-hint">
|
||||
{{fieldReviewHint}}
|
||||
</div>
|
||||
</div>
|
||||
{{#if showGuidedComplianceEditMode}}
|
||||
{{#if foldedChangeSet.length}}
|
||||
{{#dataset-table
|
||||
@ -151,7 +154,7 @@
|
||||
{{#if
|
||||
(and row.suggestion (and (not row.suggestionMatchesCurrentValue) (not row.suggestionResolution)))}}
|
||||
|
||||
<span class="nacho-tooltip" data-title="Has suggestions">
|
||||
<span class="nacho-tooltip" data-title="Suggestion conflicts with data type">
|
||||
<i class="fa fa-exclamation dataset-compliance-fields__has-suggestions__icon"
|
||||
title="Compliance field has suggested values"></i>
|
||||
</span>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user