Merged 2.0.0-m3

2025-11-08 14:35:45 +01:00 · 2019-01-23 17:52:59 +01:00
parent d957655098 904cb2d2a2
commit d28aa79a5d
28 changed files with 111 additions and 56 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -386,7 +386,7 @@
        <plugin>
          <groupId>com.github.sdorra</groupId>
          <artifactId>buildfrontend-maven-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>2.2.0</version>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
@@ -817,6 +817,10 @@
    <!-- *UserPassword JS files are excluded because extraction of common code would not make the code more readable -->
    <sonar.cpd.exclusions>**/*StoreFactory.java,**/*UserPassword.js</sonar.cpd.exclusions>

+    <node.version>8.11.4</node.version>
+    <sonar.nodejs.executable>./scm-ui/target/frontend/buildfrontend-node/node-v${node.version}-linux-x64/bin/node</sonar.nodejs.executable>
+
+
  </properties>

 </project>
--- a/scm-ui-components/packages/ui-components/src/LinkPaginator.js
+++ b/scm-ui-components/packages/ui-components/src/LinkPaginator.js
@@ -25,13 +25,13 @@ class LinkPaginator extends React.Component<Props> {
    );
  }

-  renderPreviousButton(label?: string) {
+  renderPreviousButton(className: string, label?: string) {
    const { page } = this.props;
    const previousPage = page - 1;

    return (
      <Button
-        className={"pagination-previous"}
+        className={className}
        label={label ? label : previousPage.toString()}
        disabled={!this.hasLink("prev")}
        link={`${previousPage}`}
@@ -44,12 +44,12 @@ class LinkPaginator extends React.Component<Props> {
    return collection._links[name];
  }

-  renderNextButton(label?: string) {
+  renderNextButton(className: string, label?: string) {
    const { page } = this.props;
    const nextPage = page + 1;
    return (
      <Button
-        className={"pagination-next"}
+        className={className}
        label={label ? label : nextPage.toString()}
        disabled={!this.hasLink("next")}
        link={`${nextPage}`}
@@ -96,13 +96,13 @@ class LinkPaginator extends React.Component<Props> {
      links.push(this.separator());
    }
    if (page > 2) {
-      links.push(this.renderPreviousButton());
+      links.push(this.renderPreviousButton("pagination-link"));
    }

    links.push(this.currentPage(page));

    if (page + 1 < pageTotal) {
-      links.push(this.renderNextButton());
+      links.push(this.renderNextButton("pagination-link"));
    }
    if (page + 2 < pageTotal)
      //if there exists pages between next and last
@@ -118,13 +118,13 @@ class LinkPaginator extends React.Component<Props> {
    const { t } = this.props;
    return (
      <nav className="pagination is-centered" aria-label="pagination">
-        {this.renderPreviousButton(t("paginator.previous"))}
+        {this.renderPreviousButton("pagination-previous", t("paginator.previous"))}
        <ul className="pagination-list">
          {this.pageLinks().map((link, index) => {
            return <li key={index}>{link}</li>;
          })}
        </ul>
-        {this.renderNextButton(t("paginator.next"))}
+        {this.renderNextButton("pagination-next", t("paginator.next"))}
      </nav>
    );
  }
--- a/scm-ui-components/packages/ui-components/src/forms/MemberNameTable.js
+++ b/scm-ui-components/packages/ui-components/src/forms/MemberNameTable.js
@@ -1,10 +1,7 @@
 //@flow
 import React from "react";
 import { translate } from "react-i18next";
-import {
-  RemoveEntryOfTableButton,
-  LabelWithHelpIcon
-} from "@scm-manager/ui-components";
+import RemoveEntryOfTableButton from "../buttons/RemoveEntryOfTableButton";

 type Props = {
  members: string[],
@@ -19,10 +16,6 @@ class MemberNameTable extends React.Component<Props, State> {
    const { t } = this.props;
    return (
      <div>
-        <LabelWithHelpIcon
-          label={t("group.members")}
-          helpText={t("group-form.help.memberHelpText")}
-        />
        <table className="table is-hoverable is-fullwidth">
          <tbody>
            {this.props.members.map(member => {
--- a/scm-ui-components/packages/ui-components/src/forms/index.js
+++ b/scm-ui-components/packages/ui-components/src/forms/index.js
@@ -2,6 +2,7 @@

 export { default as AddEntryToTableField } from "./AddEntryToTableField.js";
 export { default as AutocompleteAddEntryToTableField } from "./AutocompleteAddEntryToTableField.js";
+export { default as MemberNameTable } from "./MemberNameTable.js";
 export { default as Checkbox } from "./Checkbox.js";
 export { default as InputField } from "./InputField.js";
 export { default as Select } from "./Select.js";
--- 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<Props> {
  render() {
-    const { label, action } = this.props;
+    const { label, icon, action } = this.props;
+
+    let showIcon = null;
+    if (icon) {
+      showIcon = (<><i className={icon}></i>{" "}</>);
+    }
+
    return (
      <li>
-        <a onClick={action} href="javascript:void(0);">{label}</a>
+        <a onClick={action} href="javascript:void(0);">{showIcon}{label}</a>
      </li>
    );
  }
--- 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<Props> {
  }

  renderLink = (route: any) => {
-    const { to, label } = this.props;
+    const { to, icon, label } = this.props;
+
+    let showIcon = null;
+    if (icon) {
+      showIcon = (<><i className={icon}></i>{" "}</>);
+    }
+
    return (
      <li>
        <Link className={this.isActive(route) ? "is-active" : ""} to={to}>
+          {showIcon}
          {label}
        </Link>
      </li>
@@ -35,6 +43,7 @@ class NavLink extends React.Component<Props> {

  render() {
    const { to, activeOnlyWhenExact } = this.props;
+
    return (
      <Route path={to} exact={activeOnlyWhenExact} children={this.renderLink} />
    );
--- a/scm-ui/src/containers/Profile.js
+++ b/scm-ui/src/containers/Profile.js
@@ -70,7 +70,7 @@ class Profile extends React.Component<Props, State> {
          <div className="column">
            <Navigation>
              <Section label={t("profile.navigation-label")}>
-                <NavLink to={`${url}`} label={t("profile.information")} />
+                <NavLink to={`${url}`} icon="fas fa-info-circle" label={t("profile.information")} />
              </Section>
              <Section label={t("profile.actions-label")}>
                <NavLink
--- a/scm-ui/src/groups/components/GroupForm.js
+++ b/scm-ui/src/groups/components/GroupForm.js
@@ -3,6 +3,8 @@ import React from "react";
 import { translate } from "react-i18next";
 import {
  AutocompleteAddEntryToTableField,
+  LabelWithHelpIcon,
+  MemberNameTable,
  InputField,
  SubmitButton,
  Textarea
@@ -10,7 +12,6 @@ import {
 import type { Group, SelectValue } from "@scm-manager/ui-types";

 import * as validator from "./groupValidation";
-import MemberNameTable from "./MemberNameTable";

 type Props = {
  t: string => string,
@@ -97,6 +98,10 @@ class GroupForm extends React.Component<Props, State> {
          validationError={false}
          helpText={t("group-form.help.descriptionHelpText")}
        />
+        <LabelWithHelpIcon
+          label={t("group.members")}
+          helpText={t("group-form.help.memberHelpText")}
+        />
        <MemberNameTable
          members={group.members}
          memberListChanged={this.memberListChanged}
--- 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<Props> {
    if (!this.isDeletable()) {
      return null;
    }
-    return <NavAction label={t("delete-group-button.label")} action={action} />;
+    return <NavAction icon="fas fa-times" label={t("delete-group-button.label")} action={action} />;
  }
 }

--- 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<Props, State> {
    if (!this.isEditable()) {
      return null;
    }
-    return <NavLink label={t("edit-group-button.label")} to={editUrl} />;
+    return <NavLink to={editUrl} icon="fas fa-cog" label={t("edit-group-button.label")} />;
  }

  isEditable = () => {
--- a/scm-ui/src/groups/components/navLinks/SetPermissionsNavLink.js
+++ b/scm-ui/src/groups/components/navLinks/SetPermissionsNavLink.js
@@ -17,7 +17,7 @@ class ChangePermissionNavLink extends React.Component<Props> {
    if (!this.hasPermissionToSetPermission()) {
      return null;
    }
-    return <NavLink label={t("set-permissions-button.label")} to={permissionsUrl} />;
+    return <NavLink to={permissionsUrl} label={t("set-permissions-button.label")} />;
  }

  hasPermissionToSetPermission = () => {
--- 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<Props, State> {
        });
      });
  };
-  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)
+    );
  };
 }

--- a/scm-ui/src/groups/containers/SingleGroup.js
+++ b/scm-ui/src/groups/containers/SingleGroup.js
@@ -131,6 +131,7 @@ class SingleGroup extends React.Component<Props> {
              <Section label={t("single-group.navigation-label")}>
                <NavLink
                  to={`${url}`}
+                  icon="fas fa-info-circle"
                  label={t("single-group.information-label")}
                />
                <SetPermissionsNavLink
@@ -149,7 +150,11 @@ class SingleGroup extends React.Component<Props> {
                  deleteGroup={this.deleteGroup}
                />
                <EditGroupNavLink group={group} editUrl={`${url}/edit`} />
-                <NavLink to="/groups" label={t("single-group.back-label")} />
+                <NavLink
+                  to="/groups"
+                  icon="fas fa-undo-alt"
+                  label={t("single-group.back-label")}
+                />
              </Section>
            </Navigation>
          </div>
--- 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<Props> {
    if (!this.isDeletable()) {
      return null;
    }
-    return <NavAction label={t("delete-nav-action.label")} action={action} />;
+    return <NavAction action={action} icon="fas fa-times" label={t("delete-nav-action.label")} />;
  }
 }

--- 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<Props> {
      return null;
    }
    const { editUrl, t } = this.props;
-    return <NavLink to={editUrl} label={t("edit-nav-link.label")} />;
+    return <NavLink to={editUrl} icon="fas fa-cog" label={t("edit-nav-link.label")} />;
  }
 }

--- 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<Props> {
    }
    const { permissionUrl, t } = this.props;
    return (
-      <NavLink to={permissionUrl} label={t("repository-root.permissions")} />
+      <NavLink to={permissionUrl} icon="fas fa-lock" label={t("repository-root.permissions")} />
    );
  }
 }
--- 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
@@ -43,9 +47,10 @@ class Create extends React.Component<Props> {
    this.props.fetchRepositoryTypesIfNeeded();
  }

-  repoCreated = () => {
+  repoCreated = (repo: Repository) => {
    const { history } = this.props;
-    history.push("/repos");
+
+    history.push("/repo/" + repo.namespace + "/" + repo.name);
  };

  render() {
@@ -70,7 +75,9 @@ class Create extends React.Component<Props> {
          repositoryTypes={repositoryTypes}
          loading={createLoading}
          submitForm={repo => {
-            createRepo(repoLink, repo, this.repoCreated);
+            createRepo(repoLink, repo, (repo: Repository) =>
+              this.repoCreated(repo)
+            );
          }}
        />
      </Page>
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -169,11 +169,12 @@ class RepositoryRoot extends React.Component<Props> {
          <div className="column">
            <Navigation>
              <Section label={t("repository-root.navigation-label")}>
-                <NavLink to={url} label={t("repository-root.information")} />
+                <NavLink to={url} icon="fas fa-info-circle" label={t("repository-root.information")} />
                <RepositoryNavLink
                  repository={repository}
                  linkName="changesets"
                  to={`${url}/changesets/`}
+                  icon="fas fa-code-branch"
                  label={t("repository-root.history")}
                  activeWhenMatch={this.matches}
                  activeOnlyWhenExact={false}
@@ -182,6 +183,7 @@ class RepositoryRoot extends React.Component<Props> {
                  repository={repository}
                  linkName="sources"
                  to={`${url}/sources`}
+                  icon="fas fa-code"
                  label={t("repository-root.sources")}
                  activeOnlyWhenExact={false}
                />
@@ -189,7 +191,6 @@ class RepositoryRoot extends React.Component<Props> {
                  permissionUrl={`${url}/permissions`}
                  repository={repository}
                />
-                <EditNavLink repository={repository} editUrl={`${url}/edit`} />
                <ExtensionPoint
                  name="repository.navigation"
                  props={extensionProps}
@@ -198,7 +199,8 @@ class RepositoryRoot extends React.Component<Props> {
              </Section>
              <Section label={t("repository-root.actions-label")}>
                <DeleteNavAction repository={repository} delete={this.delete} />
-                <NavLink to="/repos" label={t("repository-root.back-label")} />
+                <EditNavLink repository={repository} editUrl={`${url}/edit`} />
+                <NavLink to="/repos" icon="fas fa-undo" label={t("repository-root.back-label")} />
              </Section>
            </Navigation>
          </div>
--- 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 => {
--- 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,12 +440,19 @@ 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 = () => {
+    const callback = (r: any) => {
+      expect(r).toEqual(slartiFjords);
      callMe = "yeah";
    };

--- 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<Props> {
    if (!this.isDeletable()) {
      return null;
    }
-    return <NavAction label={t("delete-user-button.label")} action={action} />;
+    return <NavAction icon="fas fa-times" label={t("delete-user-button.label")} action={action} />;
  }
 }

--- 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<Props> {
    if (!this.isEditable()) {
      return null;
    }
-    return <NavLink label={t("edit-user-button.label")} to={editUrl} />;
+    return <NavLink to={editUrl} icon="fas fa-cog" label={t("edit-user-button.label")} />;
  }

  isEditable = () => {
--- 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<Props> {
    if (!this.hasPermissionToSetPassword()) {
      return null;
    }
-    return <NavLink label={t("set-password-button.label")} to={passwordUrl} />;
+    return <NavLink to={passwordUrl} label={t("set-password-button.label")} />;
  }

  hasPermissionToSetPassword = () => {
--- a/scm-ui/src/users/components/navLinks/SetPermissionsNavLink.js
+++ b/scm-ui/src/users/components/navLinks/SetPermissionsNavLink.js
@@ -17,7 +17,7 @@ class ChangePermissionNavLink extends React.Component<Props> {
    if (!this.hasPermissionToSetPermission()) {
      return null;
    }
-    return <NavLink label={t("set-permissions-button.label")} to={permissionsUrl} />;
+    return <NavLink to={permissionsUrl} label={t("set-permissions-button.label")} />;
  }

  hasPermissionToSetPermission = () => {
--- a/scm-ui/src/users/containers/AddUser.js
+++ b/scm-ui/src/users/containers/AddUser.js
@@ -33,13 +33,15 @@ class AddUser extends React.Component<Props> {
    this.props.resetForm();
  }

-  userCreated = () => {
+  userCreated = (user: User) => {
    const { history } = this.props;
-    history.push("/users");
+    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() {
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -122,6 +122,7 @@ class SingleUser extends React.Component<Props> {
              <Section label={t("single-user.navigation-label")}>
                <NavLink
                  to={`${url}`}
+                  icon="fas fa-info-circle"
                  label={t("single-user.information-label")}
                />
                <EditUserNavLink user={user} editUrl={`${url}/edit`} />
@@ -136,7 +137,7 @@ class SingleUser extends React.Component<Props> {
              </Section>
              <Section label={t("single-user.actions-label")}>
                <DeleteUserNavLink user={user} deleteUser={this.deleteUser} />
-                <NavLink to="/users" label={t("single-user.back-label")} />
+                <NavLink to="/users" icon="fas fa-undo" label={t("single-user.back-label")} />
              </Section>
            </Navigation>
          </div>