From 54643f8305ca680bf8b6f2645605eb4d343776da Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?=
Date: Fri, 26 Apr 2019 14:25:36 +0200
Subject: [PATCH] Fix wrong delete button usage in auto org import canceling
---
.../create/organization/AutoOrganizationCreate.tsx | 10 +++++-----
.../organization/AutoPersonalOrganizationBind.tsx | 9 ++++++---
.../__tests__/AutoOrganizationCreate-test.tsx | 2 +-
.../__tests__/AutoPersonalOrganizationBind-test.tsx | 2 +-
.../AutoOrganizationCreate-test.tsx.snap | 12 ++++++++----
.../AutoPersonalOrganizationBind-test.tsx.snap | 6 ++++--
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/server/sonar-web/src/main/js/apps/create/organization/AutoOrganizationCreate.tsx b/server/sonar-web/src/main/js/apps/create/organization/AutoOrganizationCreate.tsx
index 08ad2ed676f..a9193117774 100644
--- a/server/sonar-web/src/main/js/apps/create/organization/AutoOrganizationCreate.tsx
+++ b/server/sonar-web/src/main/js/apps/create/organization/AutoOrganizationCreate.tsx
@@ -25,7 +25,8 @@ import OrganizationDetailsStep from './OrganizationDetailsStep';
import PlanStep from './PlanStep';
import { Step } from './utils';
import { Alert } from '../../../components/ui/Alert';
-import { DeleteButton } from '../../../components/ui/buttons';
+import { ButtonIcon } from '../../../components/ui/buttons';
+import ClearIcon from '../../../components/icons-components/ClearIcon';
import RadioToggle from '../../../components/controls/RadioToggle';
import { bindAlmOrganization } from '../../../api/alm-integration';
import { sanitizeAlmId, getAlmMembersUrl, isGithub } from '../../../helpers/almIntegrations';
@@ -136,10 +137,9 @@ export default class AutoOrganizationCreate extends React.PureComponent{almOrganization.name}
}}
/>
-
+
+
+
{hasUnboundOrgs && (
diff --git a/server/sonar-web/src/main/js/apps/create/organization/AutoPersonalOrganizationBind.tsx b/server/sonar-web/src/main/js/apps/create/organization/AutoPersonalOrganizationBind.tsx
index c50cb5ff706..a97e49ed951 100644
--- a/server/sonar-web/src/main/js/apps/create/organization/AutoPersonalOrganizationBind.tsx
+++ b/server/sonar-web/src/main/js/apps/create/organization/AutoPersonalOrganizationBind.tsx
@@ -23,11 +23,12 @@ import OrganizationDetailsForm from './OrganizationDetailsForm';
import OrganizationDetailsStep from './OrganizationDetailsStep';
import PlanStep from './PlanStep';
import { Step } from './utils';
-import { DeleteButton } from '../../../components/ui/buttons';
+import ClearIcon from '../../../components/icons-components/ClearIcon';
+import OrganizationAvatar from '../../../components/common/OrganizationAvatar';
+import { ButtonIcon } from '../../../components/ui/buttons';
import { getBaseUrl } from '../../../helpers/urls';
import { translate } from '../../../helpers/l10n';
import { sanitizeAlmId } from '../../../helpers/almIntegrations';
-import OrganizationAvatar from '../../../components/common/OrganizationAvatar';
interface Props {
almApplication: T.AlmApplication;
@@ -97,7 +98,9 @@ export default class AutoPersonalOrganizationBind extends React.PureComponent{importPersonalOrg.name}
}}
/>
-
+
+
+
{
const handleCancelImport = jest.fn().mockResolvedValue({ key: 'foo' });
const wrapper = shallowRender({ handleCancelImport });
- click(wrapper.find('DeleteButton'));
+ click(wrapper.find('ButtonIcon'));
expect(handleCancelImport).toBeCalled();
});
diff --git a/server/sonar-web/src/main/js/apps/create/organization/__tests__/AutoPersonalOrganizationBind-test.tsx b/server/sonar-web/src/main/js/apps/create/organization/__tests__/AutoPersonalOrganizationBind-test.tsx
index 7aec3fc2661..8d9282c3f10 100644
--- a/server/sonar-web/src/main/js/apps/create/organization/__tests__/AutoPersonalOrganizationBind-test.tsx
+++ b/server/sonar-web/src/main/js/apps/create/organization/__tests__/AutoPersonalOrganizationBind-test.tsx
@@ -56,7 +56,7 @@ it('should allow to cancel org import', () => {
handleCancelImport
});
- click(wrapper.find('DeleteButton'));
+ click(wrapper.find('ButtonIcon'));
expect(handleCancelImport).toBeCalled();
});
diff --git a/server/sonar-web/src/main/js/apps/create/organization/__tests__/__snapshots__/AutoOrganizationCreate-test.tsx.snap b/server/sonar-web/src/main/js/apps/create/organization/__tests__/__snapshots__/AutoOrganizationCreate-test.tsx.snap
index 1af9195ea68..89856c1c8b3 100644
--- a/server/sonar-web/src/main/js/apps/create/organization/__tests__/__snapshots__/AutoOrganizationCreate-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/create/organization/__tests__/__snapshots__/AutoOrganizationCreate-test.tsx.snap
@@ -31,10 +31,12 @@ exports[`should display choice between import or creation 1`] = `
}
}
/>
-
+ >
+
+
-
+ >
+
+
-
+ >
+
+