fixed display username

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

@@ -35,7 +35,7 @@ import ModalDialogContainer from "../ModalDialogContainer";
 
 const LogoutAllSessionDialog = ({
   t,
-  data,
+  displayName,
   visible,
   isLoading,
   onClose,
@@ -58,9 +58,7 @@ const LogoutAllSessionDialog = ({
   const bodySubtitle =
     isSeveralSelection || isProfile
       ? t("Profile:LogoutDescription")
-      : t("Profile:LogoutCurrentUserDescription", {
-          displayName: data?.displayName,
-        });
+      : t("Profile:LogoutCurrentUserDescription", { displayName });
 
   const bodyText = !isSeveralSelection && (
     <>

packages/client/src/components/panels/UserSessionsPanel/UserInfoBlock.js

@@ -42,7 +42,7 @@ const UserInfoBlock = (props) => {
     userData,
     setLogoutAllDialogVisible,
     setDisableDialogVisible,
-    setSessionModalData,
+    setDisplayName,
   } = props;
 
   const { avatar, displayName, isAdmin, isOwner } = userData;
@@ -58,7 +58,7 @@ const UserInfoBlock = (props) => {
 
   const onClickLogout = () => {
     setLogoutAllDialogVisible(true);
-    setSessionModalData({ displayName });
+    setDisplayName(displayName);
   };
 
   const onClickDisable = () => {

packages/client/src/components/panels/UserSessionsPanel/index.js

@@ -88,17 +88,17 @@ export default inject(({ setup, dialogsStore }) => {
     setDisableDialogVisible,
     userModalData,
     sessionModalData,
-    setSessionModalData,
+    setDisplayName,
   } = setup;
 
   return {
     userData: userModalData,
     sessionData: sessionModalData,
-    setSessionModalData,
     setLogoutAllDialogVisible,
     setDisableDialogVisible,
     visible: userSessionsPanelVisible,
     setVisible: setUserSessionPanelVisible,
+    setDisplayName,
   };
 })(
   withTranslation(["Settings", "Profile", "Common"])(

packages/client/src/components/panels/UserSessionsPanel/sub-components/RowView/SessionsRow.js

@@ -45,11 +45,9 @@ const SessionsRow = (props) => {
 };
 
 export default inject(({ setup }) => {
-  const { setSessionModalData, setLogoutDialogVisible, setPlatformModalData } =
-    setup;
+  const { setLogoutDialogVisible, setPlatformModalData } = setup;
 
   return {
-    setSessionModalData,
     setLogoutDialogVisible,
     setPlatformModalData,
   };

packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js

@@ -158,6 +158,7 @@ const SessionsTableRow = (props) => {
     setUserModalData,
     setSessionModalData,
     setUserSessionPanelVisible,
+    setDisplayName,
   } = props;
 
   const role = item.isOwner ? "owner" : item.isAdmin ? "admin" : null;
@@ -170,7 +171,7 @@ const SessionsTableRow = (props) => {
 
   const onClickLogout = () => {
     setLogoutAllDialogVisible(true);
-    setSessionModalData({ displayName });
+    setDisplayName(displayName);
   };
 
   const onClickDisable = () => {
@@ -309,6 +310,7 @@ export default inject(({ setup, dialogsStore }) => {
     setDisableDialogVisible,
     setUserModalData,
     setSessionModalData,
+    setDisplayName,
   } = setup;
 
   return {
@@ -317,5 +319,6 @@ export default inject(({ setup, dialogsStore }) => {
     setUserModalData,
     setSessionModalData,
     setUserSessionPanelVisible,
+    setDisplayName,
   };
 })(withContent(observer(SessionsTableRow)));

packages/client/src/pages/PortalSettings/categories/security/sessions/index.js

@@ -88,11 +88,11 @@ const Sessions = ({
   setDisableDialogVisible,
   setLogoutDialogVisible,
   setLogoutAllDialogVisible,
-  sessionModalData,
   platformModalData,
   getUsersList,
   socketHelper,
   getUserSessionsById,
+  displayName,
 }) => {
   const [isLoading, setIsLoading] = useState(false);
 
@@ -218,7 +218,7 @@ const Sessions = ({
           t={t}
           visible={logoutAllDialogVisible}
           isLoading={isLoading}
-          data={sessionModalData}
+          displayName={displayName}
           onClose={() => setLogoutAllDialogVisible(false)}
           onRemoveAllSessions={onClickRemoveAllSessions}
           onRemoveAllExceptThis={onClickRemoveAllExceptThis}
@@ -243,9 +243,9 @@ export default inject(({ settingsStore, setup, peopleStore }) => {
     setDisableDialogVisible,
     setLogoutDialogVisible,
     setLogoutAllDialogVisible,
-    sessionModalData,
     platformModalData,
     getUserSessionsById,
+    displayName,
   } = setup;
 
   return {
@@ -261,12 +261,12 @@ export default inject(({ settingsStore, setup, peopleStore }) => {
     setDisableDialogVisible,
     setLogoutDialogVisible,
     setLogoutAllDialogVisible,
-    sessionModalData,
     platformModalData,
     socketHelper,
     getUsersList,
     setAllConnections,
     getUserSessionsById,
+    displayName,
   };
 })(
   withTranslation(["Settings", "Profile", "Common", "ChangeUserStatusDialog"])(

packages/client/src/store/SettingsSetupStore.js

@@ -107,6 +107,7 @@ class SettingsSetupStore {
 
   securityLifetime = [];
 
+  displayName = "";
   sessionsIsInit = false;
   sessions = [];
   currentSession = [];
@@ -611,6 +612,10 @@ class SettingsSetupStore {
       browser: data.browser,
     };
   };
+
+  setDisplayName = (name) => {
+    this.displayName = name;
+  };
 }
 
 export default SettingsSetupStore;