From 35e8b67c4c90c79b509bb5d5398679c0596387bc Mon Sep 17 00:00:00 2001 From: Revanshu Paliwal Date: Thu, 20 Jul 2023 15:43:21 +0200 Subject: [PATCH] SONAR-19922 Cleaning up indentation with some fixes --- .../src/components/CodeSnippet.tsx | 6 +- .../components/__tests__/CodeSnippet-test.tsx | 9 +- .../__snapshots__/CodeSnippet-test.tsx.snap | 215 +++++++++++++++++- .../RepositoryVariables.tsx | 2 +- .../tutorials/components/GradleBuild.tsx | 2 +- .../gitlabci/EnvironmentVariablesStep.tsx | 6 +- .../tutorials/gitlabci/YmlFileStep.tsx | 11 +- .../{JenkinsfileStep.tsx => JenkinsStep.tsx} | 0 .../tutorials/jenkins/JenkinsTutorial.tsx | 36 +-- .../jenkins/MultiBranchPipelineStep.tsx | 2 +- .../jenkins/WebhookStepBitbucket.tsx | 2 +- .../tutorials/jenkins/WebhookStepGitLab.tsx | 2 +- .../tutorials/jenkins/WebhookStepGithub.tsx | 2 +- .../jenkins/buildtool-steps/CFamilly.tsx | 34 ++- .../CreateJenkinsfileBulletPoint.tsx | 71 +++--- .../jenkins/buildtool-steps/DotNet.tsx | 21 +- .../jenkins/buildtool-steps/DotNetCore.tsx | 4 +- .../buildtool-steps/DotNetFramework.tsx | 2 +- .../buildtool-steps/DotNetPrereqsMSBuild.tsx | 2 +- .../buildtool-steps/DotNetPrereqsScanner.tsx | 5 +- .../jenkins/buildtool-steps/Gradle.tsx | 24 +- .../jenkins/buildtool-steps/Maven.tsx | 2 +- .../jenkins/buildtool-steps/Other.tsx | 2 +- .../tutorials/other/BuildToolForm.tsx | 2 +- 24 files changed, 342 insertions(+), 122 deletions(-) rename server/sonar-web/src/main/js/components/tutorials/jenkins/{JenkinsfileStep.tsx => JenkinsStep.tsx} (100%) diff --git a/server/sonar-web/design-system/src/components/CodeSnippet.tsx b/server/sonar-web/design-system/src/components/CodeSnippet.tsx index bf11a5632ba..fcb8532c487 100644 --- a/server/sonar-web/design-system/src/components/CodeSnippet.tsx +++ b/server/sonar-web/design-system/src/components/CodeSnippet.tsx @@ -19,6 +19,7 @@ */ import styled from '@emotion/styled'; import classNames from 'classnames'; +import { escape as lodashEscape } from 'lodash'; import tw from 'twin.macro'; import { themeBorder, themeColor } from '../helpers/theme'; import { isDefined } from '../helpers/types'; @@ -53,7 +54,10 @@ export function CodeSnippet(props: Props) { ); - const renderSnippet = render ?? (wrap || isOneLine ? finalSnippet : `
${finalSnippet}
`); + const renderSnippet = + render ?? (wrap || isOneLine) + ? `${lodashEscape(finalSnippet)}` + : `
${lodashEscape(finalSnippet)}
`; return ( { +it('should show full size when multiline with no editing', () => { const { container } = setupWithProps(); const copyButton = screen.getByRole('button', { name: 'Copy' }); expect(copyButton).toHaveStyle('top: 1.5rem'); expect(container).toMatchSnapshot(); }); -it('should show reduced size when single line with no editting', () => { +it('should show reduced size when single line with no editing', () => { const { container } = setupWithProps({ isOneLine: true, snippet: 'foobar' }); const copyButton = screen.getByRole('button', { name: 'Copy' }); expect(copyButton).toHaveStyle('top: 1rem'); expect(container).toMatchSnapshot(); }); +it('should highlight code content correctly', () => { + const { container } = setupWithProps({ snippet: 'foobar' }); + expect(container).toMatchSnapshot(); +}); + function setupWithProps(props: Partial> = {}) { return renderWithContext( diff --git a/server/sonar-web/design-system/src/components/__tests__/__snapshots__/CodeSnippet-test.tsx.snap b/server/sonar-web/design-system/src/components/__tests__/__snapshots__/CodeSnippet-test.tsx.snap index e52ece83539..20b9a394505 100644 --- a/server/sonar-web/design-system/src/components/__tests__/__snapshots__/CodeSnippet-test.tsx.snap +++ b/server/sonar-web/design-system/src/components/__tests__/__snapshots__/CodeSnippet-test.tsx.snap @@ -1,6 +1,213 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`should show full size when multiline with no editting 1`] = ` +exports[`should highlight code content correctly 1`] = ` +.emotion-0 { + background-color: rgb(252,252,253); + border: 1px solid rgb(225,230,243); + border-radius: 0.5rem; + position: relative; + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + +.emotion-0.code-snippet-simple-oneline { + margin-top: 0; + margin-bottom: 0; + border-radius: 0.25rem; +} + +.emotion-4 { + box-sizing: border-box; + -webkit-text-decoration: none; + text-decoration: none; + outline: none; + border: var(--border); + color: var(--color); + background-color: var(--background); + -webkit-transition: background-color 0.2s ease,outline 0.2s ease; + transition: background-color 0.2s ease,outline 0.2s ease; + display: -webkit-inline-box; + display: -webkit-inline-flex; + display: -ms-inline-flexbox; + display: inline-flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + height: 2.25rem; + font-family: Inter,ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; + font-size: 0.875rem; + line-height: 1.25rem; + font-weight: 600; + padding-left: 1rem; + padding-right: 1rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; + border-radius: 0.5rem; + cursor: pointer; + --background: rgb(255,255,255); + --backgroundHover: rgb(239,242,249); + --color: rgb(62,67,87); + --focus: rgba(197,205,223,0.2); + --border: 1px solid rgb(197,205,223); + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + font-family: Inter,ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; + font-size: 0.875rem; + line-height: 1.25rem; + font-weight: 400; + right: 1.5rem; + top: 1.5rem; + position: absolute; +} + +.emotion-4:hover, +.emotion-4:active { + color: var(--color); + background-color: var(--backgroundHover); +} + +.emotion-4:focus, +.emotion-4:active { + color: var(--color); + outline: 4px solid var(--focus); +} + +.emotion-4:disabled, +.emotion-4:disabled:hover { + color: rgb(166,173,194); + background-color: rgb(239,242,249); + border: 1px solid rgb(197,205,223); + cursor: not-allowed; +} + +.emotion-4>svg { + margin-right: 0.25rem; +} + +.emotion-4 [disabled] { + pointer-events: none; +} + +.emotion-4:hover, +.emotion-4:active, +.emotion-4:focus { + border-color: rgb(197,205,223); +} + +.code-snippet-highlighted-oneline .emotion-4 { + bottom: 0.5rem; +} + +.emotion-6 code { + font-family: Ubuntu Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace; + font-size: 0.875rem; + line-height: 1.125rem; + font-weight: 400; + background: rgb(252,252,253); + color: rgb(51,53,60); +} + +.emotion-6 code.hljs { + padding: unset; +} + +.emotion-6 .hljs-meta, +.emotion-6 .hljs-variable { + color: rgb(51,53,60); +} + +.emotion-6 .hljs-doctag, +.emotion-6 .hljs-title, +.emotion-6 .hljs-title.class_, +.emotion-6 .hljs-title.function_ { + color: rgb(34,84,192); +} + +.emotion-6 .hljs-comment { + font-family: Ubuntu Mono,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace; + font-size: 0.875rem; + line-height: 1.125rem; + font-style: italic; + color: rgb(109,111,119); +} + +.emotion-6 .hljs-keyword, +.emotion-6 .hljs-tag, +.emotion-6 .hljs-type { + color: rgb(152,29,150); +} + +.emotion-6 .hljs-literal, +.emotion-6 .hljs-number { + color: rgb(126,83,5); +} + +.emotion-6 .hljs-string { + color: rgb(32,105,31); +} + +.emotion-6 .hljs-meta .hljs-keyword { + color: rgb(47,103,48); +} + +.emotion-6.code-wrap { + white-space: pre-wrap; + word-break: break-all; +} + +.emotion-6 mark { + font-weight: 400; + padding: 0.25rem; + border-radius: 0.25rem; + background-color: rgb(197,205,223); + color: rgb(217,45,32); +} + +
+
+ + + 
+        <prop>foobar<prop>
+
+ +
+
+`; + +exports[`should show full size when multiline with no editing 1`] = ` .emotion-0 { background-color: rgb(252,252,253); border: 1px solid rgb(225,230,243); @@ -209,7 +416,7 @@ bar `; -exports[`should show reduced size when single line with no editting 1`] = ` +exports[`should show reduced size when single line with no editing 1`] = ` .emotion-0 { background-color: rgb(252,252,253); border: 1px solid rgb(225,230,243); @@ -410,7 +617,9 @@ exports[`should show reduced size when single line with no editting 1`] = ` - foobar + + foobar + diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx index a84a8053335..cf7b50ab403 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx @@ -112,7 +112,7 @@ export default function RepositoryVariables(props: RepositoryVariablesProps) { defaultMessage={translate('onboarding.tutorial.env_variables')} id="onboarding.tutorial.env_variables" values={{ - extra: , + extra: , field: ( {translate('onboarding.tutorial.env_variables.field')} diff --git a/server/sonar-web/src/main/js/components/tutorials/components/GradleBuild.tsx b/server/sonar-web/src/main/js/components/tutorials/components/GradleBuild.tsx index 6e1edddb92b..b71bcc00289 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/GradleBuild.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/GradleBuild.tsx @@ -56,7 +56,7 @@ export default function GradleBuild({ component }: Props) { {(build) => ( diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx index 843cacaae4f..38a8de03348 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx @@ -71,7 +71,7 @@ export default function EnvironmentVariablesStep(props: EnvironmentVariablesStep defaultMessage={fieldValueTranslation} id="onboarding.tutorial.with.gitlab_ci.variables.step1" values={{ - extra: , + extra: , field: ( {translate('onboarding.tutorial.with.gitlab_ci.variables.step1')} @@ -135,7 +135,7 @@ export default function EnvironmentVariablesStep(props: EnvironmentVariablesStep defaultMessage={fieldValueTranslation} id="onboarding.tutorial.with.gitlab_ci.variables.step1" values={{ - extra: , + extra: , field: ( {translate('onboarding.tutorial.with.gitlab_ci.variables.step1')} @@ -150,7 +150,7 @@ export default function EnvironmentVariablesStep(props: EnvironmentVariablesStep defaultMessage={fieldValueTranslation} id="onboarding.tutorial.with.gitlab_ci.variables.step2" values={{ - extra: , + extra: , field: ( {translate('onboarding.tutorial.env_variables.field')} diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx index b06d09d08e8..1f5d6c95f99 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx @@ -100,6 +100,13 @@ const filenameForBuildTool = { [BuildTools.Other]: 'sonar-project.properties', }; +const snippetLanguageForBuildTool = { + [BuildTools.CFamily]: undefined, + [BuildTools.Gradle]: undefined, + [BuildTools.Maven]: 'xml', + [BuildTools.Other]: undefined, +}; + export function YmlFileStep(props: YmlFileStepProps) { const { component, hasCLanguageFeature } = props; @@ -178,7 +185,7 @@ export function YmlFileStep(props: YmlFileStepProps) { {(build) => ( )} @@ -186,7 +193,7 @@ export function YmlFileStep(props: YmlFileStepProps) { ) : ( )} diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsStep.tsx similarity index 100% rename from server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx rename to server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsStep.tsx diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx index 03ca049eab2..a9768462798 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { BasicSeparator, Title } from 'design-system'; +import { BasicSeparator, Title, TutorialStepList } from 'design-system'; import * as React from 'react'; import withAvailableFeatures, { WithAvailableFeaturesProps, @@ -31,7 +31,7 @@ import { import { Feature } from '../../../types/features'; import { Component } from '../../../types/types'; import AllSet from '../components/AllSet'; -import JenkinsfileStep from './JenkinsfileStep'; +import JenkinsfileStep from './JenkinsStep'; import MultiBranchPipelineStep from './MultiBranchPipelineStep'; import PipelineStep from './PipelineStep'; import PreRequisitesStep from './PreRequisitesStep'; @@ -58,30 +58,30 @@ export function JenkinsTutorial(props: JenkinsTutorialProps) { {translate('onboarding.tutorial.with.jenkins.title')} {hasSelectAlmStep && } - {alm && ( <> - + + + + {branchSupportEnabled ? ( + + ) : ( + + )} - {branchSupportEnabled ? ( - - ) : ( - - )} - - - - + + {done && ( <> diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx index 5907b2baf59..17a01755dc3 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx @@ -181,7 +181,7 @@ export default function MultiBranchPipelineStep(props: MultiBranchPipelineStepPr )} : - + - +

diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx index 883d086041c..e1829267589 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx @@ -41,7 +41,7 @@ export default function WebhookStepGitLab({ branchesEnabled }: WebhookStepGitLab /> {branchesEnabled ? ( - +

diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx index bea0464256e..4046ba3890b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx @@ -61,7 +61,7 @@ export default function WebhookStepGithub(props: WebhookStepGithubProps) { }} /> - +

diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx index a0e21e87013..0e42069ef58 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx @@ -25,7 +25,7 @@ import DefaultProjectKey from '../../components/DefaultProjectKey'; import GithubCFamilyExampleRepositories from '../../components/GithubCFamilyExampleRepositories'; import RenderOptions from '../../components/RenderOptions'; import { OSs, TutorialModes } from '../../types'; -import { LanguageProps } from '../JenkinsfileStep'; +import { LanguageProps } from '../JenkinsStep'; import CreateJenkinsfileBulletPoint from './CreateJenkinsfileBulletPoint'; const YAML_MAP: Record string> = { @@ -104,7 +104,7 @@ const YAML_MAP: Record string> = { export default function CFamilly(props: LanguageProps) { const { baseUrl, component, onDone } = props; - const [os, setOs] = React.useState(); + const [os, setOs] = React.useState(OSs.Linux); React.useEffect(() => { onDone(os !== undefined); @@ -113,24 +113,22 @@ export default function CFamilly(props: LanguageProps) { return ( <> - + {translate('onboarding.build.other.os')} -
- setOs(value as OSs)} - options={Object.values(OSs)} + setOs(value as OSs)} + options={Object.values(OSs)} + /> + {os && ( + - {os && ( - - )} -
+ )} {os && ( + -
- {alertTranslationKeyPart && ( - -
- - -

- -

-

- -

- - } - > - - -
- - )} - - {children} -
+
+ {alertTranslationKeyPart && ( + +
+ + +

+ +

+

+ +

+ + } + > + + +
+ + )} + + {children} ); } diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx index d39dfed053f..4d48a3878d4 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx @@ -23,7 +23,7 @@ import { translate } from '../../../../helpers/l10n'; import { Component } from '../../../../types/types'; import RenderOptions from '../../components/RenderOptions'; import { OSs } from '../../types'; -import { LanguageProps } from '../JenkinsfileStep'; +import { LanguageProps } from '../JenkinsStep'; import DotNetCore from './DotNetCore'; import DotNetFramework from './DotNetFramework'; @@ -43,7 +43,8 @@ const DotOS: { [key in keyof typeof DotNetFlavor]: OSDotNet } = { export default function DotNet(props: LanguageProps) { const { component, onDone } = props; - const [flavorComponent, setFlavorComponent] = React.useState(); + const [flavorComponent, setFlavorComponent] = + React.useState('win_core'); const DotNetTutorial = flavorComponent && DotNetFlavor[flavorComponent]; React.useEffect(() => { @@ -54,15 +55,13 @@ export default function DotNet(props: LanguageProps) { <> {translate('onboarding.tutorial.with.jenkins.jenkinsfile.dotnet.build_agent')} -
- setFlavorComponent(value as keyof typeof DotNetFlavor)} - options={Object.keys(DotNetFlavor)} - /> -
+ setFlavorComponent(value as keyof typeof DotNetFlavor)} + options={Object.keys(DotNetFlavor)} + /> {DotNetTutorial && flavorComponent && ( diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetCore.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetCore.tsx index 9987c9863e1..4a5a62224ad 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetCore.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetCore.tsx @@ -48,13 +48,13 @@ export default function DotNetCore({ component, os }: DotNetCoreFrameworkProps) return ( <> - + diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetFramework.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetFramework.tsx index a7e3eab0918..4ae7fe8fc15 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetFramework.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetFramework.tsx @@ -45,7 +45,7 @@ export default function DotNetFramework({ component }: DotNetCoreFrameworkProps) <> - + + + - +
+ {translate('onboarding.tutorial.with.jenkins.dotnet.scanner.prereqs.info')} diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx index 03aa14f1817..662256ee14c 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx @@ -25,7 +25,7 @@ import GradleBuildSelection from '../../components/GradleBuildSelection'; import { InlineSnippet } from '../../components/InlineSnippet'; import { GradleBuildDSL } from '../../types'; import { buildGradleSnippet } from '../../utils'; -import { LanguageProps } from '../JenkinsfileStep'; +import { LanguageProps } from '../JenkinsStep'; import CreateJenkinsfileBulletPoint from './CreateJenkinsfileBulletPoint'; const JENKINSFILE_SNIPPET = `node { @@ -44,7 +44,7 @@ export default function Gradle(props: LanguageProps) { return ( <> - + -
- - {(build) => ( - - )} - -
+ + {(build) => ( + + )} + diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Maven.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Maven.tsx index 2ac775c1027..9c8a1e5c5cf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Maven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Maven.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { LanguageProps } from '../JenkinsfileStep'; +import { LanguageProps } from '../JenkinsStep'; import CreateJenkinsfileBulletPoint from './CreateJenkinsfileBulletPoint'; function jenkinsfileSnippet(projectKey: string, projectName: string) { diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Other.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Other.tsx index c9c8fcad16e..0a12687b635 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Other.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Other.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import DefaultProjectKey from '../../components/DefaultProjectKey'; -import { LanguageProps } from '../JenkinsfileStep'; +import { LanguageProps } from '../JenkinsStep'; import CreateJenkinsfileBulletPoint from './CreateJenkinsfileBulletPoint'; const JENKINSFILE_SNIPPET = `node { diff --git a/server/sonar-web/src/main/js/components/tutorials/other/BuildToolForm.tsx b/server/sonar-web/src/main/js/components/tutorials/other/BuildToolForm.tsx index 889231e06af..e1266dd3543 100644 --- a/server/sonar-web/src/main/js/components/tutorials/other/BuildToolForm.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/other/BuildToolForm.tsx @@ -95,7 +95,7 @@ export class BuildToolForm extends React.PureComponent { {config.buildTool === BuildTools.CFamily && config.os && ( -- 2.39.5