IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Elyor Djalilov 2024-02-03 18:41:08 +05:00
parent f4584a69f9
commit 7cf5d9186f
6 changed files with 76 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

1
packages/shared/store/SettingsStore.ts
View File

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