Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

fix a ton of typescript errors

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-01-08 13:40:07 +01:00
parent 15a9a5b09b
commit a43ffacf03
41 changed files with 229 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-ui/ui-webapp/src/containers/App.tsx
View File

@@ -1,6 +1,7 @@
import React, { Component } from "react";
import Main from "./Main";
import { connect } from "react-redux";
import { compose } from "redux";
import { WithTranslation, withTranslation } from "react-i18next";
import { withRouter } from "react-router-dom";
import { fetchMe, getFetchMeFailure, getMe, isAuthenticated, isFetchMePending } from "../modules/auth";
@@ -61,7 +62,7 @@ const mapDispatchToProps = (dispatch: any) => {
};
};
const mapStateToProps = state => {
const mapStateToProps = (state: any) => {
const authenticated = isAuthenticated(state);
const me = getMe(state);
const loading = isFetchMePending(state) || isFetchIndexResourcesPending(state);
@@ -78,9 +79,4 @@ const mapStateToProps = state => {
};
};
export default withRouter(
connect(
mapStateToProps,
mapDispatchToProps
)(withTranslation("commons")(App))
);
export default compose(withRouter, connect(mapStateToProps, mapDispatchToProps), withTranslation("commons"))(App);

10
scm-ui/ui-webapp/src/containers/Index.tsx
View File

@@ -1,6 +1,7 @@
import React, { Component } from "react";
import App from "./App";
import { connect } from "react-redux";
import { compose } from "redux";
import { WithTranslation, withTranslation } from "react-i18next";
import { withRouter } from "react-router-dom";
import { Loading, ErrorBoundary } from "@scm-manager/ui-components";
@@ -74,7 +75,7 @@ const mapDispatchToProps = (dispatch: any) => {
};
};
const mapStateToProps = state => {
const mapStateToProps = (state: any) => {
const loading = isFetchIndexResourcesPending(state);
const error = getFetchIndexResourcesFailure(state);
const indexResources = getLinks(state);
@@ -85,9 +86,4 @@ const mapStateToProps = state => {
};
};
export default withRouter(
connect(
mapStateToProps,
mapDispatchToProps
)(withTranslation("commons")(Index))
);
export default compose(withRouter, connect(mapStateToProps, mapDispatchToProps), withTranslation("commons"))(Index);

12
scm-ui/ui-webapp/src/containers/Login.tsx
View File

@@ -62,7 +62,7 @@ class Login extends React.Component<Props> {
}
}
const mapStateToProps = state => {
const mapStateToProps = (state: any) => {
const authenticated = isAuthenticated(state);
const loading = isLoginPending(state);
const error = getLoginFailure(state);
@@ -77,16 +77,10 @@ const mapStateToProps = state => {
};
};
const mapDispatchToProps = dispatch => {
const mapDispatchToProps = (dispatch: any) => {
return {
login: (loginLink: string, username: string, password: string) => dispatch(login(loginLink, username, password))
};
};
export default compose(
withRouter,
connect(
mapStateToProps,
mapDispatchToProps
)
)(Login);
export default compose(withRouter, connect(mapStateToProps, mapDispatchToProps))(Login);

9
scm-ui/ui-webapp/src/containers/Logout.tsx
View File

@@ -35,7 +35,7 @@ class Logout extends React.Component<Props> {
}
}
const mapStateToProps = state => {
const mapStateToProps = (state: any) => {
const authenticated = isAuthenticated(state);
const loading = isLogoutPending(state);
const redirecting = isRedirecting(state);
@@ -50,13 +50,10 @@ const mapStateToProps = state => {
};
};
const mapDispatchToProps = dispatch => {
const mapDispatchToProps = (dispatch: any) => {
return {
logout: (link: string) => dispatch(logout(link))
};
};
export default connect(
mapStateToProps,
mapDispatchToProps
)(withTranslation("commons")(Logout));
export default connect(mapStateToProps, mapDispatchToProps)(withTranslation("commons")(Logout));

8
scm-ui/ui-webapp/src/containers/Profile.tsx
View File

@@ -78,14 +78,10 @@ class Profile extends React.Component<Props, State> {
}
}
const mapStateToProps = state => {
const mapStateToProps = (state: any) => {
return {
me: getMe(state)
};
};
export default compose(
withTranslation("commons"),
connect(mapStateToProps),
withRouter
)(Profile);
export default compose(withTranslation("commons"), connect(mapStateToProps), withRouter)(Profile);