From b5aa6fedd2cd45c264ce3b0562aa3797b957b3d5 Mon Sep 17 00:00:00 2001 From: cptran777 Date: Wed, 19 Sep 2018 15:50:17 -0700 Subject: [PATCH] Add advanced edit errors and purge key tooltip for compliance edit --- .../app/controllers/Application.java | 3 + .../app/constants/datasets/compliance.ts | 2 +- .../dataset-compliance/_compliance-table.scss | 1 - wherehows-web/app/styles/layout/_login.scss | 4 + .../components/dataset-compliance.hbs | 2 +- .../-dataset-classification.hbs | 148 ------------------ .../-dataset-compliance-entities.hbs | 4 + .../-dataset-compliance-step-indicator.hbs | 5 - 8 files changed, 13 insertions(+), 156 deletions(-) delete mode 100644 wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs delete mode 100644 wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-step-indicator.hbs diff --git a/wherehows-frontend/app/controllers/Application.java b/wherehows-frontend/app/controllers/Application.java index 2efe15b1a1..c56dd7160b 100644 --- a/wherehows-frontend/app/controllers/Application.java +++ b/wherehows-frontend/app/controllers/Application.java @@ -95,6 +95,8 @@ public class Application extends Controller { Play.application().configuration().getString("links.wiki.exportPolicy", ""); private static final String WHZ_WIKI_LINKS__METADATA_HEALTH = Play.application().configuration().getString("links.wiki.metadataHealth", ""); + private static final String WHZ_WIKI_LINKS__PURGE_KEY = + Play.application().configuration().getString("links.wiki.purgeKey", ""); private static final String WHZ_LINKS__JIT_ACL_CONTACT = Play.application().configuration().getString("links.jitAcl.contact", ""); @@ -269,6 +271,7 @@ public class Application extends Controller { wikiLinks.put("metadataCustomRegex", WHZ_WIKI_LINKS__METADATA_CUSTOM_REGEX); wikiLinks.put("exportPolicy", WHZ_WIKI_LINKS__EXPORT_POLICY); wikiLinks.put("metadataHealth", WHZ_WIKI_LINKS__METADATA_HEALTH); + wikiLinks.put("purgeKey", WHZ_WIKI_LINKS__PURGE_KEY); return wikiLinks; } diff --git a/wherehows-web/app/constants/datasets/compliance.ts b/wherehows-web/app/constants/datasets/compliance.ts index 751fa11134..8817367eb7 100644 --- a/wherehows-web/app/constants/datasets/compliance.ts +++ b/wherehows-web/app/constants/datasets/compliance.ts @@ -13,7 +13,7 @@ enum Classification { Confidential = 'CONFIDENTIAL', LimitedDistribution = 'LIMITED_DISTRIBUTION', HighlyConfidential = 'HIGHLY_CONFIDENTIAL', - Internal = 'INTERNAL', + Internal = 'GENERAL', Public = 'PUBLIC' } diff --git a/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss b/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss index fd9a127d80..8edfc34a5c 100644 --- a/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss +++ b/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss @@ -135,7 +135,6 @@ &__guided-modal { @include nacho-container; - overflow: hidden; padding: 0; border: 0; z-index: z(modal); diff --git a/wherehows-web/app/styles/layout/_login.scss b/wherehows-web/app/styles/layout/_login.scss index 4019c442b8..601925284f 100644 --- a/wherehows-web/app/styles/layout/_login.scss +++ b/wherehows-web/app/styles/layout/_login.scss @@ -32,6 +32,10 @@ background-color: transparent; outline: 0; padding: 0; + + &::placeholder { + color: get-color(white, 0.5); + } } &__button { diff --git a/wherehows-web/app/templates/components/dataset-compliance.hbs b/wherehows-web/app/templates/components/dataset-compliance.hbs index c4f27d121b..e28bd82982 100644 --- a/wherehows-web/app/templates/components/dataset-compliance.hbs +++ b/wherehows-web/app/templates/components/dataset-compliance.hbs @@ -61,7 +61,7 @@ {{/track-ui-event}} - {{#if (and isInitialEditStep (and manualParseError (not showGuidedComplianceEditMode)))}} + {{#if (and (eq editTarget ComplianceEdit.CompliancePolicy) (and manualParseError (not showGuidedComplianceEditMode)))}}
{{fa-icon "times-circle-o"}} diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs deleted file mode 100644 index d557bbeddb..0000000000 --- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs +++ /dev/null @@ -1,148 +0,0 @@ -
-
-

- {{if isEditing - "Does this dataset contain the following types of data?" - "Types of data contained in this dataset"}} - - - {{more-info - link=@wikiLinks.gdprTaxonomy - tooltip="Click for more information on Dataset classification with examples" - }} -

- - {{#unless isEditing}} -
- -
- {{/unless}} - - {{#if isEditing}} - - {{/if}} -
-
- -{{#dataset-table - class="nacho-table nacho-table--bordered nacho-table--stripped" - fields=datasetClassification as |table|}} - - {{#table.head as |head|}} - {{#head.column}}Types of data{{/head.column}} - - {{#head.column class="dataset-field-content__header"}} - Is this type of data contained in this dataset? - {{/head.column}} - {{/table.head}} - - {{#table.body as |body|}} - {{#each (if shouldShowAllMemberData table.data (filter-by "value" true table.data)) as |classification|}} - {{#body.row as |row|}} - {{#row.cell class="dataset-field-content__prompt"}} - - {{#if (eq classification.value true)}} - - - - - - - - - - {{/if}} - - {{#if (eq classification.value false)}} - - - - - - - - {{/if}} - - {{classification.label}} - - {{/row.cell}} - - {{#row.cell class="dataset-field-content__input"}} - - {{#radio-button-composer - value=true - name=classification.classifier - groupValue=(readonly classification.value) - changed=(action "onChangeDatasetClassification" classification.classifier)}} - Yes - {{/radio-button-composer}} - {{#radio-button-composer - value=false - name=classification.classifier - groupValue=(readonly classification.value) - changed=(action "onChangeDatasetClassification" classification.classifier)}} - No - {{/radio-button-composer}} - {{/row.cell}} - {{/body.row}} - {{else}} - - - -
-
- - None selected - -
- - {{#if (and excludesSomeMemberData (not isEditing))}} -

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

- {{/if}} -
- - - - {{/each}} - {{/table.body}} - - {{#if (and excludesSomeMemberData (not isEditing))}} - - {{#table.foot}} - - - - {{/table.foot}} - - {{/if}} - -{{/dataset-table}} diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs index a6c0822557..6eb734ec44 100644 --- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs +++ b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs @@ -360,6 +360,10 @@
Is purge key? + {{more-info + link=@wikiLinks.purgeKey + tooltip="Click for more information about purge keys" + }}
diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-step-indicator.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-step-indicator.hbs deleted file mode 100644 index ec15622bd6..0000000000 --- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-step-indicator.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{#each editSteps as |step index|}} - - {{inc index}} - -{{/each}}