Client: rename

packages/client/src/components/FilesSelector/FilesSelector.types.ts

@@ -50,7 +50,7 @@ export type setTotalCallback = (value: number) => number;
 
 export type useSocketHelperProps = {
   socketHelper: any;
-  socketSubscribersId: Set<string>;
+  socketSubscribers: Set<string>;
   setItems: (callback: setItemsCallback) => void;
   setBreadCrumbs: (callback: setBreadCrumbsCallback) => void;
   setTotal: (callback: setTotalCallback) => void;
@@ -204,7 +204,7 @@ export type FilesSelectorProps = {
   includeFolder?: boolean;
 
   socketHelper: any;
-  socketSubscribersId: Set<string>;
+  socketSubscribers: Set<string>;
   currentDeviceType: "mobile" | "tablet" | "desktop";
 
   embedded: boolean;

packages/client/src/components/FilesSelector/helpers/useSocketHelper.ts

@@ -11,7 +11,7 @@ import { convertRoomsToItems } from "./useRoomsHelper";
 
 const useSocketHelper = ({
   socketHelper,
-  socketSubscribersId,
+  socketSubscribers,
   setItems,
   setBreadCrumbs,
   setTotal,
@@ -23,9 +23,9 @@ const useSocketHelper = ({
   const subscribe = (id: number) => {
     const roomParts = `DIR-${id}`;
 
-    if (socketSubscribersId.has(roomParts)) return (subscribedId.current = id);
+    if (socketSubscribers.has(roomParts)) return (subscribedId.current = id);
 
-    if (subscribedId.current && !socketSubscribersId.has(roomParts)) {
+    if (subscribedId.current && !socketSubscribers.has(roomParts)) {
       unsubscribe(subscribedId.current, false);
     }
 
@@ -45,7 +45,7 @@ const useSocketHelper = ({
       subscribedId.current = null;
     }
 
-    if (id && !socketSubscribersId.has(`DIR-${id}`)) {
+    if (id && !socketSubscribers.has(`DIR-${id}`)) {
       socketHelper.emit({
         command: "unsubscribe",
         data: {

packages/client/src/components/FilesSelector/index.tsx

@@ -91,7 +91,7 @@ const FilesSelector = ({
   includeFolder,
 
   socketHelper,
-  socketSubscribersId,
+  socketSubscribers,
   setMoveToPublicRoomVisible,
   setInfoPanelIsMobileHidden,
   currentDeviceType,
@@ -129,7 +129,7 @@ const FilesSelector = ({
 
   const { subscribe, unsubscribe } = useSocketHelper({
     socketHelper,
-    socketSubscribersId,
+    socketSubscribers,
     setItems,
     setBreadCrumbs,
     setTotal,
@@ -609,7 +609,7 @@ export default inject(
 
     const { theme, socketHelper, currentDeviceType } = auth.settingsStore;
 
-    const socketSubscribesId = socketHelper.socketSubscribersId;
+    const socketSubscribesId = socketHelper.socketSubscribers;
 
     const {
       selection,
@@ -674,7 +674,7 @@ export default inject(
       setInfoPanelIsMobileHidden,
       includeFolder,
       socketHelper,
-      socketSubscribersId: socketSubscribesId,
+      socketSubscribers: socketSubscribesId,
       setMoveToPublicRoomVisible,
       currentDeviceType,
     };

packages/client/src/store/FilesStore.js

@@ -174,7 +174,7 @@ class FilesStore {
     const { socketHelper } = authStore.settingsStore;
 
     socketHelper.on("s:modify-folder", async (opt) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
 
       if (opt && opt.data) {
         const data = JSON.parse(opt.data);
@@ -184,8 +184,8 @@ class FilesStore {
           : `DIR-${data.parentId}`;
 
         if (
-          !socketSubscribersId.has(pathParts) &&
-          !socketSubscribersId.has(`DIR-${data.id}`)
+          !socketSubscribers.has(pathParts) &&
+          !socketSubscribers.has(`DIR-${data.id}`)
         )
           return;
       }
@@ -225,10 +225,10 @@ class FilesStore {
     });
 
     socketHelper.on("refresh-folder", (id) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
       const pathParts = `DIR-${id}`;
 
-      if (!socketSubscribersId.has(pathParts)) return;
+      if (!socketSubscribers.has(pathParts)) return;
 
       if (!id || this.clientLoadingStore.isLoading) return;
 
@@ -246,10 +246,10 @@ class FilesStore {
     });
 
     socketHelper.on("s:markasnew-folder", ({ folderId, count }) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
       const pathParts = `DIR-${folderId}`;
 
-      if (!socketSubscribersId.has(pathParts)) return;
+      if (!socketSubscribers.has(pathParts)) return;
 
       console.log(`[WS] markasnew-folder ${folderId}:${count}`);
 
@@ -264,10 +264,10 @@ class FilesStore {
     });
 
     socketHelper.on("s:markasnew-file", ({ fileId, count }) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
       const pathParts = `FILE-${fileId}`;
 
-      if (!socketSubscribersId.has(pathParts)) return;
+      if (!socketSubscribers.has(pathParts)) return;
 
       console.log(`[WS] markasnew-file ${fileId}:${count}`);
 
@@ -286,10 +286,10 @@ class FilesStore {
 
     //WAIT FOR RESPONSES OF EDITING FILE
     socketHelper.on("s:start-edit-file", (id) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
       const pathParts = `FILE-${id}`;
 
-      if (!socketSubscribersId.has(pathParts)) return;
+      if (!socketSubscribers.has(pathParts)) return;
 
       const foundIndex = this.files.findIndex((x) => x.id === id);
       if (foundIndex == -1) return;
@@ -309,10 +309,10 @@ class FilesStore {
     });
 
     socketHelper.on("s:stop-edit-file", (id) => {
-      const { socketSubscribersId } = socketHelper;
+      const { socketSubscribers } = socketHelper;
       const pathParts = `FILE-${id}`;
 
-      if (!socketSubscribersId.has(pathParts)) return;
+      if (!socketSubscribers.has(pathParts)) return;
 
       const foundIndex = this.files.findIndex((x) => x.id === id);
       if (foundIndex == -1) return;
@@ -908,10 +908,6 @@ class FilesStore {
     if (folders.length === 0 && this.folders.length === 0) return;
 
     if (this.folders?.length > 0) {
-      this.folders.forEach((f) => {
-        deleteSocketSubscribersId(`DIR-${f.id}`);
-      });
-
       socketHelper.emit({
         command: "unsubscribe",
         data: {

packages/common/utils/socket.js

@@ -2,7 +2,7 @@ import io from "socket.io-client";
 
 let client = null;
 let callbacks = [];
-const subscribesId = new Set();
+const subscribers = new Set();
 
 class SocketIOHelper {
   socketUrl = null;
@@ -50,8 +50,8 @@ class SocketIOHelper {
     return this.socketUrl !== null;
   }
 
-  get socketSubscribersId() {
-    return subscribesId;
+  get socketSubscribers() {
+    return subscribers;
   }
 
   emit = ({ command, data, room = null }) => {
@@ -62,13 +62,13 @@ class SocketIOHelper {
 
     ids.forEach((id) => {
       if (command === "subscribe") {
-        if (subscribesId.has(id)) return;
+        if (subscribers.has(id)) return;
 
-        subscribesId.add(id);
+        subscribers.add(id);
       }
 
       if (command === "unsubscribe") {
-        subscribesId.delete(id);
+        subscribers.delete(id);
       }
     });