From cbbba3046a7427579cfe0cfc2601f1169c32cf0a Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Thu, 2 May 2024 12:11:39 +0300
Subject: [PATCH 1/8] FIx Bug 67796

Added scroll to wizard
---
 packages/client/src/pages/Wizard/index.js | 357 +++++++++++-----------
 1 file changed, 180 insertions(+), 177 deletions(-)

diff --git a/packages/client/src/pages/Wizard/index.js b/packages/client/src/pages/Wizard/index.js
index 549919f38a..5e081c8ee9 100644
--- a/packages/client/src/pages/Wizard/index.js
+++ b/packages/client/src/pages/Wizard/index.js
@@ -42,6 +42,7 @@ import { Button } from "@docspace/shared/components/button";
 import { FieldContainer } from "@docspace/shared/components/field-container";
 import ErrorContainer from "@docspace/shared/components/error-container/ErrorContainer";
 import { FileInput } from "@docspace/shared/components/file-input";
+import { Scrollbar } from "@docspace/shared/components/scrollbar";
 
 import { Loader } from "@docspace/shared/components/loader";
 
@@ -314,207 +315,209 @@ const Wizard = (props) => {
   return (
     <Wrapper>
       <div className="bg-cover"></div>
-      <StyledContent>
-        <WizardContainer>
-          <DocspaceLogo className="docspace-logo" />
-          <Text
-            as="div"
-            fontWeight={700}
-            fontSize="23px"
-            className="welcome-text"
-          >
-            {t("WelcomeTitle")}
-          </Text>
-          <FormWrapper>
-            <Text fontWeight={600} fontSize="16px" className="form-header">
-              {t("Desc")}
+      <Scrollbar id="customScrollBar">
+        <StyledContent>
+          <WizardContainer>
+            <DocspaceLogo className="docspace-logo" />
+            <Text
+              as="div"
+              fontWeight={700}
+              fontSize="23px"
+              className="welcome-text"
+            >
+              {t("WelcomeTitle")}
             </Text>
-            <FieldContainer
-              className="wizard-field"
-              isVertical={true}
-              labelVisible={false}
-              hasError={hasErrorEmail}
-              errorMessage={t("ErrorEmail")}
-            >
-              <EmailInput
-                name="wizard-email"
-                tabIndex={1}
-                size="large"
-                scale={true}
-                placeholder={t("Common:Email")}
-                emailSettings={emailSettings}
-                hasError={hasErrorEmail}
-                onValidateInput={onEmailChangeHandler}
-                isDisabled={isCreated}
-              />
-            </FieldContainer>
-
-            <FieldContainer
-              className="wizard-field password-field"
-              isVertical={true}
-              labelVisible={false}
-              hasError={hasErrorPass}
-              errorMessage={t("ErrorPassword")}
-            >
-              <PasswordInput
-                ref={refPassInput}
-                tabIndex={2}
-                size="large"
-                scale={true}
-                inputValue={password}
-                passwordSettings={passwordSettings}
-                isDisabled={isCreated}
-                placeholder={t("Common:Password")}
-                hideNewPasswordButton={true}
-                isDisableTooltip={true}
-                isTextTooltipVisible={false}
-                hasError={hasErrorPass}
-                onChange={onChangePassword}
-                autoComplete="current-password"
-                onValidateInput={isValidPassHandler}
-              />
-            </FieldContainer>
-            <StyledLink>
-              <IconButton
-                size="12"
-                iconName={RefreshReactSvgUrl}
-                onClick={generatePassword}
-              />
-              <Link
-                className="generate-password-link"
-                type="action"
-                fontWeight={600}
-                isHovered={true}
-                onClick={generatePassword}
-              >
-                {t("GeneratePassword")}
-              </Link>
-            </StyledLink>
-
-            {isLicenseRequired && (
+            <FormWrapper>
+              <Text fontWeight={600} fontSize="16px" className="form-header">
+                {t("Desc")}
+              </Text>
               <FieldContainer
-                className="license-filed"
+                className="wizard-field"
                 isVertical={true}
                 labelVisible={false}
-                hasError={hasErrorLicense}
-                errorMessage={
-                  invalidLicense
-                    ? t("ErrorLicenseBody")
-                    : t("ErrorUploadLicenseFile")
-                }
+                hasError={hasErrorEmail}
+                errorMessage={t("ErrorEmail")}
               >
-                <FileInput
-                  scale
+                <EmailInput
+                  name="wizard-email"
+                  tabIndex={1}
                   size="large"
-                  accept={[".lic"]}
-                  placeholder={t("PlaceholderLicense")}
-                  onInput={onLicenseFileHandler}
-                  hasError={hasErrorLicense}
+                  scale={true}
+                  placeholder={t("Common:Email")}
+                  emailSettings={emailSettings}
+                  hasError={hasErrorEmail}
+                  onValidateInput={onEmailChangeHandler}
+                  isDisabled={isCreated}
                 />
               </FieldContainer>
-            )}
-            <StyledInfo>
-              <Text color="#A3A9AE" fontWeight={400}>
-                {t("Common:Domain")}
-              </Text>
-              <Text fontWeight={600} className="machine-name">
-                {machineName}
-              </Text>
-            </StyledInfo>
-            <StyledInfo>
-              <Text color="#A3A9AE" fontWeight={400}>
-                {t("Common:Language")}
-              </Text>
-              <div className="wrapper__language-selector">
+
+              <FieldContainer
+                className="wizard-field password-field"
+                isVertical={true}
+                labelVisible={false}
+                hasError={hasErrorPass}
+                errorMessage={t("ErrorPassword")}
+              >
+                <PasswordInput
+                  ref={refPassInput}
+                  tabIndex={2}
+                  size="large"
+                  scale={true}
+                  inputValue={password}
+                  passwordSettings={passwordSettings}
+                  isDisabled={isCreated}
+                  placeholder={t("Common:Password")}
+                  hideNewPasswordButton={true}
+                  isDisableTooltip={true}
+                  isTextTooltipVisible={false}
+                  hasError={hasErrorPass}
+                  onChange={onChangePassword}
+                  autoComplete="current-password"
+                  onValidateInput={isValidPassHandler}
+                />
+              </FieldContainer>
+              <StyledLink>
+                <IconButton
+                  size="12"
+                  iconName={RefreshReactSvgUrl}
+                  onClick={generatePassword}
+                />
+                <Link
+                  className="generate-password-link"
+                  type="action"
+                  fontWeight={600}
+                  isHovered={true}
+                  onClick={generatePassword}
+                >
+                  {t("GeneratePassword")}
+                </Link>
+              </StyledLink>
+
+              {isLicenseRequired && (
+                <FieldContainer
+                  className="license-filed"
+                  isVertical={true}
+                  labelVisible={false}
+                  hasError={hasErrorLicense}
+                  errorMessage={
+                    invalidLicense
+                      ? t("ErrorLicenseBody")
+                      : t("ErrorUploadLicenseFile")
+                  }
+                >
+                  <FileInput
+                    scale
+                    size="large"
+                    accept={[".lic"]}
+                    placeholder={t("PlaceholderLicense")}
+                    onInput={onLicenseFileHandler}
+                    hasError={hasErrorLicense}
+                  />
+                </FieldContainer>
+              )}
+              <StyledInfo>
+                <Text color="#A3A9AE" fontWeight={400}>
+                  {t("Common:Domain")}
+                </Text>
+                <Text fontWeight={600} className="machine-name">
+                  {machineName}
+                </Text>
+              </StyledInfo>
+              <StyledInfo>
+                <Text color="#A3A9AE" fontWeight={400}>
+                  {t("Common:Language")}
+                </Text>
+                <div className="wrapper__language-selector">
+                  <ComboBox
+                    withoutPadding
+                    directionY="both"
+                    options={cultureNames || []}
+                    selectedOption={selectedLanguage || {}}
+                    onSelect={onLanguageSelect}
+                    isDisabled={isCreated}
+                    scaled={isMobile()}
+                    scaledOptions={false}
+                    size="content"
+                    showDisabledItems={true}
+                    dropDownMaxHeight={364}
+                    manualWidth="250px"
+                    isDefaultMode={!isMobile()}
+                    withBlur={isMobile()}
+                    fillIcon={false}
+                    modernView={true}
+                  />
+                  {selectedLanguage?.isBeta && (
+                    <BetaBadge withOutFeedbackLink place="bottom" />
+                  )}
+                </div>
+              </StyledInfo>
+              <StyledInfo>
+                <Text color="#A3A9AE" fontWeight={400}>
+                  {t("Timezone")}
+                </Text>
                 <ComboBox
+                  textOverflow
                   withoutPadding
                   directionY="both"
-                  options={cultureNames || []}
-                  selectedOption={selectedLanguage || {}}
-                  onSelect={onLanguageSelect}
+                  options={timezones || []}
+                  selectedOption={selectedTimezone || {}}
+                  onSelect={onTimezoneSelect}
                   isDisabled={isCreated}
                   scaled={isMobile()}
                   scaledOptions={false}
                   size="content"
                   showDisabledItems={true}
                   dropDownMaxHeight={364}
-                  manualWidth="250px"
+                  manualWidth="350px"
                   isDefaultMode={!isMobile()}
                   withBlur={isMobile()}
                   fillIcon={false}
                   modernView={true}
                 />
-                {selectedLanguage?.isBeta && (
-                  <BetaBadge withOutFeedbackLink place="bottom" />
-                )}
-              </div>
-            </StyledInfo>
-            <StyledInfo>
-              <Text color="#A3A9AE" fontWeight={400}>
-                {t("Timezone")}
-              </Text>
-              <ComboBox
-                textOverflow
-                withoutPadding
-                directionY="both"
-                options={timezones || []}
-                selectedOption={selectedTimezone || {}}
-                onSelect={onTimezoneSelect}
-                isDisabled={isCreated}
-                scaled={isMobile()}
-                scaledOptions={false}
-                size="content"
-                showDisabledItems={true}
-                dropDownMaxHeight={364}
-                manualWidth="350px"
-                isDefaultMode={!isMobile()}
-                withBlur={isMobile()}
-                fillIcon={false}
-                modernView={true}
-              />
-            </StyledInfo>
+              </StyledInfo>
 
-            <StyledAcceptTerms>
-              <Checkbox
-                className="wizard-checkbox"
-                id="license"
-                name="confirm"
-                label={t("License")}
-                isChecked={agreeTerms}
-                onChange={onAgreeTermsChange}
-                isDisabled={isCreated}
-                hasError={hasErrorAgree}
-              />
-              <Link
-                type="page"
-                color={
-                  hasErrorAgree
-                    ? theme.checkbox.errorColor
-                    : theme.client.wizard.linkColor
-                }
-                fontSize="13px"
-                target="_blank"
-                href={
-                  urlLicense
-                    ? urlLicense
-                    : "https://gnu.org/licenses/gpl-3.0.html"
-                }
-              >
-                {t("LicenseLink")}
-              </Link>
-            </StyledAcceptTerms>
+              <StyledAcceptTerms>
+                <Checkbox
+                  className="wizard-checkbox"
+                  id="license"
+                  name="confirm"
+                  label={t("License")}
+                  isChecked={agreeTerms}
+                  onChange={onAgreeTermsChange}
+                  isDisabled={isCreated}
+                  hasError={hasErrorAgree}
+                />
+                <Link
+                  type="page"
+                  color={
+                    hasErrorAgree
+                      ? theme.checkbox.errorColor
+                      : theme.client.wizard.linkColor
+                  }
+                  fontSize="13px"
+                  target="_blank"
+                  href={
+                    urlLicense
+                      ? urlLicense
+                      : "https://gnu.org/licenses/gpl-3.0.html"
+                  }
+                >
+                  {t("LicenseLink")}
+                </Link>
+              </StyledAcceptTerms>
 
-            <Button
-              size="medium"
-              scale={true}
-              primary
-              label={t("Common:ContinueButton")}
-              isLoading={isCreated}
-              onClick={onContinueClick}
-            />
-          </FormWrapper>
-        </WizardContainer>
-      </StyledContent>
+              <Button
+                size="medium"
+                scale={true}
+                primary
+                label={t("Common:ContinueButton")}
+                isLoading={isCreated}
+                onClick={onContinueClick}
+              />
+            </FormWrapper>
+          </WizardContainer>
+        </StyledContent>
+      </Scrollbar>
     </Wrapper>
   );
 };

