From 24c0397ef090b266d8237c31c5196182e26ec7ac Mon Sep 17 00:00:00 2001
From: mushka <nikitamushka@mail.ru>
Date: Mon, 4 Jul 2022 13:20:18 +0300
Subject: [PATCH] fixed DeleteProfileEver and DeleteUsersDialog + fixed
 ModalDialogComponent

---
 .../modal-dialog/handlers/resizeHandler.js      | 15 +++++++++++++--
 .../modal-dialog/modal-dialog.stories.js        |  2 +-
 packages/asc-web-components/themes/base.js      |  1 -
 packages/asc-web-components/utils/device.js     | 11 -----------
 .../dialogs/DeleteProfileEverDialog/index.js    | 17 ++++++++---------
 .../dialogs/DeleteUsersDialog/index.js          |  1 -
 .../ASC.People/Client/src/store/DialogStore.js  |  1 +
 7 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/packages/asc-web-components/modal-dialog/handlers/resizeHandler.js b/packages/asc-web-components/modal-dialog/handlers/resizeHandler.js
index 2010147787..89aa85c9c0 100644
--- a/packages/asc-web-components/modal-dialog/handlers/resizeHandler.js
+++ b/packages/asc-web-components/modal-dialog/handlers/resizeHandler.js
@@ -1,4 +1,15 @@
-import { getCurrentSizeName } from "../../utils/device";
+import { size } from "../../utils/device";
+
+const getCurrentSizeName = () => {
+  const innerWidth = window.innerWidth;
+  return innerWidth > size.tablet
+    ? "desktop"
+    : innerWidth <= size.tablet && innerWidth > size.smallTablet
+    ? "tablet"
+    : innerWidth <= size.smallTablet && innerWidth > size.mobile
+    ? "smallTablet"
+    : "mobile";
+};
 
 export const getCurrentDisplayType = (
   propsDisplayType,
@@ -7,7 +18,7 @@ export const getCurrentDisplayType = (
   if (!propsDisplayTypeDetailed) return propsDisplayType;
 
   const detailedDisplayType = propsDisplayTypeDetailed[getCurrentSizeName()];
-  if (detailedDisplayType) return detailedDisplayType;
 
+  if (detailedDisplayType) return detailedDisplayType;
   return propsDisplayType;
 };
diff --git a/packages/asc-web-components/modal-dialog/modal-dialog.stories.js b/packages/asc-web-components/modal-dialog/modal-dialog.stories.js
index 8d51bb2024..35c437e7c4 100644
--- a/packages/asc-web-components/modal-dialog/modal-dialog.stories.js
+++ b/packages/asc-web-components/modal-dialog/modal-dialog.stories.js
@@ -71,6 +71,6 @@ Default.args = {
     desktop: "modal",
     tablet: "aside",
     smallTablet: "modal",
-    mobile: "modal",
+    mobile: "aside",
   },
 };
diff --git a/packages/asc-web-components/themes/base.js b/packages/asc-web-components/themes/base.js
index 25724d2f9d..60be79083e 100644
--- a/packages/asc-web-components/themes/base.js
+++ b/packages/asc-web-components/themes/base.js
@@ -1,4 +1,3 @@
-import { smallTablet } from "../utils/device";
 import globalColors from "../utils/globalColors";
 
 const {
diff --git a/packages/asc-web-components/utils/device.js b/packages/asc-web-components/utils/device.js
index f4b8858535..bdff4df634 100644
--- a/packages/asc-web-components/utils/device.js
+++ b/packages/asc-web-components/utils/device.js
@@ -35,17 +35,6 @@ export const isTouchDevice = !!(
   ("ontouchstart" in window || navigator.msMaxTouchPoints > 0)
 );
 
-export const getCurrentSizeName = () => {
-  const innerWidth = window.innerWidth;
-  return innerWidth >= size.desktop
-    ? "desktop"
-    : innerWidth <= size.tablet && innerWidth > size.smallTablet
-    ? "tablet"
-    : innerWidth <= size.smallTablet && innerWidth > size.mobile
-    ? "smallTablet"
-    : "mobile";
-};
-
 export const getModalType = () => {
   return window.innerWidth < size.desktop ? "aside" : "modal";
 };
diff --git a/products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js b/products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
index 12c66c2777..6240427186 100644
--- a/products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
+++ b/products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
@@ -93,21 +93,20 @@ class DeleteProfileEverDialogComponent extends React.Component {
         <ModalDialog.Footer>
           <Button
             key="OKBtn"
-            className="delete-profile_button-delete"
             label={t("Common:OKButton")}
             size="normal"
             primary={true}
+            scale
             onClick={this.onDeleteProfileEver}
             isLoading={isRequestRunning}
           />
-          {/* <Button
-              className="button-dialog"
-              key="ReassignBtn"
-              label={t("Translations:ReassignData")}
-              size="small"
-              onClick={this.onReassignDataClick}
-              isDisabled={isRequestRunning}
-            /> */}
+          <Button
+            label={t("Common:CancelButton")}
+            size="normal"
+            scale
+            onClick={onClose}
+            isLoading={isRequestRunning}
+          />
         </ModalDialog.Footer>
       </ModalDialogContainer>
     );
diff --git a/products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js b/products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
index e51b6b5297..33f04b67d6 100644
--- a/products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
+++ b/products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
@@ -150,7 +150,6 @@ class DeleteGroupUsersDialogComponent extends React.Component {
             isDisabled={!userIds.length}
           />
           <Button
-            className="button-dialog"
             label={t("Common:CancelButton")}
             size="normal"
             scale
diff --git a/products/ASC.People/Client/src/store/DialogStore.js b/products/ASC.People/Client/src/store/DialogStore.js
index 551c683682..cc11affa5f 100644
--- a/products/ASC.People/Client/src/store/DialogStore.js
+++ b/products/ASC.People/Client/src/store/DialogStore.js
@@ -13,6 +13,7 @@ class DialogStore {
   disableDialogVisible = false;
   sendInviteDialogVisible = false;
   invitationDialogVisible = false;
+  deleteDialogVisible = false;
 
   constructor() {
     makeAutoObservable(this);