From a3624a16710c4fe486196d64cf382f1c67ea98f8 Mon Sep 17 00:00:00 2001
From: cptran777 <catran@linkedin.com>
Date: Tue, 11 Sep 2018 10:06:53 -0700
Subject: [PATCH] Separate compliance and retention post requests on save

---
 .../app/components/dataset-compliance.ts      |  8 +++++-
 .../datasets/containers/dataset-compliance.ts | 27 +++++++++++++++++++
 .../containers/dataset-compliance.hbs         |  1 +
 .../app/utils/api/datasets/compliance.ts      |  7 +----
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/wherehows-web/app/components/dataset-compliance.ts b/wherehows-web/app/components/dataset-compliance.ts
index d7dec725c1..ee66300c65 100644
--- a/wherehows-web/app/components/dataset-compliance.ts
+++ b/wherehows-web/app/components/dataset-compliance.ts
@@ -239,6 +239,11 @@ export default class DatasetCompliance extends Component {
   onReset: <T>() => Promise<T>;
   onSave: <T>() => Promise<T>;
 
+  /**
+   * Passthrough from parent to export policy component to save the retention policy
+   */
+  onSaveRetentionPolicy: <T>() => Promise<T>;
+
   /**
    * Passthrough from parent to export policy component to save the export policy
    */
@@ -1499,10 +1504,11 @@ export default class DatasetCompliance extends Component {
       try {
         const isSaving = true;
         const onSave = get(this, 'onSave');
+        const onSaveRetentionPolicy = get(this, 'onSaveRetentionPolicy');
         setSaveFlag(isSaving);
 
         await this.beforeSaveCompliance(editTarget);
-        await onSave();
+        await (editTarget === ComplianceEdit.PurgePolicy ? onSaveRetentionPolicy() : onSave());
         return;
       } finally {
         setSaveFlag();
diff --git a/wherehows-web/app/components/datasets/containers/dataset-compliance.ts b/wherehows-web/app/components/datasets/containers/dataset-compliance.ts
index dc42280f55..382f0a636b 100644
--- a/wherehows-web/app/components/datasets/containers/dataset-compliance.ts
+++ b/wherehows-web/app/components/datasets/containers/dataset-compliance.ts
@@ -40,6 +40,9 @@ import { notificationDialogActionFactory } from 'wherehows-web/utils/notificatio
 import Configurator from 'wherehows-web/services/configurator';
 import { typeOf } from '@ember/utils';
 import { service } from '@ember-decorators/service';
+import { saveDatasetRetentionByUrn } from 'wherehows-web/utils/api/datasets/retention';
+import { extractRetentionFromComplianceInfo } from 'wherehows-web/utils/datasets/retention';
+import { IDatasetRetention } from 'wherehows-web/typings/api/datasets/retention';
 
 /**
  * Type alias for the response when container data items are batched
@@ -340,6 +343,30 @@ export default class DatasetComplianceContainer extends Component {
     }
   }
 
+  /**
+   * Persists the updates to the retention policy on the remote host
+   * @return {Promise<void>}
+   */
+  @action
+  async saveRetentionPolicy(this: DatasetComplianceContainer): Promise<void> {
+    const complianceInfo = get(this, 'complianceInfo');
+    if (complianceInfo) {
+      const { complianceEntities } = complianceInfo;
+
+      await this.notifyOnSave<IDatasetRetention>(
+        saveDatasetRetentionByUrn(
+          get(this, 'urn'),
+          extractRetentionFromComplianceInfo({
+            ...complianceInfo,
+            complianceEntities: removeReadonlyAttr(editableTags(complianceEntities))
+          })
+        )
+      );
+
+      this.resetPrivacyCompliancePolicy.call(this);
+    }
+  }
+
   /**
    * Persists the updates to the export policy on the remote host
    * @return {Promise<void}
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 b5b2231503..82acf067f8 100644
--- a/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs
+++ b/wherehows-web/app/templates/components/datasets/containers/dataset-compliance.hbs
@@ -35,6 +35,7 @@
       notifyOnComplianceSuggestionFeedback=(action "onSuggestionsComplianceFeedback")
       notifyOnChangeSetRequiresReview=(action "onCompliancePolicyChangeSetDrift")
       onSave=(action "savePrivacyCompliancePolicy")
+      onSaveRetentionPolicy=(action "saveRetentionPolicy")
       onSaveExportPolicy=(action "saveExportPolicy")
       onReset=(action "resetPrivacyCompliancePolicy")
       onComplianceJsonUpdate=(action "onComplianceJsonUpdate")
diff --git a/wherehows-web/app/utils/api/datasets/compliance.ts b/wherehows-web/app/utils/api/datasets/compliance.ts
index be803c8610..18f1359605 100644
--- a/wherehows-web/app/utils/api/datasets/compliance.ts
+++ b/wherehows-web/app/utils/api/datasets/compliance.ts
@@ -11,11 +11,7 @@ import {
   IDatasetExportPolicy
 } from 'wherehows-web/typings/api/datasets/compliance';
 import { getJSON, postJSON } from 'wherehows-web/utils/api/fetcher';
-import { saveDatasetRetentionByUrn } from 'wherehows-web/utils/api/datasets/retention';
-import {
-  extractRetentionFromComplianceInfo,
-  nullifyRetentionFieldsOnComplianceInfo
-} from 'wherehows-web/utils/datasets/retention';
+import { nullifyRetentionFieldsOnComplianceInfo } from 'wherehows-web/utils/datasets/retention';
 
 /**
  * Constructs the dataset compliance url
@@ -106,7 +102,6 @@ const saveDatasetComplianceByUrn = async (urn: string, complianceInfo: IComplian
     url: datasetComplianceUrlByUrn(urn),
     data: nullifyRetentionFieldsOnComplianceInfo(complianceInfo)
   });
-  await saveDatasetRetentionByUrn(urn, extractRetentionFromComplianceInfo(complianceInfo));
 };
 
 /**