fix bad merge

packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js

@@ -487,72 +487,74 @@ const SectionHeaderContent = (props) => {
   );
 };
 
-export default inject(({ currentQuotaStore, setup, common }) => {
-  const {
-    isBrandingAndCustomizationAvailable,
-    isRestoreAndAutoBackupAvailable,
-  } = currentQuotaStore;
-  const { addUsers, removeAdmins } = setup.headerAction;
-  const {
-    toggleSelector,
-    setDisableDialogVisible,
-    setLogoutDialogVisible,
-    setLogoutAllDialogVisible,
-    setSessionModalData,
-  } = setup;
-  const {
-    selected,
-    setSelected: setupSetSelected,
-    isHeaderIndeterminate: isSetupHeaderIndeterminate,
-    isHeaderChecked: isSetupHeaderChecked,
-    isHeaderVisible: isSetupHeaderVisible,
-    deselectUser,
-    selectAll,
-    selection: setupSelection,
-  } = setup.selectionStore;
-  const {
-    isHeaderIndeterminate: isPeopleHeaderIndeterminate,
-    isHeaderChecked: isPeopleHeaderChecked,
-    isHeaderVisible: isPeopleHeaderVisible,
-    setSelected: peopleSetSelected,
-    isSeveralSelection,
-    selection: peopleSelection,
-  } = peopleStore.selectionStore;
+export default inject(
+  ({ currentQuotaStore, setup, common, peopleStore, dialogsStore }) => {
+    const {
+      isBrandingAndCustomizationAvailable,
+      isRestoreAndAutoBackupAvailable,
+    } = currentQuotaStore;
+    const { addUsers, removeAdmins } = setup.headerAction;
+    const {
+      toggleSelector,
+      setDisableDialogVisible,
+      setLogoutDialogVisible,
+      setLogoutAllDialogVisible,
+      setSessionModalData,
+    } = setup;
+    const {
+      selected,
+      setSelected: setupSetSelected,
+      isHeaderIndeterminate: isSetupHeaderIndeterminate,
+      isHeaderChecked: isSetupHeaderChecked,
+      isHeaderVisible: isSetupHeaderVisible,
+      deselectUser,
+      selectAll,
+      selection: setupSelection,
+    } = setup.selectionStore;
+    const {
+      isHeaderIndeterminate: isPeopleHeaderIndeterminate,
+      isHeaderChecked: isPeopleHeaderChecked,
+      isHeaderVisible: isPeopleHeaderVisible,
+      setSelected: peopleSetSelected,
+      isSeveralSelection,
+      selection: peopleSelection,
+    } = peopleStore.selectionStore;
 
-  const { admins, selectorIsOpen } = setup.security.accessRight;
-  const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common;
-  const { setUserSessionPanelVisible } = dialogsStore;
-  return {
-    addUsers,
-    removeAdmins,
-    selected,
-    admins,
-    setupSetSelected,
-    isSetupHeaderIndeterminate,
-    isSetupHeaderChecked,
-    isSetupHeaderVisible,
-    deselectUser,
-    selectAll,
-    toggleSelector,
-    selectorIsOpen,
-    setupSelection,
-    isLoadedSectionHeader,
-    setIsLoadedSectionHeader,
-    isBrandingAndCustomizationAvailable,
-    isRestoreAndAutoBackupAvailable,
-    peopleSetSelected,
-    peopleSelection,
-    isPeopleHeaderIndeterminate,
-    isPeopleHeaderChecked,
-    isPeopleHeaderVisible,
-    isSeveralSelection,
-    setDisableDialogVisible,
-    setLogoutDialogVisible,
-    setLogoutAllDialogVisible,
-    setSessionModalData,
-    setUserSessionPanelVisible,
-  };
-})(
+    const { admins, selectorIsOpen } = setup.security.accessRight;
+    const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common;
+    const { setUserSessionPanelVisible } = dialogsStore;
+    return {
+      addUsers,
+      removeAdmins,
+      selected,
+      admins,
+      setupSetSelected,
+      isSetupHeaderIndeterminate,
+      isSetupHeaderChecked,
+      isSetupHeaderVisible,
+      deselectUser,
+      selectAll,
+      toggleSelector,
+      selectorIsOpen,
+      setupSelection,
+      isLoadedSectionHeader,
+      setIsLoadedSectionHeader,
+      isBrandingAndCustomizationAvailable,
+      isRestoreAndAutoBackupAvailable,
+      peopleSetSelected,
+      peopleSelection,
+      isPeopleHeaderIndeterminate,
+      isPeopleHeaderChecked,
+      isPeopleHeaderVisible,
+      isSeveralSelection,
+      setDisableDialogVisible,
+      setLogoutDialogVisible,
+      setLogoutAllDialogVisible,
+      setSessionModalData,
+      setUserSessionPanelVisible,
+    };
+  }
+)(
   withLoading(
     withTranslation(["Settings", "SingleSignOn", "Common", "Files"])(
       observer(SectionHeaderContent)

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

@@ -106,8 +106,8 @@ const RowView = (props) => {
   );
 };
 
-export default inject(({ auth }) => {
-  const { id: userId } = auth.userStore.user;
+export default inject(({ userStore }) => {
+  const { id: userId } = userStore.user;
 
   return {
     userId,

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

@@ -1,4 +1,3 @@
-import { useEffect } from "react";
 import { inject, observer } from "mobx-react";
 import { useCallback } from "react";
 import { Base } from "@docspace/shared/themes";
@@ -129,7 +128,6 @@ StyledTableRow.defaultProps = { theme: Base };
 const SessionsTableRow = (props) => {
   const {
     t,
-    id,
     item,
     element,
     checkedProps,
@@ -147,7 +145,6 @@ const SessionsTableRow = (props) => {
     setLogoutAllDialogVisible,
     setDisableDialogVisible,
     setSessionModalData,
-    onlineSessionsSocket,
     setUserSessionPanelVisible,
   } = props;
 
@@ -165,13 +162,6 @@ const SessionsTableRow = (props) => {
     setDisableDialogVisible(true);
   };
 
-  useEffect(() => {
-    onlineSessionsSocket.emit("getStatusesInPortal", { id });
-    onlineSessionsSocket.on("statuses-in-room", (data) => {
-      console.log(data);
-    });
-  }, []);
-
   const contextOptions = [
     {
       key: "ViewSessions",
@@ -291,8 +281,7 @@ const SessionsTableRow = (props) => {
   );
 };
 
-export default inject(({ auth, setup, dialogsStore }) => {
-  const { onlineSessionsSocket } = auth.settingsStore;
+export default inject(({ setup, dialogsStore }) => {
   const { setUserSessionPanelVisible } = dialogsStore;
   const {
     setLogoutAllDialogVisible,
@@ -304,7 +293,6 @@ export default inject(({ auth, setup, dialogsStore }) => {
     setLogoutAllDialogVisible,
     setDisableDialogVisible,
     setSessionModalData,
-    onlineSessionsSocket,
     setUserSessionPanelVisible,
   };
 })(withContent(observer(SessionsTableRow)));

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

@@ -180,8 +180,8 @@ const TableView = ({ t, sectionWidth, userId, sessionsData }) => {
   );
 };
 
-export default inject(({ auth }) => {
-  const { id: userId } = auth.userStore.user;
+export default inject(({ userStore }) => {
+  const { id: userId } = userStore.user;
 
   return {
     userId,

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

@@ -197,9 +197,9 @@ const Sessions = ({
   );
 };
 
-export default inject(({ auth, setup, peopleStore }) => {
-  const { culture, currentDeviceType } = auth.settingsStore;
-  const { user } = auth.userStore;
+export default inject(({ userStore, settingsStore, setup, peopleStore }) => {
+  const { culture, currentDeviceType } = settingsStore;
+  const { user } = userStore;
   const locale = (user && user.cultureName) || culture || "en";
   const { clearSelection, allSessions, setAllSessions } =
     peopleStore.selectionStore;

packages/shared/store/SettingsStore.ts

@@ -965,6 +965,7 @@ class SettingsStore {
       this.frameConfig = frameConfig;
     });
 
+    // eslint-disable-next-line no-extra-boolean-cast
     if (!!frameConfig) {
       frameCallEvent({
         event: "onAppReady",