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

Web: Files: renamed setNewTreeFilesBadge action to setUpdateTree

Browse Source
This commit is contained in:
Nikita Gopienko 2020-10-06 15:35:12 +03:00
parent 5ae3b98548
commit fa4f3d5d7b
6 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
View File

@ -16,7 +16,7 @@ import {
setTreeFolders,
setProgressBarData,
clearProgressData,
setNewTreeFilesBadge
setUpdateTree
} from "../../../store/files/actions";
import { loopTreeFolders } from "../../../store/files/selectors";
import { createI18N } from "../../../helpers/i18n";
@ -61,7 +61,8 @@ class DeleteDialogComponent extends React.Component {
setProgressBarData,
clearProgressData,
t,
fetchFiles
fetchFiles,
setUpdateTree
} = this.props;
const successMessage = "Files and folders was deleted";
api.files.getProgress()
@ -88,7 +89,7 @@ class DeleteDialogComponent extends React.Component {
const folders = data.selectedFolder.folders;
const foldersCount = data.selectedFolder.foldersCount;
loopTreeFolders(path, newTreeFolders, folders, foldersCount);
this.props.setNewTreeFilesBadge(true);
setUpdateTree(true);
setTreeFolders(newTreeFolders);
}
toastr.success(successMessage);
@ -272,5 +273,5 @@ const mapStateToProps = state => {
export default connect(
mapStateToProps,
{ setTreeFolders, setProgressBarData, clearProgressData, setNewTreeFilesBadge, fetchFiles }
{ setTreeFolders, setProgressBarData, clearProgressData, setUpdateTree, fetchFiles }
)(withRouter(DeleteDialog));

8
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
View File

@ -6,7 +6,7 @@ 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 } from 'asc-web-common';
import { createFile, createFolder, renameFolder, updateFile, fetchFiles, setTreeFolders, setProgressBarData, clearProgressData, setNewTreeFilesBadge, setNewRowItems, setIsLoading } from '../../../../../store/files/actions';
import { createFile, createFolder, renameFolder, updateFile, fetchFiles, setTreeFolders, setProgressBarData, clearProgressData, setUpdateTree, setNewRowItems, setIsLoading } from '../../../../../store/files/actions';
import {
canConvert,
canWebEdit,
@ -251,7 +251,7 @@ class FilesRowContent extends React.PureComponent {
onBadgeClick = () => {
const { showNewFilesPanel } = this.state;
const { item, treeFolders, setTreeFolders, rootFolderId, newItems, setNewRowItems, setNewTreeFilesBadge } = this.props;
const { item, treeFolders, setTreeFolders, rootFolderId, newItems, setNewRowItems, setUpdateTree } = this.props;
if (item.fileExst) {
api.files
.markAsRead([], [item.id])
@ -259,7 +259,7 @@ class FilesRowContent extends React.PureComponent {
const data = treeFolders;
const dataItem = data.find((x) => x.id === rootFolderId);
dataItem.newItems = newItems ? dataItem.newItems - 1 : 0;
setNewTreeFilesBadge(true);
setUpdateTree(true);
setTreeFolders(data);
setNewRowItems([`${item.id}`]);
})
@ -563,7 +563,7 @@ export default connect(mapStateToProps, {
renameFolder,
setTreeFolders,
setProgressBarData,
setNewTreeFilesBadge,
setUpdateTree,
setNewRowItems,
setIsLoading,
clearProgressData,

9
products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
View File

@ -38,7 +38,7 @@ import {
setDragItem,
setIsLoading,
setMediaViewerData,
setNewTreeFilesBadge,
setUpdateTree,
setProgressBarData,
setSelected,
setSelection,
@ -243,6 +243,7 @@ class SectionBodyContent extends React.Component {
setTreeFolders,
setIsLoading,
fetchFiles,
setUpdateTree
} = this.props;
const items = [...folders, ...files];
const item = items.filter((o) => o.id === id && !o.fileExst);
@ -261,6 +262,7 @@ class SectionBodyContent extends React.Component {
const newTreeFolders = treeFolders;
const folders = data.selectedFolder.folders;
loopTreeFolders(path, newTreeFolders, folders, null, newItem);
setUpdateTree(true);
setTreeFolders(newTreeFolders);
}
})
@ -309,6 +311,7 @@ class SectionBodyContent extends React.Component {
t,
setProgressBarData,
fetchFiles,
setUpdateTree
} = this.props;
api.files.getProgress().then((res) => {
const deleteProgress = res.find((x) => x.id === id);
@ -333,7 +336,7 @@ class SectionBodyContent extends React.Component {
const folders = data.selectedFolder.folders;
const foldersCount = data.selectedFolder.foldersCount;
loopTreeFolders(path, newTreeFolders, folders, foldersCount);
this.props.setNewTreeFilesBadge(true);
setUpdateTree(true);
setTreeFolders(newTreeFolders);
}
isFolder
@ -1597,7 +1600,7 @@ export default connect(mapStateToProps, {
setProgressBarData,
setSelection,
setSelected,
setNewTreeFilesBadge,
setUpdateTree,
setIsLoading,
clearProgressData,
})(withRouter(withTranslation()(SectionBodyContent)));

8
products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
View File

@ -35,7 +35,7 @@ import {
fetchFiles,
setMediaViewerData,
setTreeFolders,
setNewTreeFilesBadge,
setUpdateTree,
setNewRowItems,
setIsLoading
} from "../../../store/files/actions";
@ -104,7 +104,7 @@ class NewFilesPanelComponent extends React.Component {
api.files
.markAsRead(folderIds, fileIds)
.then(() => {
this.props.setNewTreeFilesBadge(true);
this.props.setUpdateTree(true);
this.setNewFilesCount(folderId, markAsReadFiles);
this.props.setNewRowItems(itemsIds);
})
@ -123,7 +123,7 @@ class NewFilesPanelComponent extends React.Component {
api.files
.markAsRead(folderIds, fileId)
.then(() => {
this.props.setNewTreeFilesBadge(true);
this.props.setUpdateTree(true);
this.setNewFilesCount(folderId, false, item);
this.onFilesClick(item);
})
@ -296,5 +296,5 @@ const mapStateToProps = state => {
export default connect(
mapStateToProps,
{ setMediaViewerData, setTreeFolders, setNewTreeFilesBadge, setNewRowItems, setIsLoading, fetchFiles }
{ setMediaViewerData, setTreeFolders, setUpdateTree, setNewRowItems, setIsLoading, fetchFiles }
)(withRouter(NewFilesPanel));

8
products/ASC.Files/Client/src/store/files/actions.js
View File

@ -37,7 +37,7 @@ export const SET_MEDIA_VIEWER_VISIBLE = "SET_MEDIA_VIEWER_VISIBLE";
export const SET_PROGRESS_BAR_DATA = "SET_PROGRESS_BAR_DATA";
export const SET_VIEW_AS = "SET_VIEW_AS";
export const SET_CONVERT_DIALOG_VISIBLE = "SET_CONVERT_DIALOG_VISIBLE";
export const SET_NEW_TREE_FILES = "SET_NEW_TREE_FILES";
export const SET_UPDATE_TREE = "SET_UPDATE_TREE";
export const SET_NEW_ROW_ITEMS = "SET_NEW_ROW_ITEMS";
export const SET_SELECTED_NODE = "SET_SELECTED_NODE";
export const SET_EXPAND_SETTINGS_TREE = "SET_EXPAND_SETTINGS_TREE";
@ -182,10 +182,10 @@ export function setConvertDialogVisible(convertDialogVisible) {
};
}
export function setNewTreeFilesBadge(updateTreeNew) {
export function setUpdateTree(updateTree) {
return {
type: SET_NEW_TREE_FILES,
updateTreeNew
type: SET_UPDATE_TREE,
updateTree
};
}

8
products/ASC.Files/Client/src/store/files/reducers.js
View File

@ -18,7 +18,7 @@ import {
SET_MEDIA_VIEWER_VISIBLE,
SET_PROGRESS_BAR_DATA,
SET_CONVERT_DIALOG_VISIBLE,
SET_NEW_TREE_FILES,
SET_UPDATE_TREE,
SET_NEW_ROW_ITEMS,
SET_SELECTED_NODE,
SET_EXPAND_SETTINGS_TREE,
@ -51,7 +51,7 @@ const initialState = {
mediaViewerData: { visible: false, id: null },
progressData: { percent: 0, label: "", visible: false },
convertDialogVisible: false,
updateTreeNew: false,
updateTree: false,
newRowItems: [],
selectedTreeNode: [],
isLoading: false,
@ -173,9 +173,9 @@ const filesReducer = (state = initialState, action) => {
return Object.assign({}, state, {
convertDialogVisible: action.convertDialogVisible,
});
case SET_NEW_TREE_FILES:
case SET_UPDATE_TREE:
return Object.assign({}, state, {
updateTreeNew: action.updateTreeNew,
updateTree: action.updateTree,
});
case SET_NEW_ROW_ITEMS:
return Object.assign({}, state, {