From f75838cea76a1f10f16ccc0d49d90b1518d1c293 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Thu, 15 Apr 2021 12:52:34 +0200
Subject: [PATCH 1/2] changed all cancel buttons to type "link"

fixing: #459
---
 src/authentication/DuplicateFlowModal.tsx | 2 +-
 src/client-scopes/ChangeTypeDialog.tsx    | 6 +-----
 src/client-scopes/add/MapperDialog.tsx    | 2 +-
 src/clients/advanced/AddHostDialog.tsx    | 2 +-
 src/clients/scopes/AddScopeDialog.tsx     | 2 +-
 src/groups/GroupsModal.tsx                | 2 +-
 src/groups/MembersModal.tsx               | 2 +-
 src/groups/MoveGroupDialog.tsx            | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/authentication/DuplicateFlowModal.tsx b/src/authentication/DuplicateFlowModal.tsx
index 443a978751..5e6387e810 100644
--- a/src/authentication/DuplicateFlowModal.tsx
+++ b/src/authentication/DuplicateFlowModal.tsx
@@ -80,7 +80,7 @@ export const DuplicateFlowModal = ({
         <Button
           id="modal-cancel"
           key="cancel"
-          variant={ButtonVariant.secondary}
+          variant={ButtonVariant.link}
           onClick={() => {
             toggleDialog();
           }}
diff --git a/src/client-scopes/ChangeTypeDialog.tsx b/src/client-scopes/ChangeTypeDialog.tsx
index d146b24954..4849aa1344 100644
--- a/src/client-scopes/ChangeTypeDialog.tsx
+++ b/src/client-scopes/ChangeTypeDialog.tsx
@@ -41,11 +41,7 @@ export const ChangeTypeDialog = ({
         >
           {t("common:continue")}
         </Button>,
-        <Button
-          key="cancel"
-          variant={ButtonVariant.secondary}
-          onClick={onClose}
-        >
+        <Button key="cancel" variant={ButtonVariant.link} onClick={onClose}>
           {t("common:cancel")}
         </Button>,
       ]}
diff --git a/src/client-scopes/add/MapperDialog.tsx b/src/client-scopes/add/MapperDialog.tsx
index 401455b218..384db09f57 100644
--- a/src/client-scopes/add/MapperDialog.tsx
+++ b/src/client-scopes/add/MapperDialog.tsx
@@ -93,7 +93,7 @@ export const AddMapperDialog = (props: AddMapperDialogProps) => {
               <Button
                 id="modal-cancel"
                 key="cancel"
-                variant={ButtonVariant.secondary}
+                variant={ButtonVariant.link}
                 onClick={() => {
                   props.toggleDialog();
                 }}
diff --git a/src/clients/advanced/AddHostDialog.tsx b/src/clients/advanced/AddHostDialog.tsx
index a4c6c37b7a..01c610f3cb 100644
--- a/src/clients/advanced/AddHostDialog.tsx
+++ b/src/clients/advanced/AddHostDialog.tsx
@@ -71,7 +71,7 @@ export const AddHostDialog = ({
         <Button
           id="add-node-cancel"
           key="cancel"
-          variant={ButtonVariant.secondary}
+          variant={ButtonVariant.link}
           onClick={() => onClose()}
         >
           {t("common:cancel")}
diff --git a/src/clients/scopes/AddScopeDialog.tsx b/src/clients/scopes/AddScopeDialog.tsx
index 4e1a0a1687..05111f1da1 100644
--- a/src/clients/scopes/AddScopeDialog.tsx
+++ b/src/clients/scopes/AddScopeDialog.tsx
@@ -79,7 +79,7 @@ export const AddScopeDialog = ({
         <Button
           id="modal-cancel"
           key="cancel"
-          variant={ButtonVariant.secondary}
+          variant={ButtonVariant.link}
           onClick={() => {
             setRows([]);
             toggleDialog();
diff --git a/src/groups/GroupsModal.tsx b/src/groups/GroupsModal.tsx
index 9c7bd2be67..c7c02f4749 100644
--- a/src/groups/GroupsModal.tsx
+++ b/src/groups/GroupsModal.tsx
@@ -77,7 +77,7 @@ export const GroupsModal = ({
         <Button
           id="modal-cancel"
           key="cancel"
-          variant={ButtonVariant.secondary}
+          variant={ButtonVariant.link}
           onClick={() => {
             handleModalToggle();
           }}
diff --git a/src/groups/MembersModal.tsx b/src/groups/MembersModal.tsx
index 4fa6b25818..6d9f35539f 100644
--- a/src/groups/MembersModal.tsx
+++ b/src/groups/MembersModal.tsx
@@ -82,7 +82,7 @@ export const MemberModal = ({ groupId, onClose }: MemberModalProps) => {
         <Button
           data-testid="cancel"
           key="cancel"
-          variant="secondary"
+          variant="link"
           onClick={onClose}
         >
           {t("common:cancel")}
diff --git a/src/groups/MoveGroupDialog.tsx b/src/groups/MoveGroupDialog.tsx
index f5efe7942e..f3796ecbb4 100644
--- a/src/groups/MoveGroupDialog.tsx
+++ b/src/groups/MoveGroupDialog.tsx
@@ -92,7 +92,7 @@ export const MoveGroupDialog = ({
         <Button
           data-testid="moveCancel"
           key="cancel"
-          variant="secondary"
+          variant="link"
           onClick={onClose}
         >
           {t("common:cancel")}

From cb55f67fdc06d79aa748324392373a1cafbaa50a Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Thu, 15 Apr 2021 15:29:50 +0200
Subject: [PATCH 2/2] fixed tests

---
 .../__snapshots__/MapperDialog.test.tsx.snap       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
index 175264a694..f0901d5ebd 100644
--- a/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
+++ b/src/client-scopes/add/__tests__/__snapshots__/MapperDialog.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`<MapperDialog/> should have disabled add button when nothing is selecte
           <Button
             id="modal-cancel"
             onClick={[Function]}
-            variant="secondary"
+            variant="link"
           >
             cancel
           </Button>,
@@ -1052,8 +1052,8 @@ exports[`<MapperDialog/> should have disabled add button when nothing is selecte
                     </button>
                     <button
                       aria-disabled="false"
-                      class="pf-c-button pf-m-secondary"
-                      data-ouia-component-id="OUIA-Generated-Button-secondary-1"
+                      class="pf-c-button pf-m-link"
+                      data-ouia-component-id="OUIA-Generated-Button-link-1"
                       data-ouia-component-type="PF4/Button"
                       data-ouia-safe="true"
                       id="modal-cancel"
@@ -1081,7 +1081,7 @@ exports[`<MapperDialog/> should have disabled add button when nothing is selecte
               <Button
                 id="modal-cancel"
                 onClick={[Function]}
-                variant="secondary"
+                variant="link"
               >
                 cancel
               </Button>,
@@ -20303,13 +20303,13 @@ exports[`<MapperDialog/> should have disabled add button when nothing is selecte
                             id="modal-cancel"
                             key="cancel"
                             onClick={[Function]}
-                            variant="secondary"
+                            variant="link"
                           >
                             <button
                               aria-disabled={false}
                               aria-label={null}
-                              className="pf-c-button pf-m-secondary"
-                              data-ouia-component-id="OUIA-Generated-Button-secondary-1"
+                              className="pf-c-button pf-m-link"
+                              data-ouia-component-id="OUIA-Generated-Button-link-1"
                               data-ouia-component-type="PF4/Button"
                               data-ouia-safe={true}
                               disabled={false}