From a3356fde6db848fb5e07a19c0c6c5e08f200db8d Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Thu, 30 Nov 2017 12:48:42 -0800 Subject: [PATCH] adds representation for dataset purge policy when viewing compliance in readonly mode --- wherehows-web/app/components/purge-policy.ts | 4 - .../components/dataset-compliance.hbs | 12 +-- .../app/templates/components/purge-policy.hbs | 80 +++++++++++++------ 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/wherehows-web/app/components/purge-policy.ts b/wherehows-web/app/components/purge-policy.ts index c8cd367475..de22a3f348 100644 --- a/wherehows-web/app/components/purge-policy.ts +++ b/wherehows-web/app/components/purge-policy.ts @@ -11,10 +11,6 @@ import { import noop from 'wherehows-web/utils/noop'; export default Component.extend({ - tagName: 'ul', - - classNames: ['purge-policy-list'], - exemptPolicy, purgePolicyProps, diff --git a/wherehows-web/app/templates/components/dataset-compliance.hbs b/wherehows-web/app/templates/components/dataset-compliance.hbs index 44e8b89178..7c716f78fc 100644 --- a/wherehows-web/app/templates/components/dataset-compliance.hbs +++ b/wherehows-web/app/templates/components/dataset-compliance.hbs @@ -98,18 +98,20 @@ {{partial "datasets/dataset-compliance/dataset-classification"}} {{/if}} - {{#if (or isReadOnly (eq editStepIndex 0))}} - {{partial "datasets/dataset-compliance/dataset-compliance-entities"}} - {{/if}} - - {{#if (eq editStepIndex 1)}} + {{#if (or isReadOnly (eq editStepIndex 1))}} {{purge-policy + isEditable=(not isReadOnly) platform=platform purgeNote=complianceInfo.compliancePurgeNote purgePolicy=(readonly complianceInfo.complianceType) onPolicyChange=(action "onDatasetPurgePolicyChange") }} {{/if}} + + {{#if (or isReadOnly (eq editStepIndex 0))}} + {{partial "datasets/dataset-compliance/dataset-compliance-entities"}} + {{/if}} + {{yield}} diff --git a/wherehows-web/app/templates/components/purge-policy.hbs b/wherehows-web/app/templates/components/purge-policy.hbs index 3b6494fc9a..bdda87c373 100644 --- a/wherehows-web/app/templates/components/purge-policy.hbs +++ b/wherehows-web/app/templates/components/purge-policy.hbs @@ -1,32 +1,62 @@ -{{#each-in purgePolicyProps as |purgeType prop|}} -
  • + - {{#radio-button-composer - name="dataset-purge-policy" - value=(if (contains (uppercase platform) prop.platforms) purgeType null) - disabled=(if (contains (uppercase platform) prop.platforms) false true) - groupValue=(readonly purgePolicy) - changed=(action "onChange") - }} - {{prop.displayAs}} - {{/radio-button-composer}} +