From 5e64d624d8d01623441708942b7e369b551b876c Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Thu, 2 May 2024 12:43:59 +0300
Subject: [PATCH 2/8] Shared:Selectors:Files: fix opening isUserOnly

---
 packages/shared/selectors/Files/FilesSelector.types.ts  | 1 +
 packages/shared/selectors/Files/hooks/useFilesHelper.ts | 8 +++++---
 packages/shared/selectors/Files/index.tsx               | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/shared/selectors/Files/FilesSelector.types.ts b/packages/shared/selectors/Files/FilesSelector.types.ts
index 2aeb171850..e48713e8f9 100644
--- a/packages/shared/selectors/Files/FilesSelector.types.ts
+++ b/packages/shared/selectors/Files/FilesSelector.types.ts
@@ -107,6 +107,7 @@ export type UseFilesHelpersProps = {
     value: number | string | undefined | TBreadCrumb[],
   ) => void;
   isRoomsOnly: boolean;
+  isUserOnly?: boolean;
   rootThirdPartyId?: string;
   getRoomList?: (
     startIndex: number,
diff --git a/packages/shared/selectors/Files/hooks/useFilesHelper.ts b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
index e7dd178d3b..74d8537381 100644
--- a/packages/shared/selectors/Files/hooks/useFilesHelper.ts
+++ b/packages/shared/selectors/Files/hooks/useFilesHelper.ts
@@ -65,6 +65,7 @@ const useFilesHelper = ({
   getRootData,
   onSetBaseFolderPath,
   isRoomsOnly,
+  isUserOnly,
   rootThirdPartyId,
   getRoomList,
   getIcon,
@@ -141,7 +142,7 @@ const useFilesHelper = ({
         }
       }
 
-      const id = selectedItemId || "";
+      const id = isUserOnly ? "@my" : selectedItemId || "";
 
       filter.folder = id.toString();
 
@@ -149,7 +150,7 @@ const useFilesHelper = ({
         folderId: string | number,
         isErrorPath = false,
       ) => {
-        if (initRef.current && getRootData) {
+        if (initRef.current && getRootData && folderId !== "@my") {
           const folder = await getFolderInfo(folderId, true);
 
           const isArchive = folder.rootFolderType === FolderType.Archive;
@@ -247,7 +248,7 @@ const useFilesHelper = ({
           //   if (item.roomType) breadCrumbs[idx].isRoom = true;
           // });
 
-          if (!isThirdParty && !isRoomsOnly)
+          if (!isThirdParty && !isRoomsOnly && !isUserOnly)
             breadCrumbs.unshift({ ...DEFAULT_BREAD_CRUMB });
 
           onSetBaseFolderPath?.(isErrorPath ? [] : breadCrumbs);
@@ -308,6 +309,7 @@ const useFilesHelper = ({
       setIsNextPageLoading,
       searchValue,
       filterParam,
+      isUserOnly,
       selectedItemId,
       getRootData,
       setSelectedItemSecurity,
diff --git a/packages/shared/selectors/Files/index.tsx b/packages/shared/selectors/Files/index.tsx
index 0c454a5e64..7376cae3d3 100644
--- a/packages/shared/selectors/Files/index.tsx
+++ b/packages/shared/selectors/Files/index.tsx
@@ -186,6 +186,7 @@ const FilesSelector = ({
     setIsRoot,
     searchValue,
     isRoomsOnly,
+
     onSetBaseFolderPath,
     isInit,
     setIsInit,
@@ -211,6 +212,7 @@ const FilesSelector = ({
     getRootData,
     onSetBaseFolderPath,
     isRoomsOnly,
+    isUserOnly,
     rootThirdPartyId,
     getRoomList,
     getIcon,
@@ -289,7 +291,7 @@ const FilesSelector = ({
       return;
     }
 
-    if (!currentFolderId) {
+    if (!currentFolderId && !isUserOnly) {
       setSelectedItemType("rooms");
       return;
     }
@@ -311,6 +313,7 @@ const FilesSelector = ({
     currentFolderId,
     isRoomsOnly,
     isThirdParty,
+    isUserOnly,
     parentId,
     roomsFolderId,
     rootFolderType,

From 3f2f348379d6a184078b4dc07d0c6aa1d678e468 Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Thu, 2 May 2024 13:07:45 +0300
Subject: [PATCH 3/8] Fix Bug 67559

Content is not displayed when auth via Google
---
 packages/login/src/client/components/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/login/src/client/components/Login.tsx b/packages/login/src/client/components/Login.tsx
index 8fca7c3e08..a800c4693d 100644
--- a/packages/login/src/client/components/Login.tsx
+++ b/packages/login/src/client/components/Login.tsx
@@ -194,7 +194,7 @@ const Login: React.FC<ILoginProps> = ({
           : window.open(
               url,
               "login",
-              "width=800,height=500,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=no"
+              "width=800,height=500,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=no,popup=yes"
             );
 
         const code: string = await getOAuthToken(tokenGetterWin);

From 2966efb5e17cca54df8caecf87a326f83cf38ac2 Mon Sep 17 00:00:00 2001
From: Tatiana Lopaeva <tatiana.lopaeva@onlyoffice.com>
Date: Thu, 2 May 2024 13:15:59 +0300
Subject: [PATCH 4/8] Fix Bug 67797 - Srv:Accounts. Hide the Status line in the
 info panel of the user.

---
 .../InfoPanel/Body/views/Accounts/index.js    | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
index 102fe9ce78..576590ec0f 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
@@ -53,6 +53,7 @@ const Accounts = (props) => {
     setPeopleBufferSelection,
 
     showStorageInfo,
+    standalone,
   } = props;
 
   const navigate = useNavigate();
@@ -233,18 +234,22 @@ const Accounts = (props) => {
           </Text>
           {typeData}
 
-          <Text className={"info_field"} noSelect title={t("UserStatus")}>
-            {t("UserStatus")}
-          </Text>
-          <Text
-            className={"info_data first-row"}
-            fontSize={"13px"}
-            fontWeight={600}
-            noSelect
-            title={statusLabel}
-          >
-            {statusText}
-          </Text>
+          {!standalone && (
+            <>
+              <Text className={"info_field"} noSelect title={t("UserStatus")}>
+                {t("UserStatus")}
+              </Text>
+              <Text
+                className={"info_data first-row"}
+                fontSize={"13px"}
+                fontWeight={600}
+                noSelect
+                title={statusLabel}
+              >
+                {statusText}
+              </Text>
+            </>
+          )}
           {showStorageInfo && (
             <>
               <Text
@@ -310,6 +315,7 @@ export default inject(
     accessRightsStore,
     infoPanelStore,
     currentQuotaStore,
+    settingsStore,
   }) => {
     const { isOwner, isAdmin, id: selfId } = userStore.user;
     const { changeType: changeUserType, usersStore } = peopleStore;
@@ -323,6 +329,8 @@ export default inject(
     } = peopleStore.selectionStore;
 
     const { showStorageInfo } = currentQuotaStore;
+    const { standalone } = settingsStore;
+
     return {
       isOwner,
       isAdmin,
@@ -335,6 +343,7 @@ export default inject(
       setPeopleSelection,
       setPeopleBufferSelection,
       showStorageInfo,
+      standalone,
     };
   },
 )(

From dbeef2444cf71c4381ba3ac66d4c2bea4b171794 Mon Sep 17 00:00:00 2001
From: Tatiana Lopaeva <tatiana.lopaeva@onlyoffice.com>
Date: Thu, 2 May 2024 13:35:19 +0300
Subject: [PATCH 5/8] Web: DocEditor: DeepLink: Fixed styles.

---
 packages/doceditor/src/components/deep-link/DeepLink.styled.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/doceditor/src/components/deep-link/DeepLink.styled.ts b/packages/doceditor/src/components/deep-link/DeepLink.styled.ts
index f5b0e94989..62b068ce44 100644
--- a/packages/doceditor/src/components/deep-link/DeepLink.styled.ts
+++ b/packages/doceditor/src/components/deep-link/DeepLink.styled.ts
@@ -126,6 +126,7 @@ export const StyledBody = styled.div`
 
   max-width: 960px;
   width: 100vw;
+  margin-bottom: 16px;
 
   @media ${mobile} {
     margin: 0 auto;

From 8554455665f93cd787094414dda41af55691d56b Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Thu, 2 May 2024 13:50:32 +0300
Subject: [PATCH 6/8] Client:FilesSelector: fix open copy\move dialog

---
 packages/client/src/components/FilesSelector/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/FilesSelector/index.tsx b/packages/client/src/components/FilesSelector/index.tsx
index beafcc7080..24f6e2fc42 100644
--- a/packages/client/src/components/FilesSelector/index.tsx
+++ b/packages/client/src/components/FilesSelector/index.tsx
@@ -335,7 +335,7 @@ const FilesSelectorWrapper = ({
       isThirdParty={isThirdParty}
       rootThirdPartyId={rootThirdPartyId}
       roomsFolderId={roomsFolderId}
-      currentFolderId={currentFolderId || 0}
+      currentFolderId={currentFolderId}
       parentId={parentId}
       rootFolderType={rootFolderType || FolderType.Rooms}
       currentDeviceType={currentDeviceType}
@@ -481,7 +481,7 @@ export default inject(
       (rootFolderType === FolderType.Archive ||
       rootFolderType === FolderType.TRASH
         ? undefined
-        : selectedId !== selectionsWithoutEditing[0]?.id
+        : selectedId === selectionsWithoutEditing[0]?.id
           ? parentId
           : selectedId);
 

From 3e77c404881d4bf63bcc7f215792f0f7ca71de13 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Thu, 2 May 2024 13:50:49 +0300
Subject: [PATCH 7/8] Shared:Selectors:Files: add openRoot flag

---
 .../selectors/Files/FilesSelector.types.ts    |  1 +
 packages/shared/selectors/Files/index.tsx     | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/shared/selectors/Files/FilesSelector.types.ts b/packages/shared/selectors/Files/FilesSelector.types.ts
index e48713e8f9..f9e0604fc3 100644
--- a/packages/shared/selectors/Files/FilesSelector.types.ts
+++ b/packages/shared/selectors/Files/FilesSelector.types.ts
@@ -150,6 +150,7 @@ export type FilesSelectorProps = (
     value: number | string | undefined | TBreadCrumb[],
   ) => void;
   isUserOnly?: boolean;
+  openRoot?: boolean;
   isRoomsOnly: boolean;
   isThirdParty: boolean;
   rootThirdPartyId?: string;
diff --git a/packages/shared/selectors/Files/index.tsx b/packages/shared/selectors/Files/index.tsx
index 89013b5014..8c393f0858 100644
--- a/packages/shared/selectors/Files/index.tsx
+++ b/packages/shared/selectors/Files/index.tsx
@@ -76,6 +76,7 @@ const FilesSelector = ({
   onSetBaseFolderPath,
   isUserOnly,
   isRoomsOnly,
+  openRoot,
   isThirdParty,
   rootThirdPartyId,
   roomsFolderId,
@@ -291,7 +292,7 @@ const FilesSelector = ({
       return;
     }
 
-    if (!currentFolderId && !isUserOnly) {
+    if (!currentFolderId && !isUserOnly && !openRoot) {
       setSelectedItemType("rooms");
       return;
     }
@@ -317,6 +318,7 @@ const FilesSelector = ({
     parentId,
     roomsFolderId,
     rootFolderType,
+    openRoot,
     setIsFirstLoad,
   ]);
 
@@ -442,10 +444,24 @@ const FilesSelector = ({
   );
 
   React.useEffect(() => {
-    if (selectedItemType === "rooms") getRoomList(0);
+    if (selectedItemType === "rooms") {
+      getRoomList(0);
+      return;
+    }
+    if (openRoot && !selectedItemId) {
+      getRootData();
+      return;
+    }
     if (selectedItemType === "files" && typeof selectedItemId !== "undefined")
       getFileList(0);
-  }, [getFileList, getRoomList, selectedItemType, selectedItemId]);
+  }, [
+    getFileList,
+    getRoomList,
+    selectedItemType,
+    selectedItemId,
+    getRootData,
+    openRoot,
+  ]);
 
   const headerProps: TSelectorHeader = withHeader
     ? { withHeader, headerProps: { headerLabel } }

From e0ef798bb30d6823b495c7e5fe8908e957cc1c13 Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Thu, 2 May 2024 15:05:10 +0400
Subject: [PATCH 8/8] Translation: Test: Fix UselessTranslationKeysTest issue

---
 packages/doceditor/src/components/Editor.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/doceditor/src/components/Editor.tsx b/packages/doceditor/src/components/Editor.tsx
index ae5938cfe1..16930dcbb6 100644
--- a/packages/doceditor/src/components/Editor.tsx
+++ b/packages/doceditor/src/components/Editor.tsx
@@ -141,7 +141,7 @@ const Editor = ({
       )?.["Editor"] as {
         [key: string]: string;
       }
-    )?.["FileLocation"];
+    )?.["FileLocation"]; // t("FileLocation");
 
     if (editorGoBack === "false" || user?.isVisitor || !user) {
     } else if (editorGoBack === "event") {
@@ -294,3 +294,4 @@ const Editor = ({
 };
 
 export default Editor;
+