yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-09-26 09:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from cptran777/retention-api-handling

Browse Source 
Use retention API instead of compliance to determine purge policy
This commit is contained in:
Charlie Tran 2018-09-25 21:38:10 -07:00 committed by GitHub
commit d209c93a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wherehows-web/app/components/datasets/containers/dataset-compliance.ts
View File

@ -41,9 +41,9 @@ import Configurator from 'wherehows-web/services/configurator';
import { typeOf } from '@ember/utils'; import { typeOf } from '@ember/utils';
import { service } from '@ember-decorators/service'; import { service } from '@ember-decorators/service';
import { containerDataSource } from 'wherehows-web/utils/components/containers/data-source'; import { containerDataSource } from 'wherehows-web/utils/components/containers/data-source';
import { saveDatasetRetentionByUrn } from 'wherehows-web/utils/api/datasets/retention'; import { saveDatasetRetentionByUrn, readDatasetRetentionByUrn } from 'wherehows-web/utils/api/datasets/retention';
import { extractRetentionFromComplianceInfo } from 'wherehows-web/utils/datasets/retention'; import { extractRetentionFromComplianceInfo } from 'wherehows-web/utils/datasets/retention';
import { IDatasetRetention } from 'wherehows-web/typings/api/datasets/retention'; import { IDatasetRetention, IGetDatasetRetentionResponse } from 'wherehows-web/typings/api/datasets/retention';
import { readUpstreamDatasetsByUrn } from 'wherehows-web/utils/api/datasets/lineage'; import { readUpstreamDatasetsByUrn } from 'wherehows-web/utils/api/datasets/lineage';
import { LineageList } from 'wherehows-web/typings/api/datasets/relationships'; import { LineageList } from 'wherehows-web/typings/api/datasets/relationships';
@ -56,7 +56,8 @@ type BatchComplianceResponse = [
IComplianceSuggestion, IComplianceSuggestion,
IDatasetSchema, IDatasetSchema,
IDatasetExportPolicy | null, IDatasetExportPolicy | null,
LineageList LineageList,
IGetDatasetRetentionResponse | null
]; ];
/** /**
@ -142,6 +143,12 @@ export default class DatasetComplianceContainer extends Component {
*/ */
exportPolicy: IDatasetExportPolicy | null; exportPolicy: IDatasetExportPolicy | null;
/**
* Object containing the fields for the retention policy of the dataset, retrieved by task GET
* /retention api response
*/
retentionPolicy: IDatasetRetention | null;
/** /**
* The platform / db that the dataset is persisted * The platform / db that the dataset is persisted
* @type {IDatasetView.platform} * @type {IDatasetView.platform}
@ -201,14 +208,16 @@ export default class DatasetComplianceContainer extends Component {
complianceSuggestion, complianceSuggestion,
{ columns, schemaless }, { columns, schemaless },
exportPolicy, exportPolicy,
upstreams upstreams,
retentionResponse
]: BatchComplianceResponse = await Promise.all([ ]: BatchComplianceResponse = await Promise.all([
readDatasetComplianceByUrn(urn), readDatasetComplianceByUrn(urn),
readComplianceDataTypes(), readComplianceDataTypes(),
readDatasetComplianceSuggestionByUrn(urn), readDatasetComplianceSuggestionByUrn(urn),
readDatasetSchemaByUrn(urn), readDatasetSchemaByUrn(urn),
readDatasetExportPolicyByUrn(urn), readDatasetExportPolicyByUrn(urn),
readUpstreamDatasetsByUrn(urn) readUpstreamDatasetsByUrn(urn),
readDatasetRetentionByUrn(urn)
]); ]);
const schemaFieldNamesMappedToDataTypes = await iterateArrayAsync(columnDataTypesAndFieldNames)(columns); const schemaFieldNamesMappedToDataTypes = await iterateArrayAsync(columnDataTypesAndFieldNames)(columns);
const { containingPersonalData, fromUpstream } = complianceInfo; const { containingPersonalData, fromUpstream } = complianceInfo;
@ -231,7 +240,8 @@ export default class DatasetComplianceContainer extends Component {
schemaFieldNamesMappedToDataTypes, schemaFieldNamesMappedToDataTypes,
schemaless, schemaless,
exportPolicy, exportPolicy,
upstreams upstreams,
retentionPolicy: retentionResponse && retentionResponse.retentionPolicy
}); });
} }

2
wherehows-web/app/templates/components/dataset-compliance.hbs
View File

@ -158,7 +158,7 @@
missingPolicyText="This dataset does not have a current compliance purge policy." missingPolicyText="This dataset does not have a current compliance purge policy."
supportedPurgePolicies=supportedPurgePolicies supportedPurgePolicies=supportedPurgePolicies
purgeNote=complianceInfo.compliancePurgeNote purgeNote=complianceInfo.compliancePurgeNote
purgePolicy=(readonly complianceInfo.complianceType) purgePolicy=(readonly (if retentionPolicy retentionPolicy.purgeType complianceInfo.complianceType))
onPolicyChange=(action "onDatasetPurgePolicyChange") onPolicyChange=(action "onDatasetPurgePolicyChange")
}} }}

1
wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs
View File

@ -30,6 +30,7 @@
fieldReviewOption=@complianceTagFilter fieldReviewOption=@complianceTagFilter
complianceInfo=complianceInfo complianceInfo=complianceInfo
exportPolicy=exportPolicy exportPolicy=exportPolicy
retentionPolicy=retentionPolicy
complianceSuggestion=complianceSuggestion complianceSuggestion=complianceSuggestion
suggestionConfidenceThreshold=suggestionConfidenceThreshold suggestionConfidenceThreshold=suggestionConfidenceThreshold
isNewComplianceInfo=isNewComplianceInfo isNewComplianceInfo=isNewComplianceInfo