mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-01-19 22:12:10 +01:00
use ErrorNotification instead of ErrorPage, because we are already wrapped by a Page
This commit is contained in:
@@ -44,8 +44,6 @@
|
||||
"subtitle": "Erstellen eines neuen Repository"
|
||||
},
|
||||
"branches": {
|
||||
"errorTitle": "Fehler",
|
||||
"errorSubtitle": "Unbekannter Branch Fehler",
|
||||
"overview": {
|
||||
"title": "Übersicht aller verfügbaren Branches",
|
||||
"createButton": "Branch erstellen"
|
||||
|
||||
@@ -44,8 +44,6 @@
|
||||
"subtitle": "Create a new repository"
|
||||
},
|
||||
"branches": {
|
||||
"errorTitle": "Error",
|
||||
"errorSubtitle": "Unknown branch error",
|
||||
"overview": {
|
||||
"title": "Overview of all branches",
|
||||
"createButton": "Create Branch"
|
||||
|
||||
@@ -3,7 +3,6 @@ import React from "react";
|
||||
import BranchView from "../components/BranchView";
|
||||
import { connect } from "react-redux";
|
||||
import { Redirect, Route, Switch, withRouter } from "react-router-dom";
|
||||
import { translate } from "react-i18next";
|
||||
import type { Repository, Branch } from "@scm-manager/ui-types";
|
||||
import {
|
||||
fetchBranch,
|
||||
@@ -11,7 +10,7 @@ import {
|
||||
getFetchBranchFailure,
|
||||
isFetchBranchPending
|
||||
} from "../modules/branches";
|
||||
import { ErrorPage, Loading } from "@scm-manager/ui-components";
|
||||
import { ErrorNotification, Loading } from "@scm-manager/ui-components";
|
||||
import type { History } from "history";
|
||||
import { NotFoundError } from "@scm-manager/ui-components";
|
||||
|
||||
@@ -23,7 +22,6 @@ type Props = {
|
||||
error?: Error,
|
||||
|
||||
// context props
|
||||
t: string => string,
|
||||
history: History,
|
||||
match: any,
|
||||
location: any,
|
||||
@@ -56,7 +54,6 @@ class BranchRoot extends React.Component<Props> {
|
||||
branch,
|
||||
loading,
|
||||
error,
|
||||
t,
|
||||
match,
|
||||
location
|
||||
} = this.props;
|
||||
@@ -69,11 +66,7 @@ class BranchRoot extends React.Component<Props> {
|
||||
}
|
||||
|
||||
return (
|
||||
<ErrorPage
|
||||
title={t("branches.errorTitle")}
|
||||
subtitle={t("branches.errorSubtitle")}
|
||||
error={error}
|
||||
/>
|
||||
<ErrorNotification error={error} />
|
||||
);
|
||||
}
|
||||
|
||||
@@ -122,5 +115,5 @@ export default withRouter(
|
||||
connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(translate("repos")(BranchRoot))
|
||||
)(BranchRoot)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user