IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: added version history api

Browse Source
This commit is contained in:
Nikita Gopienko 2020-08-12 11:08:04 +03:00
parent 15745729c8
commit 181c1e52f4
4 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
View File

@ -100,9 +100,10 @@ const StyledRow = styled(Row)`
`;
const VersionRow = props => {
const { info, index, culture, selectedFolderId, filter, onLoading, isVersion, t } = props;
const { info, index, culture, selectedFolderId, filter, onLoading, isVersion, t, getFileVersions } = props;
const [showEditPanel, setShowEditPanel] = useState(false);
const [commentValue, setCommentValue] = useState(info.comment);
const [commentValue, setCommentValue] = useState(info.comment);
const [displayComment, setDisplayComment] = useState(info.comment);
const VersionBadge = (props) => (
<Box {...props} marginProp="0 8px" displayProp="flex">
@ -140,11 +141,18 @@ const VersionRow = props => {
const linkStyles = { isHovered: true, type: "action" };
const onDownloadAction = () => window.open(info.viewUrl);
const onDownloadAction = () => window.open(`${info.viewUrl}&version=${info.version}`);
const onEditComment = () => setShowEditPanel(!showEditPanel);
const onChange = e => setCommentValue(e.target.value);
const onSaveClick = () => console.log('onSaveClick server');
const onSaveClick = () =>
api.files
.versionEditComment(info.id, commentValue, info.version)
.then(() => setDisplayComment(commentValue))
.catch((err) => toastr.error(err))
.finally(() => onEditComment());
const onCancelClick = () => {
setCommentValue(info.comment);
setShowEditPanel(!showEditPanel);
@ -153,37 +161,27 @@ const VersionRow = props => {
const onRestoreClick = () => {
console.log("onRestoreClick");
/*const fileId = info.id;
onLoading(true);
//TODO: wait api request
/*onLoading(true);
api.files
.finalizeVersionTest(fileId, info.version)
.then((data) => {
return fetchFiles(
selectedFolderId,
filter,
store.dispatch
).catch((err) => toastr.error(err));
})
.versionRestore(info.id, info.version)
.then(() => getFileVersions(info.id))
.catch((err) => toastr.error(err))
.finally(() => onLoading(false));*/
}
const onVersionClick = (e) => {
console.log("onVersionClick");
/*const fileId = info.id;
//TODO: wait api request
/*if(index === 0) return;
//const version = isVersion ? info.versionGroup : info.version;
onLoading(true);
api.files
.finalizeVersionTest(fileId, info.version)
.then((data) => {
return fetchFiles(
selectedFolderId,
filter,
store.dispatch
).catch((err) => toastr.error(err));
})
api.files.markAsVersion(info.id, isVersion, info.version)
.then(() => getFileVersions(info.id))
.catch((err) => toastr.error(err))
.finally(() => onLoading(false));*/
}
@ -250,9 +248,9 @@ const VersionRow = props => {
</>
)}
<Link onClick={onEditComment} className="version_link">
{info.comment}
{displayComment}
</Link>
<Text className="version_text">{info.comment}</Text>
<Text className="version_text">{displayComment}</Text>
</>
<Link
@ -272,7 +270,7 @@ const VersionRow = props => {
</Box>
{showEditPanel && (
<Box className="version_edit-comment" marginProp='8px 0 16px 70px'>
<Button size='medium' primary style={{marginRight: '8px'}} onClick={onSaveClick} label={'AddButton'}/>
<Button size='medium' primary style={{marginRight: '8px'}} onClick={onSaveClick} label={t('AddButton')}/>
<Button size='medium' onClick={onCancelClick} label={t('CancelButton')} />
</Box>
)}
@ -292,4 +290,3 @@ const mapStateToProps = state => {
};
export default connect(mapStateToProps, { })(withRouter(withTranslation()(VersionRow)));
//export default VersionRow;

4
products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
View File

@ -7,7 +7,7 @@ import VersionRow from "./VersionRow";
//import i18n from '../../i18n';
const SectionBodyContent = props => {
const { versions, culture, onLoading } = props;
const { versions, culture, onLoading, getFileVersions } = props;
console.log("VersionHistory SectionBodyContent render()", versions);
let itemVersion = null;
@ -23,7 +23,7 @@ const SectionBodyContent = props => {
}
return (
<VersionRow isVersion={isVersion} key={info.id} info={info} index={index} culture={culture} onLoading={onLoading}/>
<VersionRow getFileVersions={getFileVersions} isVersion={isVersion} key={info.id} info={info} index={index} culture={culture} onLoading={onLoading}/>
);
})}</RowContainer>
)

10
products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
View File

@ -37,12 +37,15 @@ class PureVersionHistory extends React.Component {
//document.title = `${t("GroupAction")} – ${t("People")}`;
if (fileId) {
//fetchGroup(fileId);
api.files.getFileVersionInfo(fileId)
.then((versions) => this.setState({ versions }))
this.getFileVersions(fileId);
}
}
getFileVersions = fileId => {
api.files.getFileVersionInfo(fileId)
.then((versions) => this.setState({ versions }))
}
onLoading = status => {
this.setState({ isLoading: status });
};
@ -91,6 +94,7 @@ class PureVersionHistory extends React.Component {
<PageLayout.SectionBody>
<SectionBodyContent
getFileVersions={this.getFileVersions}
onLoading={this.onLoading}
versions={versions}
culture={settings.culture}

15
web/ASC.Web.Common/src/api/files/index.js
View File

@ -360,3 +360,18 @@ export function finalizeVersion(fileId, version, continueVersion) {
data
});
}
export function markAsVersion(fileId, continueVersion, version) {
const data = { continueVersion, version };
return request({ method: "put", url: `/files/file/${fileId}/history`, data });
}
export function versionEditComment(fileId, comment, version) {
const data = { comment, version };
return request({ method: "put", url: `/files/file/${fileId}/comment`, data });
}
export function versionRestore(fileId, version) {
const data = { version };
return request({ method: "put", url: `/files/file/${fileId}`, data });
}