fix bad merge
This commit is contained in:
parent
0b34ae0b1e
commit
8a1a4a1b86
@ -217,6 +217,7 @@ const SectionHeaderContent = (props) => {
|
||||
setIsLoadedSectionHeader,
|
||||
isSSOAvailable,
|
||||
workspace,
|
||||
organizationName,
|
||||
} = props;
|
||||
|
||||
const navigate = useNavigate();
|
||||
@ -377,11 +378,9 @@ const SectionHeaderContent = (props) => {
|
||||
setItems,
|
||||
setUserSessionPanelVisible,
|
||||
setDisplayName,
|
||||
getFromDateAgo,
|
||||
} = props;
|
||||
const { header, isCategoryOrHeader, isNeedPaidIcon } = state;
|
||||
const arrayOfParams = getArrayOfParams();
|
||||
const fromDateAgo = getFromDateAgo(peopleSelection[0]?.id);
|
||||
|
||||
const menuItems = isSessionsPage ? (
|
||||
<>
|
||||
@ -465,18 +464,6 @@ const SectionHeaderContent = (props) => {
|
||||
},
|
||||
];
|
||||
|
||||
const pathname = location.pathname;
|
||||
const translatedHeader =
|
||||
header === "ImportHeader"
|
||||
? workspace === "GoogleWorkspace"
|
||||
? t("ImportFromGoogle")
|
||||
: workspace === "Nextcloud"
|
||||
? t("ImportFromNextcloud")
|
||||
: workspace === "Workspace"
|
||||
? t("ImportFromPortal", { organizationName })
|
||||
: t("DataImport")
|
||||
: t(header, { organizationName });
|
||||
|
||||
const isHeaderVisible = isSessionsPage
|
||||
? isPeopleHeaderVisible
|
||||
: isSetupHeaderVisible;
|
||||
@ -491,6 +478,17 @@ const SectionHeaderContent = (props) => {
|
||||
|
||||
const withoutInfoPanelToggler = isSessionsPage ? true : false;
|
||||
|
||||
const translatedHeader =
|
||||
header === "ImportHeader"
|
||||
? workspace === "GoogleWorkspace"
|
||||
? t("ImportFromGoogle")
|
||||
: workspace === "Nextcloud"
|
||||
? t("ImportFromNextcloud")
|
||||
: workspace === "Workspace"
|
||||
? t("ImportFromPortal", { organizationName })
|
||||
: t("DataImport")
|
||||
: t(header, { organizationName });
|
||||
|
||||
return (
|
||||
<StyledContainer isHeaderVisible={isHeaderVisible}>
|
||||
{isHeaderVisible ? (
|
||||
@ -556,19 +554,35 @@ const SectionHeaderContent = (props) => {
|
||||
};
|
||||
|
||||
export default inject(
|
||||
({ currentQuotaStore, setup, common, peopleStore, dialogsStore }) => {
|
||||
({
|
||||
currentQuotaStore,
|
||||
setup,
|
||||
common,
|
||||
peopleStore,
|
||||
dialogsStore,
|
||||
settingsStore,
|
||||
importAccountsStore,
|
||||
}) => {
|
||||
const { addUsers, removeAdmins } = setup.headerAction;
|
||||
const { organizationName } = settingsStore;
|
||||
const { workspace } = importAccountsStore;
|
||||
const { admins, selectorIsOpen } = setup.security.accessRight;
|
||||
const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common;
|
||||
const { setUserSessionPanelVisible } = dialogsStore;
|
||||
|
||||
const {
|
||||
isBrandingAndCustomizationAvailable,
|
||||
isRestoreAndAutoBackupAvailable,
|
||||
isSSOAvailable,
|
||||
} = currentQuotaStore;
|
||||
const { addUsers, removeAdmins } = setup.headerAction;
|
||||
|
||||
const {
|
||||
toggleSelector,
|
||||
setDisableDialogVisible,
|
||||
setLogoutDialogVisible,
|
||||
setLogoutAllDialogVisible,
|
||||
} = setup;
|
||||
|
||||
const {
|
||||
selected,
|
||||
setSelected: setupSetSelected,
|
||||
@ -590,14 +604,9 @@ export default inject(
|
||||
setItems,
|
||||
setDisplayName,
|
||||
allSessions,
|
||||
getFromDateAgo,
|
||||
isMe,
|
||||
} = peopleStore.selectionStore;
|
||||
const { organizationName } = settingsStore;
|
||||
|
||||
const { admins, selectorIsOpen } = setup.security.accessRight;
|
||||
const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common;
|
||||
const { setUserSessionPanelVisible } = dialogsStore;
|
||||
return {
|
||||
addUsers,
|
||||
removeAdmins,
|
||||
@ -630,8 +639,9 @@ export default inject(
|
||||
setUserSessionPanelVisible,
|
||||
setDisplayName,
|
||||
allSessions,
|
||||
getFromDateAgo,
|
||||
isMe,
|
||||
organizationName,
|
||||
workspace,
|
||||
};
|
||||
},
|
||||
)(
|
||||
|
||||
66
yarn.lock
66
yarn.lock
@ -2629,48 +2629,6 @@ __metadata:
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@docspace/common@workspace:packages/common":
|
||||
version: 0.0.0-use.local
|
||||
resolution: "@docspace/common@workspace:packages/common"
|
||||
dependencies:
|
||||
"@babel/runtime": "npm:^7.21.0"
|
||||
"@loadable/component": "npm:^5.15.3"
|
||||
"@types/crypto-js": "npm:^4.2.1"
|
||||
"@welldone-software/why-did-you-render": "npm:^6.2.3"
|
||||
axios: "npm:^0.22.0"
|
||||
cross-fetch: "npm:3.1.5"
|
||||
fast-deep-equal: "npm:^3.1.3"
|
||||
global: "npm:^4.4.0"
|
||||
i18next: "npm:^20.6.1"
|
||||
mobx: "npm:^6.8.0"
|
||||
mobx-react: "npm:^7.6.0"
|
||||
moment: "npm:^2.29.4"
|
||||
moment-timezone: "npm:^0.5.43"
|
||||
prop-types: "npm:^15.8.1"
|
||||
query-string: "npm:7.1.3"
|
||||
re-resizable: "npm:^6.9.9"
|
||||
react: "npm:^18.2.0"
|
||||
react-autosize-textarea: "npm:^7.1.0"
|
||||
react-content-loader: "npm:^5.1.4"
|
||||
react-dom: "npm:^18.2.0"
|
||||
react-hammerjs: "npm:^1.0.1"
|
||||
react-i18next: "npm:^13.2.1"
|
||||
react-player: "npm:^1.15.3"
|
||||
react-router: "npm:^6.10.0"
|
||||
react-router-dom: "npm:^6.10.0"
|
||||
react-tooltip: "npm:^5.23.0"
|
||||
react-viewer: "npm:^3.2.2"
|
||||
react-virtualized-auto-sizer: "npm:^1.0.7"
|
||||
react-window: "npm:^1.8.8"
|
||||
react-window-infinite-loader: "npm:^1.0.8"
|
||||
screenfull: "npm:^5.2.0"
|
||||
sjcl: "npm:^1.0.8"
|
||||
socket.io-client: "npm:^4.6.1"
|
||||
styled-components: "npm:^5.3.9"
|
||||
workbox-window: "npm:^6.5.4"
|
||||
languageName: unknown
|
||||
linkType: soft
|
||||
|
||||
"@docspace/doceditor@workspace:packages/doceditor":
|
||||
version: 0.0.0-use.local
|
||||
resolution: "@docspace/doceditor@workspace:packages/doceditor"
|
||||
@ -9227,17 +9185,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@welldone-software/why-did-you-render@npm:^6.2.3":
|
||||
version: 6.2.3
|
||||
resolution: "@welldone-software/why-did-you-render@npm:6.2.3"
|
||||
dependencies:
|
||||
lodash: "npm:^4"
|
||||
peerDependencies:
|
||||
react: ^16 || ^17
|
||||
checksum: 10/7255723b0d6790f273e353449bf047fbbeaaf8fc0abcca0e8cd7dd9a0cce5a4da5bc9d055117b49d2ff7bfe9a0737faf0a268630e4a72722bc14de0b29714809
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@wojtekmaj/enzyme-adapter-react-17@npm:^0.4.1":
|
||||
version: 0.4.1
|
||||
resolution: "@wojtekmaj/enzyme-adapter-react-17@npm:0.4.1"
|
||||
@ -19112,7 +19059,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.1, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
|
||||
"lodash@npm:4.17.21, lodash@npm:^4.0.1, lodash@npm:^4.17.13, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21":
|
||||
version: 4.17.21
|
||||
resolution: "lodash@npm:4.17.21"
|
||||
checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
|
||||
@ -25728,7 +25675,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"socket.io-client@npm:^4.6.1, socket.io-client@npm:^4.7.5":
|
||||
"socket.io-client@npm:^4.7.5":
|
||||
version: 4.7.5
|
||||
resolution: "socket.io-client@npm:4.7.5"
|
||||
dependencies:
|
||||
@ -27539,14 +27486,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"ua-parser-js@npm:^1.0.33":
|
||||
version: 1.0.38
|
||||
resolution: "ua-parser-js@npm:1.0.38"
|
||||
checksum: 10/f2345e9bd0f9c5f85bcaa434535fae88f4bb891538e568106f0225b2c2937fbfbeb5782bd22320d07b6b3d68b350b8861574c1d7af072ff9b2362fb72d326fd9
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"ua-parser-js@npm:^1.0.35":
|
||||
"ua-parser-js@npm:^1.0.33, ua-parser-js@npm:^1.0.35":
|
||||
version: 1.0.38
|
||||
resolution: "ua-parser-js@npm:1.0.38"
|
||||
checksum: 10/f2345e9bd0f9c5f85bcaa434535fae88f4bb891538e568106f0225b2c2937fbfbeb5782bd22320d07b6b3d68b350b8861574c1d7af072ff9b2362fb72d326fd9
|
||||
|
||||
Loading…
Reference in New Issue
Block a user