From b69c06960e598177148a936045bcdbe52df8207a Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 21 Dec 2018 13:41:34 +0100 Subject: [PATCH 01/16] added icons to navigation --- .../ui-components/src/navigation/NavAction.js | 11 +++++++++-- .../packages/ui-components/src/navigation/NavLink.js | 11 ++++++++++- .../groups/components/navLinks/DeleteGroupNavLink.js | 2 +- .../groups/components/navLinks/EditGroupNavLink.js | 2 +- scm-ui/src/groups/containers/SingleGroup.js | 3 ++- scm-ui/src/repos/components/DeleteNavAction.js | 2 +- .../users/components/navLinks/DeleteUserNavLink.js | 2 +- .../src/users/components/navLinks/EditUserNavLink.js | 2 +- scm-ui/src/users/containers/SingleUser.js | 1 + 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/navigation/NavAction.js b/scm-ui-components/packages/ui-components/src/navigation/NavAction.js index 5eacbb7407..3ae30d4b68 100644 --- a/scm-ui-components/packages/ui-components/src/navigation/NavAction.js +++ b/scm-ui-components/packages/ui-components/src/navigation/NavAction.js @@ -2,16 +2,23 @@ import React from "react"; type Props = { + icon?: string, label: string, action: () => void }; class NavAction extends React.Component { render() { - const { label, action } = this.props; + const { label, icon, action } = this.props; + + let showIcon = null; + if (icon) { + showIcon = (<>{" "}); + } + return (
  • - {label} + {showIcon}{label}
    • ); } diff --git a/scm-ui-components/packages/ui-components/src/navigation/NavLink.js b/scm-ui-components/packages/ui-components/src/navigation/NavLink.js index 9a7c72adb1..53b124ef31 100644 --- a/scm-ui-components/packages/ui-components/src/navigation/NavLink.js +++ b/scm-ui-components/packages/ui-components/src/navigation/NavLink.js @@ -6,6 +6,7 @@ import {Link, Route} from "react-router-dom"; type Props = { to: string, + icon?: string, label: string, activeOnlyWhenExact?: boolean, activeWhenMatch?: (route: any) => boolean @@ -23,10 +24,17 @@ class NavLink extends React.Component { } renderLink = (route: any) => { - const { to, label } = this.props; + const { to, icon, label } = this.props; + + let showIcon = null; + if (icon) { + showIcon = (<>{" "}); + } + return (
  • + {showIcon} {label}
    • @@ -35,6 +43,7 @@ class NavLink extends React.Component { render() { const { to, activeOnlyWhenExact } = this.props; + return ( ); diff --git a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js index 45bbdd3026..8021e468b3 100644 --- a/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js +++ b/scm-ui/src/groups/components/navLinks/DeleteGroupNavLink.js @@ -49,7 +49,7 @@ export class DeleteGroupNavLink extends React.Component { if (!this.isDeletable()) { return null; } - return ; + return ; } } diff --git a/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js index a0e36bc8d7..8cb46f691d 100644 --- a/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js +++ b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js @@ -18,7 +18,7 @@ class EditGroupNavLink extends React.Component { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => { diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js index 1dd4aa569f..6a626f325b 100644 --- a/scm-ui/src/groups/containers/SingleGroup.js +++ b/scm-ui/src/groups/containers/SingleGroup.js @@ -109,6 +109,7 @@ class SingleGroup extends React.Component {
    @@ -117,7 +118,7 @@ class SingleGroup extends React.Component { deleteGroup={this.deleteGroup} /> - +
    diff --git a/scm-ui/src/repos/components/DeleteNavAction.js b/scm-ui/src/repos/components/DeleteNavAction.js index c2369a5bfb..2d00b99bd4 100644 --- a/scm-ui/src/repos/components/DeleteNavAction.js +++ b/scm-ui/src/repos/components/DeleteNavAction.js @@ -51,7 +51,7 @@ class DeleteNavAction extends React.Component { if (!this.isDeletable()) { return null; } - return ; + return ; } } diff --git a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js b/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js index 47fdae0f92..80c355e999 100644 --- a/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js +++ b/scm-ui/src/users/components/navLinks/DeleteUserNavLink.js @@ -49,7 +49,7 @@ class DeleteUserNavLink extends React.Component { if (!this.isDeletable()) { return null; } - return ; + return ; } } diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.js b/scm-ui/src/users/components/navLinks/EditUserNavLink.js index 9999428212..3632f8da51 100644 --- a/scm-ui/src/users/components/navLinks/EditUserNavLink.js +++ b/scm-ui/src/users/components/navLinks/EditUserNavLink.js @@ -17,7 +17,7 @@ class EditUserNavLink extends React.Component { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => { diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js index 5f20598962..b6660f2aef 100644 --- a/scm-ui/src/users/containers/SingleUser.js +++ b/scm-ui/src/users/containers/SingleUser.js @@ -111,6 +111,7 @@ class SingleUser extends React.Component {
    From a0f9710860a3463ac047abfd0b4e164f08a24ed6 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 21 Dec 2018 13:53:59 +0100 Subject: [PATCH 02/16] added more navicons --- scm-ui/src/repos/components/EditNavLink.js | 2 +- scm-ui/src/repos/components/PermissionsNavLink.js | 2 +- scm-ui/src/repos/containers/RepositoryRoot.js | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scm-ui/src/repos/components/EditNavLink.js b/scm-ui/src/repos/components/EditNavLink.js index 1a49fdee81..a42625a154 100644 --- a/scm-ui/src/repos/components/EditNavLink.js +++ b/scm-ui/src/repos/components/EditNavLink.js @@ -15,7 +15,7 @@ class EditNavLink extends React.Component { return null; } const { editUrl, t } = this.props; - return ; + return ; } } diff --git a/scm-ui/src/repos/components/PermissionsNavLink.js b/scm-ui/src/repos/components/PermissionsNavLink.js index cb6d0e0723..70d5cec2e2 100644 --- a/scm-ui/src/repos/components/PermissionsNavLink.js +++ b/scm-ui/src/repos/components/PermissionsNavLink.js @@ -20,7 +20,7 @@ class PermissionsNavLink extends React.Component { } const { permissionUrl, t } = this.props; return ( - + ); } } diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index a3f69fe70b..d24224fe17 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -182,11 +182,12 @@ class RepositoryRoot extends React.Component {
    - + { repository={repository} linkName="sources" to={`${url}/sources`} + icon="fas fa-code" label={t("repository-root.sources")} activeOnlyWhenExact={false} /> From f3ee18767eb48a95a6df1f453862b6cdd3b7c517 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 21 Dec 2018 13:55:36 +0100 Subject: [PATCH 03/16] moved editNavLink in action section --- scm-ui/src/repos/containers/RepositoryRoot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index d24224fe17..31187702a8 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -209,10 +209,10 @@ class RepositoryRoot extends React.Component { permissionUrl={`${url}/permissions`} repository={repository} /> -
    +
    From 8eb5e7786abad8c1b36c153f08cb2b9416c4806d Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Fri, 21 Dec 2018 14:08:19 +0100 Subject: [PATCH 04/16] added navicons --- scm-ui/src/containers/Profile.js | 2 +- scm-ui/src/groups/components/navLinks/EditGroupNavLink.js | 2 +- scm-ui/src/groups/containers/SingleGroup.js | 4 ++-- scm-ui/src/repos/components/DeleteNavAction.js | 2 +- scm-ui/src/repos/components/PermissionsNavLink.js | 2 +- scm-ui/src/repos/containers/RepositoryRoot.js | 4 ++-- scm-ui/src/users/components/navLinks/EditUserNavLink.js | 2 +- scm-ui/src/users/components/navLinks/SetPasswordNavLink.js | 2 +- scm-ui/src/users/containers/SingleUser.js | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scm-ui/src/containers/Profile.js b/scm-ui/src/containers/Profile.js index b40f5f3ee0..3464e125dd 100644 --- a/scm-ui/src/containers/Profile.js +++ b/scm-ui/src/containers/Profile.js @@ -70,7 +70,7 @@ class Profile extends React.Component {
    - +
    { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => { diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js index 6a626f325b..0e56354288 100644 --- a/scm-ui/src/groups/containers/SingleGroup.js +++ b/scm-ui/src/groups/containers/SingleGroup.js @@ -108,8 +108,8 @@ class SingleGroup extends React.Component {
    @@ -118,7 +118,7 @@ class SingleGroup extends React.Component { deleteGroup={this.deleteGroup} /> - +
    diff --git a/scm-ui/src/repos/components/DeleteNavAction.js b/scm-ui/src/repos/components/DeleteNavAction.js index 2d00b99bd4..fe35a9caf1 100644 --- a/scm-ui/src/repos/components/DeleteNavAction.js +++ b/scm-ui/src/repos/components/DeleteNavAction.js @@ -51,7 +51,7 @@ class DeleteNavAction extends React.Component { if (!this.isDeletable()) { return null; } - return ; + return ; } } diff --git a/scm-ui/src/repos/components/PermissionsNavLink.js b/scm-ui/src/repos/components/PermissionsNavLink.js index 70d5cec2e2..3a6f97588b 100644 --- a/scm-ui/src/repos/components/PermissionsNavLink.js +++ b/scm-ui/src/repos/components/PermissionsNavLink.js @@ -20,7 +20,7 @@ class PermissionsNavLink extends React.Component { } const { permissionUrl, t } = this.props; return ( - + ); } } diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index 31187702a8..2ffa18e6b7 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -182,7 +182,7 @@ class RepositoryRoot extends React.Component {
    - + {
    - +
    diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.js b/scm-ui/src/users/components/navLinks/EditUserNavLink.js index 3632f8da51..8be8dbc621 100644 --- a/scm-ui/src/users/components/navLinks/EditUserNavLink.js +++ b/scm-ui/src/users/components/navLinks/EditUserNavLink.js @@ -17,7 +17,7 @@ class EditUserNavLink extends React.Component { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => { diff --git a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js index 43b7a4b5a4..46e931e788 100644 --- a/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js +++ b/scm-ui/src/users/components/navLinks/SetPasswordNavLink.js @@ -17,7 +17,7 @@ class ChangePasswordNavLink extends React.Component { if (!this.hasPermissionToSetPassword()) { return null; } - return ; + return ; } hasPermissionToSetPassword = () => { diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js index b6660f2aef..ce6e3eba50 100644 --- a/scm-ui/src/users/containers/SingleUser.js +++ b/scm-ui/src/users/containers/SingleUser.js @@ -111,8 +111,8 @@ class SingleUser extends React.Component {
    @@ -123,7 +123,7 @@ class SingleUser extends React.Component {
    - +
    From 28ac14f5f9c0b80419bc1689a16c7ac8f798fcda Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 2 Jan 2019 15:03:45 +0100 Subject: [PATCH 05/16] corrected unit tests for icon cases --- scm-ui/src/repos/components/EditNavLink.test.js | 2 +- scm-ui/src/repos/components/PermissionsNavLink.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-ui/src/repos/components/EditNavLink.test.js b/scm-ui/src/repos/components/EditNavLink.test.js index 935b7cf928..fdb13ade8d 100644 --- a/scm-ui/src/repos/components/EditNavLink.test.js +++ b/scm-ui/src/repos/components/EditNavLink.test.js @@ -33,6 +33,6 @@ describe("EditNavLink", () => { , options.get() ); - expect(navLink.text()).toBe("edit-nav-link.label"); + expect(navLink.text()).toBe(" edit-nav-link.label"); }); }); diff --git a/scm-ui/src/repos/components/PermissionsNavLink.test.js b/scm-ui/src/repos/components/PermissionsNavLink.test.js index 450c7f49e6..901175caa0 100644 --- a/scm-ui/src/repos/components/PermissionsNavLink.test.js +++ b/scm-ui/src/repos/components/PermissionsNavLink.test.js @@ -33,6 +33,6 @@ describe("PermissionsNavLink", () => { , options.get() ); - expect(navLink.text()).toBe("repository-root.permissions"); + expect(navLink.text()).toBe(" repository-root.permissions"); }); }); From 329241f29d428036de885d25f01df42534f2c926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Fri, 11 Jan 2019 12:08:19 +0100 Subject: [PATCH 06/16] remove brackets --- scm-ui/src/groups/containers/SingleGroup.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js index 0e56354288..ffc1f5feda 100644 --- a/scm-ui/src/groups/containers/SingleGroup.js +++ b/scm-ui/src/groups/containers/SingleGroup.js @@ -108,7 +108,7 @@ class SingleGroup extends React.Component {
    @@ -118,7 +118,11 @@ class SingleGroup extends React.Component { deleteGroup={this.deleteGroup} /> - +
    From 2b782b1aca4f7533818628e47803ee39f32b0544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 22 Jan 2019 10:50:45 +0100 Subject: [PATCH 07/16] open user page after user is created --- scm-ui/src/repos/containers/Create.js | 5 +++-- scm-ui/src/users/containers/AddUser.js | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js index 4cf8d468de..2d41811723 100644 --- a/scm-ui/src/repos/containers/Create.js +++ b/scm-ui/src/repos/containers/Create.js @@ -43,8 +43,9 @@ class Create extends React.Component { this.props.fetchRepositoryTypesIfNeeded(); } - repoCreated = () => { + repoCreated = (repo: Repository) => { const { history } = this.props; + //TODO: Problem: repo name can be set in history, but repo namespace is not known without fetching anything history.push("/repos"); }; @@ -70,7 +71,7 @@ class Create extends React.Component { repositoryTypes={repositoryTypes} loading={createLoading} submitForm={repo => { - createRepo(repoLink, repo, this.repoCreated); + createRepo(repoLink, repo, () => this.repoCreated(repo)); }} /> diff --git a/scm-ui/src/users/containers/AddUser.js b/scm-ui/src/users/containers/AddUser.js index 1ee6fc759d..fd9e5bdd15 100644 --- a/scm-ui/src/users/containers/AddUser.js +++ b/scm-ui/src/users/containers/AddUser.js @@ -12,7 +12,7 @@ import { } from "../modules/users"; import { Page } from "@scm-manager/ui-components"; import { translate } from "react-i18next"; -import {getUsersLink} from "../../modules/indexResource"; +import { getUsersLink } from "../../modules/indexResource"; type Props = { loading?: boolean, @@ -33,13 +33,16 @@ class AddUser extends React.Component { this.props.resetForm(); } - userCreated = () => { + userCreated = (user: User) => { const { history } = this.props; - history.push("/users"); + console.log(user); + history.push("/user/" + user.name); }; createUser = (user: User) => { - this.props.addUser(this.props.usersLink, user, this.userCreated); + this.props.addUser(this.props.usersLink, user, () => + this.userCreated(user) + ); }; render() { From e1a889143c00a602eaae9319a448de4f95c8d90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 22 Jan 2019 10:53:15 +0100 Subject: [PATCH 08/16] open group page after groupd is created --- scm-ui/src/groups/containers/AddGroup.js | 8 +++++--- scm-ui/src/users/containers/AddUser.js | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scm-ui/src/groups/containers/AddGroup.js b/scm-ui/src/groups/containers/AddGroup.js index c19f6156d1..69c1171ea9 100644 --- a/scm-ui/src/groups/containers/AddGroup.js +++ b/scm-ui/src/groups/containers/AddGroup.js @@ -68,11 +68,13 @@ class AddGroup extends React.Component { }); }); }; - groupCreated = () => { - this.props.history.push("/groups"); + groupCreated = (group: Group) => { + this.props.history.push("/group/" + group.name); }; createGroup = (group: Group) => { - this.props.createGroup(this.props.createLink, group, this.groupCreated); + this.props.createGroup(this.props.createLink, group, () => + this.groupCreated(group) + ); }; } diff --git a/scm-ui/src/users/containers/AddUser.js b/scm-ui/src/users/containers/AddUser.js index fd9e5bdd15..f19f974265 100644 --- a/scm-ui/src/users/containers/AddUser.js +++ b/scm-ui/src/users/containers/AddUser.js @@ -35,7 +35,6 @@ class AddUser extends React.Component { userCreated = (user: User) => { const { history } = this.props; - console.log(user); history.push("/user/" + user.name); }; From 0a7dca0be3f4361082ddaf4707a9f2dc6c93056f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 22 Jan 2019 11:58:31 +0100 Subject: [PATCH 09/16] open repo page after repo is created --- scm-ui/src/repos/containers/Create.js | 14 ++++++++++---- scm-ui/src/repos/modules/repos.js | 11 ++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/scm-ui/src/repos/containers/Create.js b/scm-ui/src/repos/containers/Create.js index 2d41811723..2cdd61fbbd 100644 --- a/scm-ui/src/repos/containers/Create.js +++ b/scm-ui/src/repos/containers/Create.js @@ -29,7 +29,11 @@ type Props = { // dispatch functions fetchRepositoryTypesIfNeeded: () => void, - createRepo: (link: string, Repository, callback: () => void) => void, + createRepo: ( + link: string, + Repository, + callback: (repo: Repository) => void + ) => void, resetForm: () => void, // context props @@ -45,8 +49,8 @@ class Create extends React.Component { repoCreated = (repo: Repository) => { const { history } = this.props; - //TODO: Problem: repo name can be set in history, but repo namespace is not known without fetching anything - history.push("/repos"); + + history.push("/repo/" + repo.namespace + "/" + repo.name); }; render() { @@ -71,7 +75,9 @@ class Create extends React.Component { repositoryTypes={repositoryTypes} loading={createLoading} submitForm={repo => { - createRepo(repoLink, repo, () => this.repoCreated(repo)); + createRepo(repoLink, repo, (repo: Repository) => + this.repoCreated(repo) + ); }} /> diff --git a/scm-ui/src/repos/modules/repos.js b/scm-ui/src/repos/modules/repos.js index 3e574aa938..aa77b4553b 100644 --- a/scm-ui/src/repos/modules/repos.js +++ b/scm-ui/src/repos/modules/repos.js @@ -164,16 +164,21 @@ export function fetchRepoFailure( export function createRepo( link: string, repository: Repository, - callback?: () => void + callback?: (repo: Repository) => void ) { return function(dispatch: any) { dispatch(createRepoPending()); return apiClient .post(link, repository, CONTENT_TYPE) - .then(() => { + .then(response => { + const location = response.headers.get("Location"); dispatch(createRepoSuccess()); + return apiClient.get(location); + }) + .then(response => response.json()) + .then(response => { if (callback) { - callback(); + callback(response); } }) .catch(err => { From 2494daebd49be4d8c3299d8462133375b0110162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Tue, 22 Jan 2019 13:09:06 +0100 Subject: [PATCH 10/16] fix tests --- scm-ui/src/repos/modules/repos.test.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js index e8d9873e99..0670550c18 100644 --- a/scm-ui/src/repos/modules/repos.test.js +++ b/scm-ui/src/repos/modules/repos.test.js @@ -415,9 +415,14 @@ describe("repos fetch", () => { it("should successfully create repo slarti/fjords", () => { fetchMock.postOnce(REPOS_URL, { - status: 201 + status: 201, + headers: { + location: "repositories/slarti/fjords" + } }); + fetchMock.getOnce(REPOS_URL + "/slarti/fjords", slartiFjords); + const expectedActions = [ { type: CREATE_REPO_PENDING @@ -435,9 +440,14 @@ describe("repos fetch", () => { it("should successfully create repo slarti/fjords and call the callback", () => { fetchMock.postOnce(REPOS_URL, { - status: 201 + status: 201, + headers: { + location: "repositories/slarti/fjords" + } }); + fetchMock.getOnce(REPOS_URL + "/slarti/fjords", slartiFjords); + let callMe = "not yet"; const callback = () => { From f92d6925842cdc9ba2b647ed44a98cf3c09fe50d Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 10:48:31 +0100 Subject: [PATCH 11/16] Test whether callback is called with correct parameter --- scm-ui/src/repos/modules/repos.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scm-ui/src/repos/modules/repos.test.js b/scm-ui/src/repos/modules/repos.test.js index 0670550c18..ca4b6802b8 100644 --- a/scm-ui/src/repos/modules/repos.test.js +++ b/scm-ui/src/repos/modules/repos.test.js @@ -446,11 +446,13 @@ describe("repos fetch", () => { } }); + fetchMock.getOnce(REPOS_URL + "/slarti/fjords", slartiFjords); let callMe = "not yet"; - const callback = () => { + const callback = (r: any) => { + expect(r).toEqual(slartiFjords); callMe = "yeah"; }; From 2a8640b9637c8367c3361bc6250f9a24a4bb1b60 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 11:53:07 +0100 Subject: [PATCH 12/16] Switched to recent buildfrontend-maven-plugin version to prevent issues with SQ --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e04a47ef41..41d06e8ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -386,7 +386,7 @@ com.github.sdorra buildfrontend-maven-plugin - 2.1.1 + 2.2.0 org.apache.maven.plugins From 3ddbdc6ca0a758957aea688726a4f04be98c315b Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 14:24:25 +0100 Subject: [PATCH 13/16] Configured Sonarqube to use the correct node path --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 41d06e8ca3..39f1bc15d8 100644 --- a/pom.xml +++ b/pom.xml @@ -817,6 +817,10 @@ **/*StoreFactory.java,**/*UserPassword.js + 8.11.3 + ./target/frontend/buildfrontend-node/node-v${node.version}-linux-x64/bin/node + + From 8d7435f8064f50c0e3a00b1130803bab76ede3c1 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 14:46:49 +0100 Subject: [PATCH 14/16] Fixed node path/version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 39f1bc15d8..5b300fb634 100644 --- a/pom.xml +++ b/pom.xml @@ -817,8 +817,8 @@ **/*StoreFactory.java,**/*UserPassword.js - 8.11.3 - ./target/frontend/buildfrontend-node/node-v${node.version}-linux-x64/bin/node + 8.11.4 + ./scm-ui/target/frontend/buildfrontend-node/node-v${node.version}-linux-x64/bin/node From e2ad44c69497d99fbd9f98f553115289ae2264d2 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Wed, 23 Jan 2019 14:12:40 +0000 Subject: [PATCH 15/16] Close branch feature/openElementAfterCreation From f68a59e5d1481596762026d1738716ae3547136a Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 23 Jan 2019 15:44:29 +0000 Subject: [PATCH 16/16] Close branch feature/ux_icons