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

Merge branch 'release/1.0.0' into bugfix/remove-access-btn

Browse Source
This commit is contained in:
Dmitry Sychugov 2021-08-06 18:30:58 +05:00
commit 360e7392d0
8 changed files with 76 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
products/ASC.Files/Client/src/HOCs/withContextOptions.js
View File

@ -109,14 +109,26 @@ export default function withContextOptions(WrappedComponent) {
setConvertItem(item);
setConvertDialogVisible(true);
} else {
this.onPreviewClick();
this.openDocEditor(false);
}
};
onPreviewClick = () => {
this.openDocEditor(true);
};
openDocEditor = (preview = false) => {
const { item, openDocEditor, isDesktop } = this.props;
const { id, providerKey, fileExst } = item;
const urlFormation = preview
? combineUrl(
AppServerConfig.proxyURL,
config.homepage,
`/doceditor?fileId=${id}&action=view`
)
: null;
let tab =
!isDesktop && fileExst
? window.open(
@ -129,15 +141,14 @@ export default function withContextOptions(WrappedComponent) {
)
: null;
openDocEditor(id, providerKey, tab);
openDocEditor(id, providerKey, tab, urlFormation);
};
onClickDownload = () => {
const { item, downloadAction, t } = this.props;
const { fileExst, contentLength, viewUrl } = item;
const isFile = !!fileExst && contentLength;
isFile
? window.open(viewUrl, "_blank")
? window.open(viewUrl, "_self")
: downloadAction(t("Translations:ArchivingData")).catch((err) =>
toastr.error(err)
);

8
products/ASC.Files/Client/src/HOCs/withFileActions.js
View File

@ -173,6 +173,7 @@ export default function withFileActions(WrappedFileItem) {
isVideo,
canConvert,
canWebEdit,
canViewedDocs,
item,
isTrashFolder,
isPrivacy,
@ -226,7 +227,7 @@ export default function withFileActions(WrappedFileItem) {
if (fileStatus === 2) this.onMarkAsRead(id);
if (canWebEdit) {
if (canWebEdit || canViewedDocs) {
let tab =
!isDesktop && fileExst
? window.open(
@ -268,6 +269,7 @@ export default function withFileActions(WrappedFileItem) {
isDesktop,
personal,
canWebEdit,
canViewedDocs,
} = this.props;
const { fileExst, access, contentLength, id, shared } = item;
@ -294,7 +296,7 @@ export default function withFileActions(WrappedFileItem) {
const sharedButton =
!canShare ||
!showShare ||
(personal && !canWebEdit) ||
(personal && !canWebEdit && !canViewedDocs) ||
isEdit ||
id <= 0 ||
isMobile
@ -402,6 +404,7 @@ export default function withFileActions(WrappedFileItem) {
const isVideo = mediaViewersFormatsStore.isVideo(item.fileExst);
const canWebEdit = docserviceStore.canWebEdit(item.fileExst);
const canConvert = docserviceStore.canConvert(item.fileExst);
const canViewedDocs = docserviceStore.canViewedDocs(item.fileExst);
return {
t,
@ -432,6 +435,7 @@ export default function withFileActions(WrappedFileItem) {
isSound,
isVideo,
canWebEdit,
canViewedDocs,
canConvert,
isTrashFolder: isRecycleBinFolder,
openDocEditor,

11
products/ASC.Files/Client/src/components/panels/StyledPanels.js
View File

@ -1,5 +1,6 @@
import styled, { css } from "styled-components";
import Scrollbar from "@appserver/components/scrollbar";
import { tablet } from "@appserver/components/utils/device";
const PanelStyles = css`
.panel_combo-box {
@ -204,6 +205,16 @@ const StyledContent = styled.div`
display: inline;
margin-right: 10px;
}
.layout-progress-bar {
position: fixed;
right: 15px;
bottom: 21px;
@media ${tablet} {
bottom: 83px;
}
}
`;
const StyledHeaderContent = styled.div`

13
products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
View File

@ -4,6 +4,7 @@ import Backdrop from "@appserver/components/backdrop";
import Heading from "@appserver/components/heading";
import Aside from "@appserver/components/aside";
import Loaders from "@appserver/common/components/Loaders";
import FloatingButton from "@appserver/common/components/FloatingButton";
import { withTranslation } from "react-i18next";
import history from "@appserver/common/history";
import {
@ -35,9 +36,10 @@ class PureVersionHistoryPanel extends React.Component {
render() {
//console.log("render versionHistoryPanel");
const { visible, isLoading, versions } = this.props;
const { visible, isLoading, versions, showProgressBar } = this.props;
const zIndex = 310;
console.log("showProgressBar", showProgressBar);
return (
<StyledVersionHistoryPanel
className="version-history-modal-dialog"
@ -74,6 +76,13 @@ class PureVersionHistoryPanel extends React.Component {
<StyledBody className="version-history-panel-body">
<SectionBodyContent />
</StyledBody>
{showProgressBar && (
<FloatingButton
className="layout-progress-bar"
icon="file"
alert={false}
/>
)}
</StyledContent>
</Aside>
</StyledVersionHistoryPanel>
@ -97,6 +106,7 @@ export default inject(({ auth, filesStore, versionHistoryStore }) => {
versions,
setIsVerHistoryPanel,
isVisible: visible,
showProgressBar,
} = versionHistoryStore;
return {
@ -106,6 +116,7 @@ export default inject(({ auth, filesStore, versionHistoryStore }) => {
fileId,
versions,
visible,
showProgressBar,
setIsVerHistoryPanel,
};

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

@ -41,13 +41,16 @@ class PureVersionHistory extends React.Component {
};
render() {
const { isLoading, versions } = this.props;
const { isLoading, versions, showProgressBar } = this.props;
return (
<PageLayout
withBodyScroll={true}
withBodyAutoFocus={true}
headerBorderBottom={true}
showSecondaryProgressBar={showProgressBar}
secondaryProgressBarIcon="file"
showSecondaryButtonAlert={false}
>
<PageLayout.ArticleHeader>
<ArticleHeaderContent />
@ -88,13 +91,18 @@ VersionHistory.propTypes = {
export default inject(({ auth, filesStore, versionHistoryStore }) => {
const { filter, isLoading } = filesStore;
const { setIsVerHistoryPanel, versions } = versionHistoryStore;
const {
setIsVerHistoryPanel,
versions,
showProgressBar,
} = versionHistoryStore;
return {
isTabletView: auth.settingsStore.isTabletView,
isLoading,
filter,
versions,
showProgressBar,
setIsVerHistoryPanel,
};

2
products/ASC.Files/Client/src/store/FilesStore.js
View File

@ -461,7 +461,7 @@ class FilesStore {
"unsubscribe",
]);
if (!this.isWebEditSelected) {
if (!this.isWebEditSelected && !canViewedDocs(item.fileExst)) {
fileOptions = this.removeOptions(fileOptions, ["sharing-settings"]);
}
}

22
products/ASC.Files/Client/src/store/VersionHistoryStore.js
View File

@ -6,12 +6,14 @@ class VersionHistoryStore {
fileId = null;
versions = null;
filesStore = null;
showProgressBar = false;
constructor(filesStore) {
makeObservable(this, {
isVisible: observable,
fileId: observable,
versions: observable,
showProgressBar: observable,
setIsVerHistoryPanel: action,
setVerHistoryFileId: action,
@ -75,11 +77,17 @@ class VersionHistoryStore {
};
restoreVersion = (id, version) => {
return api.files.versionRestore(id, version).then((newVersion) => {
const updatedVersions = this.versions.slice();
updatedVersions.splice(1, 0, newVersion);
this.setVerHistoryFileVersions(updatedVersions);
});
this.setShowProgressBar(true);
return api.files
.versionRestore(id, version)
.then((newVersion) => {
const updatedVersions = this.versions.slice();
updatedVersions.splice(1, 0, newVersion);
this.setVerHistoryFileVersions(updatedVersions);
this.setShowProgressBar(false);
})
.catch(() => this.setShowProgressBar(false));
};
updateCommentVersion = (id, comment, version) => {
@ -96,6 +104,10 @@ class VersionHistoryStore {
this.setVerHistoryFileVersions(updatedVersions);
});
};
setShowProgressBar = (show) => {
this.showProgressBar = show;
};
}
export default VersionHistoryStore;

4
web/ASC.Web.Editor/src/Editor.jsx
View File

@ -233,6 +233,10 @@ const Editor = () => {
};
}
if (url.indexOf("action=view") !== -1) {
config.editorConfig.mode = "view";
}
setIsLoading(false);
loadDocApi(docApiUrl, () => onLoad(config));