diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2018-10-15 11:55:35 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-11-16 20:21:03 +0100 |
| commit | f61d654f7d74036f50f2a1ca6b380a437ec911a2 (patch) | |
| tree | 9a89718368daa1b60d5547ef606fbd00ebca59fc /server/sonar-web/src/main/js/apps/tutorials | |
| parent | f8694e7d8b50651cba439fb5847ffde2d3bd013c (diff) | |
| download | sonarqube-f61d654f7d74036f50f2a1ca6b380a437ec911a2.tar.gz sonarqube-f61d654f7d74036f50f2a1ca6b380a437ec911a2.zip | |
SONAR-11321 Create organization from GitHub organization or BitBucket team
* Create api/alm_integration/show_organization and handle only GitHub installation
* Add import from ALM tab in Create Org page
* Do not show error while validating detail input
* Add step to create organization from ALM
* Display a warning if the installation id was not found
* Add Alm link to remote organization in org context
* Create GET api/alm_integration/show_app_info
Diffstat (limited to 'server/sonar-web/src/main/js/apps/tutorials')
| -rw-r--r-- | server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx | 3 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectOnboarding.tsx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx index b41edb8e99e..60a134428aa 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx @@ -26,8 +26,9 @@ import OnboardingProjectIcon from '../../../components/icons-components/Onboardi import OnboardingTeamIcon from '../../../components/icons-components/OnboardingTeamIcon'; import { Button, ResetButtonLink } from '../../../components/ui/buttons'; import { translate } from '../../../helpers/l10n'; -import { CurrentUser, isLoggedIn } from '../../../app/types'; +import { CurrentUser } from '../../../app/types'; import { getCurrentUser, Store } from '../../../store/rootReducer'; +import { isLoggedIn } from '../../../helpers/users'; import '../styles.css'; interface OwnProps { diff --git a/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectOnboarding.tsx b/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectOnboarding.tsx index 9068fb81f94..164f58ed467 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectOnboarding.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/projectOnboarding/ProjectOnboarding.tsx @@ -27,11 +27,12 @@ import OrganizationStep from '../components/OrganizationStep'; import TokenStep from '../components/TokenStep'; import handleRequiredAuthentication from '../../../app/utils/handleRequiredAuthentication'; import { getCurrentUser, areThereCustomOrganizations, Store } from '../../../store/rootReducer'; -import { CurrentUser, isLoggedIn } from '../../../app/types'; +import { CurrentUser } from '../../../app/types'; import { ResetButtonLink } from '../../../components/ui/buttons'; import { getProjectUrl } from '../../../helpers/urls'; import { translate, translateWithParameters } from '../../../helpers/l10n'; import { isSonarCloud } from '../../../helpers/system'; +import { isLoggedIn } from '../../../helpers/users'; import '../styles.css'; interface OwnProps { |