diff --git a/packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.js b/packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.js index dc5cc5576f..7d6783689e 100644 --- a/packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.js +++ b/packages/client/src/components/panels/UserSessionsPanel/LastSessionBlock.js @@ -99,6 +99,7 @@ const StyledLastSessionBlock = styled.div` const LastSessionBlock = (props) => { const { t, + isMe, items, setDisplayName, setDisableDialogVisible, @@ -152,12 +153,14 @@ const LastSessionBlock = (props) => { { key: "Separator", isSeparator: true, + disabled: isMe, }, { key: "Disable", label: t("Common:DisableUserButton"), icon: RemoveSvgUrl, onClick: onClickDisable, + disabled: isMe, }, ]; }; @@ -227,11 +230,13 @@ const LastSessionBlock = (props) => { export default inject(({ setup, peopleStore }) => { const { setDisableDialogVisible, setLogoutAllDialogVisible } = setup; - const { getFromDateAgo, items, setDisplayName } = peopleStore.selectionStore; + const { isMe, getFromDateAgo, items, setDisplayName } = + peopleStore.selectionStore; return { - getFromDateAgo, + isMe, items, + getFromDateAgo, setDisplayName, setDisableDialogVisible, setLogoutAllDialogVisible, diff --git a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js index bdfe4b2341..53885dc053 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js @@ -358,6 +358,7 @@ const SectionHeaderContent = (props) => { const { t, + isMe, isLoadedSectionHeader, isSetupleHeaderIndeterminate, @@ -451,6 +452,7 @@ const SectionHeaderContent = (props) => { label: t("Common:DisableUserButton"), onClick: onClickDisable, iconUrl: RemoveSvgUrl, + disabled: isMe, }, ] : [ @@ -594,6 +596,7 @@ export default inject( setDisplayName, allSessions, getFromDateAgo, + isMe, } = peopleStore.selectionStore; const { admins, selectorIsOpen } = setup.security.accessRight; @@ -632,6 +635,7 @@ export default inject( setDisplayName, allSessions, getFromDateAgo, + isMe, }; }, )( diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRow.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRow.js index 0590680851..31cbbf9519 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRow.js +++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/RowView/SessionsRow.js @@ -112,6 +112,7 @@ const SessionsRow = (props) => { status, userId, connections, + isMe, locale, setLogoutAllDialogVisible, setDisableDialogVisible, @@ -178,12 +179,14 @@ const SessionsRow = (props) => { { key: "Separator", isSeparator: true, + disabled: isMe, }, { key: "Disable", label: t("Common:DisableUserButton"), - icon: TrashReactSvgUrl, + icon: RemoveSvgUrl, onClick: onClickDisable, + disabled: isMe, }, ]; @@ -237,6 +240,7 @@ export default inject( const locale = (user && user.cultureName) || culture || "en"; const { + isMe, setItems, setDisplayName, convertDate, @@ -245,6 +249,7 @@ export default inject( } = peopleStore.selectionStore; return { + isMe, locale, setLogoutAllDialogVisible, setDisableDialogVisible, diff --git a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js index b7af20635d..2e3a211b9e 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js +++ b/packages/client/src/pages/PortalSettings/categories/security/sessions/SessionsTable/TableView/SessionsTableRow.js @@ -155,6 +155,7 @@ const SessionsTableRow = (props) => { status, userId, connections, + isMe, locale, setLogoutAllDialogVisible, setDisableDialogVisible, @@ -221,12 +222,14 @@ const SessionsTableRow = (props) => { { key: "Separator", isSeparator: true, + disabled: isMe, }, { key: "Disable", label: t("Common:DisableUserButton"), icon: RemoveSvgUrl, onClick: onClickDisable, + disabled: isMe, }, ]; @@ -319,6 +322,7 @@ export default inject( const locale = (user && user.cultureName) || culture || "en"; const { + isMe, setItems, setDisplayName, convertDate, @@ -327,6 +331,7 @@ export default inject( } = peopleStore.selectionStore; return { + isMe, locale, setLogoutAllDialogVisible, setDisableDialogVisible,