Preserve previous tags

elastic · Dec 2, 2021 · a24a200 · a24a200
1 parent 2d63d79
commit a24a200
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...ck/plugins/security_solution/public/management/components/effected_policy_select/utils.ts b/...ck/plugins/security_solution/public/management/components/effected_policy_select/utils.ts
@@ -10,15 +10,30 @@ import { EffectedPolicySelection } from './effected_policy_select';
 
 export const GLOBAL_POLICY_TAG = 'policy:all';
 
+/**
+ * Given a list of artifact tags, returns the tags that are not policy tags
+ * policy tags follow the format: `policy:id`
+ */
+export function getArtifactTagsWithoutPolicies(tags?: string[]): string[] {
+  return tags?.filter((tag) => !tag.startsWith('policy:')) || [];
+}
+
+/**
+ * Return a list of artifact policy tags based on a current
+ * selection by the EffectedPolicySelection component.
+ */
 export function getArtifactTagsByEffectedPolicySelection(
-  selection: EffectedPolicySelection
+  selection: EffectedPolicySelection,
+  otherTags: string[] = []
 ): string[] {
   if (selection.isGlobal) {
-    return [GLOBAL_POLICY_TAG];
+    return [GLOBAL_POLICY_TAG, ...otherTags];
   }
-  return selection.selected.map((policy) => {
+  const newTags = selection.selected.map((policy) => {
     return `policy:${policy.id}`;
   });
+
+  return newTags.concat(otherTags);
 }
 
 /**

diff --git a/...urity_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx b/...urity_solution/public/management/pages/host_isolation_exceptions/view/components/form.tsx
@@ -29,6 +29,7 @@ import {
 } from '../../../../components/effected_policy_select';
 import {
   getArtifactTagsByEffectedPolicySelection,
+  getArtifactTagsWithoutPolicies,
   getEffectedPolicySelectionByTags,
   isGlobalPolicyEffected,
 } from '../../../../components/effected_policy_select/utils';
@@ -126,10 +127,13 @@ export const HostIsolationExceptionsForm: React.FC<{
         setSelectedPolicies(() => selection);
       }
       onChange({
-        tags: getArtifactTagsByEffectedPolicySelection(selection),
+        tags: getArtifactTagsByEffectedPolicySelection(
+          selection,
+          getArtifactTagsWithoutPolicies(exception.tags)
+        ),
       });
     },
-    [onChange]
+    [exception.tags, onChange]
   );
 
   const handleOnDescriptionChange = useCallback(