From 720559c759f92b1d5dfaf6fca9de1e869bf89821 Mon Sep 17 00:00:00 2001
From: mushka <nikitamushka@mail.ru>
Date: Mon, 25 Jul 2022 04:48:58 +0300
Subject: [PATCH] moved checkbox to ThirdpartyComboBox

---
 .../StorageLocation/ThirpartyComboBox.js           | 14 ++++++++++++++
 .../CreateRoom/StorageLocation/index.js            | 13 -------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/ThirpartyComboBox.js b/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/ThirpartyComboBox.js
index 72be36d292..a1671a848e 100644
--- a/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/ThirpartyComboBox.js
+++ b/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/ThirpartyComboBox.js
@@ -11,6 +11,7 @@ import {
   StyledDropDown,
   StyledDropDownWrapper,
 } from "../../common/StyledDropdown";
+import Checkbox from "@appserver/components/checkbox";
 
 const StyledStorageLocation = styled.div`
   display: flex;
@@ -96,6 +97,12 @@ const ThirpartyComboBox = ({
     setIsScrollLocked(false);
   };
 
+  const setRememberStorageLocation = () =>
+    setRoomParams({
+      ...roomParams,
+      rememberStorageLocation: !roomParams.rememberStorageLocation,
+    });
+
   const dropdownRef = useRef(null);
   return (
     <StyledStorageLocation isGrayLabel={isGrayLabel} isOpen={isOpen}>
@@ -143,6 +150,13 @@ const ThirpartyComboBox = ({
           ))}
         </StyledDropDown>
       </StyledDropDownWrapper>
+
+      <Checkbox
+        className="set_room_params-thirdparty-checkbox"
+        label={t("Remember this choice for new rooms")}
+        isChecked={roomParams.rememberStorageLocation}
+        onChange={setRememberStorageLocation}
+      />
     </StyledStorageLocation>
   );
 };
diff --git a/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/index.js b/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/index.js
index 445a05d056..1b4c710341 100644
--- a/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/index.js
+++ b/products/ASC.Files/Client/src/components/dialogs/CreateRoomDialog/sub-components/CreateRoom/StorageLocation/index.js
@@ -13,12 +13,6 @@ const StorageLocation = ({
   setRoomParams,
   setIsScrollLocked,
 }) => {
-  const setRememberStorageLocation = () =>
-    setRoomParams({
-      ...roomParams,
-      rememberStorageLocation: !roomParams.rememberStorageLocation,
-    });
-
   return (
     <StyledParam storageLocation>
       <div className="set_room_params-info">
@@ -46,13 +40,6 @@ const StorageLocation = ({
         setRoomParams={setRoomParams}
         setIsScrollLocked={setIsScrollLocked}
       />
-
-      <Checkbox
-        className="set_room_params-thirdparty-checkbox"
-        label={t("Remember this choice for new rooms")}
-        isChecked={roomParams.rememberStorageLocation}
-        onChange={setRememberStorageLocation}
-      />
     </StyledParam>
   );
 };