* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { getJSON, postJSON } from '../helpers/request';
+import { getJSON, postJSON, post } from '../helpers/request';
import { AlmRepository, AlmApplication, AlmOrganization } from '../app/types';
import throwGlobalError from '../app/utils/throwGlobalError';
+export function bindAlmOrganization(data: { installationId: string; organization: string }) {
+ return post('/api/alm_integration/bind_organization', data).catch(throwGlobalError);
+}
+
export function getAlmAppInfo(): Promise<{ application: AlmApplication }> {
return getJSON('/api/alm_integration/show_app_info').catch(throwGlobalError);
}
}
export function createOrganization(
- data: OrganizationBase & { installId?: string }
+ data: OrganizationBase & { installationId?: string }
): Promise<Organization> {
return postJSON('/api/organizations/create', data).then(r => r.organization, throwGlobalError);
}
)}
{renderBreadcrumbs(component.breadcrumbs)}
{isSonarCloud() &&
- component.almRepoUrl && (
+ component.alm && (
<a
className="link-no-underline"
- href={component.almRepoUrl}
+ href={component.alm.url}
rel="noopener noreferrer"
target="_blank">
<img
- alt={sanitizeAlmId(component.almId)}
+ alt={sanitizeAlmId(component.alm.key)}
className="text-text-top spacer-left"
height={16}
- src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(component.almId)}.svg`}
+ src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(component.alm.key)}.svg`}
width={16}
/>
</a>
branchLikes={[]}
component={{
...component,
- almId: 'bitbucketcloud',
- almRepoUrl: 'https://bitbucket.org/foo'
+ alm: { key: 'bitbucketcloud', url: 'https://bitbucket.org/foo' }
}}
currentBranchLike={undefined}
organization={organization}
}
export interface Component extends LightComponent {
- almId?: string;
- almRepoUrl?: string;
+ alm?: { key: string; url: string };
analysisDate?: string;
breadcrumbs: Breadcrumb[];
configuration?: ComponentConfiguration;
local?: boolean;
login: string;
name: string;
+ personalOrganization?: string;
scmAccounts: string[];
}
}
export interface Organization extends OrganizationBase {
- almId?: string;
- almRepoUrl?: string;
+ alm?: { key: string; url: string };
adminPages?: Extension[];
canAdmin?: boolean;
canDelete?: boolean;
import { getBaseUrl } from '../../../helpers/urls';
import { translate } from '../../../helpers/l10n';
import { sanitizeAlmId } from '../../../helpers/almIntegrations';
+import OrganizationAvatar from '../../../components/common/OrganizationAvatar';
interface Props {
almApplication: AlmApplication;
almInstallId?: string;
almOrganization?: AlmOrganization;
createOrganization: (
- organization: OrganizationBase & { installId?: string }
+ organization: OrganizationBase & { installationId?: string }
) => Promise<Organization>;
+ importPersonalOrg?: Organization;
onOrgCreated: (organization: string) => void;
+ updateOrganization: (
+ organization: OrganizationBase & { installationId?: string }
+ ) => Promise<Organization>;
}
export default class AutoOrganizationCreate extends React.PureComponent<Props> {
handleCreateOrganization = (organization: Required<OrganizationBase>) => {
if (organization) {
- return this.props
- .createOrganization({
+ const { importPersonalOrg } = this.props;
+ let promise: Promise<Organization>;
+ if (importPersonalOrg) {
+ promise = this.props.updateOrganization({
+ avatar: organization.avatar,
+ description: organization.description,
+ installationId: this.props.almInstallId,
+ key: importPersonalOrg.key,
+ name: organization.name || organization.key,
+ url: organization.url
+ });
+ } else {
+ promise = this.props.createOrganization({
avatar: organization.avatar,
description: organization.description,
- installId: this.props.almInstallId,
+ installationId: this.props.almInstallId,
key: organization.key,
name: organization.name || organization.key,
url: organization.url
- })
- .then(({ key }) => this.props.onOrgCreated(key));
+ });
+ }
+ return promise.then(({ key }) => this.props.onOrgCreated(key));
} else {
return Promise.reject();
}
};
render() {
- const { almApplication, almInstallId, almOrganization } = this.props;
+ const { almApplication, almInstallId, almOrganization, importPersonalOrg } = this.props;
if (almInstallId && almOrganization) {
+ const description = importPersonalOrg
+ ? translate('onboarding.import_personal_organization_x')
+ : translate('onboarding.import_organization_x');
+ const submitText = importPersonalOrg
+ ? translate('onboarding.import_organization.bind')
+ : translate('my_account.create_organization');
return (
<OrganizationDetailsStep
description={
<p className="huge-spacer-bottom">
<FormattedMessage
- defaultMessage={translate('onboarding.create_organization.import_organization_x')}
- id="onboarding.create_organization.import_organization_x"
+ defaultMessage={description}
+ id={description}
values={{
avatar: (
<img
width={16}
/>
),
- name: <strong>{almOrganization.name}</strong>
+ name: <strong>{almOrganization.name}</strong>,
+ personalAvatar: importPersonalOrg && (
+ <OrganizationAvatar organization={importPersonalOrg} small={true} />
+ ),
+ personalName: importPersonalOrg && <strong>{importPersonalOrg.name}</strong>
}}
/>
</p>
}
finished={false}
+ keyReadOnly={Boolean(importPersonalOrg)}
onContinue={this.handleCreateOrganization}
onOpen={() => {}}
open={true}
- organization={almOrganization}
- submitText={translate('my_account.create_organization')}
+ organization={importPersonalOrg || almOrganization}
+ submitText={submitText}
/>
);
}
import DeferredSpinner from '../../../components/common/DeferredSpinner';
import Tabs from '../../../components/controls/Tabs';
import { whenLoggedIn } from '../../../components/hoc/whenLoggedIn';
-import { getAlmAppInfo, getAlmOrganization } from '../../../api/alm-integration';
+import { withUserOrganizations } from '../../../components/hoc/withUserOrganizations';
+import {
+ getAlmAppInfo,
+ getAlmOrganization,
+ bindAlmOrganization
+} from '../../../api/alm-integration';
import { getSubscriptionPlans } from '../../../api/billing';
import {
LoggedInUser,
AlmOrganization,
OrganizationBase
} from '../../../app/types';
-import { hasAdvancedALMIntegration } from '../../../helpers/almIntegrations';
+import { hasAdvancedALMIntegration, isPersonal } from '../../../helpers/almIntegrations';
import { translate } from '../../../helpers/l10n';
import { getOrganizationUrl } from '../../../helpers/urls';
import * as api from '../../../api/organizations';
import '../../tutorials/styles.css'; // TODO remove me
interface Props {
- createOrganization: (organization: OrganizationBase) => Promise<Organization>;
+ createOrganization: (
+ organization: OrganizationBase & { installationId?: string }
+ ) => Promise<Organization>;
currentUser: LoggedInUser;
deleteOrganization: (key: string) => Promise<void>;
+ updateOrganization: (
+ organization: OrganizationBase & { installationId?: string }
+ ) => Promise<Organization>;
+ userOrganizations: Organization[];
}
interface State {
};
render() {
- const { location } = this.props;
- const { almApplication, loading, subscriptionPlans } = this.state;
+ const { currentUser, location } = this.props;
+ const { almApplication, almOrganization, loading, subscriptionPlans } = this.state;
const state = (location.state || {}) as LocationState;
const query = parseQuery(location.query);
- const header = translate('onboarding.create_organization.page.header');
+ const importPersonalOrg = isPersonal(almOrganization)
+ ? this.props.userOrganizations.find(o => o.key === currentUser.personalOrganization)
+ : undefined;
+ const header = importPersonalOrg
+ ? translate('onboarding.import_organization.personal.page.header')
+ : translate('onboarding.create_organization.page.header');
+ const description = importPersonalOrg
+ ? translate('onboarding.import_organization.personal.page.description')
+ : translate('onboarding.create_organization.page.description');
const startedPrice = subscriptionPlans && subscriptionPlans[0] && subscriptionPlans[0].price;
const formattedPrice = formatPrice(startedPrice);
const showManualTab = state.tab === 'manual' && !query.almInstallId;
{startedPrice !== undefined && (
<p className="page-description">
<FormattedMessage
- defaultMessage={translate('onboarding.create_organization.page.description')}
- id="onboarding.create_organization.page.description"
+ defaultMessage={description}
+ id={description}
values={{
break: <br />,
price: formattedPrice,
<DeferredSpinner />
) : (
<>
- {almApplication && (
- <Tabs<TabKeys>
- onChange={this.onTabChange}
- selected={showManualTab ? 'manual' : 'auto'}
- tabs={[
- {
- key: 'auto',
- node: (
- <>
- {translate(
- 'onboarding.create_organization.import_organization',
- almApplication.key
- )}
- <span
- className={classNames('beta-badge spacer-left', {
- 'is-muted': showManualTab
- })}>
- {translate('beta')}
- </span>
- </>
- )
- },
- {
- disabled: Boolean(query.almInstallId),
- key: 'manual',
- node: translate('onboarding.create_organization.create_manually')
- }
- ]}
- />
- )}
+ {almApplication &&
+ !importPersonalOrg && (
+ <Tabs<TabKeys>
+ onChange={this.onTabChange}
+ selected={showManualTab ? 'manual' : 'auto'}
+ tabs={[
+ {
+ key: 'auto',
+ node: (
+ <>
+ {translate('onboarding.import_organization', almApplication.key)}
+ <span
+ className={classNames('beta-badge spacer-left', {
+ 'is-muted': showManualTab
+ })}>
+ {translate('beta')}
+ </span>
+ </>
+ )
+ },
+ {
+ disabled: Boolean(query.almInstallId),
+ key: 'manual',
+ node: translate('onboarding.create_organization.create_manually')
+ }
+ ]}
+ />
+ )}
{showManualTab || !almApplication ? (
<ManualOrganizationCreate
<AutoOrganizationCreate
almApplication={almApplication}
almInstallId={query.almInstallId}
- almOrganization={this.state.almOrganization}
+ almOrganization={almOrganization}
createOrganization={this.props.createOrganization}
+ importPersonalOrg={importPersonalOrg}
onOrgCreated={this.handleOrgCreated}
+ updateOrganization={this.props.updateOrganization}
/>
)}
</>
}
}
-function createOrganization(organization: OrganizationBase & { installId?: string }) {
+function createOrganization(organization: OrganizationBase & { installationId?: string }) {
return (dispatch: Dispatch) => {
return api.createOrganization(organization).then((organization: Organization) => {
dispatch(actions.createOrganization(organization));
};
}
+function updateOrganization(
+ organization: OrganizationBase & { key: string; installationId?: string }
+) {
+ return (dispatch: Dispatch) => {
+ const { key, installationId, ...changes } = organization;
+ const promises = [api.updateOrganization(key, changes)];
+ if (installationId) {
+ promises.push(bindAlmOrganization({ organization: key, installationId }));
+ }
+ return Promise.all(promises).then(() => {
+ dispatch(actions.updateOrganization(key, changes));
+ return organization;
+ });
+ };
+}
+
function deleteOrganization(key: string) {
return (dispatch: Dispatch) => {
return api.deleteOrganization(key).then(() => {
const mapDispatchToProps = {
createOrganization: createOrganization as any,
- deleteOrganization: deleteOrganization as any
+ deleteOrganization: deleteOrganization as any,
+ updateOrganization: updateOrganization as any
};
export default whenLoggedIn(
- withRouter(
- connect(
- null,
- mapDispatchToProps
- )(CreateOrganization)
+ withUserOrganizations(
+ withRouter(
+ connect(
+ null,
+ mapDispatchToProps
+ )(CreateOrganization)
+ )
)
);
interface Props {
description?: React.ReactNode;
finished: boolean;
+ keyReadOnly?: boolean;
onContinue: (organization: RequiredOrganization) => Promise<void>;
onOpen: () => void;
open: boolean;
<div className="boxed-group-inner">
<form id="organization-form" onSubmit={this.handleSubmit}>
{this.props.description}
- <OrganizationKeyInput initialValue={this.state.key} onChange={this.handleKeyUpdate} />
+ <OrganizationKeyInput
+ initialValue={this.state.key}
+ onChange={this.handleKeyUpdate}
+ readOnly={this.props.keyReadOnly}
+ />
<div className="big-spacer-top">
<ResetButtonLink onClick={this.handleAdditionalClick}>
{translate(
<div className="big-spacer-top">
<OrganizationAvatarInput
initialValue={this.state.avatar}
+ name={this.state.name}
onChange={this.handleDescriptionUpdate}
/>
</div>
wrapper.find('OrganizationDetailsStep').prop<Function>('onContinue')(organization);
await waitAndUpdate(wrapper);
- expect(createOrganization).toBeCalledWith({ ...organization, installId: 'id-foo' });
+ expect(createOrganization).toBeCalledWith({ ...organization, installationId: 'id-foo' });
expect(onOrgCreated).toBeCalledWith('foo');
});
+it('should render for personal organizations', async () => {
+ const personalOrg = { key: 'personal-org', name: 'personal-org' };
+ const updateOrganization = jest.fn().mockResolvedValue({ key: personalOrg.key });
+ const onOrgCreated = jest.fn();
+ const wrapper = shallowRender({
+ almInstallId: 'id-foo',
+ almOrganization: { ...organization, type: 'USER' },
+ importPersonalOrg: personalOrg,
+ onOrgCreated,
+ updateOrganization
+ });
+
+ expect(wrapper).toMatchSnapshot();
+
+ wrapper.find('OrganizationDetailsStep').prop<Function>('onContinue')(personalOrg);
+ await waitAndUpdate(wrapper);
+
+ expect(updateOrganization).toBeCalledWith({ ...personalOrg, installationId: 'id-foo' });
+ expect(onOrgCreated).toBeCalledWith(personalOrg.key);
+});
+
function shallowRender(props: Partial<AutoOrganizationCreate['props']> = {}) {
return shallow(
<AutoOrganizationCreate
}}
createOrganization={jest.fn()}
onOrgCreated={jest.fn()}
+ updateOrganization={jest.fn()}
{...props}
/>
);
// @ts-ignore avoid passing everything from WithRouterProps
location={{}}
router={mockRouter()}
+ userOrganizations={[
+ { key: 'foo', name: 'Foo' },
+ { alm: { key: 'github', url: '' }, key: 'bar', name: 'Bar' }
+ ]}
{...props}
/>
);
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`should render for personal organizations 1`] = `
+<OrganizationDetailsStep
+ description={
+ <p
+ className="huge-spacer-bottom"
+ >
+ <FormattedMessage
+ defaultMessage="onboarding.import_personal_organization_x"
+ id="onboarding.import_personal_organization_x"
+ values={
+ Object {
+ "avatar": <img
+ alt="BitBucket"
+ className="little-spacer-left"
+ src="/images/sonarcloud/bitbucket.svg"
+ width={16}
+ />,
+ "name": <strong>
+ name-foo
+ </strong>,
+ "personalAvatar": <OrganizationAvatar
+ organization={
+ Object {
+ "key": "personal-org",
+ "name": "personal-org",
+ }
+ }
+ small={true}
+ />,
+ "personalName": <strong>
+ personal-org
+ </strong>,
+ }
+ }
+ />
+ </p>
+ }
+ finished={false}
+ keyReadOnly={true}
+ onContinue={[Function]}
+ onOpen={[Function]}
+ open={true}
+ organization={
+ Object {
+ "key": "personal-org",
+ "name": "personal-org",
+ }
+ }
+ submitText="onboarding.import_organization.bind"
+/>
+`;
+
exports[`should render prefilled and create org 1`] = `
<OrganizationDetailsStep
description={
className="huge-spacer-bottom"
>
<FormattedMessage
- defaultMessage="onboarding.create_organization.import_organization_x"
- id="onboarding.create_organization.import_organization_x"
+ defaultMessage="onboarding.import_organization_x"
+ id="onboarding.import_organization_x"
values={
Object {
"avatar": <img
"name": <strong>
name-foo
</strong>,
+ "personalAvatar": undefined,
+ "personalName": undefined,
}
}
/>
</p>
}
finished={false}
+ keyReadOnly={false}
onContinue={[Function]}
onOpen={[Function]}
open={true}
Object {
"key": "auto",
"node": <React.Fragment>
- onboarding.create_organization.import_organization.github
+ onboarding.import_organization.github
<span
className="beta-badge spacer-left"
>
Object {
"key": "auto",
"node": <React.Fragment>
- onboarding.create_organization.import_organization.github
+ onboarding.import_organization.github
<span
className="beta-badge spacer-left"
>
Object {
"key": "auto",
"node": <React.Fragment>
- onboarding.create_organization.import_organization.github
+ onboarding.import_organization.github
<span
className="beta-badge spacer-left"
>
interface Props {
initialValue?: string;
onChange: (value: string | undefined) => void;
+ readOnly?: boolean;
}
interface State {
this.mounted = true;
if (this.props.initialValue !== undefined) {
this.setState({ value: this.props.initialValue });
- this.validateKey(this.props.initialValue);
+ if (!this.props.readOnly) {
+ this.validateKey(this.props.initialValue);
+ }
}
}
isInvalid={isInvalid}
isValid={isValid}
label={translate('onboarding.create_organization.organization_name')}
- required={true}>
+ required={!this.props.readOnly}>
<div className="display-inline-flex-baseline">
<span className="little-spacer-right">
{getHostUrl().replace(/https*:\/\//, '') + '/organizations/'}
+ {this.props.readOnly && this.state.value}
</span>
- <input
- autoFocus={true}
- className={classNames('input-super-large', 'text-middle', {
- 'is-invalid': isInvalid,
- 'is-valid': isValid
- })}
- id="organization-key"
- maxLength={255}
- onBlur={this.handleBlur}
- onChange={this.handleChange}
- onFocus={this.handleFocus}
- type="text"
- value={this.state.value}
- />
+ {!this.props.readOnly && (
+ <input
+ autoFocus={true}
+ className={classNames('input-super-large', 'text-middle', {
+ 'is-invalid': isInvalid,
+ 'is-valid': isValid
+ })}
+ id="organization-key"
+ maxLength={255}
+ onBlur={this.handleBlur}
+ onChange={this.handleChange}
+ onFocus={this.handleFocus}
+ type="text"
+ value={this.state.value}
+ />
+ )}
</div>
</ValidationInput>
);
expect(wrapper.find('ValidationInput').prop('isValid')).toMatchSnapshot();
});
+it('should render correctly with readonly mode', () => {
+ const wrapper = shallow(
+ <OrganizationKeyInput initialValue="key" onChange={jest.fn()} readOnly={true} />
+ );
+ expect(wrapper).toMatchSnapshot();
+});
+
it('should not display any status when the key is not defined', async () => {
const wrapper = shallow(<OrganizationKeyInput onChange={jest.fn()} />);
await waitAndUpdate(wrapper);
`;
exports[`should render correctly 2`] = `true`;
+
+exports[`should render correctly with readonly mode 1`] = `
+<ValidationInput
+ id="organization-key"
+ isInvalid={false}
+ isValid={false}
+ label="onboarding.create_organization.organization_name"
+ required={false}
+>
+ <div
+ className="display-inline-flex-baseline"
+ >
+ <span
+ className="little-spacer-right"
+ >
+ localhost/organizations/
+ key
+ </span>
+ </div>
+</ValidationInput>
+`;
import DeferredSpinner from '../../../components/common/DeferredSpinner';
import Tabs from '../../../components/controls/Tabs';
import { whenLoggedIn } from '../../../components/hoc/whenLoggedIn';
-import { fetchMyOrganizations } from '../../account/organizations/actions';
-import { getMyOrganizations, Store } from '../../../store/rootReducer';
+import { withUserOrganizations } from '../../../components/hoc/withUserOrganizations';
import { skipOnboarding as skipOnboardingAction } from '../../../store/users';
import { LoggedInUser, AlmApplication, Organization } from '../../../app/types';
import { getAlmAppInfo } from '../../../api/alm-integration';
import { getProjectUrl } from '../../../helpers/urls';
import '../../../app/styles/sonarcloud.css';
-interface StateProps {
- userOrganizations: Organization[];
-}
-
interface Props {
currentUser: LoggedInUser;
- fetchMyOrganizations: () => Promise<void>;
skipOnboardingAction: () => void;
+ userOrganizations: Organization[];
}
interface State {
tab?: TabKeys;
}
-export class CreateProjectPage extends React.PureComponent<
- Props & StateProps & WithRouterProps,
- State
-> {
+export class CreateProjectPage extends React.PureComponent<Props & WithRouterProps, State> {
mounted = false;
state: State = { loading: true };
componentDidMount() {
this.mounted = true;
- this.props.fetchMyOrganizations();
if (hasAdvancedALMIntegration(this.props.currentUser)) {
this.fetchAlmApplication();
} else {
) : (
<AutoProjectCreate
almApplication={almApplication}
- boundOrganizations={userOrganizations.filter(o => o.almId)}
+ boundOrganizations={userOrganizations.filter(o => o.alm)}
onProjectCreate={this.handleProjectCreate}
organization={state.organization}
/>
}
}
-const mapDispatchToProps = {
- fetchMyOrganizations,
- skipOnboardingAction
-};
-
-const mapStateToProps = (state: Store) => {
- return {
- userOrganizations: getMyOrganizations(state)
- };
-};
+const mapDispatchToProps = { skipOnboardingAction };
export default whenLoggedIn(
- connect<StateProps>(
- mapStateToProps,
- mapDispatchToProps
- )(CreateProjectPage)
+ withUserOrganizations(
+ connect(
+ null,
+ mapDispatchToProps
+ )(CreateProjectPage)
+ )
);
export function optionRenderer(organization: Organization) {
return (
<span>
- {organization.almId && (
+ {organization.alm && (
<img
- alt={organization.almId}
+ alt={organization.alm.key}
className="spacer-right"
height={14}
- src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(organization.almId)}.svg`}
+ src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(organization.alm.key)}.svg`}
/>
)}
{organization.name}
<AutoProjectCreate
almApplication={almApplication}
boundOrganizations={[
- { almId: 'github', key: 'foo', name: 'Foo' },
- { almId: 'github', key: 'bar', name: 'Bar' }
+ { alm: { key: 'github', url: '' }, key: 'foo', name: 'Foo' },
+ { alm: { key: 'github', url: '' }, key: 'bar', name: 'Bar' }
]}
onProjectCreate={jest.fn()}
organization=""
<CreateProjectPage
addGlobalErrorMessage={jest.fn()}
currentUser={user}
- fetchMyOrganizations={jest.fn()}
// @ts-ignore avoid passing everything from WithRouterProps
location={{}}
router={mockRouter()}
skipOnboardingAction={jest.fn()}
userOrganizations={[
{ key: 'foo', name: 'Foo' },
- { almId: 'github', key: 'bar', name: 'Bar' }
+ { alm: { key: 'github', url: '' }, key: 'bar', name: 'Bar' }
]}
{...props}
/>
import { shallow } from 'enzyme';
import OrganizationSelect, { optionRenderer } from '../OrganizationSelect';
-const organizations = [{ key: 'foo', name: 'Foo' }, { almId: 'github', key: 'bar', name: 'Bar' }];
+const organizations = [
+ { key: 'foo', name: 'Foo' },
+ { alm: { key: 'github', url: '' }, key: 'bar', name: 'Bar' }
+];
it('should render correctly', () => {
expect(
organizations={
Array [
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "foo",
"name": "Foo",
},
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "bar",
"name": "Bar",
},
boundOrganizations={
Array [
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "bar",
"name": "Bar",
},
"name": "Foo",
},
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "bar",
"name": "Bar",
},
boundOrganizations={
Array [
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "bar",
"name": "Bar",
},
options={
Array [
Object {
- "almId": "github",
+ "alm": Object {
+ "key": "github",
+ "url": "",
+ },
"key": "bar",
"name": "Bar",
},
) : (
<span className="spacer-left">{organization.name}</span>
)}
- {organization.almRepoUrl && (
+ {organization.alm && (
<a
className="link-no-underline"
- href={organization.almRepoUrl}
+ href={organization.alm.url}
rel="noopener noreferrer"
target="_blank">
<img
- alt={sanitizeAlmId(organization.almId)}
+ alt={sanitizeAlmId(organization.alm.key)}
className="text-text-top spacer-left"
height={16}
- src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(organization.almId)}.svg`}
+ src={`${getBaseUrl()}/images/sonarcloud/${sanitizeAlmId(organization.alm.key)}.svg`}
width={16}
/>
</a>
shallow(
<OrganizationNavigationHeader
organization={{
- almId: 'github',
- almRepoUrl: 'https://github.com/foo',
+ alm: { key: 'github', url: 'https://github.com/foo' },
key: 'foo',
name: 'Foo',
projectVisibility: Visibility.Public
<OrganizationAvatar
organization={
Object {
- "almId": "github",
- "almRepoUrl": "https://github.com/foo",
+ "alm": Object {
+ "key": "github",
+ "url": "https://github.com/foo",
+ },
"key": "foo",
"name": "Foo",
"projectVisibility": "public",
const { component, currentUser } = this.props;
const { step, token } = this.state;
- const almId = component.almId || currentUser.externalProvider;
+ const almKey = (component.alm && component.alm.key) || currentUser.externalProvider;
return (
<>
<div className="page-header big-spacer-bottom">
<p className="page-description">{translate('onboarding.project_analysis.description')}</p>
</div>
- <AnalyzeTutorialSuggestion almId={almId} />
+ <AnalyzeTutorialSuggestion almKey={almKey} />
- {!isVSTS(almId) && (
+ {!isVSTS(almKey) && (
<>
<TokenStep
currentUser={currentUser}
import { getBaseUrl } from '../../../helpers/urls';
import { Alert } from '../../../components/ui/Alert';
-export default function AnalyzeTutorialSuggestion({ almId }: { almId?: string }) {
- if (isBitbucket(almId)) {
+export default function AnalyzeTutorialSuggestion({ almKey }: { almKey?: string }) {
+ if (isBitbucket(almKey)) {
return (
<Alert className="big-spacer-bottom" variant="info">
<p>{translate('onboarding.project_analysis.commands_for_analysis')}</p>
/>
</Alert>
);
- } else if (isGithub(almId)) {
+ } else if (isGithub(almKey)) {
return (
<Alert className="big-spacer-bottom" variant="info">
<p>{translate('onboarding.project_analysis.commands_for_analysis')} </p>
/>
</Alert>
);
- } else if (isVSTS(almId)) {
+ } else if (isVSTS(almKey)) {
return (
<Alert className="big-spacer-bottom" variant="info">
<FormattedMessage
import AnalyzeTutorialSuggestion from '../AnalyzeTutorialSuggestion';
it('should not render', () => {
- expect(shallow(<AnalyzeTutorialSuggestion almId={undefined} />).type()).toBeNull();
+ expect(shallow(<AnalyzeTutorialSuggestion almKey={undefined} />).type()).toBeNull();
});
it('renders bitbucket suggestions correctly', () => {
- expect(shallow(<AnalyzeTutorialSuggestion almId="bitbucket" />)).toMatchSnapshot();
+ expect(shallow(<AnalyzeTutorialSuggestion almKey="bitbucket" />)).toMatchSnapshot();
});
it('renders github suggestions correctly', () => {
- expect(shallow(<AnalyzeTutorialSuggestion almId="github" />)).toMatchSnapshot();
+ expect(shallow(<AnalyzeTutorialSuggestion almKey="github" />)).toMatchSnapshot();
});
it('renders vsts suggestions correctly', () => {
- expect(shallow(<AnalyzeTutorialSuggestion almId="microsoft" />)).toMatchSnapshot();
+ expect(shallow(<AnalyzeTutorialSuggestion almKey="microsoft" />)).toMatchSnapshot();
});
import * as React from 'react';
import { shallow, ShallowWrapper } from 'enzyme';
import { createStore } from 'redux';
-import { mockRouter } from '../../../helpers/testUtils';
import handleRequiredAuthentication from '../../../app/utils/handleRequiredAuthentication';
import { whenLoggedIn } from '../whenLoggedIn';
it('should not render for anonymous user', () => {
const store = createStore(state => state, { users: { currentUser: { isLoggedIn: false } } });
- const router = mockRouter({ replace: jest.fn() });
- const wrapper = shallow(<UnderTest />, { context: { store, router } });
+ const wrapper = shallow(<UnderTest />, { context: { store } });
expect(getRenderedType(wrapper)).toBe(null);
expect(handleRequiredAuthentication).toBeCalled();
});
function getRenderedType(wrapper: ShallowWrapper) {
return wrapper
- .dive()
.dive()
.dive()
.type();
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import * as React from 'react';
+import { shallow } from 'enzyme';
+import { createStore } from 'redux';
+import { Organization } from '../../../app/types';
+import { withUserOrganizations } from '../withUserOrganizations';
+
+jest.mock('../../../api/organizations', () => ({ getOrganizations: jest.fn() }));
+
+class X extends React.Component<{ userOrganizations: Organization[] }> {
+ render() {
+ return <div />;
+ }
+}
+
+const UnderTest = withUserOrganizations(X);
+
+// TODO Find a way to make this work, currently getting the following error : Actions must be plain objects. Use custom middleware for async actions.
+it.skip('should pass user organizations and logged in user', () => {
+ const org = { key: 'my-org', name: 'My Organization' };
+ const store = createStore(state => state, {
+ organizations: { byKey: { 'my-org': org }, my: ['my-org'] }
+ });
+ const wrapper = shallow(<UnderTest />, { context: { store } });
+ const wrappedComponent = wrapper
+ .dive()
+ .dive()
+ .dive();
+ expect(wrappedComponent.type()).toBe(X);
+ expect(wrappedComponent.prop('userOrganizations')).toEqual([org]);
+});
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import { withRouter, WithRouterProps } from 'react-router';
import { withCurrentUser } from './withCurrentUser';
import { CurrentUser } from '../../app/types';
import { isLoggedIn } from '../../helpers/users';
export function whenLoggedIn<P>(WrappedComponent: React.ComponentClass<P>) {
const wrappedDisplayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
- class Wrapper extends React.Component<P & { currentUser: CurrentUser } & WithRouterProps> {
+ class Wrapper extends React.Component<P & { currentUser: CurrentUser }> {
static displayName = `whenLoggedIn(${wrappedDisplayName})`;
componentDidMount() {
}
}
- return withCurrentUser(withRouter(Wrapper));
+ return withCurrentUser(Wrapper);
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { Store, getMyOrganizations } from '../../store/rootReducer';
+import { fetchMyOrganizations } from '../../apps/account/organizations/actions';
+import { Organization } from '../../app/types';
+
+export function withUserOrganizations<P>(
+ WrappedComponent: React.ComponentClass<
+ P & {
+ personalOrganization?: Organization;
+ userOrganizations: Organization[];
+ }
+ >
+) {
+ type Props = P & { fetchMyOrganizations: () => Promise<void>; userOrganizations: Organization[] };
+ const wrappedDisplayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
+
+ class Wrapper extends React.Component<Props> {
+ static displayName = `withUserOrganizations(${wrappedDisplayName})`;
+
+ componentDidMount() {
+ this.props.fetchMyOrganizations();
+ }
+
+ render() {
+ // @ts-ignore Rest operator not supported yet by TS for generics
+ const { fetchMyOrganizations, ...other } = this.props;
+ return <WrappedComponent {...other} />;
+ }
+ }
+
+ const mapDispatchToProps = { fetchMyOrganizations };
+
+ function mapStateToProps(state: Store) {
+ return { userOrganizations: getMyOrganizations(state) };
+ }
+
+ return connect(
+ mapStateToProps,
+ mapDispatchToProps
+ )(Wrapper);
+}
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { isBitbucket, isGithub, isVSTS, sanitizeAlmId } from '../almIntegrations';
+import { isBitbucket, isGithub, isPersonal, isVSTS, sanitizeAlmId } from '../almIntegrations';
it('#isBitbucket', () => {
expect(isBitbucket('bitbucket')).toBeTruthy();
expect(isVSTS('github')).toBeFalsy();
});
+it('#isPersonal', () => {
+ expect(isPersonal({ key: 'foo', name: 'Foo', type: 'USER' })).toBeTruthy();
+ expect(isPersonal({ key: 'foo', name: 'Foo', type: 'ORGANIZATION' })).toBeFalsy();
+});
+
it('#sanitizeAlmId', () => {
expect(sanitizeAlmId('bitbucketcloud')).toBe('bitbucket');
expect(sanitizeAlmId('bitbucket')).toBe('bitbucket');
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import { isLoggedIn } from './users';
-import { CurrentUser } from '../app/types';
+import { CurrentUser, AlmOrganization } from '../app/types';
export function hasAdvancedALMIntegration(user: CurrentUser) {
return (
);
}
-export function isBitbucket(almId?: string) {
- return almId && almId.startsWith('bitbucket');
+export function isBitbucket(almKey?: string) {
+ return almKey && almKey.startsWith('bitbucket');
}
-export function isGithub(almId?: string) {
- return almId === 'github';
+export function isGithub(almKey?: string) {
+ return almKey === 'github';
}
-export function isVSTS(almId?: string) {
- return almId === 'microsoft';
+export function isVSTS(almKey?: string) {
+ return almKey === 'microsoft';
}
-export function sanitizeAlmId(almId?: string) {
- if (isBitbucket(almId)) {
+export function isPersonal(organization?: AlmOrganization) {
+ return Boolean(organization && organization.type === 'USER');
+}
+
+export function sanitizeAlmId(almKey?: string) {
+ if (isBitbucket(almKey)) {
return 'bitbucket';
}
- return almId;
+ return almKey;
}
onboarding.create_organization.description=Description
onboarding.create_organization.enter_org_details=Enter your organization details
onboarding.create_organization.create_manually=Create manually
-onboarding.create_organization.import_organization.bitbucket=Import from BitBucket teams
-onboarding.create_organization.import_organization.github=Import from GitHub organizations
-onboarding.create_organization.import_organization_x=Import {avatar} {name} into SonarCloud organization
onboarding.create_organization.import_org_details=Import organization details
onboarding.create_organization.import_org_not_found=We were not able to find the requested organization, here are a few tips to help you troubleshoot the issue:
onboarding.create_organization.import_org_not_found.tips_1=You must be an administrator of the organization
onboarding.create_organization.enter_your_coupon=Enter your coupon
onboarding.create_organization.create_and_upgrade=Create Organization and Upgrade
onboarding.create_organization.ready=All set! Your organization is now ready to go
+onboarding.import_organization.bind=Bind Organization
+onboarding.import_organization.personal.page.header=Bind to your personal organization
+onboarding.import_organization.personal.page.description=An organization is a space where a team or a whole company can collaborate accross many projects.
+onboarding.import_organization.bitbucket=Import from BitBucket teams
+onboarding.import_organization.github=Import from GitHub organizations
+onboarding.import_organization_x=Import {avatar} {name} into SonarCloud organization
+onboarding.import_personal_organization_x=Bind {avatar} {name} with your personal SonarCloud organization {personalAvatar} {personalName}
+
onboarding.team.header=Join a team
onboarding.team.first_step=Well congrats, the first step is done!
projects / sonarqube.git / commitdiff