Merge branch 'hotfix/v3.0.1' into feature/translations-3.1

packages/client/src/HOCs/withFileActions.js

@@ -81,12 +81,11 @@ export default function withFileActions(WrappedFileItem) {
     onDrop = (items) => {
       const { isTrashFolder, dragging, setDragging, isDisabledDropItem } =
         this.props;
-      const { fileExst, id } = this.props.item;
+      const { fileExst, isFolder, id } = this.props.item;
 
       if (isTrashFolder || isDisabledDropItem)
         return dragging && setDragging(false);
-
-      if (!fileExst) {
+      if (!fileExst && isFolder) {
         this.onDropZoneUpload(items, id);
       } else {
         this.onDropZoneUpload(items);

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

@@ -151,4 +151,5 @@ export type FilesSelectorProps = TSelectorHeader & {
   filesSettings: TFilesSettings;
 
   withCreate?: boolean;
+  checkCreating?: boolean;
 };

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

@@ -143,6 +143,7 @@ const FilesSelectorWrapper = ({
 
   withCreate,
   folderIsShared,
+  checkCreating,
 }: FilesSelectorProps) => {
   const { t }: { t: TTranslation } = useTranslation([
     "Files",
@@ -364,6 +365,7 @@ const FilesSelectorWrapper = ({
       | TRoomSecurity
       | undefined,
     selectedFileInfo: TSelectedFileInfo,
+    isDisabledFolder?: boolean,
   ) => {
     return getIsDisabled(
       isFirstLoad,
@@ -380,6 +382,7 @@ const FilesSelectorWrapper = ({
       !!selectedFileInfo,
       includeFolder,
       isRestore,
+      isDisabledFolder,
     );
   };
 
@@ -441,6 +444,7 @@ const FilesSelectorWrapper = ({
       filesSettings={filesSettings}
       headerProps={headerProps}
       formProps={formProps}
+      checkCreating={checkCreating}
     />
   );
 };

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

@@ -108,9 +108,11 @@ export const getIsDisabled = (
   isFileSelected?: boolean,
   includeFolder?: boolean,
   isRestore?: boolean,
+  isDisabledFolder?: boolean,
 ) => {
   if (isFirstLoad) return true;
   if (isRequestRunning) return true;
+  if (isDisabledFolder) return true;
   if (filterParam) return !isFileSelected;
   if (sameId && !isCopy) return true;
   if (sameId && isCopy && includeFolder) return true;

packages/client/src/components/FilesSelectorInput/index.js

@@ -64,6 +64,7 @@ const FilesSelectorInput = (props) => {
     isRoomBackup,
     isDocumentIcon,
     withCreate,
+    checkCreating,
   } = props;
 
   const isFilesSelection = !!filterParam;
@@ -140,6 +141,7 @@ const FilesSelectorInput = (props) => {
           isSelect={isSelect}
           withCreate={withCreate}
           {...(isFilesSelection ? filesSelectionProps : foldersSelectionProps)}
+          checkCreating={checkCreating}
         />
       </Aside>
     </>

packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx

@@ -285,7 +285,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
   const onCloseConflictDialog = () => {
     if (isUploadConflict) {
       cancelUploadAction();
-      onCloseDialog();
+      onClose();
     } else onCloseDialog();
   };
 

packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js

@@ -248,7 +248,6 @@ const DirectThirdPartyConnection = (props) => {
       </StyledComboBoxItem>
     );
   });
-
   return (
     <StyledBackup
       isConnectedAccount={
@@ -321,6 +320,9 @@ const DirectThirdPartyConnection = (props) => {
               isThirdParty
               isSelectFolder={isSelectFolder}
               isSelect={isSelect}
+              checkCreating={
+                selectedThirdPartyAccount?.provider_key === "WebDav"
+              }
             />
           )}
         </>

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js

@@ -85,7 +85,7 @@ const DocSpace = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Editor.js

@@ -79,7 +79,7 @@ const Editor = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/FileSelector.js

@@ -167,7 +167,7 @@ const FileSelector = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js

@@ -162,7 +162,7 @@ const Manager = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/RoomSelector.js

@@ -128,7 +128,7 @@ const RoomSelector = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/SimpleRoom.js

@@ -115,7 +115,7 @@ const SimpleRoom = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Viewer.js

@@ -80,7 +80,7 @@ const Viewer = (props) => {
   };
 
   const initFrame = () => {
-    sdk.init(config);
+    setTimeout(() => sdk.init(config), 10);
   };
 
   useEffect(() => {

packages/client/src/store/SettingsSetupStore.js

@@ -26,7 +26,6 @@
 
 import api from "@docspace/shared/api";
 import { makeAutoObservable } from "mobx";
-const { Filter } = api;
 import SelectionStore from "./SelectionStore";
 //import CommonStore from "./CommonStore";
 
@@ -41,6 +40,8 @@ import { isDesktop } from "@docspace/shared/utils";
 import { DeviceType } from "@docspace/shared/enums";
 import { toastr } from "@docspace/shared/components/toast";
 
+const { Filter } = api;
+
 class SettingsSetupStore {
   selectionStore = null;
   authStore = null;

packages/doceditor/src/components/Root.tsx

@@ -192,7 +192,7 @@ const Root = ({
       isVisibleSelectFolderDialog ||
       selectFileDialogVisible
     ) {
-      calculateAsideHeight();
+      setTimeout(() => calculateAsideHeight(calculateAsideHeight), 10);
 
       const activeElement = document.activeElement as HTMLElement | null;
 
@@ -203,10 +203,6 @@ const Root = ({
     } else if (editorRef.current) {
       editorRef.current.focus();
     }
-
-    if (isSharingDialogVisible) {
-      setTimeout(calculateAsideHeight, 10);
-    }
   }, [
     isSharingDialogVisible,
     isVisibleSelectFolderDialog,

packages/doceditor/src/utils/index.ts

@@ -209,27 +209,43 @@ export const getIsZoom = () =>
     window?.navigator?.userAgent?.includes("ZoomApps"));
 
 // need for separate window in desktop editors
-export const calculateAsideHeight = () => {
+export const calculateAsideHeight = (callback?: () => void) => {
   const viewPort = window?.AscDesktopEditor?.getViewportSettings?.();
 
-  if (!viewPort) return;
+  if (!viewPort?.widgetType || viewPort.widgetType !== "window") return;
 
-  if (viewPort.widgetType === "window") {
-    const { captionHeight } = viewPort;
-    const backdrop =
-      (document.getElementsByClassName("backdrop-active")[0] as HTMLElement) ??
-      (document.getElementsByClassName(
-        "modal-backdrop-active",
-      )[0] as HTMLElement);
-    const aside = document.getElementsByTagName("aside")[0];
+  const { captionHeight } = viewPort;
 
-    if (backdrop) {
-      backdrop.style.height = `calc(100dvh - ${captionHeight}px`;
-      backdrop.style.marginTop = `${captionHeight}px`;
-    }
-    if (aside) {
-      aside.style.height = `calc(100dvh - ${captionHeight}px`;
-      aside.style.top = `${captionHeight}px`;
-    }
+  const elements = {
+    backdrop: document.querySelector(
+      ".backdrop-active, .modal-backdrop-active",
+    ),
+    aside: document.querySelector("aside"),
+  };
+
+  const isElementInDom = !!elements.backdrop || !!elements.aside;
+
+  if (!isElementInDom)
+    return setTimeout(() => {
+      if (typeof callback === "function") callback();
+    }, 350);
+
+  const styles = {
+    height: `calc(100dvh - ${captionHeight}px)`,
+    top: `${captionHeight}px`,
+  };
+
+  if (elements.backdrop) {
+    Object.assign((elements.backdrop as HTMLElement).style, {
+      height: styles.height,
+      marginTop: styles.top,
+    });
+  }
+
+  if (elements.aside) {
+    Object.assign(elements.aside.style, {
+      height: styles.height,
+      top: styles.top,
+    });
   }
 };

packages/login/src/app/(root)/confirm/[Invite]/page.client.tsx

@@ -164,7 +164,7 @@ const CreateUserForm = (props: CreateUserFormProps) => {
         await signupOAuth(signupAccount, confirmKey);
 
         const url = roomData.roomId
-          ? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/`
+          ? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}`
           : defaultPage;
         window.location.replace(url);
       } catch (error) {

packages/shared/components/calendar/Calendar.styled.tsx

@@ -341,6 +341,8 @@ const StyledContainerTheme = styled(Container)<{
   ${HeaderActionIcon} {
     border-color: ${(props) => props.$currentColorScheme?.main?.accent};
   }
+
+  border: 1px solid ${({ theme }) => theme.calendar.containerBorderColor};
 `;
 
 const StyledDateItemTheme = styled(DateItem)<{

packages/shared/components/recover-access-modal-dialog/RecoverAccessModalDialog.tsx

@@ -169,6 +169,7 @@ const RecoverAccessModalDialog: React.FC<IRecoverAccessModalDialogProps> = ({
               onBlur={onBlurEmail}
               onChange={onChangeEmail}
               onValidateInput={onValidateEmail}
+              maxLength={255}
             />
           </FieldContainer>
           <FieldContainer

packages/shared/selectors/Files/FilesSelector.types.ts

@@ -230,4 +230,5 @@ export type FilesSelectorProps = TSelectorHeader &
     createDefineRoomType?: RoomsType;
     formProps?: FormPropsType;
     withPadding?: boolean;
+    checkCreating?: boolean;
   };

packages/shared/selectors/Files/index.tsx

@@ -67,6 +67,7 @@ import useSocketHelper from "./hooks/useSocketHelper";
 import { FilesSelectorProps } from "./FilesSelector.types";
 import { SettingsContextProvider } from "./contexts/Settings";
 import { LoadersContext, LoadersContextProvider } from "./contexts/Loaders";
+import { createFolder, deleteFolder } from "../../api/files";
 
 const FilesSelectorComponent = ({
   disabledItems,
@@ -119,6 +120,7 @@ const FilesSelectorComponent = ({
 
   withPadding,
   folderIsShared,
+  checkCreating,
 }: FilesSelectorProps) => {
   const theme = useTheme();
   const { t } = useTranslation(["Common"]);
@@ -156,6 +158,9 @@ const FilesSelectorComponent = ({
   const [isSelectedParentFolder, setIsSelectedParentFolder] =
     React.useState<boolean>(false);
   const [searchValue, setSearchValue] = React.useState<string>("");
+  const [isDisabledFolder, setIsDisabledFolder] = React.useState<
+    boolean | undefined
+  >(checkCreating);
 
   const afterSearch = React.useRef(false);
   const currentSelectedItemId = React.useRef<undefined | number | string>(
@@ -303,8 +308,10 @@ const FilesSelectorComponent = ({
     ],
   );
 
+  const translation = t("Common:NewFolder");
+
   const onSelectAction = React.useCallback(
-    (
+    async (
       item: TSelectorItem,
       isDoubleClick: boolean,
       doubleClickCallback: () => Promise<void>,
@@ -340,6 +347,16 @@ const FilesSelectorComponent = ({
         } else {
           setSelectedItemType("files");
         }
+
+        if (checkCreating && breadCrumbs.length === 1 && item.id) {
+          try {
+            const folderInfo = await createFolder(item.id, translation);
+            await deleteFolder(folderInfo.id, true, true);
+            setIsDisabledFolder(false);
+          } catch (e) {
+            setIsDisabledFolder(true);
+          }
+        }
       } else if (item.id && item.label) {
         const inPublic =
           breadCrumbs.findIndex(
@@ -367,6 +384,8 @@ const FilesSelectorComponent = ({
       setIsFirstLoad,
       formProps?.isRoomFormAccessible,
       formProps?.message,
+      translation,
+      checkCreating,
     ],
   );
 
@@ -561,6 +580,7 @@ const FilesSelectorComponent = ({
       isRoot,
       selectedItemSecurity,
       selectedFileInfo,
+      isDisabledFolder,
     ),
   };
 

packages/shared/themes/base.ts

@@ -1612,6 +1612,8 @@ export const getBaseTheme = () => {
     },
 
     calendar: {
+      containerBorderColor: white,
+
       color: black,
       disabledColor: lightGraySelected,
       pastColor: gray,

packages/shared/themes/dark.ts

@@ -1604,6 +1604,7 @@ const Dark: TTheme = {
   },
 
   calendar: {
+    containerBorderColor: grayDarkStrong,
     color: white,
     disabledColor: grayDarkStrong,
     pastColor: grayDark,

public/scripts/config.json

@@ -38,7 +38,7 @@
   },
   "loaders": {
     "showLoader": true,
-    "showLoaderTime": null,
+    "showLoaderTime": 1000,
     "loaderTime": null
   }
 }