dialog props were renamed

packages/client/src/components/dialogs/LogoutAllSessionDialog/index.js

@@ -1,5 +1,4 @@
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { useState } from "react";
 import { ModalDialog } from "@docspace/shared/components/modal-dialog";
 import { Checkbox } from "@docspace/shared/components/checkbox";
 import { Button } from "@docspace/shared/components/button";
@@ -8,20 +7,24 @@ import { Text } from "@docspace/shared/components/text";
 
 import ModalDialogContainer from "../ModalDialogContainer";
 
-const LogoutAllConnectionDialog = ({
+const LogoutAllSessionDialog = ({
+  t,
   visible,
+  isLoading,
   onClose,
   onRemoveAllSessions,
-  loading,
   onRemoveAllExceptThis,
 }) => {
-  const { t } = useTranslation(["Profile", "Common"]);
   const [isChecked, setIsChecked] = useState(false);
 
   const onChangeCheckbox = () => {
     setIsChecked((prev) => !prev);
   };
 
+  const onClick = () => {
+    isChecked ? onRemoveAllSessions() : onRemoveAllExceptThis();
+  };
+
   return (
     <ModalDialogContainer
       visible={visible}
@@ -32,8 +35,8 @@ const LogoutAllConnectionDialog = ({
         {t("Profile:LogoutAllActiveConnections")}
       </ModalDialog.Header>
       <ModalDialog.Body>
-        <Text as="p">{t("Profile:LogoutDescription")}</Text>
-        <Text as="p" style={{ margin: "15px 0" }}>
+        <Text>{t("Profile:LogoutDescription")}</Text>
+        <Text style={{ margin: "15px 0" }}>
           {t("Profile:DescriptionForSecurity")}
         </Text>
         <Box displayProp="flex" alignItems="center">
@@ -53,10 +56,8 @@ const LogoutAllConnectionDialog = ({
           size="normal"
           scale
           primary={true}
-          onClick={() =>
-            isChecked ? onRemoveAllSessions() : onRemoveAllExceptThis()
-          }
-          isLoading={loading}
+          onClick={onClick}
+          isLoading={isLoading}
         />
         <Button
           className="cancel-button"
@@ -65,11 +66,11 @@ const LogoutAllConnectionDialog = ({
           size="normal"
           scale
           onClick={onClose}
-          isDisabled={loading}
+          isDisabled={isLoading}
         />
       </ModalDialog.Footer>
     </ModalDialogContainer>
   );
 };
 
-export default LogoutAllConnectionDialog;
+export default LogoutAllSessionDialog;

packages/client/src/components/dialogs/LogoutSessionDialog/index.js

@@ -1,18 +1,19 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
 import { Button } from "@docspace/shared/components/button";
 import { ModalDialog } from "@docspace/shared/components/modal-dialog";
 
 import ModalDialogContainer from "../ModalDialogContainer";
 
-const LogoutConnectionDialog = ({
+const LogoutSessionDialog = ({
+  t,
   visible,
+  data,
   onClose,
   onRemoveSession,
-  data,
-  loading,
+  isLoading,
 }) => {
-  const { t } = useTranslation(["Profile", "Common"]);
+  const onClick = () => {
+    onRemoveSession(data.id);
+  };
 
   return (
     <ModalDialogContainer
@@ -36,8 +37,8 @@ const LogoutConnectionDialog = ({
           size="normal"
           scale
           primary={true}
-          onClick={() => onRemoveSession(data.id)}
-          isLoading={loading}
+          onClick={onClick}
+          isLoading={isLoading}
         />
         <Button
           key="CloseBtn"
@@ -45,11 +46,11 @@ const LogoutConnectionDialog = ({
           size="normal"
           scale
           onClick={onClose}
-          isDisabled={loading}
+          isDisabled={isLoading}
         />
       </ModalDialog.Footer>
     </ModalDialogContainer>
   );
 };
 
-export default LogoutConnectionDialog;
+export default LogoutSessionDialog;

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

@@ -24,8 +24,8 @@ import ChangeNameDialog from "./ChangeNameDialog";
 import AvatarEditorDialog from "./AvatarEditorDialog";
 import DeletePortalDialog from "./DeletePortalDialog";
 import InviteUsersWarningDialog from "./InviteUsersWarningDialog";
-import LogoutConnectionDialog from "./LogoutConnectionDialog";
-import LogoutAllConnectionDialog from "./LogoutAllConnectionDialog";
+import LogoutSessionDialog from "./LogoutSessionDialog";
+import LogoutAllSessionDialog from "./LogoutAllSessionDialog";
 import CreateRoomConfirmDialog from "./CreateRoomConfirmDialog";
 import PortalRenamingDialog from "./PortalRenamingDialog";
 import DataReassignmentDialog from "./DataReassignmentDialog";
@@ -39,6 +39,7 @@ import SettingsPluginDialog from "./SettingsPluginDialog";
 import ReportDialog from "./ReportDialog";
 import PluginDialog from "./PluginDialog";
 import DeletePluginDialog from "./DeletePluginDialog";
+import DisableUserDialog from "./DisableUserDialog";
 
 export {
   EmptyTrashDialog,
@@ -67,9 +68,9 @@ export {
   ChangeNameDialog,
   AvatarEditorDialog,
   DeletePortalDialog,
-  LogoutConnectionDialog,
+  LogoutSessionDialog,
+  LogoutAllSessionDialog,
   InviteUsersWarningDialog,
-  LogoutAllConnectionDialog,
   PortalRenamingDialog,
   DataReassignmentDialog,
   SubmitToFormGallery,
@@ -82,4 +83,5 @@ export {
   ReportDialog,
   PluginDialog,
   DeletePluginDialog,
+  DisableUserDialog,
 };

packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js

@@ -14,8 +14,8 @@ import { useTheme } from "styled-components";
 import Loaders from "@docspace/common/components/Loaders";
 
 import {
-  LogoutConnectionDialog,
-  LogoutAllConnectionDialog,
+  LogoutSessionDialog,
+  LogoutAllSessionDialog,
 } from "SRC_DIR/components/dialogs";
 
 import {
@@ -43,10 +43,10 @@ const ActiveSessions = ({
   getAllSessions,
   removeAllSessions,
   removeSession,
-  logoutVisible,
-  setLogoutVisible,
-  logoutAllVisible,
-  setLogoutAllVisible,
+  logoutDialogVisible,
+  setLogoutDialogVisible,
+  logoutAllDialogVisible,
+  setLogoutAllDialogVisible,
   removeAllExecptThis,
   sessionsIsInit,
   getSessions,
@@ -59,7 +59,7 @@ const ActiveSessions = ({
   const isMobile = currentDeviceType === DeviceType.mobile;
 
   const [modalData, setModalData] = useState({});
-  const [loading, setLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
   const { interfaceDirection } = useTheme();
 
   useEffect(() => {
@@ -68,34 +68,34 @@ const ActiveSessions = ({
 
   const onClickRemoveAllSessions = async () => {
     try {
-      setLoading(true);
+      setIsLoading(true);
       await removeAllSessions().then((res) => window.location.replace(res));
     } catch (error) {
       toastr.error(error);
     } finally {
-      setLoading(false);
-      setLogoutAllVisible(false);
+      setIsLoading(false);
+      setLogoutAllDialogVisible(false);
     }
   };
 
   const onClickRemoveAllExceptThis = async () => {
     try {
-      setLoading(true);
+      setIsLoading(true);
       await removeAllExecptThis().then(() =>
         getAllSessions().then((res) => setSessions(res.items))
       );
     } catch (error) {
       toastr.error(error);
     } finally {
-      setLoading(false);
-      setLogoutAllVisible(false);
+      setIsLoading(false);
+      setLogoutAllDialogVisible(false);
     }
   };
 
   const onClickRemoveSession = async (id) => {
     const foundSession = sessions.find((s) => s.id === id);
     try {
-      setLoading(true);
+      setIsLoading(true);
       await removeSession(foundSession.id).then(() =>
         getAllSessions().then((res) => setSessions(res.items))
       );
@@ -108,8 +108,8 @@ const ActiveSessions = ({
     } catch (error) {
       toastr.error(error);
     } finally {
-      setLoading(false);
-      setLogoutVisible(false);
+      setIsLoading(false);
+      setLogoutDialogVisible(false);
     }
   };
 
@@ -151,7 +151,7 @@ const ActiveSessions = ({
           className="session-logout"
           type="action"
           isHovered
-          onClick={() => setLogoutAllVisible(true)}
+          onClick={() => setLogoutAllDialogVisible(true)}
         >
           {t("Profile:LogoutAllActiveSessions")}
         </Link>
@@ -187,7 +187,7 @@ const ActiveSessions = ({
                 <TableDataCell
                   style={{ borderTop: "0" }}
                   onClick={() => {
-                    setLogoutVisible(true);
+                    setLogoutDialogVisible(true);
                     setModalData({
                       id: session.id,
                       platform: session.platform,
@@ -221,7 +221,7 @@ const ActiveSessions = ({
                 <TableDataCell>{session.ip}</TableDataCell>
                 <TableDataCell
                   onClick={() => {
-                    setLogoutVisible(true);
+                    setLogoutDialogVisible(true);
                     setModalData({
                       id: session.id,
                       platform: session.platform,
@@ -237,21 +237,23 @@ const ActiveSessions = ({
         </Table>
       )}
 
-      {logoutVisible && (
-        <LogoutConnectionDialog
-          visible={logoutVisible}
+      {logoutDialogVisible && (
+        <LogoutSessionDialog
+          t={t}
+          visible={logoutDialogVisible}
           data={modalData}
-          loading={loading}
-          onClose={() => setLogoutVisible(false)}
+          isLoading={isLoading}
+          onClose={() => setLogoutDialogVisible(false)}
           onRemoveSession={onClickRemoveSession}
         />
       )}
 
-      {logoutAllVisible && (
-        <LogoutAllConnectionDialog
-          visible={logoutAllVisible}
-          loading={loading}
-          onClose={() => setLogoutAllVisible(false)}
+      {logoutAllDialogVisible && (
+        <LogoutAllSessionDialog
+          t={t}
+          visible={logoutAllDialogVisible}
+          isLoading={isLoading}
+          onClose={() => setLogoutAllDialogVisible(false)}
           onRemoveAllSessions={onClickRemoveAllSessions}
           onRemoveAllExceptThis={onClickRemoveAllExceptThis}
         />
@@ -269,10 +271,10 @@ export default inject(({ auth, setup }) => {
     getAllSessions,
     removeAllSessions,
     removeSession,
-    logoutVisible,
-    setLogoutVisible,
-    logoutAllVisible,
-    setLogoutAllVisible,
+    logoutDialogVisible,
+    setLogoutDialogVisible,
+    logoutAllDialogVisible,
+    setLogoutAllDialogVisible,
     removeAllExecptThis,
     sessionsIsInit,
     sessions,
@@ -285,10 +287,10 @@ export default inject(({ auth, setup }) => {
     getAllSessions,
     removeAllSessions,
     removeSession,
-    logoutVisible,
-    setLogoutVisible,
-    logoutAllVisible,
-    setLogoutAllVisible,
+    logoutDialogVisible,
+    setLogoutDialogVisible,
+    logoutAllDialogVisible,
+    setLogoutAllDialogVisible,
     removeAllExecptThis,
     sessionsIsInit,
     sessions,