Merge branch 'feature/files' into feature/files-recent
# Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
This commit is contained in:
commit
3578340bcd
@ -31,12 +31,17 @@ const {
|
||||
getModules,
|
||||
setCurrentProductId,
|
||||
setCurrentProductHomePage,
|
||||
getPortalPasswordSettings,
|
||||
getPortalCultures,
|
||||
} = commonStore.auth.actions;
|
||||
const { AUTH_KEY } = constants;
|
||||
|
||||
class App extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.isEditor = window.location.pathname.indexOf("doceditor") !== -1;
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
utils.removeTempContent();
|
||||
|
||||
@ -45,7 +50,6 @@ class App extends React.Component {
|
||||
getUser,
|
||||
getPortalSettings,
|
||||
getModules,
|
||||
getPortalPasswordSettings,
|
||||
getPortalCultures,
|
||||
fetchTreeFolders,
|
||||
setIsLoaded,
|
||||
@ -59,11 +63,12 @@ class App extends React.Component {
|
||||
return setIsLoaded();
|
||||
}
|
||||
|
||||
const requests = [
|
||||
const requests = this.isEditor
|
||||
? [getUser()]
|
||||
: [
|
||||
getUser(),
|
||||
getPortalSettings(),
|
||||
getModules(),
|
||||
getPortalPasswordSettings(),
|
||||
getPortalCultures(),
|
||||
fetchTreeFolders(),
|
||||
];
|
||||
@ -82,9 +87,7 @@ class App extends React.Component {
|
||||
|
||||
return navigator.onLine ? (
|
||||
<Router history={history}>
|
||||
{!window.location.pathname.startsWith(`${homepage}/doceditor`) && (
|
||||
<NavMenu />
|
||||
)}
|
||||
{!this.isEditor && <NavMenu />}
|
||||
<Main>
|
||||
<Suspense fallback={null}>
|
||||
<Switch>
|
||||
@ -144,7 +147,6 @@ const mapDispatchToProps = (dispatch) => {
|
||||
getUser: () => getUser(dispatch),
|
||||
getPortalSettings: () => getPortalSettings(dispatch),
|
||||
getModules: () => getModules(dispatch),
|
||||
getPortalPasswordSettings: () => getPortalPasswordSettings(dispatch),
|
||||
getPortalCultures: () => getPortalCultures(dispatch),
|
||||
fetchTreeFolders: () => fetchTreeFolders(dispatch),
|
||||
setIsLoaded: () => dispatch(setIsLoaded(true)),
|
||||
|
@ -113,14 +113,13 @@ class TreeFolders extends React.Component {
|
||||
commonId,
|
||||
rootFolderId,
|
||||
currentId,
|
||||
draggableItems
|
||||
draggableItems,
|
||||
} = this.props;
|
||||
if (item.id === currentId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(draggableItems.find(x => x.id === item.id))
|
||||
return false;
|
||||
if (draggableItems.find((x) => x.id === item.id)) return false;
|
||||
|
||||
const isMy = rootFolderId === FolderType.USER;
|
||||
const isCommon = rootFolderId === FolderType.COMMON;
|
||||
@ -190,6 +189,9 @@ class TreeFolders extends React.Component {
|
||||
dragging={dragging}
|
||||
isLeaf={item.foldersCount ? false : true}
|
||||
icon={this.getFolderIcon(item)}
|
||||
newItems={item.newItems}
|
||||
onBadgeClick={this.onBadgeClick}
|
||||
showBadge={showBadge}
|
||||
/>
|
||||
);
|
||||
});
|
||||
@ -362,8 +364,10 @@ class TreeFolders extends React.Component {
|
||||
const { dragging, id } = data.node.props;
|
||||
setDragging(false);
|
||||
if (dragging) {
|
||||
const promise = new Promise((resolve) => onConvertFiles(data.event, resolve));
|
||||
promise.then(files => onTreeDrop(files, id));
|
||||
const promise = new Promise((resolve) =>
|
||||
onConvertFiles(data.event, resolve)
|
||||
);
|
||||
promise.then((files) => onTreeDrop(files, id));
|
||||
}
|
||||
};
|
||||
|
||||
@ -424,7 +428,7 @@ function mapStateToProps(state) {
|
||||
dragging: getDragging(state),
|
||||
updateTree: getUpdateTree(state),
|
||||
rootFolderId: getRootFolderId(state),
|
||||
draggableItems: getDraggableItems(state)
|
||||
draggableItems: getDraggableItems(state),
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,7 @@
|
||||
"TitleRemoved": "Удалён",
|
||||
"TitleSubfolders": "Flds",
|
||||
"TitleDocuments": "Dcs",
|
||||
"Share": "Общий доступ",
|
||||
"Share": "Доступ",
|
||||
"DownloadAs": "Скачать как",
|
||||
"More": "Больше",
|
||||
"CloseButton": "Закрыть",
|
||||
|
@ -1,11 +1,17 @@
|
||||
|
||||
import React from "react";
|
||||
import { connect } from "react-redux";
|
||||
import { withRouter } from "react-router";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import styled from "styled-components";
|
||||
import { RowContent, Link, Text, Icons, IconButton, Badge } from "asc-web-components";
|
||||
import { constants, api, toastr, store as initStore } from 'asc-web-common';
|
||||
import {
|
||||
RowContent,
|
||||
Link,
|
||||
Text,
|
||||
Icons,
|
||||
IconButton,
|
||||
Badge,
|
||||
} from "asc-web-components";
|
||||
import { constants, api, toastr, store as initStore } from "asc-web-common";
|
||||
import {
|
||||
clearProgressData,
|
||||
createFile,
|
||||
@ -18,7 +24,7 @@ import {
|
||||
setTreeFolders,
|
||||
setUpdateTree,
|
||||
updateFile,
|
||||
} from '../../../../../store/files/actions';
|
||||
} from "../../../../../store/files/actions";
|
||||
import {
|
||||
canConvert,
|
||||
canWebEdit,
|
||||
@ -38,13 +44,13 @@ import {
|
||||
isImage,
|
||||
isSound,
|
||||
isVideo,
|
||||
} from '../../../../../store/files/selectors';
|
||||
} from "../../../../../store/files/selectors";
|
||||
import { NewFilesPanel } from "../../../../panels";
|
||||
import { ConvertDialog } from "../../../../dialogs";
|
||||
import EditingWrapperComponent from "./EditingWrapperComponent";
|
||||
|
||||
const { FileAction } = constants;
|
||||
const sideColor = '#A3A9AE';
|
||||
const sideColor = "#A3A9AE";
|
||||
const { getSettings } = initStore.auth.selectors;
|
||||
|
||||
const SimpleFilesRowContent = styled(RowContent)`
|
||||
@ -75,22 +81,25 @@ const SimpleFilesRowContent = styled(RowContent)`
|
||||
}
|
||||
`;
|
||||
|
||||
const okIcon = <Icons.CheckIcon
|
||||
className='edit-ok-icon'
|
||||
size='scale'
|
||||
const okIcon = (
|
||||
<Icons.CheckIcon
|
||||
className="edit-ok-icon"
|
||||
size="scale"
|
||||
isfill={true}
|
||||
color='#A3A9AE'
|
||||
/>;
|
||||
color="#A3A9AE"
|
||||
/>
|
||||
);
|
||||
|
||||
const cancelIcon = <Icons.CrossIcon
|
||||
className='edit-cancel-icon'
|
||||
size='scale'
|
||||
const cancelIcon = (
|
||||
<Icons.CrossIcon
|
||||
className="edit-cancel-icon"
|
||||
size="scale"
|
||||
isfill={true}
|
||||
color='#A3A9AE'
|
||||
/>;
|
||||
color="#A3A9AE"
|
||||
/>
|
||||
);
|
||||
|
||||
class FilesRowContent extends React.PureComponent {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
let titleWithoutExt = getTitleWithoutExst(props.item);
|
||||
@ -105,30 +114,37 @@ class FilesRowContent extends React.PureComponent {
|
||||
showNewFilesPanel: false,
|
||||
newFolderId: [],
|
||||
newItems: props.item.new || props.item.fileStatus === 2,
|
||||
showConvertDialog: false
|
||||
showConvertDialog: false,
|
||||
//loading: false
|
||||
};
|
||||
}
|
||||
|
||||
completeAction = (id) => {
|
||||
this.props.onEditComplete(id, !this.props.item.fileExst);
|
||||
}
|
||||
};
|
||||
|
||||
updateItem = (e) => {
|
||||
const { fileAction, updateFile, renameFolder, item, setIsLoading } = this.props;
|
||||
const {
|
||||
fileAction,
|
||||
updateFile,
|
||||
renameFolder,
|
||||
item,
|
||||
setIsLoading,
|
||||
} = this.props;
|
||||
|
||||
const { itemTitle } = this.state;
|
||||
const originalTitle = getTitleWithoutExst(item);
|
||||
|
||||
setIsLoading(true);
|
||||
if (originalTitle === itemTitle)
|
||||
return this.completeAction(fileAction.id);
|
||||
if (originalTitle === itemTitle) return this.completeAction(fileAction.id);
|
||||
|
||||
item.fileExst
|
||||
? updateFile(fileAction.id, itemTitle)
|
||||
.then(() => this.completeAction(fileAction.id)).finally(() => setIsLoading(false))
|
||||
.then(() => this.completeAction(fileAction.id))
|
||||
.finally(() => setIsLoading(false))
|
||||
: renameFolder(fileAction.id, itemTitle)
|
||||
.then(() => this.completeAction(fileAction.id)).finally(() => setIsLoading(false));
|
||||
.then(() => this.completeAction(fileAction.id))
|
||||
.finally(() => setIsLoading(false));
|
||||
};
|
||||
|
||||
createItem = (e) => {
|
||||
@ -139,29 +155,28 @@ class FilesRowContent extends React.PureComponent {
|
||||
|
||||
const itemId = e.currentTarget.dataset.itemid;
|
||||
|
||||
if (itemTitle.trim() === '')
|
||||
return this.completeAction(itemId);
|
||||
if (itemTitle.trim() === "") return this.completeAction(itemId);
|
||||
|
||||
let newTab = item.fileExst
|
||||
? window.open('about:blank', '_blank')
|
||||
: null;
|
||||
let newTab = item.fileExst ? window.open("about:blank", "_blank") : null;
|
||||
|
||||
!item.fileExst
|
||||
? createFolder(item.parentId, itemTitle)
|
||||
.then(() => this.completeAction(itemId)).finally(() => setIsLoading(false))
|
||||
.then(() => this.completeAction(itemId))
|
||||
.finally(() => setIsLoading(false))
|
||||
: createFile(item.parentId, `${itemTitle}.${item.fileExst}`)
|
||||
.then((file) => {
|
||||
newTab.location = file.webUrl;
|
||||
this.completeAction(itemId);
|
||||
}).finally(() => setIsLoading(false))
|
||||
}
|
||||
})
|
||||
.finally(() => setIsLoading(false));
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
const { fileAction, item, newRowItems, setNewRowItems } = this.props;
|
||||
const itemId = item.id.toString();
|
||||
|
||||
if (newRowItems.length && newRowItems.includes(itemId)) {
|
||||
const rowItems = newRowItems.filter(x => x !== itemId)
|
||||
const rowItems = newRowItems.filter((x) => x !== itemId);
|
||||
if (this.state.newItems !== 0) {
|
||||
this.setState({ newItems: 0 }, () => setNewRowItems(rowItems));
|
||||
}
|
||||
@ -169,27 +184,39 @@ class FilesRowContent extends React.PureComponent {
|
||||
|
||||
if (fileAction) {
|
||||
if (fileAction.id !== prevProps.fileAction.id) {
|
||||
this.setState({ editingId: fileAction.id })
|
||||
this.setState({ editingId: fileAction.id });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
renameTitle = e => {
|
||||
renameTitle = (e) => {
|
||||
this.setState({ itemTitle: e.target.value });
|
||||
}
|
||||
};
|
||||
|
||||
cancelUpdateItem = e => {
|
||||
cancelUpdateItem = (e) => {
|
||||
this.completeAction(e);
|
||||
}
|
||||
};
|
||||
|
||||
onClickUpdateItem = e => {
|
||||
(this.props.fileAction.type === FileAction.Create)
|
||||
onClickUpdateItem = (e) => {
|
||||
this.props.fileAction.type === FileAction.Create
|
||||
? this.createItem(e)
|
||||
: this.updateItem(e);
|
||||
}
|
||||
};
|
||||
|
||||
onFilesClick = () => {
|
||||
const { filter, parentFolder, setIsLoading, onMediaFileClick, fetchFiles, isImage, isSound, isVideo, canWebEdit, item, openDocEditor } = this.props;
|
||||
const {
|
||||
filter,
|
||||
parentFolder,
|
||||
setIsLoading,
|
||||
onMediaFileClick,
|
||||
fetchFiles,
|
||||
isImage,
|
||||
isSound,
|
||||
isVideo,
|
||||
canWebEdit,
|
||||
item,
|
||||
openDocEditor
|
||||
} = this.props;
|
||||
const { id, fileExst, viewUrl } = item;
|
||||
|
||||
if (!fileExst) {
|
||||
@ -201,7 +228,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
}
|
||||
|
||||
fetchFiles(id, newFilter)
|
||||
.catch(err => {
|
||||
.catch((err) => {
|
||||
toastr.error(err);
|
||||
setIsLoading(false);
|
||||
})
|
||||
@ -221,17 +248,19 @@ class FilesRowContent extends React.PureComponent {
|
||||
};
|
||||
|
||||
onMobileRowClick = (e) => {
|
||||
if (window.innerWidth > 1024)
|
||||
return;
|
||||
const { isTrashFolder } = this.props;
|
||||
|
||||
if (isTrashFolder || window.innerWidth > 1024) return;
|
||||
|
||||
this.onFilesClick();
|
||||
}
|
||||
};
|
||||
|
||||
getStatusByDate = () => {
|
||||
const { culture, t, item } = this.props;
|
||||
const { created, updated, version, fileExst } = item;
|
||||
|
||||
const title = version > 1
|
||||
const title =
|
||||
version > 1
|
||||
? t("TitleModified")
|
||||
: fileExst
|
||||
? t("TitleUploaded")
|
||||
@ -247,11 +276,11 @@ class FilesRowContent extends React.PureComponent {
|
||||
const { t } = this.props;
|
||||
|
||||
switch (format) {
|
||||
case 'docx':
|
||||
case "docx":
|
||||
return t("NewDocument");
|
||||
case 'xlsx':
|
||||
case "xlsx":
|
||||
return t("NewSpreadsheet");
|
||||
case 'pptx':
|
||||
case "pptx":
|
||||
return t("NewPresentation");
|
||||
default:
|
||||
return t("NewFolder");
|
||||
@ -263,11 +292,19 @@ class FilesRowContent extends React.PureComponent {
|
||||
const fileId = e.currentTarget.dataset.id;
|
||||
|
||||
history.push(`${settings.homepage}/${fileId}/history`);
|
||||
}
|
||||
};
|
||||
|
||||
onBadgeClick = () => {
|
||||
const { showNewFilesPanel } = this.state;
|
||||
const { item, treeFolders, setTreeFolders, rootFolderId, newItems, setNewRowItems, setUpdateTree } = this.props;
|
||||
const {
|
||||
item,
|
||||
treeFolders,
|
||||
setTreeFolders,
|
||||
rootFolderId,
|
||||
newItems,
|
||||
setNewRowItems,
|
||||
setUpdateTree,
|
||||
} = this.props;
|
||||
if (item.fileExst) {
|
||||
api.files
|
||||
.markAsRead([], [item.id])
|
||||
@ -279,7 +316,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
setTreeFolders(data);
|
||||
setNewRowItems([`${item.id}`]);
|
||||
})
|
||||
.catch((err) => toastr.error(err))
|
||||
.catch((err) => toastr.error(err));
|
||||
} else {
|
||||
const newFolderId = this.props.selectedFolder.pathParts;
|
||||
newFolderId.push(item.id);
|
||||
@ -288,7 +325,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
newFolderId,
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
onShowNewFilesPanel = () => {
|
||||
const { showNewFilesPanel } = this.state;
|
||||
@ -298,39 +335,55 @@ class FilesRowContent extends React.PureComponent {
|
||||
setConvertDialogVisible = () =>
|
||||
this.setState({ showConvertDialog: !this.state.showConvertDialog });
|
||||
|
||||
getConvertProgress = fileId => {
|
||||
const { selectedFolder, filter, setIsLoading, setProgressBarData, t, clearProgressData, fetchFiles } = this.props;
|
||||
api.files.getConvertFile(fileId).then(res => {
|
||||
getConvertProgress = (fileId) => {
|
||||
const {
|
||||
selectedFolder,
|
||||
filter,
|
||||
setIsLoading,
|
||||
setProgressBarData,
|
||||
t,
|
||||
clearProgressData,
|
||||
fetchFiles,
|
||||
} = this.props;
|
||||
api.files.getConvertFile(fileId).then((res) => {
|
||||
if (res && res[0] && res[0].progress !== 100) {
|
||||
setProgressBarData({ visible: true, percent: res[0].progress, label: t("Convert") });
|
||||
setProgressBarData({
|
||||
visible: true,
|
||||
percent: res[0].progress,
|
||||
label: t("Convert"),
|
||||
});
|
||||
setTimeout(() => this.getConvertProgress(fileId), 1000);
|
||||
} else {
|
||||
if (res[0].error) {
|
||||
toastr.error(res[0].error);
|
||||
clearProgressData();
|
||||
} else {
|
||||
setProgressBarData({ visible: true, percent: 100, label: t("Convert") });
|
||||
setTimeout(() => clearProgressData(), 5000)
|
||||
setProgressBarData({
|
||||
visible: true,
|
||||
percent: 100,
|
||||
label: t("Convert"),
|
||||
});
|
||||
setTimeout(() => clearProgressData(), 5000);
|
||||
const newFilter = filter.clone();
|
||||
fetchFiles(selectedFolder.id, newFilter)
|
||||
.catch(err => toastr.error(err))
|
||||
.catch((err) => toastr.error(err))
|
||||
.finally(() => setIsLoading(false));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
onConvert = () => {
|
||||
const { item, t, setProgressBarData } = this.props;
|
||||
setProgressBarData({ visible: true, percent: 0, label: t("Convert") });
|
||||
this.setState({ showConvertDialog: false }, () =>
|
||||
api.files.convertFile(item.id).then(convertRes => {
|
||||
api.files.convertFile(item.id).then((convertRes) => {
|
||||
if (convertRes && convertRes[0] && convertRes[0].progress !== 100) {
|
||||
this.getConvertProgress(item.id);
|
||||
}
|
||||
})
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const {
|
||||
@ -343,7 +396,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
isLoading,
|
||||
isMobile,
|
||||
canWebEdit,
|
||||
canConvert
|
||||
canConvert,
|
||||
} = this.props;
|
||||
const {
|
||||
itemTitle,
|
||||
@ -351,7 +404,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
showNewFilesPanel,
|
||||
newItems,
|
||||
newFolderId,
|
||||
showConvertDialog
|
||||
showConvertDialog,
|
||||
} = this.state;
|
||||
const {
|
||||
contentLength,
|
||||
@ -363,18 +416,23 @@ class FilesRowContent extends React.PureComponent {
|
||||
fileStatus,
|
||||
id,
|
||||
versionGroup,
|
||||
locked
|
||||
locked,
|
||||
} = item;
|
||||
const titleWithoutExt = getTitleWithoutExst(item);
|
||||
const fileOwner = createdBy && ((this.props.viewer.id === createdBy.id && t("AuthorMe")) || createdBy.displayName);
|
||||
const fileOwner =
|
||||
createdBy &&
|
||||
((this.props.viewer.id === createdBy.id && t("AuthorMe")) ||
|
||||
createdBy.displayName);
|
||||
const updatedDate = updated && this.getStatusByDate();
|
||||
|
||||
const isEdit = (id === editingId) && (fileExst === fileAction.extension);
|
||||
const linkStyles = isTrashFolder ? { noHover: true } : { onClick: this.onFilesClick };
|
||||
const isEdit = id === editingId && fileExst === fileAction.extension;
|
||||
const linkStyles = isTrashFolder
|
||||
? { noHover: true }
|
||||
: { onClick: this.onMobileRowClick };
|
||||
const showNew = !!newItems;
|
||||
|
||||
return isEdit
|
||||
? <EditingWrapperComponent
|
||||
return isEdit ? (
|
||||
<EditingWrapperComponent
|
||||
itemTitle={itemTitle}
|
||||
okIcon={okIcon}
|
||||
cancelIcon={cancelIcon}
|
||||
@ -384,7 +442,7 @@ class FilesRowContent extends React.PureComponent {
|
||||
itemId={id}
|
||||
isLoading={isLoading}
|
||||
/>
|
||||
: (
|
||||
) : (
|
||||
<>
|
||||
{showConvertDialog && (
|
||||
<ConvertDialog
|
||||
@ -409,11 +467,11 @@ class FilesRowContent extends React.PureComponent {
|
||||
onClick={this.onMobileRowClick}
|
||||
>
|
||||
<Link
|
||||
containerWidth='55%'
|
||||
type='page'
|
||||
containerWidth="55%"
|
||||
type="page"
|
||||
title={titleWithoutExt}
|
||||
fontWeight="600"
|
||||
fontSize='15px'
|
||||
fontSize="15px"
|
||||
{...linkStyles}
|
||||
color="#333"
|
||||
isTextOverflow
|
||||
@ -421,56 +479,56 @@ class FilesRowContent extends React.PureComponent {
|
||||
{titleWithoutExt}
|
||||
</Link>
|
||||
<>
|
||||
{fileExst ?
|
||||
<div className='badges'>
|
||||
{fileExst ? (
|
||||
<div className="badges">
|
||||
<Text
|
||||
className='badge-ext'
|
||||
className="badge-ext"
|
||||
as="span"
|
||||
color="#A3A9AE"
|
||||
fontSize='15px'
|
||||
fontSize="15px"
|
||||
fontWeight={600}
|
||||
title={fileExst}
|
||||
truncate={true}
|
||||
>
|
||||
{fileExst}
|
||||
</Text>
|
||||
{canConvert &&
|
||||
{canConvert && (
|
||||
<IconButton
|
||||
onClick={this.setConvertDialogVisible}
|
||||
iconName="FileActionsConvertIcon"
|
||||
className='badge'
|
||||
size='small'
|
||||
className="badge"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color='#A3A9AE'
|
||||
color="#A3A9AE"
|
||||
/>
|
||||
}
|
||||
{canWebEdit &&
|
||||
)}
|
||||
{canWebEdit && (
|
||||
<Icons.AccessEditIcon
|
||||
className='badge'
|
||||
size='small'
|
||||
className="badge"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color='#A3A9AE'
|
||||
color="#A3A9AE"
|
||||
/>
|
||||
}
|
||||
{fileStatus === 1 &&
|
||||
)}
|
||||
{fileStatus === 1 && (
|
||||
<Icons.FileActionsConvertEditDocIcon
|
||||
className='badge'
|
||||
size='small'
|
||||
className="badge"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color='#3B72A7'
|
||||
color="#3B72A7"
|
||||
/>
|
||||
}
|
||||
{locked &&
|
||||
)}
|
||||
{locked && (
|
||||
<Icons.FileActionsLockedIcon
|
||||
className='badge'
|
||||
size='small'
|
||||
className="badge"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color='#3B72A7'
|
||||
color="#3B72A7"
|
||||
/>
|
||||
}
|
||||
{versionGroup > 1 &&
|
||||
)}
|
||||
{versionGroup > 1 && (
|
||||
<Badge
|
||||
className='badge-version'
|
||||
className="badge-version"
|
||||
backgroundColor="#A3A9AE"
|
||||
borderRadius="11px"
|
||||
color="#FFFFFF"
|
||||
@ -482,10 +540,10 @@ class FilesRowContent extends React.PureComponent {
|
||||
padding="0 5px"
|
||||
data-id={id}
|
||||
/>
|
||||
}
|
||||
{showNew &&
|
||||
)}
|
||||
{showNew && (
|
||||
<Badge
|
||||
className='badge-version'
|
||||
className="badge-version"
|
||||
backgroundColor="#ED7309"
|
||||
borderRadius="11px"
|
||||
color="#FFFFFF"
|
||||
@ -497,13 +555,13 @@ class FilesRowContent extends React.PureComponent {
|
||||
padding="0 5px"
|
||||
data-id={id}
|
||||
/>
|
||||
}
|
||||
)}
|
||||
</div>
|
||||
:
|
||||
<div className='badges'>
|
||||
{showNew &&
|
||||
) : (
|
||||
<div className="badges">
|
||||
{showNew && (
|
||||
<Badge
|
||||
className='badge-version'
|
||||
className="badge-version"
|
||||
backgroundColor="#ED7309"
|
||||
borderRadius="11px"
|
||||
color="#FFFFFF"
|
||||
@ -515,16 +573,16 @@ class FilesRowContent extends React.PureComponent {
|
||||
padding="0 5px"
|
||||
data-id={id}
|
||||
/>
|
||||
}
|
||||
)}
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
</>
|
||||
<Text
|
||||
containerMinWidth='120px'
|
||||
containerWidth='15%'
|
||||
containerMinWidth="120px"
|
||||
containerWidth="15%"
|
||||
as="div"
|
||||
color={sideColor}
|
||||
fontSize='12px'
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
title={fileOwner}
|
||||
truncate={true}
|
||||
@ -532,10 +590,10 @@ class FilesRowContent extends React.PureComponent {
|
||||
{fileOwner}
|
||||
</Text>
|
||||
<Text
|
||||
containerMinWidth='200px'
|
||||
containerWidth='15%'
|
||||
containerMinWidth="200px"
|
||||
containerWidth="15%"
|
||||
title={updatedDate}
|
||||
fontSize='12px'
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
color={sideColor}
|
||||
className="row_update-text"
|
||||
@ -543,24 +601,26 @@ class FilesRowContent extends React.PureComponent {
|
||||
{updatedDate && updatedDate}
|
||||
</Text>
|
||||
<Text
|
||||
containerMinWidth='90px'
|
||||
containerWidth='10%'
|
||||
containerMinWidth="90px"
|
||||
containerWidth="10%"
|
||||
as="div"
|
||||
color={sideColor}
|
||||
fontSize='12px'
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
title=''
|
||||
title=""
|
||||
truncate={true}
|
||||
>
|
||||
{fileExst
|
||||
? contentLength
|
||||
: `${t("TitleDocuments")}: ${filesCount} | ${t("TitleSubfolders")}: ${foldersCount}`}
|
||||
: `${t("TitleDocuments")}: ${filesCount} | ${t(
|
||||
"TitleSubfolders"
|
||||
)}: ${foldersCount}`}
|
||||
</Text>
|
||||
</SimpleFilesRowContent>
|
||||
</>
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function mapStateToProps(state, props) {
|
||||
return {
|
||||
@ -583,7 +643,7 @@ function mapStateToProps(state, props) {
|
||||
isImage: isImage(props.item.fileExst)(state),
|
||||
isSound: isSound(props.item.fileExst)(state),
|
||||
isVideo: isVideo(props.item.fileExst)(state),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, {
|
||||
@ -597,5 +657,5 @@ export default connect(mapStateToProps, {
|
||||
setNewRowItems,
|
||||
setIsLoading,
|
||||
clearProgressData,
|
||||
fetchFiles
|
||||
fetchFiles,
|
||||
})(withRouter(withTranslation()(FilesRowContent)));
|
@ -1250,7 +1250,7 @@ class SectionBodyContent extends React.Component {
|
||||
<Text
|
||||
className="share-button"
|
||||
as="span"
|
||||
title={"Share"}
|
||||
title={this.props.t("Share")}
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
color="#A3A9AE"
|
||||
@ -1264,7 +1264,7 @@ class SectionBodyContent extends React.Component {
|
||||
size={16}
|
||||
iconName="CatalogSharedIcon"
|
||||
/>
|
||||
Share
|
||||
{this.props.t("Share")}
|
||||
</Text>
|
||||
);
|
||||
};
|
||||
@ -1466,8 +1466,11 @@ class SectionBodyContent extends React.Component {
|
||||
const checkedProps = isEdit || item.id <= 0 ? {} : { checked };
|
||||
const element = this.getItemIcon(item, isEdit || item.id <= 0);
|
||||
const sharedButton =
|
||||
isEdit || item.id <= 0 ? null : this.getSharedButton();
|
||||
const displayShareButton = widthProp > 500 ? "96px" : "26px";
|
||||
isRecycleBin || isEdit || item.id <= 0
|
||||
? null
|
||||
: this.getSharedButton();
|
||||
const displayShareButton =
|
||||
widthProp < 500 ? "26px" : isRecycleBin ? "38px" : "96px";
|
||||
let classNameProp =
|
||||
isFolder && item.access < 2 && !isRecycleBin
|
||||
? { className: " dropable" }
|
||||
|
@ -54,7 +54,7 @@
|
||||
"TitleRemoved": "Удалён",
|
||||
"TitleSubfolders": "Папки",
|
||||
"TitleDocuments": "Файлы",
|
||||
"Share": "Общий доступ",
|
||||
"Share": "Доступ",
|
||||
"DownloadAs": "Скачать как",
|
||||
"More": "Больше",
|
||||
"CloseButton": "Закрыть",
|
||||
|
@ -11,7 +11,7 @@ import {
|
||||
RowContainer,
|
||||
Text,
|
||||
Link,
|
||||
Button
|
||||
Button,
|
||||
} from "asc-web-components";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import { utils as commonUtils, api, toastr } from "asc-web-common";
|
||||
@ -21,15 +21,11 @@ import {
|
||||
StyledContent,
|
||||
StyledHeaderContent,
|
||||
StyledBody,
|
||||
StyledFooter
|
||||
StyledFooter,
|
||||
} from "../StyledPanels";
|
||||
import {
|
||||
getFileIcon,
|
||||
getFolderIcon,
|
||||
canWebEdit,
|
||||
isImage,
|
||||
isSound,
|
||||
isVideo,
|
||||
getFilter,
|
||||
getFiles,
|
||||
getFolders,
|
||||
@ -42,13 +38,13 @@ import {
|
||||
setTreeFolders,
|
||||
setUpdateTree,
|
||||
setNewRowItems,
|
||||
setIsLoading,
|
||||
|
||||
addFileToRecentlyViewed
|
||||
} from "../../../store/files/actions";
|
||||
import { createI18N } from "../../../helpers/i18n";
|
||||
const i18n = createI18N({
|
||||
page: "NewFilesPanel",
|
||||
localesPath: "panels/NewFilesPanel"
|
||||
localesPath: "panels/NewFilesPanel",
|
||||
});
|
||||
|
||||
const { changeLanguage } = commonUtils;
|
||||
@ -67,8 +63,8 @@ class NewFilesPanelComponent extends React.Component {
|
||||
setIsLoading(true);
|
||||
api.files
|
||||
.getNewFiles(folderId[folderId.length - 1])
|
||||
.then(files => this.setState({ files }))
|
||||
.catch(err => toastr.error(err))
|
||||
.then((files) => this.setState({ files }))
|
||||
.catch((err) => toastr.error(err))
|
||||
.finally(() => setIsLoading(false));
|
||||
}
|
||||
|
||||
@ -80,7 +76,7 @@ class NewFilesPanelComponent extends React.Component {
|
||||
|
||||
return (
|
||||
<ReactSVG
|
||||
beforeInjection={svg => {
|
||||
beforeInjection={(svg) => {
|
||||
svg.setAttribute("style", "margin-top: 4px");
|
||||
isEdit && svg.setAttribute("style", "margin-left: 24px");
|
||||
}}
|
||||
@ -110,15 +106,14 @@ class NewFilesPanelComponent extends React.Component {
|
||||
api.files
|
||||
.markAsRead(folderIds, fileIds)
|
||||
.then(() => {
|
||||
this.props.setUpdateTree(true);
|
||||
this.setNewFilesCount(folderId, markAsReadFiles);
|
||||
this.props.setNewRowItems(itemsIds);
|
||||
})
|
||||
.catch(err => toastr.error(err))
|
||||
.catch((err) => toastr.error(err))
|
||||
.finally(() => onClose());
|
||||
};
|
||||
|
||||
onNewFilesClick = item => {
|
||||
onNewFilesClick = (item) => {
|
||||
const { onClose, /*setIsLoading,*/ folderId } = this.props;
|
||||
const folderIds = [];
|
||||
const fileId = [];
|
||||
@ -133,29 +128,30 @@ class NewFilesPanelComponent extends React.Component {
|
||||
this.setNewFilesCount(folderId, false, item);
|
||||
this.onFilesClick(item);
|
||||
})
|
||||
.catch(err => toastr.error(err))
|
||||
.catch((err) => toastr.error(err))
|
||||
.finally(() => {
|
||||
!isFile && onClose();
|
||||
});
|
||||
};
|
||||
|
||||
onFilesClick = item => {
|
||||
const { id, fileExst, viewUrl } = item;
|
||||
const { filter, setMediaViewerData, fetchFiles, canWebEdit, addFileToRecentlyViewed } = this.props;
|
||||
onFilesClick = (item) => {
|
||||
const { id, fileExst, viewUrl, fileType } = item;
|
||||
const { filter, setMediaViewerData, fetchFiles, addFileToRecentlyViewed } = this.props;
|
||||
|
||||
if (!fileExst) {
|
||||
fetchFiles(id, filter).catch(err => toastr.error(err));
|
||||
fetchFiles(id, filter).catch((err) => toastr.error(err));
|
||||
} else {
|
||||
if (canWebEdit) {
|
||||
const canEdit = [5, 6, 7].includes(fileType); //TODO: maybe dirty
|
||||
const isMedia = [2, 3, 4].includes(fileType);
|
||||
|
||||
if (canEdit) {
|
||||
return addFileToRecentlyViewed(id)
|
||||
.then(() => console.log("Pushed to recently viewed"))
|
||||
.catch(e => console.error(e))
|
||||
.finally(window.open(`./doceditor?fileId=${id}`, "_blank"));
|
||||
}
|
||||
|
||||
const isOpenMedia =
|
||||
isImage(fileExst) || isSound(fileExst) || isVideo(fileExst);
|
||||
if (isOpenMedia) {
|
||||
if (isMedia) {
|
||||
const mediaItem = { visible: true, id };
|
||||
setMediaViewerData(mediaItem);
|
||||
return;
|
||||
@ -166,15 +162,21 @@ class NewFilesPanelComponent extends React.Component {
|
||||
};
|
||||
|
||||
setNewFilesCount = (folderPath, markAsReadAll, item) => {
|
||||
const { treeFolders, setTreeFolders, folders, files } = this.props;
|
||||
const {
|
||||
treeFolders,
|
||||
setTreeFolders,
|
||||
folders,
|
||||
files,
|
||||
setUpdateTree,
|
||||
} = this.props;
|
||||
|
||||
const data = treeFolders;
|
||||
let dataItem;
|
||||
|
||||
const loop = (index, newData) => {
|
||||
dataItem = newData.find(x => x.id === folderPath[index]);
|
||||
dataItem = newData.find((x) => x.id === folderPath[index]);
|
||||
if (index === folderPath.length - 1) {
|
||||
const rootItem = data.find(x => x.id === folderPath[0]);
|
||||
const rootItem = data.find((x) => x.id === folderPath[0]);
|
||||
const newFilesCounter = dataItem.newItems
|
||||
? dataItem.newItems
|
||||
: dataItem.new;
|
||||
@ -192,28 +194,29 @@ class NewFilesPanelComponent extends React.Component {
|
||||
if (folderPath.length > 1) {
|
||||
loop(0, data);
|
||||
} else {
|
||||
dataItem = data.find(x => x.id === +folderPath[0]);
|
||||
dataItem = data.find((x) => x.id === +folderPath[0]);
|
||||
dataItem.newItems = markAsReadAll ? 0 : dataItem.newItems - 1;
|
||||
|
||||
if (item && item.fileExst) {
|
||||
const fileItem = files.find(x => x.id === item.id && x.fileExst);
|
||||
const fileItem = files.find((x) => x.id === item.id && x.fileExst);
|
||||
if (fileItem) {
|
||||
fileItem.new = markAsReadAll ? 0 : fileItem.new - 1;
|
||||
} else {
|
||||
const filesFolder = folders.find(x => x.id === item.folderId);
|
||||
const filesFolder = folders.find((x) => x.id === item.folderId);
|
||||
if (filesFolder) {
|
||||
filesFolder.new = markAsReadAll ? 0 : filesFolder.new - 1;
|
||||
}
|
||||
}
|
||||
this.props.setNewRowItems([`${item.id}`]);
|
||||
} else if (item && !item.fileExst) {
|
||||
const folderItem = folders.find(x => x.id === item.id && !x.fileExst);
|
||||
const folderItem = folders.find((x) => x.id === item.id && !x.fileExst);
|
||||
if (folderItem) {
|
||||
folderItem.new = markAsReadAll ? 0 : folderItem.new - 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
setUpdateTree(true);
|
||||
setTreeFolders(data);
|
||||
};
|
||||
|
||||
@ -235,7 +238,7 @@ class NewFilesPanelComponent extends React.Component {
|
||||
</StyledHeaderContent>
|
||||
<StyledBody className="files-operations-body">
|
||||
<RowContainer useReactWindow manualHeight="83vh">
|
||||
{files.map(file => {
|
||||
{files.map((file) => {
|
||||
const element = this.getItemIcon(file);
|
||||
return (
|
||||
<Row key={file.id} element={element}>
|
||||
@ -287,29 +290,32 @@ class NewFilesPanelComponent extends React.Component {
|
||||
|
||||
NewFilesPanelComponent.propTypes = {
|
||||
onClose: PropTypes.func,
|
||||
visible: PropTypes.bool
|
||||
visible: PropTypes.bool,
|
||||
};
|
||||
|
||||
const NewFilesPanelContainerTranslated = withTranslation()(
|
||||
NewFilesPanelComponent
|
||||
);
|
||||
|
||||
const NewFilesPanel = props => (
|
||||
const NewFilesPanel = (props) => (
|
||||
<NewFilesPanelContainerTranslated i18n={i18n} {...props} />
|
||||
);
|
||||
|
||||
const mapStateToProps = (state, props) => {
|
||||
const mapStateToProps = (state) => {
|
||||
return {
|
||||
filter: getFilter(state),
|
||||
files: getFiles(state),
|
||||
folders: getFolders(state),
|
||||
treeFolders: getTreeFolders(state),
|
||||
selectedFolder: getSelectedFolder(state),
|
||||
canWebEdit: canWebEdit(props.item.fileExst)(state),
|
||||
};
|
||||
};
|
||||
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
{ setMediaViewerData, setTreeFolders, setUpdateTree, setNewRowItems, setIsLoading, fetchFiles, addFileToRecentlyViewed }
|
||||
)(withRouter(NewFilesPanel));
|
||||
export default connect(mapStateToProps, {
|
||||
setMediaViewerData,
|
||||
setTreeFolders,
|
||||
setUpdateTree,
|
||||
setNewRowItems,
|
||||
fetchFiles,
|
||||
addFileToRecentlyViewed
|
||||
})(withRouter(NewFilesPanel));
|
||||
|
@ -529,11 +529,14 @@ export const getSelected = (state) => {
|
||||
|
||||
const getSelectionSelector = (state) => {
|
||||
return state.files.selection;
|
||||
}
|
||||
};
|
||||
|
||||
export const getSelection = createSelector(getSelectionSelector, selection => {
|
||||
export const getSelection = createSelector(
|
||||
getSelectionSelector,
|
||||
(selection) => {
|
||||
return selection;
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
export const getSelectionLength = (state) => {
|
||||
return state.files.selection.length;
|
||||
@ -643,7 +646,15 @@ const getFilesContextOptions = (item, isRecycleBin, canOpenPlayer) => {
|
||||
export const getItemsList = createSelector(
|
||||
[getFolders, getFiles],
|
||||
(folders, files) => {
|
||||
return folders && files ? [...folders, ...files] : [];
|
||||
const items =
|
||||
folders && files
|
||||
? [...folders, ...files]
|
||||
: folders
|
||||
? folders
|
||||
: files
|
||||
? files
|
||||
: [];
|
||||
return items;
|
||||
}
|
||||
);
|
||||
|
||||
@ -799,6 +810,7 @@ export const getFilesList = (state) => {
|
||||
const isSoundItem = isSound(item.fileExst)(state);
|
||||
const isEbookItem = isEbook(item.fileExst)(state);
|
||||
const isHtmlItem = isHtml(item.fileExst)(state);
|
||||
const isCanWebEdit = canWebEdit(item.fileExst)(state);
|
||||
|
||||
const icon = fileExst
|
||||
? getFileIcon(
|
||||
@ -849,6 +861,7 @@ export const getFilesList = (state) => {
|
||||
providerKey,
|
||||
draggable,
|
||||
canOpenPlayer,
|
||||
canWebEdit: isCanWebEdit,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
@ -64,6 +64,9 @@ class SectionBodyContent extends React.PureComponent {
|
||||
if (!isLoaded) return;
|
||||
|
||||
if(peopleList.length <= 0) setIsLoaded();
|
||||
|
||||
setIsLoaded(false)
|
||||
|
||||
fetchPeople(filter)
|
||||
.then(() => isLoaded && setIsLoaded(true))
|
||||
.catch((error) => {
|
||||
|
Loading…
Reference in New Issue
Block a user