Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
This commit is contained in:
commit
686151c65a
@ -31,7 +31,13 @@ class PureEditor extends React.Component {
|
||||
const fileId = urlParams.fileId || null;
|
||||
|
||||
files.openEdit(fileId)
|
||||
.then(config => window.DocsAPI.DocEditor("editor", config));
|
||||
.then(config => {
|
||||
if (window.innerWidth < 600) {
|
||||
config.type = 'mobile';
|
||||
}
|
||||
|
||||
window.DocsAPI.DocEditor("editor", config)
|
||||
});
|
||||
|
||||
return (
|
||||
<>
|
||||
|
@ -156,7 +156,7 @@ class SectionBodyContent extends React.Component {
|
||||
const deleteProgress = res.find(x => x.id === id);
|
||||
if(deleteProgress && deleteProgress.progress !== 100) {
|
||||
setProgressValue(deleteProgress.progress);
|
||||
setTimeout(() => this.loopDeleteProgress(id, folderId), 1000);
|
||||
setTimeout(() => this.loopDeleteProgress(id, folderId, isFolder), 1000);
|
||||
} else {
|
||||
fetchFiles(folderId, filter, store.dispatch).then(data => {
|
||||
if (currentFolderType !== "Trash" && isFolder) {
|
||||
|
@ -168,7 +168,8 @@ const renameTreeFolder = (folders, newItems, currentFolder) => {
|
||||
}
|
||||
|
||||
const removeTreeFolder = (folders, newItems, foldersCount) => {
|
||||
for (let folder of newItems.folders) {
|
||||
const newFolders = JSON.parse(JSON.stringify(newItems.folders));
|
||||
for (let folder of newFolders) {
|
||||
let currentFolder;
|
||||
if(folders) {
|
||||
currentFolder = folders.find((x) => x.id === folder.id);
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-common",
|
||||
"version": "1.0.144",
|
||||
"version": "1.0.145",
|
||||
"description": "Ascensio System SIA common components and solutions library",
|
||||
"license": "AGPL-3.0",
|
||||
"files": [
|
||||
@ -26,7 +26,6 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^0.19.1",
|
||||
"faker": "^4.1.0",
|
||||
"history": "4.10.1",
|
||||
"lodash": "4.17.15",
|
||||
"lodash-es": "4.17.15",
|
||||
@ -78,6 +77,7 @@
|
||||
"enzyme-adapter-react-16": "^1.15.2",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-react": "^7.17.0",
|
||||
"faker": "^4.1.0",
|
||||
"i18next": "19.0.3",
|
||||
"jest": "^24.9.0",
|
||||
"jest-enzyme": "^7.1.2",
|
||||
|
@ -1,124 +0,0 @@
|
||||
//import Filter from "./filter";
|
||||
import { random, system, lorem, internet, name, date } from "faker";
|
||||
|
||||
const generateFiles = (count) => {
|
||||
return Array.from({ length: count }, () => {
|
||||
const file = {
|
||||
folderId: random.number(30),
|
||||
version: random.number(3),
|
||||
versionGroup: random.number(3),
|
||||
contentLength: `${random.number(99)}.${random.number(99)} KB`,
|
||||
pureContentLength: random.number(9999),
|
||||
fileStatus: 0,
|
||||
viewUrl: "",
|
||||
webUrl: "",
|
||||
fileType: 7,
|
||||
fileExst: `.${system.commonFileExt()}`,
|
||||
comment: lorem.word(),
|
||||
id: random.number(500),
|
||||
title: lorem.sentence(random.number({ min: 2, max: 10 })).split('.').slice(0, -1).join('.'),
|
||||
access: 0,
|
||||
shared: false,
|
||||
rootFolderType: 5,
|
||||
updatedBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
created: date.past().toLocaleString("en-US"),
|
||||
createdBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
updated: date.past().toLocaleString("en-US"),
|
||||
};
|
||||
|
||||
return file;
|
||||
});
|
||||
};
|
||||
|
||||
const generateFolders = (count) => {
|
||||
return Array.from({ length: count }, () => {
|
||||
const folder = {
|
||||
parentId: random.number(20),
|
||||
filesCount: random.number(50),
|
||||
foldersCount: random.number(10),
|
||||
id: random.number(100000),
|
||||
title: lorem.sentence(random.number({ min: 2, max: 10 })),
|
||||
access: 0,
|
||||
shared: false,
|
||||
rootFolderType: 5,
|
||||
updatedBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
created: date.past().toLocaleString("en-US"),
|
||||
createdBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
updated: date.past().toLocaleString("en-US"),
|
||||
};
|
||||
|
||||
return folder;
|
||||
});
|
||||
};
|
||||
|
||||
const current = (rootTitle) => {
|
||||
return {
|
||||
parentId: 0,
|
||||
filesCount: 4,
|
||||
foldersCount: 2,
|
||||
isShareable: true,
|
||||
id: random.number(),
|
||||
title: rootTitle,
|
||||
access: 0,
|
||||
shared: false,
|
||||
rootFolderType: 5,
|
||||
updatedBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
created: date.past().toLocaleString("en-US"),
|
||||
createdBy: {
|
||||
id: random.uuid(),
|
||||
displayName: name.findName(),
|
||||
title: name.title(),
|
||||
avatarSmall: internet.avatar(),
|
||||
profileUrl: ""
|
||||
},
|
||||
updated: date.past().toLocaleString("en-US")
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
export function getFakeElements(filter, rootTitle = "My Documents") {
|
||||
const files = random.number({ min: 1, max: 30 });
|
||||
const folders = random.number({ min: 1, max: 15 });
|
||||
const total = files + folders;
|
||||
const fakeFiles = generateFiles(files)
|
||||
const fakeFolders = generateFolders(folders);
|
||||
return Promise.resolve({
|
||||
files: fakeFiles,
|
||||
folders: fakeFolders,
|
||||
current: current(rootTitle),
|
||||
pathParts: [17],
|
||||
startIndex: 0,
|
||||
count: total,
|
||||
total: total
|
||||
});
|
||||
}
|
@ -1,7 +1,6 @@
|
||||
import { request } from "../client";
|
||||
import axios from "axios";
|
||||
import FilesFilter from "./filter";
|
||||
import * as fakeFiles from "./fake";
|
||||
|
||||
export function openEdit(fileId) {
|
||||
const options = {
|
||||
@ -30,11 +29,7 @@ export function getFolderPath(folderId) {
|
||||
return request(options);
|
||||
}
|
||||
|
||||
export function getFolder(folderId, filter, fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "Fake folder");
|
||||
}
|
||||
|
||||
export function getFolder(folderId, filter) {
|
||||
const params =
|
||||
filter && filter instanceof FilesFilter
|
||||
? `${folderId}?${filter.toUrlParams()}`
|
||||
@ -74,11 +69,7 @@ export function getFoldersTree() {
|
||||
))
|
||||
}
|
||||
|
||||
export function getMyFolderList(filter = FilesFilter.getDefault(), fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "My Documents");
|
||||
}
|
||||
|
||||
export function getMyFolderList(filter = FilesFilter.getDefault()) {
|
||||
const options = {
|
||||
method: "get",
|
||||
url: `/files/@my`
|
||||
@ -87,11 +78,7 @@ export function getMyFolderList(filter = FilesFilter.getDefault(), fake = false)
|
||||
return request(options);
|
||||
}
|
||||
|
||||
export function getCommonFolderList(filter = FilesFilter.getDefault(), fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "Common Documents");
|
||||
}
|
||||
|
||||
export function getCommonFolderList(filter = FilesFilter.getDefault()) {
|
||||
const options = {
|
||||
method: "get",
|
||||
url: `/files/@common`
|
||||
@ -100,11 +87,7 @@ export function getCommonFolderList(filter = FilesFilter.getDefault(), fake = fa
|
||||
return request(options);
|
||||
}
|
||||
|
||||
export function getProjectsFolderList(filter = FilesFilter.getDefault(), fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "Project Documents");
|
||||
}
|
||||
|
||||
export function getProjectsFolderList(filter = FilesFilter.getDefault()) {
|
||||
const options = {
|
||||
method: "get",
|
||||
url: `/files/@projects`
|
||||
@ -113,11 +96,7 @@ export function getProjectsFolderList(filter = FilesFilter.getDefault(), fake =
|
||||
return request(options);
|
||||
}
|
||||
|
||||
export function getTrashFolderList(filter = FilesFilter.getDefault(), fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "Recycle Bin");
|
||||
}
|
||||
|
||||
export function getTrashFolderList(filter = FilesFilter.getDefault()) {
|
||||
const options = {
|
||||
method: "get",
|
||||
url: `/files/@trash`
|
||||
@ -126,11 +105,7 @@ export function getTrashFolderList(filter = FilesFilter.getDefault(), fake = fal
|
||||
return request(options);
|
||||
}
|
||||
|
||||
export function getSharedFolderList(filter = FilesFilter.getDefault(), fake = false) {
|
||||
if (fake) {
|
||||
return fakeFiles.getFakeElements(filter, "Shared with Me");
|
||||
}
|
||||
|
||||
export function getSharedFolderList(filter = FilesFilter.getDefault()) {
|
||||
const options = {
|
||||
method: "get",
|
||||
url: `/files/@share`
|
||||
|
@ -1,5 +1,4 @@
|
||||
import Filter from "./filter";
|
||||
import { name, image, internet } from "faker";
|
||||
import uniqueId from "lodash/uniqueId";
|
||||
|
||||
const generateUsers = (count, search, group) => {
|
||||
@ -7,10 +6,10 @@ const generateUsers = (count, search, group) => {
|
||||
const user = {
|
||||
id: uniqueId(),
|
||||
groups: group ? [group] : [],
|
||||
displayName: search ? name.findName(search) : name.findName(),
|
||||
avatar: image.avatar(),
|
||||
title: name.jobTitle(),
|
||||
email: internet.email()
|
||||
displayName: 'Demo User',
|
||||
avatar: '',
|
||||
title: 'Demo',
|
||||
email: 'demo@demo.com'
|
||||
};
|
||||
|
||||
return user;
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-components",
|
||||
"version": "1.0.384",
|
||||
"version": "1.0.385",
|
||||
"description": "Ascensio System SIA component library",
|
||||
"license": "AGPL-3.0",
|
||||
"main": "dist/asc-web-components.js",
|
||||
@ -74,7 +74,6 @@
|
||||
"enzyme-adapter-react-16": "^1.15.2",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-react": "^7.17.0",
|
||||
"faker": "^4.1.0",
|
||||
"jest": "^24.9.0",
|
||||
"jest-enzyme": "^7.1.2",
|
||||
"jest-junit": "^10.0.0",
|
||||
|
@ -5572,11 +5572,6 @@ extsprintf@^1.2.0:
|
||||
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
|
||||
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
|
||||
|
||||
faker@^4.1.0:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
|
||||
integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
|
||||
|
||||
fast-deep-equal@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
|
||||
|
Loading…
Reference in New Issue
Block a user