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

reload historyView on branch switch // cleanup Sources

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-01-15 10:04:30 +01:00
parent 38d5de7435
commit bafa25f025
2 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scm-ui/ui-webapp/src/repos/sources/containers/HistoryView.tsx
View File

@@ -14,6 +14,7 @@ type State = {
page: number;
pageCollection?: PagedCollection;
error?: Error;
currentRevision: string;
};
class HistoryView extends React.Component<Props, State> {
@@ -23,35 +24,44 @@ class HistoryView extends React.Component<Props, State> {
this.state = {
loaded: false,
page: 1,
changesets: []
changesets: [],
currentRevision: ""
};
}
componentDidMount() {
const { file } = this.props;
this.updateHistory(file._links.history.href);
file && this.updateHistory(file._links.history.href);
}
componentDidUpdate() {
const { file } = this.props;
const { currentRevision } = this.state;
if (file?.revision !== currentRevision) {
this.updateHistory(file._links.history.href);
}
}
updateHistory(link: string) {
const { file } = this.props;
getHistory(link)
.then(result => {
if (result.error) {
this.setState({
...this.state,
error: result.error,
loaded: true
});
} else {
this.setState({
...this.state,
loaded: true,
changesets: result.changesets,
pageCollection: result.pageCollection,
page: result.pageCollection.page
});
}
this.setState({
...this.state,
loaded: true,
changesets: result.changesets,
pageCollection: result.pageCollection,
page: result.pageCollection.page,
currentRevision: file.revision
});
})
.catch(err => {});
.catch(error =>
this.setState({
...this.state,
error,
loaded: true
})
);
}
updatePage(page: number) {

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

@@ -49,7 +49,7 @@ class Sources extends React.Component<Props> {
return revision ? decodeURIComponent(revision) : revision;
};
onSelectBranch = (branch?: Branch, replaceHistory?: boolean) => {
onSelectBranch = (branch?: Branch) => {
const { baseUrl, history, path } = this.props;
let url;
if (branch) {
@@ -66,8 +66,8 @@ class Sources extends React.Component<Props> {
};
evaluateSwitchViewLink = () => {
const { baseUrl, selectedBranch } = this.props;
if (selectedBranch) {
const { baseUrl, selectedBranch, branches } = this.props;
if (selectedBranch && branches?.filter(b => b.name === selectedBranch).length !== 0) {
return `${baseUrl}/branch/${encodeURIComponent(selectedBranch)}/changesets/`;
}
return `${baseUrl}/changesets/`;