removes check for auto generated compliance policy on compliance container. prevents policy render on datasets with upstream compliance policy

This commit is contained in:
Seyi Adebajo 2018-03-01 10:52:49 -08:00
parent 96c1cf9363
commit 59ce8f95a4
3 changed files with 20 additions and 52 deletions

View File

@ -1,10 +1,9 @@
import Component from '@ember/component';
import { get, set, setProperties, getProperties, computed } from '@ember/object';
import { get, set, setProperties, getProperties } from '@ember/object';
import ComputedProperty from '@ember/object/computed';
import { inject } from '@ember/service';
import { task, TaskInstance } from 'ember-concurrency';
import { action } from 'ember-decorators/object';
import DatasetCompliance from 'wherehows-web/components/dataset-compliance';
import Notifications, { NotificationEvent } from 'wherehows-web/services/notifications';
import { IDatasetColumn } from 'wherehows-web/typings/api/datasets/columns';
import { IComplianceInfo, IComplianceSuggestion } from 'wherehows-web/typings/api/datasets/compliance';
@ -21,12 +20,7 @@ import {
import { columnDataTypesAndFieldNames } from 'wherehows-web/utils/api/datasets/columns';
import { readDatasetSchemaByUrn } from 'wherehows-web/utils/api/datasets/schema';
import { readComplianceDataTypes } from 'wherehows-web/utils/api/list/compliance-datatypes';
import {
compliancePolicyStrings,
removeReadonlyAttr,
filterEditableEntities,
isAutoGeneratedPolicy
} from 'wherehows-web/constants';
import { compliancePolicyStrings, removeReadonlyAttr, filterEditableEntities } from 'wherehows-web/constants';
const { successUpdating, failedUpdating } = compliancePolicyStrings;
@ -193,17 +187,6 @@ export default class DatasetComplianceContainer extends Component {
}
});
/**
* Checks if the compliance purge policy is auto generated
* @type {ComputedProperty<boolean>}
* @memberof DatasetCompliance
*/
isCompliancePurgePolicyAutoGenerated = computed('complianceInfo.{complianceEntities,complianceType}', function(
this: DatasetCompliance
): boolean {
return isAutoGeneratedPolicy(get(this, 'complianceInfo') || void 0);
});
/**
* Handles user notifications when save succeeds or fails
* @template T the return type for the save request

View File

@ -11,17 +11,10 @@
{{else}}
{{#if complianceInfo.fromUpstream}}
{{datasets/containers/upstream-dataset upstreamUrn=complianceInfo.datasetUrn}}
{{/if}}
{{#if isCompliancePurgePolicyAutoGenerated}}
<div class="compliance-container__default-purge-policy">
<i class="fa fa-info-circle"></i>
<header class="compliance-container__default-purge-policy__title">
Please note: The default Purge Policy for this dataset is system generated
</header>
</div>
{{/if}}
{{datasets/containers/upstream-dataset upstreamUrn=complianceInfo.datasetUrn}}
{{else}}
{{dataset-compliance
datasetName=datasetName
@ -38,4 +31,6 @@
onReset=(action "resetPrivacyCompliancePolicy")
}}
{{/if}}
{{/if}}

View File

@ -1,5 +1,4 @@
import { notFoundApiError } from 'wherehows-web/utils/api';
import { isAutoGeneratedPolicy } from 'wherehows-web/constants';
import { createInitialComplianceInfo } from 'wherehows-web/utils/datasets/compliance-policy';
import { datasetUrlById, datasetUrlByUrn } from 'wherehows-web/utils/api/datasets/shared';
import {
@ -38,13 +37,6 @@ const datasetComplianceSuggestionsUrlById = (id: number): string => `${datasetCo
*/
const datasetComplianceSuggestionUrlByUrn = (urn: string): string => `${datasetUrlByUrn(urn)}/compliance/suggestion`;
/**
* Determines if the client app should 'new' a compliance policy
* @param {IComplianceInfo} policy the compliance policy
* @return {boolean}
*/
const requiresCompliancePolicyCreation = (policy?: IComplianceInfo): boolean => isAutoGeneratedPolicy(policy);
/**
* Describes the properties on a map generated by reading the compliance policy for a dataset
* @interface
@ -68,8 +60,6 @@ const readDatasetComplianceByUrn = async (urn: string): Promise<IReadComplianceR
({ complianceInfo } = await getJSON<Pick<IComplianceGetResponse, 'complianceInfo'>>({
url: datasetComplianceUrlByUrn(urn)
}));
isNewComplianceInfo = requiresCompliancePolicyCreation(complianceInfo);
} catch (e) {
if (notFoundApiError(e)) {
complianceInfo = createInitialComplianceInfo(urn);