From 1b685fe1caf8aff6fabbb37bb57958c89f7a13e1 Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Thu, 1 Sep 2022 01:27:05 +0530
Subject: [PATCH] Fix Cypress tests (#7091)

* Fix Glossary Cypress tests

* Fix dashboard permission error

* Fix description permission on glossary

* Change addNewTagToEntity selector

* Fix policy cypress test
---
 .../src/main/resources/ui/cypress/common/common.js       | 4 +---
 .../DashboardDetails/DashboardDetails.component.tsx      | 4 +++-
 .../GlossaryTerms/GlossaryTermsV1.component.tsx          | 4 +---
 .../PoliciesDetailPage/PoliciesDetailPage.tsx            | 9 ++++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
index dcf1627f78e..667d5cb6b84 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js
@@ -352,9 +352,7 @@ export const addNewTagToEntity = (entity, term) => {
   searchEntity(entity);
   cy.wait(500);
   cy.get('[data-testid="table-link"]').first().contains(entity).click();
-  cy.get(
-    '[data-testid="tags-wrapper"] > [data-testid="tag-container"] > div > :nth-child(1) > [data-testid="tags"] > .tw-no-underline'
-  )
+  cy.get('[data-testid="tags"] > [data-testid="add-tag"]').eq(0)
     .should('be.visible')
     .scrollIntoView()
     .click();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
index f056578cd88..be9e329c38a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
@@ -177,7 +177,9 @@ const DashboardDetails = ({
   );
 
   useEffect(() => {
-    fetchResourcePermission();
+    if (dashboardDetails.id) {
+      fetchResourcePermission();
+    }
   }, [dashboardDetails.id]);
 
   const onEntityFieldSelect = (value: string) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
index 62e5db74550..836ae62d57c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
@@ -285,9 +285,6 @@ const GlossaryTermsV1 = ({
   const handleValidation = (
     event: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
-    if (permissions.EditAll) {
-      return;
-    }
     const value = event.target.value;
     const eleName = event.target.name;
 
@@ -418,6 +415,7 @@ const GlossaryTermsV1 = ({
               removeBlur
               description={glossaryTerm.description || ''}
               entityName={glossaryTerm?.displayName ?? glossaryTerm?.name}
+              hasEditAccess={permissions.EditDescription}
               isEdit={isDescriptionEditable}
               onCancel={onCancel}
               onDescriptionEdit={onDescriptionEdit}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
index 3b94610f373..34d39fc67a9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
@@ -498,14 +498,13 @@ const PoliciesDetailPage = () => {
                               </Typography.Text>
                             </Space>
                             {rule.condition && (
-                              <Space
-                                data-testid="condition"
-                                direction="vertical"
-                                size={4}>
+                              <Space direction="vertical" size={4}>
                                 <Typography.Text className="tw-text-grey-muted">
                                   Condition:
                                 </Typography.Text>
-                                <code>{rule.condition}</code>
+                                <code data-testid="condition">
+                                  {rule.condition}
+                                </code>
                               </Space>
                             )}
                           </Space>