From a3b1ec4db4566b0a5f9ef74c463a61f19452b084 Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Sun, 26 Aug 2018 23:25:51 -0700 Subject: [PATCH] converts links to use config object --- wherehows-web/app/components/dataset-aclaccess.ts | 6 ++++++ wherehows-web/app/controllers/datasets/dataset.ts | 9 +++++++++ wherehows-web/app/routes/datasets/dataset.ts | 3 ++- .../app/templates/components/dataset-aclaccess.hbs | 2 +- .../app/templates/components/dataset-compliance.hbs | 3 ++- .../datasets/containers/dataset-acl-access.hbs | 1 + .../datasets/containers/dataset-compliance.hbs | 1 + .../templates/components/datasets/schemaless-tagging.hbs | 2 +- .../dataset-compliance/-dataset-classification.hbs | 2 +- .../dataset-compliance/-dataset-compliance-entities.hbs | 6 +++--- wherehows-web/app/templates/datasets/dataset.hbs | 7 ++++++- .../app/typings/api/configurator/configurator.d.ts | 2 ++ 12 files changed, 35 insertions(+), 9 deletions(-) diff --git a/wherehows-web/app/components/dataset-aclaccess.ts b/wherehows-web/app/components/dataset-aclaccess.ts index cd33e7673a..a29aa37108 100644 --- a/wherehows-web/app/components/dataset-aclaccess.ts +++ b/wherehows-web/app/components/dataset-aclaccess.ts @@ -30,6 +30,12 @@ const minSelectableExpirationDate = new Date(Date.now() + millisecondDays()); const maxSelectableExpirationDate = new Date(Date.now() + millisecondDays(7)); export default class DatasetAclAccess extends Component { + /** + * Named component argument with a string link reference to more information on acls + * @type {string} + */ + aclMoreInfoLink: string; + /** * The currently logged in user is listed on the related datasets acl * @type {boolean} diff --git a/wherehows-web/app/controllers/datasets/dataset.ts b/wherehows-web/app/controllers/datasets/dataset.ts index c5473b29a2..252a52b117 100644 --- a/wherehows-web/app/controllers/datasets/dataset.ts +++ b/wherehows-web/app/controllers/datasets/dataset.ts @@ -66,6 +66,12 @@ export default class DatasetController extends Controller { */ jitAclAccessWhitelist: Array; + /** + * References the collection of help links with references to external pages of help information + * @type {Record} + */ + wikiLinks: Record; + /** * Flag indicating the dataset policy is derived from an upstream source * @type {boolean} @@ -140,8 +146,11 @@ export default class DatasetController extends Controller { */ constructor() { super(...arguments); + + // defaults this.tabSelected || (this.tabSelected = Tabs.Ownership); this.jitAclAccessWhitelist || (this.jitAclAccessWhitelist = []); + this.wikiLinks || (this.wikiLinks = {}); } /** diff --git a/wherehows-web/app/routes/datasets/dataset.ts b/wherehows-web/app/routes/datasets/dataset.ts index 940c0ebea7..9afc961047 100644 --- a/wherehows-web/app/routes/datasets/dataset.ts +++ b/wherehows-web/app/routes/datasets/dataset.ts @@ -96,7 +96,8 @@ export default class DatasetRoute extends Route { isInternal: !!getConfig('isInternal'), jitAclAccessWhitelist: getConfig('JitAclAccessWhitelist') || [], shouldShowDatasetLineage: getConfig('shouldShowDatasetLineage'), - shouldShowDatasetHealth: getConfig('shouldShowDatasetHealth') + shouldShowDatasetHealth: getConfig('shouldShowDatasetHealth'), + wikiLinks: getConfig('wikiLinks') }); } diff --git a/wherehows-web/app/templates/components/dataset-aclaccess.hbs b/wherehows-web/app/templates/components/dataset-aclaccess.hbs index 154ad7f807..3e025f70f3 100644 --- a/wherehows-web/app/templates/components/dataset-aclaccess.hbs +++ b/wherehows-web/app/templates/components/dataset-aclaccess.hbs @@ -1,6 +1,6 @@
{{more-info - link="http://go/jitaclfaq" + link=@aclMoreInfoLink tooltip="Click for more information on ACL Access" }}
diff --git a/wherehows-web/app/templates/components/dataset-compliance.hbs b/wherehows-web/app/templates/components/dataset-compliance.hbs index aa5f167890..3cef930456 100644 --- a/wherehows-web/app/templates/components/dataset-compliance.hbs +++ b/wherehows-web/app/templates/components/dataset-compliance.hbs @@ -175,7 +175,7 @@ Compliance Purge Policy {{more-info - link="http://go/gdpr/deletions/purgePolicies" + link=@wikiLinks.purgePolicies tooltip="Click for more information Purge Policies" }}

@@ -212,6 +212,7 @@ {{#if (or isReadOnly isInitialEditStep)}} {{datasets/schemaless-tagging + classificationHelpLink=@wikiLinks.dht isEditable=(not isReadOnly) classification=(readonly complianceInfo.confidentiality) containsPersonalData=(readonly complianceInfo.containingPersonalData) diff --git a/wherehows-web/app/templates/components/datasets/containers/dataset-acl-access.hbs b/wherehows-web/app/templates/components/datasets/containers/dataset-acl-access.hbs index 842d4ef9fa..503b77ccb8 100644 --- a/wherehows-web/app/templates/components/datasets/containers/dataset-acl-access.hbs +++ b/wherehows-web/app/templates/components/datasets/containers/dataset-acl-access.hbs @@ -7,6 +7,7 @@ {{#if isJitAclAccessEnabled}} {{dataset-aclaccess acls=acls + aclMoreInfoLink=@aclMoreInfoLink hasValidAclRequest=hasValidAclRequest userAclRequest=userAclRequest userHasAclAccess=userHasAclAccess diff --git a/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs b/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs index 293562f7cd..1553f7f6ba 100644 --- a/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs +++ b/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs @@ -24,6 +24,7 @@ datasetName=datasetName schemaless=schemaless platform=platform + wikiLinks=@wikiLinks complianceInfo=complianceInfo complianceSuggestion=complianceSuggestion suggestionConfidenceThreshold=suggestionConfidenceThreshold diff --git a/wherehows-web/app/templates/components/datasets/schemaless-tagging.hbs b/wherehows-web/app/templates/components/datasets/schemaless-tagging.hbs index 6ce18cbd64..dfdd852b1a 100644 --- a/wherehows-web/app/templates/components/datasets/schemaless-tagging.hbs +++ b/wherehows-web/app/templates/components/datasets/schemaless-tagging.hbs @@ -30,7 +30,7 @@ Dataset security classification {{more-info - link="http://go/dht" + link=@classificationHelpLink tooltip="information dataset security classification" }} diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs index 0007781499..8a459ab54e 100644 --- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs +++ b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs @@ -7,7 +7,7 @@ {{more-info - link="http://go/gdpr-taxonomy#MetadataTaxonomyforDataSets-DatasetLevelTags" + link=@wikiLinks.gdprTaxonomy tooltip="Click for more information on Dataset classification with examples" }}

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 3ef33708e4..c953a8d43a 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 @@ -6,7 +6,7 @@ "IDs and PII in the schema"}} {{more-info - link="http://go/gdpr-pii" + link=@wikiLinks.gdprPii tooltip="Click for more information on Schema field format and types" }} @@ -105,7 +105,7 @@ Field {{more-info - link="http://go/tms-schema" + link=@wikiLinks.tmsSchema tooltip="Click for more information on Schema" }} {{/head.column}} @@ -337,7 +337,7 @@ {{more-info - link="http://go/metadata-custom-regex" + link=@wikiLinks.metadataCustomRegex tooltip="Click for more information on RegExp format" }} diff --git a/wherehows-web/app/templates/datasets/dataset.hbs b/wherehows-web/app/templates/datasets/dataset.hbs index 49b6f24a3e..121b8066b5 100644 --- a/wherehows-web/app/templates/datasets/dataset.hbs +++ b/wherehows-web/app/templates/datasets/dataset.hbs @@ -149,6 +149,7 @@ {{datasets/containers/dataset-compliance urn=encodedUrn platform=model.platform + wikiLinks=wikiLinks datasetName=model.nativeName notifyPiiStatus=(action "onNotifyPiiStatus") setOnChangeSetChange=(action "setOnChangeSetChange") @@ -158,7 +159,11 @@ {{/tabs.tabpanel}} {{#tabs.tabpanel tabIds.Access}} - {{datasets/containers/dataset-acl-access urn=encodedUrn isJitAclAccessEnabled=isJitAclAccessEnabled}} + {{datasets/containers/dataset-acl-access + urn=encodedUrn + aclMoreInfoLink=wikiLinks.jitAcl + isJitAclAccessEnabled=isJitAclAccessEnabled + }} {{/tabs.tabpanel}} {{#if shouldShowDatasetLineage}} diff --git a/wherehows-web/app/typings/api/configurator/configurator.d.ts b/wherehows-web/app/typings/api/configurator/configurator.d.ts index 547b80f005..d2ac9dbff5 100644 --- a/wherehows-web/app/typings/api/configurator/configurator.d.ts +++ b/wherehows-web/app/typings/api/configurator/configurator.d.ts @@ -12,6 +12,8 @@ interface IAppConfig { shouldShowDatasetHealth: boolean; // confidence threshold for filtering out higher quality suggestions suggestionConfidenceThreshold: number; + // collection of links to external help resource pages + wikiLinks: Record; tracking: { isEnabled: boolean; trackers: {