From 7bf76a91f5f1ccc89fc6a92ec4d5672db312211b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 7 Aug 2018 15:08:44 +0200 Subject: [PATCH] fixed review notes --- scm-ui/public/locales/en/repos.json | 8 +++--- .../repos/components/list/RepositoryEntry.js | 2 -- scm-ui/src/repos/containers/Edit.js | 27 +++++++------------ scm-ui/src/repos/containers/RepositoryRoot.js | 5 +++- scm-ui/src/repos/modules/repositoryTypes.js | 5 +++- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json index 29074a49ba..7db2623247 100644 --- a/scm-ui/public/locales/en/repos.json +++ b/scm-ui/public/locales/en/repos.json @@ -20,16 +20,14 @@ "error-title": "Error", "error-subtitle": "Unknown repository error", "actions-label": "Actions", - "back-label": "Back" + "back-label": "Back", + "navigation-label": "Navigation", + "information": "Information" }, "create": { "title": "Create Repository", "subtitle": "Create a new repository" }, - "edit": { - "title": "Edit Repository", - "subtitle": "Edit an existing repository" - }, "repository-form": { "submit": "Save" }, diff --git a/scm-ui/src/repos/components/list/RepositoryEntry.js b/scm-ui/src/repos/components/list/RepositoryEntry.js index 72ebd70d77..99d59020ce 100644 --- a/scm-ui/src/repos/components/list/RepositoryEntry.js +++ b/scm-ui/src/repos/components/list/RepositoryEntry.js @@ -9,8 +9,6 @@ import classNames from "classnames"; import icon from "../../../images/blib.jpg"; -// TODO we need a variable or something central for the hover - const styles = { outer: { position: "relative" diff --git a/scm-ui/src/repos/containers/Edit.js b/scm-ui/src/repos/containers/Edit.js index 3a5662ecf1..201ab3f2a7 100644 --- a/scm-ui/src/repos/containers/Edit.js +++ b/scm-ui/src/repos/containers/Edit.js @@ -2,7 +2,6 @@ import React from "react"; import { connect } from "react-redux"; import { translate } from "react-i18next"; -import { Page } from "../../components/layout"; import RepositoryForm from "../components/form"; import type { Repository } from "../types/Repositories"; import { @@ -12,11 +11,12 @@ import { } from "../modules/repos"; import { withRouter } from "react-router-dom"; import type { History } from "history"; +import ErrorNotification from "../../components/ErrorNotification"; type Props = { repository: Repository, modifyRepo: (Repository, () => void) => void, - modifyLoading: boolean, + loading: boolean, error: Error, // context props @@ -25,43 +25,34 @@ type Props = { }; class Edit extends React.Component { - componentDidMount() {} - repoModified = () => { const { history, repository } = this.props; history.push(`/repo/${repository.namespace}/${repository.name}`); }; render() { - const { t, modifyLoading, error } = this.props; + const { loading, error } = this.props; return ( - +
+ { this.props.modifyRepo(repo, this.repoModified); }} /> - +
); } } const mapStateToProps = (state, ownProps) => { const { namespace, name } = ownProps.repository; - - const modifyLoading = isModifyRepoPending(state, namespace, name); - + const loading = isModifyRepoPending(state, namespace, name); const error = getModifyRepoFailure(state, namespace, name); - return { - modifyLoading, + loading, error }; }; diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index fe343b4be3..820aedf964 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -100,8 +100,11 @@ class RepositoryRoot extends React.Component {
-
+
+ +
+
diff --git a/scm-ui/src/repos/modules/repositoryTypes.js b/scm-ui/src/repos/modules/repositoryTypes.js index ecc3594c2b..c41fdcfc67 100644 --- a/scm-ui/src/repos/modules/repositoryTypes.js +++ b/scm-ui/src/repos/modules/repositoryTypes.js @@ -38,7 +38,10 @@ function fetchRepositoryTypes(dispatch: any) { dispatch(fetchRepositoryTypesSuccess(repositoryTypes)); }) .catch(err => { - dispatch(fetchRepositoryTypesFailure(err)); + const error = new Error( + `failed to fetch repository types: ${err.message}` + ); + dispatch(fetchRepositoryTypesFailure(error)); }); }