From bda8f23c0937f04862e6df46808f1f23a15a572d Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Thu, 1 Mar 2018 14:35:29 -0800 Subject: [PATCH] updates wording for member data to types of data. adds non readonly fields to reviewable filter. removes dataset owners from entity header --- .../app/components/dataset-compliance.ts | 11 ++++--- .../-dataset-classification.hbs | 31 ++++++++++++------- .../app/templates/datasets/dataset.hbs | 1 - .../app/utils/datasets/compliance-policy.js | 16 +++++++--- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/wherehows-web/app/components/dataset-compliance.ts b/wherehows-web/app/components/dataset-compliance.ts index 49e720fc7c..897ef115e8 100644 --- a/wherehows-web/app/components/dataset-compliance.ts +++ b/wherehows-web/app/components/dataset-compliance.ts @@ -578,7 +578,7 @@ export default class DatasetCompliance extends Component { }); /** - * Determines if all member data fields should be shown in the member data table i.e. show only fields contained in + * Determines if all types of data fields should be shown in the table i.e. show only fields contained in * this dataset or otherwise * @type {ComputedProperty} * @memberof DatasetCompliance @@ -857,12 +857,13 @@ export default class DatasetCompliance extends Component { const formattedAndUnformattedEntities: FormattedAndUnformattedEntities = { formatted: [], unformatted: [] }; // All candidate fields that can be on policy, excluding tracking type fields const changeSetEntities: Array = get(this, 'compliancePolicyChangeSet').map( - ({ identifierField, identifierType = null, logicalType, nonOwner, securityClassification }) => ({ + ({ identifierField, identifierType = null, logicalType, nonOwner, securityClassification, readonly }) => ({ identifierField, identifierType, logicalType, nonOwner, - securityClassification + securityClassification, + readonly }) ); @@ -1028,8 +1029,8 @@ export default class DatasetCompliance extends Component { let willMarkAllAsNo = true; get(this, 'notifications').notify(NotificationEvent.confirm, { - content: 'Are you sure that any this dataset does not contain any of the listed types of member data?', - header: 'Dataset contains no member data', + content: 'Are you sure this dataset does not contain any of the listed types of data?', + header: 'Dataset contains no listed types of data', dialogActions }); diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs index 3897a59827..25438258a7 100644 --- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs +++ b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs @@ -2,8 +2,8 @@

{{if isEditing - "Does this dataset contain the following types of Member data?" - "Types of member data contained in this dataset"}} + "Does this dataset contain the following types of data?" + "Types of data contained in this dataset"}} @@ -34,10 +34,10 @@ fields=datasetClassification as |table|}} {{#table.head as |head|}} - {{#head.column}}Types of member data{{/head.column}} + {{#head.column}}Types of data{{/head.column}} {{#head.column class="dataset-field-content__header"}} - Is this type of member data contained in this dataset? + Is this type of data contained in this dataset? {{/head.column}} {{/table.head}} @@ -96,12 +96,19 @@ {{/body.row}} {{else}} - - - {{empty-state - heading="Dataset has not been marked as containing Member data" - subHead="Click 'See More' below to view all available types of dataset member data" - }} + + +

+
+ + None selected + +
+ +

+ Click 'See More' below to view all available types of data +

+
@@ -117,11 +124,11 @@ class="nacho-button--large nacho-button--tertiary"> {{#if shouldShowAllMemberData}} - See Less + See Less {{else}} - See More + See More {{/if}} diff --git a/wherehows-web/app/templates/datasets/dataset.hbs b/wherehows-web/app/templates/datasets/dataset.hbs index 54d61b6e74..e87de5f1b4 100644 --- a/wherehows-web/app/templates/datasets/dataset.hbs +++ b/wherehows-web/app/templates/datasets/dataset.hbs @@ -45,7 +45,6 @@ - {{dataset-owner-list owners=owners datasetName=model.nativeName}} {{#ivy-tabs selection=tabSelected as |tabs|}} diff --git a/wherehows-web/app/utils/datasets/compliance-policy.js b/wherehows-web/app/utils/datasets/compliance-policy.js index 69028d8d25..2373d10d5f 100644 --- a/wherehows-web/app/utils/datasets/compliance-policy.js +++ b/wherehows-web/app/utils/datasets/compliance-policy.js @@ -124,20 +124,26 @@ const isRecentSuggestion = (policyModificationTime = 0, suggestionModificationTi /** * Checks if a compliance policy changeSet field requires user attention: if a suggestion * is available but the user has not indicated intent or a policy for the field does not currently exist remotely - * and the related field changeSet has not been modified on the client + * and the related field changeSet has not been modified on the client and isn't readonly * @param {boolean} isDirty flag indicating the field changeSet has been modified on the client * @param {object|void} suggestion the field suggestion properties * @param {boolean} privacyPolicyExists flag indicating that the field has a current policy upstream * @param {string} suggestionAuthority possibly empty string indicating the user intent for the suggestion * @return {boolean} */ -const fieldChangeSetRequiresReview = ({ isDirty, suggestion, privacyPolicyExists, suggestionAuthority } = {}) => { +const fieldChangeSetRequiresReview = ({ + isDirty, + suggestion, + privacyPolicyExists, + suggestionAuthority, + readonly +} = {}) => { if (suggestion) { - return !suggestionAuthority; + return !suggestionAuthority && !readonly; } - // If either the privacy policy exists, or user has made changes, then no review is required - return !(privacyPolicyExists || isDirty); + // If either the privacy policy exists, or user has made changes, and field is not readonly then no review is required + return !(privacyPolicyExists || isDirty) && !readonly; }; /**