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

fix routes for sources and changesets // fix typing errors

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-01-08 10:31:43 +01:00
parent 20c00e7222
commit c73e85e3d6
13 changed files with 130 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/ui-webapp/src/repos/sources/containers/SourceExtensions.tsx
View File

@@ -24,7 +24,7 @@ type Props = WithTranslation &
sources?: File | null;
// dispatch props
fetchSources: (repository: Repository, revision: string, path: string) => void;
fetchSources: (repository: Repository, revision: string | undefined, path: string | undefined) => void;
};
const extensionPointName = "repos.sources.extensions";
@@ -33,7 +33,7 @@ class SourceExtensions extends React.Component<Props> {
componentDidMount() {
const { fetchSources, repository, revision, path } = this.props;
// TODO get typing right
fetchSources(repository, revision || "", path || "");
fetchSources(repository, revision, path);
}
render() {

10
scm-ui/ui-webapp/src/repos/sources/containers/Sources.tsx
View File

@@ -1,9 +1,9 @@
import React from "react";
import { connect } from "react-redux";
import { connect, Dispatch, DispatchProp, MapDispatchToProps } from "react-redux";
import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import { Branch, Repository } from "@scm-manager/ui-types";
import { BranchSelector, Breadcrumb, ErrorNotification, Loading } from "@scm-manager/ui-components";
import { Breadcrumb, ErrorNotification, Loading } from "@scm-manager/ui-components";
import FileTree from "../components/FileTree";
import {
fetchBranches,
@@ -58,7 +58,7 @@ class Sources extends React.Component<Props, State> {
this.redirectToDefaultBranch();
}
componentDidUpdate(prevProps) {
componentDidUpdate(prevProps: Props) {
const { fetchSources, repository, revision, path } = this.props;
if (prevProps.revision !== revision || prevProps.path !== path) {
fetchSources(repository, this.decodeRevision(revision), path);
@@ -147,7 +147,7 @@ class Sources extends React.Component<Props, State> {
};
}
const mapStateToProps = (state, ownProps) => {
const mapStateToProps = (state: any, ownProps: Props) => {
const { repository, match } = ownProps;
const { revision, path } = match.params;
const decodedRevision = revision ? decodeURIComponent(revision) : undefined;
@@ -171,7 +171,7 @@ const mapStateToProps = (state, ownProps) => {
};
};
const mapDispatchToProps = dispatch => {
const mapDispatchToProps = (dispatch: any) => {
return {
fetchBranches: (repository: Repository) => {
dispatch(fetchBranches(repository));

4
scm-ui/ui-webapp/src/repos/sources/modules/sources.ts
View File

@@ -84,7 +84,7 @@ export function fetchSourcesFailure(repository: Repository, revision: string, pa
};
}
function createItemId(repository: Repository, revision: string, path: string) {
function createItemId(repository: Repository, revision: string | undefined, path: string) {
const revPart = revision ? revision : "_";
const pathPart = path ? path : "";
return `${repository.namespace}/${repository.name}/${decodeURIComponent(revPart)}/${pathPart}`;
@@ -121,7 +121,7 @@ export function isDirectory(state: any, repository: Repository, revision: string
export function getSources(
state: any,
repository: Repository,
revision: string,
revision: string | undefined,
path: string
): File | null | undefined {
if (state.sources) {