From 68e74f292f704dafaec5a63018b221d95f75f07f Mon Sep 17 00:00:00 2001
From: Ankit keshari <86347578+Ankit-Keshari-Vituity@users.noreply.github.com>
Date: Wed, 8 Jun 2022 00:09:26 +0530
Subject: [PATCH] fix(ui): Reload policies on activate / deactivate (#5107)

---
 .../src/app/policy/ManagePolicies.tsx              |  9 ++++++---
 .../src/app/policy/PolicyActorForm.tsx             | 14 ++++----------
 .../src/app/settings/AccessTokens.tsx              |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/datahub-web-react/src/app/policy/ManagePolicies.tsx b/datahub-web-react/src/app/policy/ManagePolicies.tsx
index ed2bc776df..f7522bce77 100644
--- a/datahub-web-react/src/app/policy/ManagePolicies.tsx
+++ b/datahub-web-react/src/app/policy/ManagePolicies.tsx
@@ -256,7 +256,7 @@ export const ManagePolicies = () => {
                 deletePolicy({ variables: { urn: policy?.urn as string } }); // There must be a focus policy urn.
                 setTimeout(function () {
                     policiesRefetch();
-                }, 2000);
+                }, 3000);
                 onCancelViewPolicy();
             },
             onCancel() {},
@@ -283,6 +283,9 @@ export const ManagePolicies = () => {
                 input: toPolicyInput(newPolicy),
             },
         });
+        setTimeout(function () {
+            policiesRefetch();
+        }, 3000);
         setShowViewPolicyModal(false);
     };
 
@@ -297,7 +300,7 @@ export const ManagePolicies = () => {
         message.success('Successfully saved policy.');
         setTimeout(function () {
             policiesRefetch();
-        }, 2000);
+        }, 3000);
         onClosePolicyBuilder();
     };
 
@@ -461,7 +464,7 @@ export const ManagePolicies = () => {
                     dataSource={tableData}
                     rowKey="urn"
                     locale={{
-                        emptyText: <Empty description="No Ingestion Sources!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                        emptyText: <Empty description="No Policies!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
                     }}
                     pagination={false}
                 />
diff --git a/datahub-web-react/src/app/policy/PolicyActorForm.tsx b/datahub-web-react/src/app/policy/PolicyActorForm.tsx
index d350966d86..f8f700d9e7 100644
--- a/datahub-web-react/src/app/policy/PolicyActorForm.tsx
+++ b/datahub-web-react/src/app/policy/PolicyActorForm.tsx
@@ -36,10 +36,6 @@ const SearchResultContent = styled.div`
     align-items: center;
 `;
 
-const SearchResultDisplayName = styled.div`
-    margin-right: 8px;
-`;
-
 /**
  * Component used to construct the "actors" portion of a DataHub
  * access Policy by populating an ActorFilter object.
@@ -160,14 +156,12 @@ export default function PolicyActorForm({ policyType, actors, setActors }: Props
             <SearchResultContainer>
                 <SearchResultContent>
                     <CustomAvatar
-                        size={18}
+                        size={24}
                         name={displayName}
                         photoUrl={avatarUrl}
                         isGroup={result.entity.type === EntityType.CorpGroup}
                     />
-                    <SearchResultDisplayName>
-                        <div>{displayName}</div>
-                    </SearchResultDisplayName>
+                    <div>{displayName}</div>
                 </SearchResultContent>
             </SearchResultContainer>
         );
@@ -186,7 +180,7 @@ export default function PolicyActorForm({ policyType, actors, setActors }: Props
 
     const tagRender = (props) => {
         // eslint-disable-next-line react/prop-types
-        const { label, closable, onClose } = props;
+        const { label, closable, onClose, value } = props;
         const onPreventMouseDown = (event) => {
             event.preventDefault();
             event.stopPropagation();
@@ -197,7 +191,7 @@ export default function PolicyActorForm({ policyType, actors, setActors }: Props
                 closable={closable}
                 onClose={onClose}
                 style={{
-                    padding: '0px 7px 0px 0px',
+                    padding: value === 'All' ? '0px 7px 0px 7px' : '0px 7px 0px 0px',
                     marginRight: 3,
                     display: 'flex',
                     justifyContent: 'start',
diff --git a/datahub-web-react/src/app/settings/AccessTokens.tsx b/datahub-web-react/src/app/settings/AccessTokens.tsx
index 97a8979f67..f410ce37cc 100644
--- a/datahub-web-react/src/app/settings/AccessTokens.tsx
+++ b/datahub-web-react/src/app/settings/AccessTokens.tsx
@@ -246,7 +246,7 @@ export const AccessTokens = () => {
                 dataSource={tableData}
                 rowKey="urn"
                 locale={{
-                    emptyText: <Empty description="No Ingestion Sources!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
+                    emptyText: <Empty description="No Access Tokens!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
                 }}
                 pagination={false}
             />