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|}} -
- Purge policy not available for {{lowercase platform}} -
- {{/unless}} + {{#each-in purgePolicyProps as |purgeType prop|}} +{{prop.desc}}
+ {{#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}} - {{#if (and requestExemptionReason (eq purgeType exemptPolicy))}} + {{#unless (contains (uppercase platform) prop.platforms)}} ++ Purge policy not available for + {{lowercase platform}} +
+ {{/unless}} - {{medium-content-editable - value=purgeNote - options=editorOptions - class="comment-new__content"}} +{{prop.desc}}
+ + {{#if (and requestExemptionReason (eq purgeType exemptPolicy))}} + + {{medium-content-editable + value=purgeNote + options=editorOptions + class="comment-new__content"}} + + {{/if}} +This dataset does not have a current compliance purge policy.
+ To update, click edit and follow the steps {{/if}} -