Merge branch 'master' into 177-UXImprovements

src/pages/Organizations/screens/Organization/Organization.jsx

@@ -1,23 +1,11 @@
 import React, { Component } from 'react';
 import { I18n, i18nMark } from '@lingui/react';
 import { t } from '@lingui/macro';
-import {
-  Switch,
-  Route,
-  withRouter,
-  Redirect,
-  Link
-} from 'react-router-dom';
-import {
-  Card,
-  CardHeader,
-  PageSection,
-} from '@patternfly/react-core';
-import {
-  TimesIcon
-} from '@patternfly/react-icons';
+import { Switch, Route, withRouter, Redirect } from 'react-router-dom';
+import { Card, CardHeader, PageSection } from '@patternfly/react-core';
 import { withNetwork } from '../../../../contexts/Network';
 import NotifyAndRedirect from '../../../../components/NotifyAndRedirect';
+import CardCloseButton from '../../../../components/CardCloseButton';
 import OrganizationAccess from './OrganizationAccess';
 import OrganizationDetail from './OrganizationDetail';
 import OrganizationEdit from './OrganizationEdit';
@@ -164,13 +152,7 @@ class Organization extends Component {
                     labeltext={i18n._(t`Organization detail tabs`)}
                     tabsArray={tabsArray}
                   />
-                  <Link
-                    aria-label="Close"
-                    title="Close"
-                    to="/organizations"
-                  >
-                    <TimesIcon className="OrgsTab-closeButton" />
-                  </Link>
+                  <CardCloseButton linkTo="/organizations" />
                 </React.Fragment>
               )}
             </I18n>

src/pages/Organizations/screens/OrganizationAdd.jsx

@@ -8,13 +8,11 @@ import {
   Card,
   CardHeader,
   CardBody,
-  Button,
   Tooltip,
 } from '@patternfly/react-core';
-import { TimesIcon } from '@patternfly/react-icons';
 
 import { withNetwork } from '../../../contexts/Network';
-
+import CardCloseButton from '../../../components/CardCloseButton';
 import OrganizationForm from '../components/OrganizationForm';
 
 class OrganizationAdd extends React.Component {
@@ -70,13 +68,7 @@ class OrganizationAdd extends React.Component {
                   content={i18n._(t`Close`)}
                   position="top"
                 >
-                  <Button
-                    variant="plain"
-                    aria-label={i18n._(t`Close`)}
-                    onClick={this.handleCancel}
-                  >
-                    <TimesIcon />
-                  </Button>
+                  <CardCloseButton onClick={this.handleCancel} />
                 </Tooltip>
               </CardHeader>
               <CardBody>