diff options
author | Philippe Perrin <philippe.perrin@sonarsource.com> | 2021-06-25 17:36:16 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2021-06-28 20:03:21 +0000 |
commit | 52e89eb6c3a1669623403f01ba5ca0338fb6a257 (patch) | |
tree | b76c527ed9d90f74057037faaeca25accca2c289 | |
parent | 13cb72e4e2b1913554b63b305067e135ebb6e819 (diff) | |
download | sonarqube-52e89eb6c3a1669623403f01ba5ca0338fb6a257.tar.gz sonarqube-52e89eb6c3a1669623403f01ba5ca0338fb6a257.zip |
SONAR-14934 Remove links to project settings and tutorials
3 files changed, 7 insertions, 104 deletions
diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx index 729bd9cbfb7..0b782d55708 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx @@ -21,21 +21,12 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; -import { PULL_REQUEST_DECORATION_BINDING_CATEGORY } from '../../../apps/settings/components/AdditionalCategoryKeys'; -import { getProjectSettingsUrl } from '../../../helpers/urls'; export interface DoneNextStepsProps { component: T.Component; } export default function DoneNextSteps({ component }: DoneNextStepsProps) { - const tutorialsLink = ( - <Link to={{ pathname: '/tutorials', query: { id: component.key } }}> - {translate( - 'onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.see_tutorials' - )} - </Link> - ); const isProjectAdmin = component.configuration?.showSettings; return ( @@ -47,38 +38,9 @@ export default function DoneNextSteps({ component }: DoneNextStepsProps) { {translate('onboarding.analysis.auto_refresh_after_analysis.auto_refresh')} </p> <p className="big-spacer-top"> - {isProjectAdmin ? ( - <FormattedMessage - defaultMessage={translate( - 'onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin' - )} - id="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin" - values={{ - link_project_settings: ( - <Link - to={getProjectSettingsUrl( - component.key, - PULL_REQUEST_DECORATION_BINDING_CATEGORY - )}> - {translate( - 'onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.project_settings' - )} - </Link> - ), - link_see_tutorials: tutorialsLink - }} - /> - ) : ( - <FormattedMessage - defaultMessage={translate( - 'onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci' - )} - id="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci" - values={{ - link_see_tutorials: tutorialsLink - }} - /> - )} + {isProjectAdmin + ? translate('onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin') + : translate('onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci')} </p> <p className="big-spacer-top"> <FormattedMessage diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap index 0b6489a943d..782a7ba254b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/__snapshots__/DoneNextSteps-test.tsx.snap @@ -15,28 +15,7 @@ exports[`should render correctly: default 1`] = ` <p className="big-spacer-top" > - <FormattedMessage - defaultMessage="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci" - id="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci" - values={ - Object { - "link_see_tutorials": <Link - onlyActiveOnIndex={false} - style={Object {}} - to={ - Object { - "pathname": "/tutorials", - "query": Object { - "id": "my-project", - }, - } - } - > - onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.see_tutorials - </Link>, - } - } - /> + onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci </p> <p className="big-spacer-top" @@ -86,43 +65,7 @@ exports[`should render correctly: project admin 1`] = ` <p className="big-spacer-top" > - <FormattedMessage - defaultMessage="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin" - id="onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin" - values={ - Object { - "link_project_settings": <Link - onlyActiveOnIndex={false} - style={Object {}} - to={ - Object { - "pathname": "/project/settings", - "query": Object { - "category": "pull_request_decoration_binding", - "id": "my-project", - }, - } - } - > - onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.project_settings - </Link>, - "link_see_tutorials": <Link - onlyActiveOnIndex={false} - style={Object {}} - to={ - Object { - "pathname": "/tutorials", - "query": Object { - "id": "my-project", - }, - } - } - > - onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.see_tutorials - </Link>, - } - } - /> + onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin </p> <p className="big-spacer-top" diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 300ba99d008..3598681d24f 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -3371,10 +3371,8 @@ onboarding.tutorial.env_variables.token_generator.value=an existing token, or a onboarding.analysis.header=Run analysis on your project onboarding.analysis.auto_refresh_after_analysis.done=Is my analysis done? onboarding.analysis.auto_refresh_after_analysis.auto_refresh=If your analysis is successful, this page will automatically refresh in a few moments. -onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin=You can set up Pull Request Decoration under the {link_project_settings}. To set up analysis with your favorite CI tool, {link_see_tutorials}. -onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci=You can request from a project administrator to set up Pull Request Decoration. To set up analysis with your favorite CI tool, {link_see_tutorials}. -onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.project_settings=project settings -onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.see_tutorials=see the tutorials +onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci.admin=You can set up Pull Request Decoration under the project settings. To set up analysis with your favorite CI tool, see the tutorials. +onboarding.analysis.auto_refresh_after_analysis.set_up_pr_deco_and_ci=You can request from a project administrator to set up Pull Request Decoration. To set up analysis with your favorite CI tool, see the tutorials. onboarding.analysis.auto_refresh_after_analysis.check_these_links=Check these useful links while you wait: {link_branches}, {link_pr_analysis}. onboarding.analysis.auto_refresh_after_analysis.check_these_links.pr_analysis=Pull Request Analysis onboarding.analysis.auto_refresh_after_analysis.check_these_links.branches=Branch Analysis |