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

Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side)

Browse Source
This commit is contained in:
Alexey Safronov 2022-02-01 18:07:23 +03:00
parent b4ac2c4e9f
commit 98ca84b1dc
8 changed files with 4 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
View File

@ -356,30 +356,6 @@ namespace ASC.Core.Notify.Signalr
ProcessError(error);
}
}
public void CreateFolder<T>(T folderId, string room, string data)
{
try
{
MakeRequest("create-folder", new { room, folderId, data });
}
catch (Exception error)
{
ProcessError(error);
}
}
public void DeleteFolder<T>(T folderId, string room)
{
try
{
MakeRequest("delete-folder", new { room, folderId });
}
catch (Exception error)
{
ProcessError(error);
}
}
public T GetAgent<T>(string numberId, List<Guid> contactsResponsibles)
{

12
common/ASC.Socket.IO/app/controllers/files.js
View File

@ -1,4 +1,4 @@
module.exports = (files) => {
module.exports = (files) => {
const router = require("express").Router();
router.post("/start-edit", (req, res) => {
@ -21,15 +21,5 @@ module.exports = (files) => {
res.end();
});
router.post("/create-folder", (req, res) => {
files.createFolder(req.body);
res.end();
});
router.post("/delete-folder", (req, res) => {
files.deleteFolder(req.body);
res.end();
});
return router;
};

14
common/ASC.Socket.IO/app/hubs/files.js
View File

@ -1,4 +1,4 @@
module.exports = (io) => {
module.exports = (io) => {
const logger = require("../log.js");
const moment = require("moment");
const filesIO = io; //TODO: Restore .of("/files");
@ -114,15 +114,5 @@ module.exports = (io) => {
modifyFolder(room, "delete", fileId, "file");
}
function createFolder({ folderId, room, data } = {}) {
logger.info(`create new folder ${folderId} in room ${room}`);
modifyFolder(room, "create", folderId, "folder", data);
}
function deleteFolder({ folderId, room } = {}) {
logger.info(`delete folder ${folderId} in room ${room}`);
modifyFolder(room, "delete", folderId, "folder");
}
return { startEdit, stopEdit, createFile, deleteFile, createFolder, deleteFolder };
return { startEdit, stopEdit, createFile, deleteFile };
};

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

@ -89,13 +89,6 @@ class FilesStore {
const file = JSON.parse(opt?.data);
this.setFiles([file, ...this.files]);
} else if (opt?.type == "folder" && opt?.id) {
const foundIndex = this.files.findIndex((x) => x.id === opt?.id);
if (foundIndex > -1) return;
const folder = JSON.parse(opt?.data);
this.setFolders([folder, ...this.folders]);
}
break;
case "delete":
@ -108,15 +101,6 @@ class FilesStore {
return index !== foundIndex;
})
);
} else if (opt?.type == "folder" && opt?.id) {
const foundIndex = this.folders.findIndex((x) => x.id === opt?.id);
if (foundIndex == -1) return;
this.setFolders(
this.folders.filter((_, index) => {
return index !== foundIndex;
})
);
}
break;
}

8
products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
View File

@ -176,11 +176,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (FolderDao.IsEmpty(folder.ID))
{
FolderDao.DeleteFolder(folder.ID);
filesMessageService.Send(folder, _headers, MessageAction.FolderDeleted, folder.Title);
filesMessageService.Send(folder, _headers, MessageAction.FolderDeleted, folder.Title);
var room = documentServiceHelper.GetSocketFolderRoom(folder.RootFolderId);
socketManager.DeleteFolder(folder.ID, room);
ProcessedFolder(folderId);
}
}
@ -203,9 +200,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
FolderDao.MoveFolder(folder.ID, _trashId, CancellationToken);
filesMessageService.Send(folder, _headers, MessageAction.FolderMovedToTrash, folder.Title);
}
var room = documentServiceHelper.GetSocketFolderRoom(folder.RootFolderId);
socketManager.DeleteFolder(folder.ID, room);
ProcessedFolder(folderId);
}

21
products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
View File

@ -238,9 +238,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (isToFolder)
needToMark.Add(newFolder);
var roomNew = documentServiceHelper.GetSocketFolderRoom(toFolderId);
socketManager.CreateFolder(newFolder.ID, roomNew, newFolder);
if (ProcessedFolder(folderId))
{
@ -263,9 +260,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
else if (FolderDao.IsEmpty(folder.ID))
{
FolderDao.DeleteFolder(folder.ID);
var room = documentServiceHelper.GetSocketFolderRoom(folder.RootFolderId);
socketManager.DeleteFolder(folder.ID, room);
if (ProcessedFolder(folderId))
{
@ -287,9 +281,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (isToFolder)
needToMark.Add(newFolder);
var roomNew = documentServiceHelper.GetSocketFolderRoom(toFolderId);
socketManager.CreateFolder(newFolder.ID, roomNew, newFolder);
if (ProcessedFolder(folderId))
{
@ -322,12 +313,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (isToFolder)
needToMark.Add(newFolder);
var roomNew = documentServiceHelper.GetSocketFolderRoom(toFolderId);
socketManager.CreateFolder(newFolder.ID, roomNew, newFolder);
var room = documentServiceHelper.GetSocketFolderRoom(folder.RootFolderId);
socketManager.DeleteFolder(folder.ID, room);
if (ProcessedFolder(folderId))
{
@ -365,12 +350,6 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
if (isToFolder)
needToMark.Add(newFolder);
var roomNew = documentServiceHelper.GetSocketFolderRoom(toFolderId);
socketManager.CreateFolder(newFolder.ID, roomNew, newFolder);
var roomOld = documentServiceHelper.GetSocketFolderRoom(folder.RootFolderId);
socketManager.DeleteFolder(folder.ID, roomOld);
if (ProcessedFolder(folderId))
{

12
products/ASC.Files/Core/Utils/SocketManager.cs
View File

@ -70,18 +70,6 @@ namespace ASC.Web.Files.Utils
public void DeleteFile<T>(T fileId, string room)
{
_signalrServiceClient.DeleteFile(fileId, room);
}
public void CreateFolder<T>(T folderId, string room, Folder<T> folder)
{
var serializerSettings = new JsonSerializerSettings();
serializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
_signalrServiceClient.CreateFolder(folderId, room, JsonConvert.SerializeObject(FolderWrapperHelper.Get(folder), Formatting.None, serializerSettings));
}
public void DeleteFolder<T>(T folderId, string room)
{
_signalrServiceClient.DeleteFolder(folderId, room);
}
}
}

3
products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
View File

@ -336,9 +336,6 @@ namespace ASC.Files.Helpers
{
var folder = FileStorageService.CreateNewFolder(folderId, title);
var room = DocumentServiceHelper.GetSocketFolderRoom(folderId);
SocketManager.CreateFolder(folder.ID, room, folder);
return FolderWrapperHelper.Get(folder);
}