From 793e86fce66f356099792b7231c9a1d949ff875e Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 29 Aug 2017 11:38:53 +0200 Subject: update prettier --- server/sonar-web/src/main/js/api/auth.ts | 5 +- .../main/js/app/components/ComponentContainer.tsx | 5 +- .../app/components/ComponentContainerNotFound.tsx | 8 +- .../src/main/js/app/components/GlobalFooter.js | 27 +-- .../components/GlobalFooterForSonarQubeDotCom.js | 24 +-- .../src/main/js/app/components/MarkdownHelp.js | 8 +- .../extensions/OrganizationPageExtension.js | 16 +- .../extensions/ProjectAdminPageExtension.js | 8 +- .../components/extensions/ProjectPageExtension.tsx | 8 +- .../src/main/js/app/components/help/GlobalHelp.js | 30 ++-- .../src/main/js/app/components/help/LinksHelp.js | 8 +- .../js/app/components/help/LinksHelpSonarCloud.js | 24 +-- .../main/js/app/components/help/ShortcutsHelp.js | 16 +- .../main/js/app/components/help/TutorialsHelp.js | 4 +- .../app/components/nav/component/ComponentNav.tsx | 5 +- .../nav/component/ComponentNavBranch.tsx | 56 +++--- .../nav/component/ComponentNavBranchesMenu.tsx | 22 +-- .../nav/component/ComponentNavBranchesMenuItem.tsx | 7 +- .../nav/component/ComponentNavBreadcrumbs.js | 22 +-- .../components/nav/component/ComponentNavMenu.tsx | 12 +- .../components/nav/component/ComponentNavMeta.tsx | 19 +- .../components/nav/component/IncrementalBadge.tsx | 4 +- .../nav/component/NoBranchSupportPopup.tsx | 8 +- .../nav/component/SingleBranchHelperPopup.tsx | 4 +- .../main/js/app/components/nav/global/GlobalNav.js | 28 +-- .../js/app/components/nav/global/GlobalNavMenu.js | 8 +- .../js/app/components/nav/global/GlobalNavUser.js | 29 ++-- .../js/app/components/nav/settings/SettingsNav.js | 24 +-- .../src/main/js/app/components/search/Search.js | 20 ++- .../main/js/app/components/search/SearchResult.js | 32 ++-- .../main/js/app/components/search/SearchResults.js | 10 +- .../js/app/components/search/SearchShowMore.js | 4 +- .../search/__tests__/SearchResults-test.js | 10 +- .../src/main/js/app/styles/boxed-group.css | 2 +- .../src/main/js/app/utils/startAjaxMonitoring.js | 4 +- .../src/main/js/app/utils/startReactApp.js | 8 +- .../src/main/js/apps/about/components/AboutApp.js | 14 +- .../about/components/AboutAppForSonarQubeDotCom.js | 5 +- .../js/apps/about/components/AboutCleanCode.js | 8 +- .../js/apps/about/components/AboutLanguages.js | 23 +-- .../js/apps/about/components/AboutLeakPeriod.js | 8 +- .../main/js/apps/about/components/AboutProjects.js | 9 +- .../js/apps/about/components/AboutQualityGates.js | 8 +- .../js/apps/about/components/AboutQualityModel.js | 4 +- .../AboutQualityModelForSonarQubeDotCom.js | 4 +- .../main/js/apps/about/components/AboutScanners.js | 12 +- .../js/apps/about/components/AboutStandards.js | 8 +- .../js/apps/about/components/EntryIssueTypes.js | 5 +- .../EntryIssueTypesForSonarQubeDotCom.js | 5 +- .../src/main/js/apps/about/components/ReadMore.js | 4 +- .../sonar-web/src/main/js/apps/account/account.css | 2 +- .../src/main/js/apps/account/components/Nav.js | 10 +- .../main/js/apps/account/components/Password.js | 15 +- .../account/notifications/GlobalNotifications.js | 12 +- .../js/apps/account/notifications/Notifications.js | 4 +- .../account/notifications/NotificationsList.js | 12 +- .../account/notifications/ProjectNotifications.js | 12 +- .../main/js/apps/account/notifications/Projects.js | 17 +- .../organizations/CreateOrganizationForm.js | 25 +-- .../apps/account/organizations/OrganizationCard.js | 25 ++- .../account/organizations/OrganizationsList.js | 4 +- .../account/organizations/UserOrganizations.js | 33 ++-- .../src/main/js/apps/account/profile/Profile.js | 10 +- .../src/main/js/apps/account/profile/UserGroups.js | 8 +- .../js/apps/account/profile/UserScmAccounts.js | 13 +- .../main/js/apps/account/projects/ProjectCard.tsx | 62 ++++--- .../src/main/js/apps/account/projects/Projects.tsx | 26 +-- .../account/projects/__tests__/ProjectCard-test.js | 14 +- .../background-tasks/components/CurrentsFilter.tsx | 4 +- .../js/apps/background-tasks/components/Header.js | 13 +- .../background-tasks/components/ScannerContext.tsx | 10 +- .../js/apps/background-tasks/components/Search.js | 10 +- .../background-tasks/components/Stacktrace.tsx | 32 ++-- .../js/apps/background-tasks/components/Stats.js | 8 +- .../background-tasks/components/TaskActions.tsx | 25 +-- .../background-tasks/components/TaskComponent.tsx | 19 +- .../components/TaskExecutionTime.tsx | 6 +- .../js/apps/background-tasks/components/TaskId.tsx | 4 +- .../background-tasks/components/TaskStatus.tsx | 18 +- .../js/apps/background-tasks/components/Tasks.js | 32 +--- .../js/apps/background-tasks/components/Workers.js | 37 ++-- .../background-tasks/components/WorkersForm.js | 4 +- server/sonar-web/src/main/js/apps/code/code.css | 2 +- .../src/main/js/apps/code/components/App.tsx | 25 +-- .../main/js/apps/code/components/Breadcrumbs.tsx | 4 +- .../src/main/js/apps/code/components/Component.tsx | 8 +- .../main/js/apps/code/components/ComponentName.tsx | 24 +-- .../main/js/apps/code/components/Components.tsx | 33 ++-- .../js/apps/code/components/ComponentsEmpty.tsx | 4 +- .../js/apps/code/components/ComponentsHeader.tsx | 4 +- .../src/main/js/apps/code/components/Search.tsx | 9 +- server/sonar-web/src/main/js/apps/code/utils.ts | 10 +- .../coding-rules/facets/quality-profile-facet.js | 8 +- .../js/apps/coding-rules/facets/template-facet.js | 4 +- .../coding-rules/rule/profile-activation-view.js | 5 +- .../js/apps/component-measures/components/App.js | 10 +- .../component-measures/components/Breadcrumb.js | 26 +-- .../component-measures/components/Breadcrumbs.js | 4 +- .../component-measures/components/FilesCounter.js | 5 +- .../components/LeakPeriodLegend.js | 6 +- .../components/MeasureContent.js | 20 ++- .../component-measures/components/MeasureHeader.js | 42 +++-- .../components/MeasureOverview.js | 10 +- .../components/MetricNotFound.js | 4 +- .../component-measures/components/PageActions.js | 5 +- .../component-measures/drilldown/BubbleChart.js | 15 +- .../component-measures/drilldown/ComponentCell.js | 41 +++-- .../component-measures/drilldown/ComponentsList.js | 21 +-- .../drilldown/ComponentsListRow.js | 4 +- .../component-measures/drilldown/EmptyResult.js | 6 +- .../apps/component-measures/drilldown/FilesView.js | 5 +- .../component-measures/drilldown/TreeMapView.js | 18 +- .../apps/component-measures/sidebar/DomainFacet.js | 49 +++--- .../sidebar/ProjectOverviewFacet.js | 4 +- .../js/apps/component-measures/sidebar/Sidebar.js | 4 +- .../src/main/js/apps/issues/components/App.js | 147 ++++++++-------- .../js/apps/issues/components/BulkChangeModal.js | 78 ++++----- .../issues/components/ComponentBreadcrumbs.tsx | 21 +-- .../js/apps/issues/components/FiltersHeader.js | 9 +- .../js/apps/issues/components/IssuesCounter.js | 10 +- .../main/js/apps/issues/components/IssuesList.js | 4 +- .../src/main/js/apps/issues/components/ListItem.js | 5 +- .../main/js/apps/issues/components/PageActions.js | 5 +- .../issues/conciseIssuesList/ConciseIssueBox.js | 5 +- .../conciseIssuesList/ConciseIssueComponent.js | 7 +- .../conciseIssuesList/ConciseIssueLocations.js | 16 +- .../ConciseIssueLocationsNavigator.js | 4 +- .../ConciseIssueLocationsNavigatorLocation.js | 8 +- .../issues/conciseIssuesList/ConciseIssuesList.js | 4 +- .../conciseIssuesList/ConciseIssuesListHeader.js | 8 +- .../main/js/apps/issues/sidebar/AssigneeFacet.js | 9 +- .../src/main/js/apps/issues/sidebar/AuthorFacet.js | 4 +- .../js/apps/issues/sidebar/CreationDateFacet.js | 36 ++-- .../main/js/apps/issues/sidebar/DirectoryFacet.js | 4 +- .../src/main/js/apps/issues/sidebar/FacetMode.js | 4 +- .../src/main/js/apps/issues/sidebar/FileFacet.js | 4 +- .../main/js/apps/issues/sidebar/LanguageFacet.js | 4 +- .../src/main/js/apps/issues/sidebar/ModuleFacet.js | 4 +- .../main/js/apps/issues/sidebar/ProjectFacet.js | 32 ++-- .../main/js/apps/issues/sidebar/ResolutionFacet.js | 5 +- .../src/main/js/apps/issues/sidebar/RuleFacet.js | 4 +- .../main/js/apps/issues/sidebar/SeverityFacet.js | 5 +- .../src/main/js/apps/issues/sidebar/Sidebar.js | 30 ++-- .../src/main/js/apps/issues/sidebar/StatusFacet.js | 5 +- .../src/main/js/apps/issues/sidebar/TagFacet.js | 4 +- .../src/main/js/apps/issues/sidebar/TypeFacet.js | 5 +- .../issues/sidebar/__tests__/AssigneeFacet-test.js | 5 +- .../apps/organizations/components/MembersList.js | 4 +- .../organizations/components/MembersListHeader.js | 5 +- .../organizations/components/MembersListItem.js | 18 +- .../organizations/components/OrganizationDelete.js | 38 ++-- .../organizations/components/OrganizationEdit.js | 21 +-- .../components/OrganizationMembers.js | 10 +- .../components/forms/AddMemberForm.js | 8 +- .../components/forms/ManageMemberGroupsForm.js | 17 +- .../components/forms/RemoveMemberForm.js | 4 +- .../navigation/OrganizationNavigation.js | 28 +-- .../components/ApplicationLeakPeriodLegend.js | 20 ++- .../js/apps/overview/components/EmptyOverview.js | 12 +- .../apps/overview/components/LeakPeriodLegend.js | 10 +- .../js/apps/overview/components/OverviewApp.js | 8 +- .../main/js/apps/overview/events/AnalysesList.js | 14 +- .../src/main/js/apps/overview/events/Analysis.js | 14 +- .../src/main/js/apps/overview/events/Event.js | 22 +-- .../main/js/apps/overview/events/PreviewGraph.js | 12 +- .../apps/overview/main/BugsAndVulnerabilities.js | 20 +-- .../src/main/js/apps/overview/main/CodeSmells.js | 16 +- .../src/main/js/apps/overview/main/Coverage.js | 70 ++++---- .../src/main/js/apps/overview/main/Duplications.js | 70 ++++---- .../src/main/js/apps/overview/main/enhance.js | 17 +- .../src/main/js/apps/overview/meta/Meta.js | 22 +-- .../src/main/js/apps/overview/meta/MetaKey.js | 4 +- .../src/main/js/apps/overview/meta/MetaLink.js | 13 +- .../js/apps/overview/meta/MetaOrganizationKey.js | 4 +- .../main/js/apps/overview/meta/MetaQualityGate.js | 15 +- .../js/apps/overview/meta/MetaQualityProfiles.js | 22 +-- .../src/main/js/apps/overview/meta/MetaSize.js | 53 +++--- .../src/main/js/apps/overview/meta/MetaTags.js | 5 +- .../overview/qualityGate/ApplicationQualityGate.js | 9 +- .../qualityGate/ApplicationQualityGateProject.js | 4 +- .../apps/overview/qualityGate/EmptyQualityGate.js | 4 +- .../js/apps/overview/qualityGate/QualityGate.js | 5 +- .../overview/qualityGate/QualityGateCondition.js | 31 ++-- .../overview/qualityGate/QualityGateConditions.js | 4 +- .../permission-templates/components/ActionsCell.js | 20 +-- .../apps/permission-templates/components/Header.js | 12 +- .../apps/permission-templates/components/List.js | 8 +- .../permission-templates/components/ListHeader.js | 20 ++- .../permission-templates/components/ListItem.js | 4 +- .../permission-templates/components/NameCell.js | 19 +- .../components/PermissionCell.js | 13 +- .../components/TemplateDetails.js | 17 +- .../components/TemplateHeader.js | 4 +- .../permissions/global/components/PageHeader.js | 8 +- .../js/apps/permissions/project/components/App.js | 15 +- .../permissions/project/components/PageHeader.js | 18 +- .../project/components/PublicProjectDisclaimer.js | 4 +- .../permissions/shared/components/GroupHolder.js | 16 +- .../permissions/shared/components/HoldersList.js | 36 ++-- .../permissions/shared/components/PageError.js | 6 +- .../permissions/shared/components/SearchForm.js | 9 +- .../permissions/shared/components/UserHolder.js | 36 ++-- .../main/js/apps/project-admin/deletion/Form.js | 9 +- .../main/js/apps/project-admin/deletion/Header.js | 8 +- .../main/js/apps/project-admin/key/BulkUpdate.js | 9 +- .../js/apps/project-admin/key/BulkUpdateForm.js | 8 +- .../js/apps/project-admin/key/BulkUpdateResults.js | 46 ++--- .../js/apps/project-admin/key/FineGrainedUpdate.js | 4 +- .../src/main/js/apps/project-admin/key/Header.js | 8 +- .../src/main/js/apps/project-admin/key/Key.js | 15 +- .../src/main/js/apps/project-admin/links/Header.js | 8 +- .../main/js/apps/project-admin/links/LinkRow.js | 20 +-- .../src/main/js/apps/project-admin/links/Table.js | 16 +- .../project-admin/links/views/CreationModal.js | 11 +- .../js/apps/projectActivity/components/Event.js | 25 +-- .../js/apps/projectActivity/components/Events.js | 4 +- .../projectActivity/components/GraphHistory.js | 18 +- .../projectActivity/components/GraphsHistory.js | 4 +- .../components/GraphsLegendCustom.js | 4 +- .../components/GraphsLegendItem.tsx | 23 +-- .../components/GraphsLegendStatic.js | 4 +- .../projectActivity/components/GraphsTooltips.js | 19 +- .../components/GraphsTooltipsContent.js | 8 +- .../components/GraphsTooltipsContentCoverage.js | 23 ++- .../components/GraphsTooltipsContentDuplication.js | 9 +- .../components/GraphsTooltipsContentEvents.js | 13 +- .../components/GraphsTooltipsContentIssues.js | 8 +- .../apps/projectActivity/components/GraphsZoom.js | 5 +- .../components/ProjectActivityAnalysesList.js | 36 ++-- .../components/ProjectActivityAnalysis.js | 20 ++- .../components/ProjectActivityEventSelectOption.js | 4 +- .../components/ProjectActivityEventSelectValue.js | 4 +- .../components/ProjectActivityGraphsHeader.js | 5 +- .../components/__tests__/GraphsHistory-test.js | 10 +- .../components/forms/AddEventForm.js | 28 ++- .../components/forms/AddGraphMetric.js | 28 ++- .../components/forms/ChangeEventForm.js | 28 ++- .../components/forms/RemoveAnalysisForm.js | 30 ++-- .../components/forms/RemoveEventForm.js | 30 ++-- .../projectActivity/components/projectActivity.css | 2 +- .../src/main/js/apps/projectActivity/utils.js | 4 +- .../js/apps/projectBranches/components/App.tsx | 20 +-- .../apps/projectBranches/components/BranchRow.tsx | 47 +++-- .../components/DeleteBranchModal.tsx | 4 +- .../components/RenameBranchModal.tsx | 4 +- .../src/main/js/apps/projectQualityGate/App.tsx | 8 +- .../src/main/js/apps/projectQualityGate/Form.tsx | 10 +- .../src/main/js/apps/projectQualityGate/Header.tsx | 8 +- .../main/js/apps/projectQualityProfiles/App.tsx | 13 +- .../main/js/apps/projectQualityProfiles/Header.tsx | 4 +- .../js/apps/projectQualityProfiles/ProfileRow.tsx | 22 +-- .../main/js/apps/projectQualityProfiles/Table.tsx | 16 +- .../projectQualityProfiles/__tests__/App-test.tsx | 5 +- .../js/apps/projects/components/AllProjects.js | 52 +++--- .../src/main/js/apps/projects/components/App.tsx | 6 +- .../js/apps/projects/components/EmptyInstance.js | 4 +- .../apps/projects/components/NoFavoriteProjects.js | 8 +- .../main/js/apps/projects/components/PageHeader.js | 5 +- .../js/apps/projects/components/PageSidebar.js | 9 +- .../apps/projects/components/PerspectiveSelect.js | 4 +- .../projects/components/ProjectCardLanguages.js | 8 +- .../js/apps/projects/components/ProjectCardLeak.js | 63 ++++--- .../projects/components/ProjectCardLeakMeasures.js | 8 +- .../apps/projects/components/ProjectCardOverall.js | 42 ++--- .../components/ProjectCardOverallMeasures.js | 27 ++- .../js/apps/projects/components/ProjectsList.js | 22 +-- .../projects/components/ProjectsSortingSelect.js | 12 +- .../components/__tests__/ProjectCardLeak-test.js | 8 +- .../__tests__/ProjectCardOverall-test.js | 10 +- .../js/apps/projects/filters/CoverageFilter.js | 15 +- .../js/apps/projects/filters/DuplicationsFilter.js | 15 +- .../src/main/js/apps/projects/filters/Filter.js | 11 +- .../main/js/apps/projects/filters/IssuesFilter.js | 5 +- .../js/apps/projects/filters/LanguagesFilter.js | 5 +- .../js/apps/projects/filters/NewLinesFilter.js | 6 +- .../main/js/apps/projects/filters/SearchFilter.js | 7 +- .../projects/filters/SearchableFilterOption.js | 6 +- .../main/js/apps/projects/filters/SizeFilter.js | 4 +- .../sonar-web/src/main/js/apps/projects/styles.css | 8 +- .../projects/visualizations/SimpleBubbleChart.js | 5 +- .../apps/projects/visualizations/Visualizations.js | 15 +- .../src/main/js/apps/projectsManagement/App.tsx | 5 +- .../projectsManagement/BulkApplyTemplateModal.tsx | 48 +++--- .../projectsManagement/ChangeVisibilityForm.tsx | 64 +++---- .../apps/projectsManagement/CreateProjectForm.tsx | 191 ++++++++++----------- .../js/apps/projectsManagement/DeleteModal.tsx | 23 +-- .../src/main/js/apps/projectsManagement/Header.tsx | 18 +- .../main/js/apps/projectsManagement/ProjectRow.tsx | 12 +- .../main/js/apps/projectsManagement/Projects.tsx | 4 +- .../src/main/js/apps/projectsManagement/Search.tsx | 47 ++--- .../projectsManagement/__tests__/Projects-test.tsx | 15 +- .../js/apps/quality-gates/components/Condition.js | 124 +++++++------ .../js/apps/quality-gates/components/Conditions.js | 98 +++++------ .../quality-gates/components/ConditionsAlert.js | 10 +- .../quality-gates/components/DetailsContent.js | 4 +- .../apps/quality-gates/components/DetailsHeader.js | 17 +- .../main/js/apps/quality-gates/components/Intro.js | 8 +- .../main/js/apps/quality-gates/components/List.js | 15 +- .../js/apps/quality-gates/components/ListHeader.js | 9 +- .../apps/quality-profiles/changelog/Changelog.tsx | 38 ++-- .../changelog/ChangelogContainer.tsx | 10 +- .../quality-profiles/changelog/ChangelogEmpty.tsx | 6 +- .../quality-profiles/changelog/ChangesList.tsx | 12 +- .../compare/ComparisonContainer.tsx | 11 +- .../quality-profiles/compare/ComparisonEmpty.tsx | 6 +- .../quality-profiles/compare/ComparisonForm.tsx | 4 +- .../quality-profiles/compare/ComparisonResults.tsx | 32 ++-- .../compare/__tests__/ComparisonResults-test.tsx | 35 +++- .../quality-profiles/components/BuiltInBadge.tsx | 6 +- .../components/CopyProfileForm.tsx | 4 +- .../components/DeleteProfileForm.tsx | 36 ++-- .../quality-profiles/components/ProfileActions.tsx | 51 +++--- .../quality-profiles/components/ProfileDate.tsx | 18 +- .../components/ProfileNotFound.tsx | 4 +- .../components/RenameProfileForm.tsx | 4 +- .../quality-profiles/details/ChangeParentForm.tsx | 12 +- .../details/ChangeProjectsForm.tsx | 4 +- .../quality-profiles/details/ProfileExporters.tsx | 8 +- .../quality-profiles/details/ProfileHeader.tsx | 33 +--- .../details/ProfileInheritance.tsx | 32 ++-- .../details/ProfileInheritanceBox.tsx | 32 ++-- .../quality-profiles/details/ProfileProjects.tsx | 28 ++- .../apps/quality-profiles/details/ProfileRules.tsx | 31 ++-- .../details/ProfileRulesRowOfType.tsx | 19 +- .../details/ProfileRulesRowTotal.tsx | 27 ++- .../quality-profiles/home/CreateProfileForm.tsx | 115 +++++++------ .../quality-profiles/home/EvolutionDeprecated.tsx | 8 +- .../apps/quality-profiles/home/EvolutionRules.tsx | 38 ++-- .../quality-profiles/home/EvolutionStagnant.tsx | 18 +- .../js/apps/quality-profiles/home/PageHeader.tsx | 19 +- .../js/apps/quality-profiles/home/ProfilesList.tsx | 31 ++-- .../quality-profiles/home/ProfilesListHeader.tsx | 4 +- .../apps/quality-profiles/home/ProfilesListRow.tsx | 42 ++--- .../quality-profiles/home/RestoreProfileForm.tsx | 86 +++++----- .../src/main/js/apps/quality-profiles/routes.ts | 20 ++- .../main/js/apps/sessions/components/LoginForm.js | 117 ++++++------- .../js/apps/sessions/components/OAuthProviders.js | 4 +- .../sessions/components/SimpleSessionsContainer.js | 6 +- .../js/apps/sessions/components/Unauthorized.tsx | 5 +- .../src/main/js/apps/settings/components/App.js | 45 ++--- .../js/apps/settings/components/CategoriesList.js | 6 +- .../main/js/apps/settings/components/Definition.js | 25 +-- .../apps/settings/components/DefinitionDefaults.js | 26 ++- .../js/apps/settings/components/DefinitionsList.js | 4 +- .../main/js/apps/settings/components/EmailForm.js | 18 +- .../main/js/apps/settings/components/PageHeader.js | 8 +- .../components/SubCategoryDefinitionsList.js | 13 +- .../settings/components/inputs/InputForBoolean.js | 5 +- .../settings/components/inputs/InputForPassword.js | 4 +- .../settings/components/inputs/MultiValueInput.js | 5 +- .../settings/components/inputs/PropertySetInput.js | 20 +-- .../inputs/__tests__/MultiValueInput-test.js | 10 +- .../js/apps/settings/encryption/EncryptionApp.js | 14 +- .../js/apps/settings/encryption/EncryptionForm.js | 5 +- .../settings/encryption/GenerateSecretKeyForm.js | 99 +++++------ .../js/apps/settings/licenses/LicenseChangeForm.js | 17 +- .../main/js/apps/settings/licenses/LicenseRow.js | 17 +- .../js/apps/settings/licenses/LicensesAppHeader.js | 4 +- .../main/js/apps/settings/licenses/LicensesList.js | 24 +-- .../licenses/__tests__/LicensesList-test.js | 14 +- .../main/js/apps/settings/serverId/ServerIdApp.js | 24 ++- .../main/js/apps/system/__tests__/system-test.js | 14 +- .../src/main/js/apps/system/item-log-level.js | 14 +- .../src/main/js/apps/system/item-object.js | 8 +- .../src/main/js/apps/system/item-value.js | 6 +- server/sonar-web/src/main/js/apps/system/main.js | 8 +- .../sonar-web/src/main/js/apps/system/section.js | 8 +- .../js/apps/tutorials/onboarding/AnalysisStep.js | 31 ++-- .../js/apps/tutorials/onboarding/LanguageStep.js | 36 ++-- .../tutorials/onboarding/NewOrganizationForm.js | 82 +++++---- .../js/apps/tutorials/onboarding/NewProjectForm.js | 70 ++++---- .../js/apps/tutorials/onboarding/Onboarding.js | 49 +++--- .../apps/tutorials/onboarding/OrganizationStep.js | 65 +++---- .../js/apps/tutorials/onboarding/ProjectKeyStep.js | 70 ++++---- .../src/main/js/apps/tutorials/onboarding/Step.js | 8 +- .../main/js/apps/tutorials/onboarding/TokenStep.js | 81 +++++---- .../onboarding/__tests__/LanguageStep-test.js | 30 +++- .../apps/tutorials/onboarding/commands/Command.js | 16 +- .../tutorials/onboarding/commands/JavaGradle.js | 4 +- .../tutorials/onboarding/commands/JavaMaven.js | 8 +- .../onboarding/commands/MSBuildScanner.js | 4 +- .../src/main/js/apps/update-center/plugins.js | 16 +- .../users/components/UsersSelectSearchOption.js | 8 +- .../users/components/UsersSelectSearchValue.js | 13 +- .../__tests__/UsersSelectSearchOption-test.js | 8 +- .../__tests__/UsersSelectSearchValue-test.js | 8 +- .../sonar-web/src/main/js/apps/users/form-view.js | 6 +- .../src/main/js/apps/web-api/components/Action.tsx | 38 ++-- .../js/apps/web-api/components/ActionChangelog.tsx | 8 +- .../js/apps/web-api/components/DeprecatedBadge.tsx | 4 +- .../src/main/js/apps/web-api/components/Domain.tsx | 23 +-- .../js/apps/web-api/components/InternalBadge.tsx | 4 +- .../src/main/js/apps/web-api/components/Menu.tsx | 9 +- .../src/main/js/apps/web-api/components/Params.tsx | 95 +++++----- .../js/apps/web-api/components/ResponseExample.tsx | 5 +- .../main/js/apps/web-api/components/WebApiApp.tsx | 9 +- .../src/main/js/components/SelectList/index.js | 14 +- .../js/components/SourceViewer/SourceViewerBase.js | 10 +- .../js/components/SourceViewer/SourceViewerCode.js | 62 ++++--- .../components/SourceViewer/SourceViewerHeader.js | 35 ++-- .../js/components/SourceViewer/components/Line.js | 24 +-- .../components/SourceViewer/components/LineCode.js | 14 +- .../SourceViewer/components/LineCoverage.js | 14 +- .../components/LineDuplicationBlock.js | 12 +- .../SourceViewer/components/LineDuplications.js | 12 +- .../SourceViewer/components/LineIssuesIndicator.js | 5 +- .../SourceViewer/components/LineIssuesList.js | 4 +- .../components/SourceViewer/components/LineSCM.js | 5 +- .../SourceViewer/views/measures-overlay.js | 23 ++- .../main/js/components/charts/AdvancedTimeline.js | 34 ++-- .../src/main/js/components/charts/BubbleChart.js | 50 ++---- .../main/js/components/charts/ColorBoxLegend.js | 9 +- .../js/components/charts/ColorGradientLegend.js | 13 +- .../js/components/charts/ColorRatingsLegend.js | 4 +- .../src/main/js/components/charts/TreeMap.js | 8 +- .../src/main/js/components/charts/TreeMapRect.js | 15 +- .../src/main/js/components/charts/ZoomTimeLine.js | 36 ++-- .../src/main/js/components/charts/bar-chart.js | 22 +-- .../src/main/js/components/charts/donut-chart.js | 12 +- .../src/main/js/components/charts/histogram.js | 22 +-- .../src/main/js/components/charts/line-chart.js | 24 +-- .../src/main/js/components/charts/word-cloud.js | 12 +- .../src/main/js/components/common/BranchStatus.tsx | 20 +-- .../js/components/common/BubblePopupHelper.tsx | 5 +- .../main/js/components/common/DeferredSpinner.js | 8 +- .../src/main/js/components/common/EmptySearch.js | 13 +- .../main/js/components/common/LocationMessage.css | 2 +- .../src/main/js/components/common/MarkdownTips.js | 12 +- .../src/main/js/components/common/MultiSelect.js | 13 +- .../src/main/js/components/common/SelectList.js | 4 +- .../js/components/common/UpgradeOrganizationBox.js | 13 +- .../js/components/common/VisibilitySelector.tsx | 54 +++--- .../components/common/__tests__/SelectList-test.js | 8 +- .../js/components/common/action-options-view.js | 16 +- .../src/main/js/components/common/modal-form.js | 5 +- .../src/main/js/components/controls/DateInput.tsx | 5 +- .../main/js/components/controls/GlobalMessages.js | 6 +- .../main/js/components/controls/RadioToggle.tsx | 10 +- .../main/js/components/controls/SearchSelect.js | 8 +- .../src/main/js/components/controls/styles.css | 2 +- .../src/main/js/components/facet/FacetBox.js | 6 +- .../src/main/js/components/facet/FacetHeader.js | 55 +++--- .../src/main/js/components/facet/FacetItem.js | 30 ++-- .../src/main/js/components/facet/FacetItemsList.js | 6 +- .../js/components/icons-components/BranchIcon.tsx | 8 +- .../components/icons-components/QualifierIcon.js | 48 ++++-- .../js/components/intl/DateTooltipFormatter.tsx | 5 +- .../js/components/intl/TimeTooltipFormatter.tsx | 5 +- .../src/main/js/components/issue/IssueView.js | 14 +- .../components/issue/components/IssueActionsBar.js | 10 +- .../js/components/issue/components/IssueAssign.js | 5 +- .../issue/components/IssueChangelogDiff.js | 6 +- .../issue/components/IssueCommentAction.js | 4 +- .../issue/components/IssueCommentLine.js | 10 +- .../components/issue/components/IssueTitleBar.js | 31 ++-- .../components/__tests__/IssueTitleBar-test.js | 7 +- .../js/components/issue/popups/ChangelogPopup.js | 9 +- .../components/issue/popups/CommentDeletePopup.js | 4 +- .../js/components/issue/popups/SetAssigneePopup.js | 9 +- .../js/components/issue/popups/SetSeverityPopup.js | 4 +- .../js/components/issue/popups/SetTypePopup.js | 4 +- .../components/issue/popups/SimilarIssuesPopup.js | 51 +++--- .../src/main/js/components/measure/Measure.js | 10 +- .../src/main/js/components/nav/NavBar.css | 4 +- .../src/main/js/components/nav/NavBar.tsx | 4 +- .../src/main/js/components/select-list/list.js | 6 +- .../src/main/js/components/shared/Organization.js | 12 +- .../src/main/js/components/shared/TypeHelper.js | 5 +- .../src/main/js/components/tags/TagsList.js | 4 +- .../main/js/components/ui/DuplicationsRating.css | 2 +- .../src/main/js/components/ui/IssueTypeIcon.tsx | 6 +- .../sonar-web/src/main/js/components/ui/Level.tsx | 6 +- .../sonar-web/src/main/js/components/ui/Rating.js | 6 +- .../src/main/js/components/ui/SizeRating.js | 6 +- .../src/main/js/components/widgets/barchart.js | 4 +- .../workspace/views/viewer-header-view.js | 8 +- server/sonar-web/src/main/js/helpers/measures.js | 5 +- server/sonar-web/src/main/js/helpers/request.ts | 30 +++- .../src/main/less/components/bubble-popup.less | 2 +- .../src/main/less/components/columns.less | 4 +- .../src/main/less/components/dropdowns.less | 2 +- .../sonar-web/src/main/less/components/issues.less | 2 +- .../sonar-web/src/main/less/components/modals.less | 22 +-- .../sonar-web/src/main/less/components/page.less | 14 +- .../src/main/less/components/react-select.less | 16 +- .../sonar-web/src/main/less/components/rules.less | 4 +- .../src/main/less/components/search-navigator.less | 8 +- .../sonar-web/src/main/less/components/source.less | 12 +- .../src/main/less/components/workspace.less | 6 +- server/sonar-web/src/main/less/init/forms.less | 46 ++--- server/sonar-web/src/main/less/init/icons.less | 172 +++++++++---------- server/sonar-web/src/main/less/init/links.less | 3 +- server/sonar-web/src/main/less/init/misc.less | 4 +- server/sonar-web/src/main/less/init/tables.less | 2 +- server/sonar-web/src/main/less/init/type.less | 6 +- server/sonar-web/src/main/less/pages/login.less | 2 +- 496 files changed, 4099 insertions(+), 4510 deletions(-) (limited to 'server/sonar-web/src/main') diff --git a/server/sonar-web/src/main/js/api/auth.ts b/server/sonar-web/src/main/js/api/auth.ts index 0c95f699127..ebe74afa014 100644 --- a/server/sonar-web/src/main/js/api/auth.ts +++ b/server/sonar-web/src/main/js/api/auth.ts @@ -28,7 +28,10 @@ export function login(login: string, password: string): Promise { } export function logout(): Promise { - return request('/api/authentication/logout').setMethod('POST').submit().then(basicCheckStatus); + return request('/api/authentication/logout') + .setMethod('POST') + .submit() + .then(basicCheckStatus); } function basicCheckStatus(response: Response): Promise { diff --git a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx index 8aea4c958d8..99bd095c9e8 100644 --- a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx @@ -136,14 +136,15 @@ export default class ComponentContainer extends React.PureComponent - {!isFile && + {!isFile && ( } + /> + )} {React.cloneElement(this.props.children, { branch, branches, diff --git a/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx b/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx index b404c5d1af8..e87bea11cce 100644 --- a/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx +++ b/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx @@ -40,12 +40,8 @@ export default class ComponentContainerNotFound extends React.PureComponent { return (
-

- {translate('dashboard.project_not_found')} -

-

- {translate('dashboard.project_not_found.2')} -

+

{translate('dashboard.project_not_found')}

+

{translate('dashboard.project_not_found.2')}

Go back to the homepage

diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.js b/server/sonar-web/src/main/js/app/components/GlobalFooter.js index d24ae3ab27b..2f104f6958f 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooter.js +++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.js @@ -42,15 +42,14 @@ export default function GlobalFooter( return ( + )} @@ -59,13 +58,9 @@ export default function GlobalFooter( sonarqubeVersion && translateWithParameters('footer.version_x', sonarqubeVersion)} {!hideLoggedInInfo && sonarqubeVersion && ' - '} - - {translate('footer.licence')} - + {translate('footer.licence')} {' - '} - - {translate('footer.community')} - + {translate('footer.community')} {' - '} {translate('footer.documentation')} @@ -79,15 +74,9 @@ export default function GlobalFooter( {translate('footer.plugins')} {!hideLoggedInInfo && ' - '} - {!hideLoggedInInfo && - - {translate('footer.web_api')} - } + {!hideLoggedInInfo && {translate('footer.web_api')}} {!hideLoggedInInfo && ' - '} - {!hideLoggedInInfo && - - {translate('footer.about')} - } + {!hideLoggedInInfo && {translate('footer.about')}}
); diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js b/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js index f2763723da2..f05bb330fda 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/app/components/GlobalFooterForSonarQubeDotCom.js @@ -34,29 +34,17 @@ export default function GlobalFooterForSonarQubeDotCom() { ); diff --git a/server/sonar-web/src/main/js/app/components/MarkdownHelp.js b/server/sonar-web/src/main/js/app/components/MarkdownHelp.js index a5ac92da031..452936b1e91 100644 --- a/server/sonar-web/src/main/js/app/components/MarkdownHelp.js +++ b/server/sonar-web/src/main/js/app/components/MarkdownHelp.js @@ -39,13 +39,9 @@ export default function MarkdownHelp() { - - {'http://sonarqube.org'} - + {'http://sonarqube.org'} - - {'http://sonarqube.org'} - + {'http://sonarqube.org'} diff --git a/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js b/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js index ab2931ac382..e5d38f46800 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js +++ b/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js @@ -54,13 +54,15 @@ class OrganizationPageExtension extends React.PureComponent { } const extension = pages.find(p => p.key === `${pluginKey}/${extensionKey}`); - return extension - ? - : ; + return extension ? ( + + ) : ( + + ); } } diff --git a/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js b/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js index a72607ce2d0..3881206d667 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js +++ b/server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.js @@ -45,9 +45,11 @@ function ProjectAdminPageExtension(props /*: Props */) { const extension = component.configuration && component.configuration.extensions.find(p => p.key === `${pluginKey}/${extensionKey}`); - return extension - ? - : ; + return extension ? ( + + ) : ( + + ); } const mapDispatchToProps = { onFail: addGlobalErrorMessage }; diff --git a/server/sonar-web/src/main/js/app/components/extensions/ProjectPageExtension.tsx b/server/sonar-web/src/main/js/app/components/extensions/ProjectPageExtension.tsx index c06716a279c..dc23ec8df22 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/ProjectPageExtension.tsx +++ b/server/sonar-web/src/main/js/app/components/extensions/ProjectPageExtension.tsx @@ -37,7 +37,9 @@ export default function ProjectPageExtension(props: Props) { const extension = component.extensions && component.extensions.find(p => p.key === `${pluginKey}/${extensionKey}`); - return extension - ? - : ; + return extension ? ( + + ) : ( + + ); } diff --git a/server/sonar-web/src/main/js/app/components/help/GlobalHelp.js b/server/sonar-web/src/main/js/app/components/help/GlobalHelp.js index 7e4b14609b5..9df12c7801c 100644 --- a/server/sonar-web/src/main/js/app/components/help/GlobalHelp.js +++ b/server/sonar-web/src/main/js/app/components/help/GlobalHelp.js @@ -62,9 +62,11 @@ export default class GlobalHelp extends React.PureComponent { case 'shortcuts': return ; case 'links': - return this.props.sonarCloud - ? - : ; + return this.props.sonarCloud ? ( + + ) : ( + + ); case 'tutorials': return ; default: @@ -72,7 +74,7 @@ export default class GlobalHelp extends React.PureComponent { } }; - renderMenuItem = (section /*: string */) => + renderMenuItem = (section /*: string */) => (
  • {translate('help.section', section)} -
    • ; + + ); - renderMenu = () => + renderMenu = () => (
      {(this.props.currentUser.isLoggedIn ? ['shortcuts', 'tutorials', 'links'] : ['shortcuts', 'links']).map(this.renderMenuItem)} -
    ; + + ); render() { return ( @@ -99,18 +103,12 @@ export default class GlobalHelp extends React.PureComponent { overlayClassName="modal-overlay" onRequestClose={this.props.onClose}>
    -

    - {translate('help')} -

    +

    {translate('help')}

    -
    - {this.renderMenu()} -
    -
    - {this.renderSection()} -
    +
    {this.renderMenu()}
    +
    {this.renderSection()}
    diff --git a/server/sonar-web/src/main/js/app/components/help/LinksHelp.js b/server/sonar-web/src/main/js/app/components/help/LinksHelp.js index 627f7d49dcd..8cb885b02a6 100644 --- a/server/sonar-web/src/main/js/app/components/help/LinksHelp.js +++ b/server/sonar-web/src/main/js/app/components/help/LinksHelp.js @@ -29,14 +29,10 @@ type Props = { onClose: () => void }; export default function LinksHelp({ onClose } /*: Props */) { return (
    -

    - {translate('help.section.links')} -

    +

    {translate('help.section.links')}

    - - {translate('footer.community')} - + {translate('footer.community')}

    diff --git a/server/sonar-web/src/main/js/app/components/help/LinksHelpSonarCloud.js b/server/sonar-web/src/main/js/app/components/help/LinksHelpSonarCloud.js index 3275528cf3c..802d1b9620c 100644 --- a/server/sonar-web/src/main/js/app/components/help/LinksHelpSonarCloud.js +++ b/server/sonar-web/src/main/js/app/components/help/LinksHelpSonarCloud.js @@ -29,38 +29,26 @@ type Props = { onClose: () => void }; export default function LinksHelpSonarCloud({ onClose } /*: Props */) { return (

    -

    - {translate('help.section.links')} -

    +

    {translate('help.section.links')}

    - - {translate('footer.news')} - + {translate('footer.news')}

    - - {translate('footer.terms')} - + {translate('footer.terms')}

    - - {translate('footer.twitter')} - + {translate('footer.twitter')}

    - - {translate('footer.get_started')} - + {translate('footer.get_started')}

    - - {translate('footer.help')} - + {translate('footer.help')}

    diff --git a/server/sonar-web/src/main/js/app/components/help/ShortcutsHelp.js b/server/sonar-web/src/main/js/app/components/help/ShortcutsHelp.js index feb27478d89..1787524f5dc 100644 --- a/server/sonar-web/src/main/js/app/components/help/ShortcutsHelp.js +++ b/server/sonar-web/src/main/js/app/components/help/ShortcutsHelp.js @@ -24,16 +24,12 @@ import { translate } from '../../../helpers/l10n'; export default function ShortcutsHelp() { return (

    -

    - {translate('help.section.shortcuts')} -

    +

    {translate('help.section.shortcuts')}

    -

    - {translate('shortcuts.section.global')} -

    +

    {translate('shortcuts.section.global')}

    • s @@ -46,9 +42,7 @@ export default function ShortcutsHelp() {
    -

    - {translate('shortcuts.section.rules')} -

    +

    {translate('shortcuts.section.rules')}

    • ↑ @@ -75,9 +69,7 @@ export default function ShortcutsHelp() {
    -

    - {translate('shortcuts.section.issues')} -

    +

    {translate('shortcuts.section.issues')}

    • ↑ diff --git a/server/sonar-web/src/main/js/app/components/help/TutorialsHelp.js b/server/sonar-web/src/main/js/app/components/help/TutorialsHelp.js index ee97ec26116..2196a8179e5 100644 --- a/server/sonar-web/src/main/js/app/components/help/TutorialsHelp.js +++ b/server/sonar-web/src/main/js/app/components/help/TutorialsHelp.js @@ -33,9 +33,7 @@ export default function TutorialsHelp({ onTutorialSelect } /*: Props */) { return (
      -

      - {translate('help.section.tutorials')} -

      +

      {translate('help.section.tutorials')}

      {translate('tutorials.onboarding')} diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx index 06a5f7889a8..1c7a748ecef 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx @@ -99,14 +99,15 @@ export default class ComponentNav extends React.PureComponent { breadcrumbs={this.props.component.breadcrumbs} /> - {this.props.currentBranch && + {this.props.currentBranch && ( } + /> + )} { - return this.state.dropdownOpen - ? - : null; + return this.state.dropdownOpen ? ( + + ) : null; }; renderMergeBranch = () => { @@ -132,19 +132,21 @@ export default class ComponentNavBranch extends React.PureComponent - {translate('branches.orphan_branch')} - - - - - : - {translate('from')} {currentBranch.mergeBranch} - ; + return currentBranch.isOrphan ? ( + + {translate('branches.orphan_branch')} + + + + + ) : ( + + {translate('from')} {currentBranch.mergeBranch} + + ); }; - renderSingleBranchPopup = () => + renderSingleBranchPopup = () => ( ; +
      + ); - renderNoBranchSupportPopup = () => + renderNoBranchSupportPopup = () => ( ; +
    + ); render() { const { branches, currentBranch } = this.props; @@ -181,9 +185,7 @@ export default class ComponentNavBranch extends React.PureComponent - - {currentBranch.name} - + {currentBranch.name} {this.renderNoBranchSupportPopup()}
    ); @@ -193,9 +195,7 @@ export default class ComponentNavBranch extends React.PureComponent - - {currentBranch.name} - + {currentBranch.name} {this.renderSingleBranchPopup()}
    ); diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenu.tsx index 3085c1212f9..9f41411bbad 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenu.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenu.tsx @@ -133,7 +133,7 @@ export default class ComponentNavBranchesMenu extends React.PureComponent branch.name === this.getSelected(); - renderSearch = () => + renderSearch = () => (
    ; +
    + ); renderBranchesList = () => { const branches = this.getFilteredBranches(); const selected = this.getSelected(); if (branches.length === 0) { - return ( -
    - {translate('no_results')} -
    - ); + return
    {translate('no_results')}
    ; } const menu: JSX.Element[] = []; @@ -190,11 +187,7 @@ export default class ComponentNavBranchesMenu extends React.PureComponent - {menu} - - ); + return
      {menu}
    ; }; render() { @@ -206,14 +199,15 @@ export default class ComponentNavBranchesMenu extends React.PureComponent (this.node = node)}> {this.renderSearch()} {this.renderBranchesList()} - {showManageLink && + {showManageLink && (
    {translate('branches.manage')} -
    } +
    + )}
    ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenuItem.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenuItem.tsx index 40fa2ec46fb..fa49b53d2d8 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenuItem.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBranchesMenuItem.tsx @@ -54,10 +54,9 @@ export default function ComponentNavBranchesMenuItem({ branch, ...props }: Props })} /> {branch.name} - {branch.isMain && -
    - {translate('branches.main_branch')} -
    } + {branch.isMain && ( +
    {translate('branches.main_branch')}
    + )}
    diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js index f584506a493..27637b0f3ed 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBreadcrumbs.js @@ -53,21 +53,20 @@ class ComponentNavBreadcrumbs extends React.PureComponent { return ( {!displayOrganization && - index === 0 && + index === 0 && ( - } + + )} - {index === breadcrumbs.length - 1 - ? - {itemName} - - : - {itemName} - } + {index === breadcrumbs.length - 1 ? ( + {itemName} + ) : ( + {itemName} + )} {index < breadcrumbs.length - 1 && } @@ -80,7 +79,7 @@ class ComponentNavBreadcrumbs extends React.PureComponent { title={component.name} organization={displayOrganization ? organization : null} /> - {displayOrganization && + {displayOrganization && ( @@ -91,7 +90,8 @@ class ComponentNavBreadcrumbs extends React.PureComponent { {organization.name} - } + + )} {items} {component.visibility === 'private' && } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx index 69f0fd45640..e3c49a90b9a 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMenu.tsx @@ -113,9 +113,11 @@ export default class ComponentNavMenu extends React.PureComponent { } }} activeClassName="active"> - {this.isView() || this.isApplication() - ? translate('view_projects.page') - : translate('code.page')} + {this.isView() || this.isApplication() ? ( + translate('view_projects.page') + ) : ( + translate('code.page') + )} ); @@ -228,9 +230,7 @@ export default class ComponentNavMenu extends React.PureComponent { {translate('layout.settings')}  -
      - {adminLinks} -
    +
      {adminLinks}
    ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx index 9f8c46a43e8..4c1e485000c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavMeta.tsx @@ -85,9 +85,7 @@ export default function ComponentNavMeta(props: Props) { overlay={
    } mouseLeaveDelay={2}>
  • - - {translate('background_task.status.FAILED')} - + {translate('background_task.status.FAILED')}
    • ); @@ -102,11 +100,7 @@ export default function ComponentNavMeta(props: Props) { } if (props.component.version && !shortBranch) { - metaList.push( -
  • - Version {props.component.version} -
    • - ); + metaList.push(
  • Version {props.component.version}
    • ); } if (props.incremental) { @@ -119,13 +113,12 @@ export default function ComponentNavMeta(props: Props) { return (
    -
      - {metaList} -
    - {shortBranch && +
      {metaList}
    + {shortBranch && (
    -
    } +
    + )}
    ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/IncrementalBadge.tsx b/server/sonar-web/src/main/js/app/components/nav/component/IncrementalBadge.tsx index 0ac87aaa448..25f9121e592 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/IncrementalBadge.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/IncrementalBadge.tsx @@ -24,9 +24,7 @@ import { translate } from '../../../../helpers/l10n'; export default function IncrementalBadge() { return ( -
    - {translate('incremental')} -
    +
    {translate('incremental')}
     ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/NoBranchSupportPopup.tsx b/server/sonar-web/src/main/js/app/components/nav/component/NoBranchSupportPopup.tsx index fe2f3235dbc..db44804e214 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/NoBranchSupportPopup.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/NoBranchSupportPopup.tsx @@ -29,12 +29,8 @@ export default function NoBranchSupportPopup(props: Props) { return (
    -
    - {translate('branches.no_support.header')} -
    -

    - {translate('branches.no_support.header.text')} -

    +
    {translate('branches.no_support.header')}
    +

    {translate('branches.no_support.header.text')}

    {translate('learn_more')} diff --git a/server/sonar-web/src/main/js/app/components/nav/component/SingleBranchHelperPopup.tsx b/server/sonar-web/src/main/js/app/components/nav/component/SingleBranchHelperPopup.tsx index abb4adc8c3d..d41c48b32ac 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/SingleBranchHelperPopup.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/SingleBranchHelperPopup.tsx @@ -29,9 +29,7 @@ export default function SingleBranchHelperPopup(props: Props) { return (

    -
    - {translate('branches.learn_how_to_analyze')} -
    +
    {translate('branches.learn_how_to_analyze')}

    {translate('branches.learn_how_to_analyze.text')}

    diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.js index 0650d20d714..fe155adbbe6 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.js @@ -111,29 +111,33 @@ class GlobalNav extends React.PureComponent {
  • - {this.state.onboardingTutorialTooltip - ? - - - : } + {this.state.onboardingTutorialTooltip ? ( + + + + ) : ( + + )}
    • - {this.state.helpOpen && + {this.state.helpOpen && ( } + /> + )} - {this.state.onboardingTutorialOpen && - } + {this.state.onboardingTutorialOpen && ( + + )} ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js index 89053dedf89..2bbec0defdc 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js @@ -123,9 +123,7 @@ export default class GlobalNavMenu extends React.PureComponent { renderGlobalPageLink = ({ key, name }) => { return (
  • - - {name} - + {name}
    • ); }; @@ -142,9 +140,7 @@ export default class GlobalNavMenu extends React.PureComponent { {translate('more')}  -
      - {withoutPortfolios.map(this.renderGlobalPageLink)} -
    +
      {withoutPortfolios.map(this.renderGlobalPageLink)}
    ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js index eee3fca4b6e..37bc3af8caa 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.js @@ -124,20 +124,19 @@ export default class GlobalNavUser extends React.PureComponent { - {this.state.open && + {this.state.open && (
    • - - {currentUser.name} - + {currentUser.name}
      - {currentUser.email != null && + {currentUser.email != null && (
      {currentUser.email} -
      } +
    + )}
  • @@ -146,27 +145,25 @@ export default class GlobalNavUser extends React.PureComponent {
    • {hasOrganizations &&
  • } + {hasOrganizations && ( +
  • {translate('my_organizations')}
    • + )} {hasOrganizations && -
  • - {translate('my_organizations')} -
    • } - {hasOrganizations && - sortBy(organizations, org => org.name.toLowerCase()).map(organization => + sortBy(organizations, org => org.name.toLowerCase()).map(organization => (
  • - - {organization.name} - + {organization.name}
    • - )} + ))} {hasOrganizations &&
  • }
  • {translate('layout.logout')}
    • - } + + )} ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js index 903de6c74ea..fe610c1edc1 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.js @@ -76,9 +76,7 @@ class SettingsNav extends React.PureComponent { return (

    - - {translate('layout.settings')} - + {translate('layout.settings')}

    @@ -130,24 +128,27 @@ class SettingsNav extends React.PureComponent { {translate('users.page')} - {!this.props.customOrganizations && + {!this.props.customOrganizations && (
  • {translate('user_groups.page')} -
    • } - {!this.props.customOrganizations && + + )} + {!this.props.customOrganizations && (
  • {translate('global_permissions.page')} -
    • } - {!this.props.customOrganizations && + + )} + {!this.props.customOrganizations && (
  • {translate('permission_templates')} -
    • } + + )} @@ -156,12 +157,13 @@ class SettingsNav extends React.PureComponent { {translate('sidebar.projects')}
      - {!this.props.customOrganizations && + {!this.props.customOrganizations && (
    • Management -
      • } + + )}
    • {translate('background_tasks.page')} diff --git a/server/sonar-web/src/main/js/app/components/search/Search.js b/server/sonar-web/src/main/js/app/components/search/Search.js index e28606b0d7d..015e56622c9 100644 --- a/server/sonar-web/src/main/js/app/components/search/Search.js +++ b/server/sonar-web/src/main/js/app/components/search/Search.js @@ -301,7 +301,7 @@ export default class Search extends React.PureComponent { this.nodes[component] = node; }; - renderResult = (component /*: Component */) => + renderResult = (component /*: Component */) => ( ; + /> + ); - renderNoResults = () => + renderNoResults = () => (
      {translateWithParameters('no_results_for_x', this.state.query)} -
      ; +
    + ); render() { const dropdownClassName = classNames('dropdown', 'navbar-search', { open: this.state.open }); @@ -343,16 +345,17 @@ export default class Search extends React.PureComponent { value={this.state.query} /> - {this.state.shortQuery && + {this.state.shortQuery && ( 5 })}> {translateWithParameters('select2.tooShort', 2)} - } + + )} {this.state.open && - Object.keys(this.state.results).length > 0 && + Object.keys(this.state.results).length > 0 && (
    (this.node = node)}> @@ -381,7 +384,8 @@ export default class Search extends React.PureComponent { }} />
    -
    } + + )} ); } diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResult.js b/server/sonar-web/src/main/js/app/components/search/SearchResult.js index f6381a3645d..7b91a192bc9 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResult.js +++ b/server/sonar-web/src/main/js/app/components/search/SearchResult.js @@ -99,11 +99,9 @@ export default class SearchResult extends React.PureComponent { } const organization = this.props.organizations[component.organization]; - return organization - ?
    - {organization.name} -
    - : null; + return organization ? ( +
    {organization.name}
    + ) : null; }; renderProject = (component /*: Component */) => { @@ -112,11 +110,9 @@ export default class SearchResult extends React.PureComponent { } const project = this.props.projects[component.project]; - return project - ?
    - {project.name} -
    - : null; + return project ? ( +
    {project.name}
    + ) : null; }; render() { @@ -144,14 +140,14 @@ export default class SearchResult extends React.PureComponent { - {component.match - ? - : - {component.name} - } + {component.match ? ( + + ) : ( + {component.name} + )} {this.renderOrganization(component)} {this.renderProject(component)} diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResults.js b/server/sonar-web/src/main/js/app/components/search/SearchResults.js index dfc5870e519..28cd8001970 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResults.js +++ b/server/sonar-web/src/main/js/app/components/search/SearchResults.js @@ -78,10 +78,10 @@ export default class SearchResults extends React.PureComponent { } }); - return renderedComponents.length > 0 - ?
      - {renderedComponents} -
    - : this.props.renderNoResults(); + return renderedComponents.length > 0 ? ( +
      {renderedComponents}
    + ) : ( + this.props.renderNoResults() + ); } } diff --git a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.js b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.js index b736a7b2bdc..4da41158cca 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.js +++ b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.js @@ -71,9 +71,7 @@ export default class SearchShowMore extends React.PureComponent { ) }} /> - - {translate('show_more')} - + {translate('show_more')} diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchResults-test.js b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchResults-test.js index 51bcac37395..4da24534c2b 100644 --- a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchResults-test.js +++ b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchResults-test.js @@ -32,10 +32,7 @@ it('renders different components and dividers between them', () => { onMoreClick={jest.fn()} onSelect={jest.fn()} renderNoResults={() =>
    } - renderResult={component => - - {component.name} - } + renderResult={component => {component.name}} results={{ TRK: [component('foo'), component('bar')], BRC: [component('qwe', 'BRC'), component('qux', 'BRC')], @@ -57,10 +54,7 @@ it('renders "Show More" link', () => { onMoreClick={jest.fn()} onSelect={jest.fn()} renderNoResults={() =>
    } - renderResult={component => - - {component.name} - } + renderResult={component => {component.name}} results={{ TRK: [component('foo'), component('bar')], BRC: [component('qwe', 'BRC'), component('qux', 'BRC')] diff --git a/server/sonar-web/src/main/js/app/styles/boxed-group.css b/server/sonar-web/src/main/js/app/styles/boxed-group.css index 0fc395a3280..56c69e066ec 100644 --- a/server/sonar-web/src/main/js/app/styles/boxed-group.css +++ b/server/sonar-web/src/main/js/app/styles/boxed-group.css @@ -28,7 +28,7 @@ line-height: 24px; } -.boxed-group-header [class^="icon-"] { +.boxed-group-header [class^='icon-'] { display: inline-block; vertical-align: middle; } diff --git a/server/sonar-web/src/main/js/app/utils/startAjaxMonitoring.js b/server/sonar-web/src/main/js/app/utils/startAjaxMonitoring.js index 013236e4049..46a70d515f5 100644 --- a/server/sonar-web/src/main/js/app/utils/startAjaxMonitoring.js +++ b/server/sonar-web/src/main/js/app/utils/startAjaxMonitoring.js @@ -101,7 +101,9 @@ const ProcessesView = Marionette.ItemView.extend({ }); el.appendTo(this.$el); } else if (timeout != null) { - el = $('
  • ').html(timeout.get('message')).addClass('process-spinner shown'); + el = $('
  • ') + .html(timeout.get('message')) + .addClass('process-spinner shown'); el.appendTo(this.$el); } return this; diff --git a/server/sonar-web/src/main/js/app/utils/startReactApp.js b/server/sonar-web/src/main/js/app/utils/startReactApp.js index 53e2290fbaa..648a6068834 100644 --- a/server/sonar-web/src/main/js/app/utils/startReactApp.js +++ b/server/sonar-web/src/main/js/app/utils/startReactApp.js @@ -137,12 +137,8 @@ const startReactApp = () => { - - {maintenanceRoutes} - - - {setupRoutes} - + {maintenanceRoutes} + {setupRoutes} diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutApp.js b/server/sonar-web/src/main/js/apps/about/components/AboutApp.js index 36ced3119e7..d736f754310 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutApp.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutApp.js @@ -138,13 +138,12 @@ class AboutApp extends React.PureComponent {
    -

    - {translate('layout.sonar.slogan')} -

    - {!this.props.currentUser.isLoggedIn && +

    {translate('layout.sonar.slogan')}

    + {!this.props.currentUser.isLoggedIn && ( {translate('layout.login')} - } + + )} {customText != null && - customText.value && + customText.value && (
    } + /> + )} diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js index 67f3b803d99..b3e048a1d1e 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutAppForSonarQubeDotCom.js @@ -77,11 +77,12 @@ export default function AboutAppForSonarQubeDotCom(props /*: Props */) {
    {customText != null && - customText.value && + customText.value && (
    } + /> + )} diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.js b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.js index 92e08353bbc..1ed36c5127b 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.js @@ -26,13 +26,9 @@ const link = 'https://redirect.sonarsource.com/doc/issues.html'; export default function AboutCleanCode() { return (
    -

    - {translate('about_page.clean_code')} -

    +

    {translate('about_page.clean_code')}

    -

    - {translate('about_page.clean_code.text')} -

    +

    {translate('about_page.clean_code.text')}

    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.js b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.js index 2a87ba96a96..5bc1b2c2bd5 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.js @@ -48,26 +48,19 @@ const half = (languages.length + 1) / 2; export default function AboutLanguages() { return (     diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.js b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.js index 1e65f5f646a..f959dd97cbb 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.js @@ -26,13 +26,9 @@ const link = 'https://redirect.sonarsource.com/doc/fix-the-leak.html'; export default function AboutLeakPeriod() { return (
    -

    - {translate('about_page.fix_the_leak')} -

    +

    {translate('about_page.fix_the_leak')}

    -

    - {translate('about_page.fix_the_leak.text')} -

    +

    {translate('about_page.fix_the_leak.text')}

    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.js b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.js index c160383e9d4..fb421a16655 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.js @@ -34,17 +34,16 @@ export default function AboutProjects({ count, loading } /*: Props */) { return (
    {loading && } - {!loading && + {!loading && (
    {formatMeasure(count, 'INT')}
    -
    - {translate('about_page.projects_analyzed')} -
    -
    } +
    {translate('about_page.projects_analyzed')}
    +
    + )}
    ); } diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.js b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.js index 8499b680883..e83d8d77b95 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.js @@ -26,13 +26,9 @@ const link = 'https://redirect.sonarsource.com/doc/quality-gates.html'; export default function AboutQualityGates() { return (
    -

    - {translate('about_page.quality_gates')} -

    +

    {translate('about_page.quality_gates')}

    -

    - {translate('about_page.quality_gates.text')} -

    +

    {translate('about_page.quality_gates.text')}

    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.js b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.js index 20c483535d5..234a78f2a90 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.js @@ -26,9 +26,7 @@ import CodeSmellIcon from '../../../components/icons-components/CodeSmellIcon'; export default function AboutQualityModel() { return (
    -

    - {translate('about_page.quality_model')} -

    +

    {translate('about_page.quality_model')}

    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js index 26b60c32f88..277c1ea2036 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModelForSonarQubeDotCom.js @@ -26,9 +26,7 @@ import CodeSmellIconForSonarQubeDotCom from './CodeSmellIconForSonarQubeDotCom'; export default function AboutQualityModelForSonarQubeDotCom() { return (
    -

    - {translate('about_page.quality_model')} -

    +

    {translate('about_page.quality_model')}

    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js index 2e8ffe89e0e..8396fa6289b 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js @@ -50,15 +50,11 @@ const scanners = [ export default function AboutScanners() { return (
    -

    - {translate('about_page.scanners')} -

    +

    {translate('about_page.scanners')}

    -

    - {translate('about_page.scanners.text')} -

    +

    {translate('about_page.scanners.text')}

    - {scanners.map(scanner => + {scanners.map(scanner => ( {translate('about_page.scanners', - )} + ))}
    diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.js b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.js index 893aed8e51f..5e50b423199 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.js @@ -45,13 +45,9 @@ export default function AboutStandards(props /*: Props */) { return (
    -

    - {translate('about_page.standards')} -

    +

    {translate('about_page.standards')}

    -

    - {translate('about_page.standards.text')} -

    +

    {translate('about_page.standards.text')}

      diff --git a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.js b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.js index caa1d57279e..9188ee11e0a 100644 --- a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.js +++ b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.js @@ -42,7 +42,7 @@ export default function EntryIssueTypes( return (
      {loading && } - {!loading && + {!loading && ( @@ -95,7 +95,8 @@ export default function EntryIssueTypes( -
      } + + )}
      ); } diff --git a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js index 1bdfba96a4e..582bf582d38 100644 --- a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js +++ b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypesForSonarQubeDotCom.js @@ -42,7 +42,7 @@ export default function EntryIssueTypesForSonarQubeDotCom( return (
      {loading && } - {!loading && + {!loading && ( @@ -95,7 +95,8 @@ export default function EntryIssueTypesForSonarQubeDotCom( -
      } + + )}
      ); } diff --git a/server/sonar-web/src/main/js/apps/about/components/ReadMore.js b/server/sonar-web/src/main/js/apps/about/components/ReadMore.js index 87df2de5625..a669ea81f56 100644 --- a/server/sonar-web/src/main/js/apps/about/components/ReadMore.js +++ b/server/sonar-web/src/main/js/apps/about/components/ReadMore.js @@ -30,9 +30,7 @@ export default class ReadMore extends React.PureComponent { return ( ); diff --git a/server/sonar-web/src/main/js/apps/account/account.css b/server/sonar-web/src/main/js/apps/account/account.css index 6050ad05929..0d9fd7ce41d 100644 --- a/server/sonar-web/src/main/js/apps/account/account.css +++ b/server/sonar-web/src/main/js/apps/account/account.css @@ -151,7 +151,7 @@ height: 100px; background-color: #e6e6e6; transform: rotate(30deg); - content: ""; + content: ''; } .my-activity-issues > a { diff --git a/server/sonar-web/src/main/js/apps/account/components/Nav.js b/server/sonar-web/src/main/js/apps/account/components/Nav.js index 14bd9fbdaa1..09281e5ac7e 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Nav.js +++ b/server/sonar-web/src/main/js/apps/account/components/Nav.js @@ -48,18 +48,20 @@ export default function Nav({ customOrganizations } /*: Props */) { {translate('my_account.notifications')} - {!customOrganizations && + {!customOrganizations && (
    • {translate('my_account.projects')} -
      • } - {customOrganizations && + + )} + {customOrganizations && (
    • {translate('my_account.organizations')} -
      • } + + )} ); diff --git a/server/sonar-web/src/main/js/apps/account/components/Password.js b/server/sonar-web/src/main/js/apps/account/components/Password.js index ae30647b7e0..f90aedc34cd 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Password.js +++ b/server/sonar-web/src/main/js/apps/account/components/Password.js @@ -71,22 +71,19 @@ export default class Password extends Component { return (
      -

      - {translate('my_profile.password.title')} -

      +

      {translate('my_profile.password.title')}

      - {success && -
      - {translate('my_profile.password.changed')} -
      } + {success && ( +
      {translate('my_profile.password.changed')}
      + )} {errors && - errors.map((e, i) => + errors.map((e, i) => (
      {e}
      - )} + ))}