From: Pascal Mugnier Date: Wed, 4 Apr 2018 07:55:31 +0000 (+0200) Subject: Hardening 28-03 (#72) X-Git-Tag: 7.5~1417 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d7c413a1e7f442bc2fdab2499d1a35db79bf7ecb;p=sonarqube.git Hardening 28-03 (#72) --- diff --git a/server/sonar-web/public/index.html b/server/sonar-web/public/index.html index c7feadbcc69..71b679d96f4 100644 --- a/server/sonar-web/public/index.html +++ b/server/sonar-web/public/index.html @@ -1,42 +1,45 @@ - - - - - - - - - - - - - + + + - + + + + + + + + + + - + - - + - <% for (var css in htmlWebpackPlugin.files.css) { %> + + + + <% for (var css in htmlWebpackPlugin.files.css) { %> <% } %> - SonarQube - - -
-
- - Loading... -
+ Loading... + + + +
+
+ + Loading...
- - <% for (var chunk in htmlWebpackPlugin.files.chunks) { %> +
+ + <% for (var chunk in htmlWebpackPlugin.files.chunks) { %> <% } %> - + + diff --git a/server/sonar-web/src/main/js/api/components.ts b/server/sonar-web/src/main/js/api/components.ts index 60f7af8b14b..4505e8e9282 100644 --- a/server/sonar-web/src/main/js/api/components.ts +++ b/server/sonar-web/src/main/js/api/components.ts @@ -70,7 +70,6 @@ export function deletePortfolio(portfolio: string): Promise { } export function createProject(data: { - branch?: string; name: string; project: string; organization?: string; 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 9375bbf356c..316ee5f06b1 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 @@ -52,12 +52,12 @@ export default function ComponentNavBranchesMenuItem({ branchLike, ...props }: P return (
  • - - + +
    {translate('branches.main_branch')}
    )}
    • -
    - -
    - - + +
    + +
    + ); } diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranchesMenuItem-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranchesMenuItem-test.tsx.snap index df7c8da7b47..463a43a173f 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranchesMenuItem-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavBranchesMenuItem-test.tsx.snap @@ -5,23 +5,23 @@ exports[`renders main branch 1`] = ` key="branch-master" onMouseEnter={[Function]} > - - +
    -
    - +
    + -
    - - + } + concise={true} + /> +
    + `; @@ -65,25 +65,25 @@ exports[`renders short-living branch 1`] = ` key="branch-foo" onMouseEnter={[Function]} > - - +
    foo
    -
    - +
    + -
    - - + } + concise={true} + /> +
    + `; @@ -138,25 +138,25 @@ exports[`renders short-living orhpan branch 1`] = ` key="branch-foo" onMouseEnter={[Function]} > - - +
    foo
    -
    - +
    + -
    - - + } + concise={true} + /> +
    + `; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx index 5a39b28c5f8..b3e90fd06b2 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx @@ -36,8 +36,6 @@ interface Props { } interface State { - advanced: boolean; - branch: string; createdProject?: { key: string; name: string }; key: string; loading: boolean; @@ -54,8 +52,6 @@ export default class CreateProjectForm extends React.PureComponent constructor(props: Props) { super(props); this.state = { - advanced: false, - branch: '', key: '', loading: false, name: '', @@ -80,12 +76,6 @@ export default class CreateProjectForm extends React.PureComponent this.mounted = false; } - handleAdvancedClick = (event: React.SyntheticEvent) => { - event.preventDefault(); - event.currentTarget.blur(); - this.setState(state => ({ advanced: !state.advanced })); - }; - handleInputChange = (event: React.SyntheticEvent) => { const { name, value } = event.currentTarget; this.setState({ [name]: value }); @@ -100,7 +90,6 @@ export default class CreateProjectForm extends React.PureComponent const data = { name: this.state.name, - branch: this.state.branch, organization: this.props.organization && this.props.organization.key, project: this.state.key, visibility: this.state.visibility @@ -211,29 +200,6 @@ export default class CreateProjectForm extends React.PureComponent )} - {this.state.advanced ? ( -
    - - -
    - ) : ( - - )}