Merge branch 'develop' into bugfix/mobile-loader

packages/client/src/components/GlobalEvents/CreateEvent.js

@@ -48,7 +48,7 @@ const CreateEvent = ({
 
   setEventDialogVisible,
   eventDialogVisible,
-  createWithoutDialog,
+  keepNewFileName,
 }) => {
   const [headerTitle, setHeaderTitle] = React.useState(null);
   const [startValue, setStartValue] = React.useState("");
@@ -77,7 +77,7 @@ const CreateEvent = ({
 
     if (!extension) return setEventDialogVisible(true);
 
-    if (!createWithoutDialog) {
+    if (!keepNewFileName) {
       setEventDialogVisible(true);
     } else {
       onSave(null, title || defaultName);
@@ -289,6 +289,7 @@ export default inject(
     uploadDataStore,
     dialogsStore,
     oformsStore,
+    settingsStore,
   }) => {
     const {
       setIsLoading,
@@ -321,7 +322,7 @@ export default inject(
       eventDialogVisible,
     } = dialogsStore;
 
-    const { createWithoutDialog } = filesStore;
+    const { keepNewFileName } = settingsStore;
 
     return {
       setEventDialogVisible,
@@ -352,7 +353,7 @@ export default inject(
       replaceFileStream,
       setEncryptionAccess,
 
-      createWithoutDialog,
+      keepNewFileName,
     };
   }
 )(observer(CreateEvent));

packages/client/src/components/GlobalEvents/sub-components/Dialog.js

@@ -22,9 +22,9 @@ const Dialog = ({
   onCancel,
   onClose,
   isCreateDialog,
-  createWithoutDialog,
-  setCreateWithoutDialog,
   extension,
+  keepNewFileName,
+  setKeepNewFileName,
 }) => {
   const [value, setValue] = useState("");
   const [isDisabled, setIsDisabled] = useState(false);
@@ -32,8 +32,8 @@ const Dialog = ({
   const [isChanged, setIsChanged] = useState(false);
 
   useEffect(() => {
-    createWithoutDialog && isCreateDialog && setIsChecked(createWithoutDialog);
-  }, [isCreateDialog, createWithoutDialog]);
+    keepNewFileName && isCreateDialog && setIsChecked(keepNewFileName);
+  }, [isCreateDialog, keepNewFileName]);
 
   useEffect(() => {
     let input = document?.getElementById("create-text-input");
@@ -80,7 +80,7 @@ const Dialog = ({
   const onSaveAction = useCallback(
     (e) => {
       setIsDisabled(true);
-      isCreateDialog && setCreateWithoutDialog(isChecked);
+      isCreateDialog && setKeepNewFileName(isChecked);
       onSave && onSave(e, value);
     },
     [onSave, isCreateDialog, value, isChecked]
@@ -88,7 +88,7 @@ const Dialog = ({
 
   const onCancelAction = useCallback((e) => {
     if (isChecked) {
-      setCreateWithoutDialog(false);
+      setKeepNewFileName(false);
     }
     onCancel && onCancel(e);
   }, []);
@@ -96,7 +96,7 @@ const Dialog = ({
   const onCloseAction = useCallback(
     (e) => {
       if (!isDisabled && isChecked) {
-        setCreateWithoutDialog(false);
+        setKeepNewFileName(false);
       }
       onClose && onClose(e);
     },
@@ -171,9 +171,9 @@ const Dialog = ({
   );
 };
 
-export default inject(({ auth, filesStore }) => {
+export default inject(({ auth, settingsStore }) => {
   const { folderFormValidation } = auth.settingsStore;
-  const { createWithoutDialog, setCreateWithoutDialog } = filesStore;
+  const { keepNewFileName, setKeepNewFileName } = settingsStore;
 
-  return { folderFormValidation, createWithoutDialog, setCreateWithoutDialog };
+  return { folderFormValidation, keepNewFileName, setKeepNewFileName };
 })(observer(Dialog));

packages/client/src/components/panels/UploadPanel/FileRow.js

@@ -142,11 +142,11 @@ class FileRow extends Component {
   onCancelCurrentUpload = (e) => {
     //console.log("cancel upload ", e);
     const { id, action, fileId } = e.currentTarget.dataset;
-    const { cancelCurrentUpload, cancelCurrentFileConversion } = this.props;
+    const { t, cancelCurrentUpload, cancelCurrentFileConversion } = this.props;
 
     return action === "convert"
       ? cancelCurrentFileConversion(fileId)
-      : cancelCurrentUpload(id);
+      : cancelCurrentUpload(id, t);
   };
 
   onMediaClick = (id) => {

packages/client/src/pages/Settings/Section/Body/CommonSettings.js

@@ -28,10 +28,11 @@ const PersonalSettings = ({
 
   t,
   showTitle,
-  createWithoutDialog,
-  setCreateWithoutDialog,
 
   showAdminSettings,
+
+  keepNewFileName,
+  setKeepNewFileName,
 }) => {
   const [isLoadingFavorites, setIsLoadingFavorites] = React.useState(false);
   const [isLoadingRecent, setIsLoadingRecent] = React.useState(false);
@@ -52,6 +53,10 @@ const PersonalSettings = ({
     setForceSave(!forceSave);
   }, [setForceSave, forceSave]);
 
+  const onChangeKeepNewFileName = React.useCallback(() => {
+    setKeepNewFileName(!keepNewFileName);
+  }, [setKeepNewFileName, keepNewFileName]);
+
   const onChangeFavorites = React.useCallback(
     (e) => {
       setIsLoadingFavorites(true);
@@ -72,10 +77,6 @@ const PersonalSettings = ({
     [setIsLoadingRecent, setRecentSetting]
   );
 
-  const onChangeCheckbox = () => {
-    setCreateWithoutDialog(!createWithoutDialog);
-  };
-
   return (
     <StyledSettings
       showTitle={showTitle}
@@ -91,8 +92,8 @@ const PersonalSettings = ({
           <ToggleButton
             className="toggle-btn"
             label={t("Common:DontAskAgain")}
-            onChange={onChangeCheckbox}
-            isChecked={createWithoutDialog}
+            onChange={onChangeKeepNewFileName}
+            isChecked={keepNewFileName}
           />
         )}
         <ToggleButton
@@ -162,8 +163,7 @@ const PersonalSettings = ({
   );
 };
 
-export default inject(
-  ({ auth, settingsStore, treeFoldersStore, filesStore }) => {
+export default inject(({ auth, settingsStore, treeFoldersStore }) => {
   const {
     storeOriginalFiles,
     confirmDelete,
@@ -181,10 +181,12 @@ export default inject(
     recentSection,
     setFavoritesSetting,
     setRecentSetting,
+
+    keepNewFileName,
+    setKeepNewFileName,
   } = settingsStore;
 
   const { myFolderId, commonFolderId } = treeFoldersStore;
-    const { setCreateWithoutDialog, createWithoutDialog } = filesStore;
 
   return {
     storeOriginalFiles,
@@ -209,8 +211,8 @@ export default inject(
     setRecentSetting,
     myFolderId,
     commonFolderId,
-      setCreateWithoutDialog,
-      createWithoutDialog,
+
+    keepNewFileName,
+    setKeepNewFileName,
   };
-  }
-)(observer(PersonalSettings));
+})(observer(PersonalSettings));

packages/client/src/store/FilesStore.js

@@ -32,7 +32,6 @@ import debounce from "lodash.debounce";
 
 const { FilesFilter, RoomsFilter } = api;
 const storageViewAs = localStorage.getItem("viewAs");
-const storageCheckbox = JSON.parse(localStorage.getItem("createWithoutDialog"));
 
 let requestCounter = 0;
 
@@ -56,7 +55,6 @@ class FilesStore {
 
   isLoaded = false;
   isLoading = false;
-  createWithoutDialog = storageCheckbox ? true : false;
 
   viewAs =
     isMobile && storageViewAs !== "tile" ? "row" : storageViewAs || "table";
@@ -569,11 +567,6 @@ class FilesStore {
     viewAs === "tile" && this.createThumbnails();
   };
 
-  setCreateWithoutDialog = (checked) => {
-    this.createWithoutDialog = checked;
-    localStorage.setItem("createWithoutDialog", JSON.stringify(checked));
-  };
-
   setPageItemsLength = (pageItemsLength) => {
     this.pageItemsLength = pageItemsLength;
   };

packages/client/src/store/InviteLinksStore.js

@@ -1,4 +1,4 @@
-import { makeAutoObservable } from "mobx";
+import { makeAutoObservable, runInAction } from "mobx";
 import {
   getInvitationLinks,
   getShortenedLink,
@@ -39,10 +39,12 @@ class InviteLinksStore {
 
     const links = await getInvitationLinks();
 
+    runInAction(() => {
       this.setUserLink(links.userLink);
       this.setGuestLink(links.guestLink);
       this.setAdminLink(links.adminLink);
       this.setCollaboratorLink(links.collaboratorLink);
+    });
   };
 
   getShortenedLink = async (link, forUser = false) => {

packages/client/src/store/SettingsStore.js

@@ -30,6 +30,7 @@ class SettingsStore {
   favoritesSection = null;
   recentSection = null;
   hideConfirmConvertSave = null;
+  keepNewFileName = null;
   chunkUploadSize = 1024 * 1023; // 1024 * 1023; //~0.999mb
 
   settingsIsLoaded = false;
@@ -149,6 +150,12 @@ class SettingsStore {
 
   setStoreForcesave = (val) => (this.storeForcesave = val);
 
+  setKeepNewFileName = (data) => {
+    api.files
+      .changeKeepNewFileName(data)
+      .then((res) => this.setFilesSetting("keepNewFileName", res));
+  };
+
   setEnableThirdParty = async (data, setting) => {
     const res = await api.files.thirdParty(data);
     this.setFilesSetting(setting, res);

packages/client/src/store/UploadDataStore.js

@@ -215,7 +215,31 @@ class UploadDataStore {
     this.setUploadData(newUploadData);
   };
 
-  cancelCurrentUpload = (id) => {
+  cancelCurrentUpload = (id, t) => {
+    if (this.isParallel) {
+      runInAction(() => {
+        const uploadedFilesHistory = this.uploadedFilesHistory.filter(
+          (el) => el.uniqueId !== id
+        );
+
+        const canceledFile = this.files.find((f) => f.uniqueId === id);
+        const newPercent = this.getFilesPercent(canceledFile.file.size);
+        canceledFile.cancel = true;
+        canceledFile.percent = 100;
+        canceledFile.action = "uploaded";
+
+        this.currentUploadNumber -= 1;
+        this.uploadedFilesHistory = uploadedFilesHistory;
+        this.percent = newPercent;
+        const nextFileIndex = this.files.findIndex((f) => !f.inAction);
+
+        if (nextFileIndex !== -1) {
+          this.startSessionFunc(nextFileIndex, t);
+        }
+      });
+      return;
+    }
+
     const newFiles = this.files.filter((el) => el.uniqueId !== id);
     const uploadedFilesHistory = this.uploadedFilesHistory.filter(
       (el) => el.uniqueId !== id

packages/common/api/files/index.js

@@ -703,6 +703,11 @@ export function forceSave(val) {
   return request({ method: "put", url: "files/forcesave", data });
 }
 
+export function changeKeepNewFileName(val) {
+  const data = { set: val };
+  return request({ method: "put", url: "files/keepnewfilename", data });
+}
+
 export function thirdParty(val) {
   const data = { set: val };
   return request({ method: "put", url: "files/thirdparty", data });

packages/components/selection-area/SelectionArea.js

@@ -265,7 +265,8 @@ class SelectionArea extends React.Component {
       e.target.closest(".tile-selected") ||
       e.target.closest(".table-row-selected") ||
       e.target.closest(".row-selected") ||
-      !e.target.closest("#sectionScroll")
+      !e.target.closest("#sectionScroll") ||
+      e.target.closest(".table-container_row-checkbox")
     )
       return;
 
@@ -292,7 +293,16 @@ class SelectionArea extends React.Component {
       y: scroll.scrollTop,
     };
 
+    const threshold = 10;
+    const { x1, y1 } = this.areaLocation;
+
+    if (
+      Math.abs(e.clientX - x1) >= threshold ||
+      Math.abs(e.clientY - y1) >= threshold
+    ) {
       onMove && onMove({ added: [], removed: [], clear: true });
+    }
+
     this.addListeners();
 
     const itemsContainer = document.getElementsByClassName(itemsContainerClass);