From 570e39bd57f77d702a91c5c31d0ecb6c2fd01183 Mon Sep 17 00:00:00 2001 From: daniele-mng Date: Mon, 2 Sep 2024 18:08:51 +0200 Subject: [PATCH] address comments --- src/gmp/commands/users.js | 4 ++-- src/web/pages/overrides/detailspage.jsx | 8 +++----- src/web/pages/usersettings/usersettingspage.jsx | 10 ---------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/gmp/commands/users.js b/src/gmp/commands/users.js index 4069b7de10..6ed7c68ea0 100644 --- a/src/gmp/commands/users.js +++ b/src/gmp/commands/users.js @@ -259,8 +259,8 @@ export class UserCommand extends EntityCommand { return this.httpPost({ cmd: 'save_my_settings', text: data.timezone, - [PARAM_KEYS.DATE]: data.dateFormat, - [PARAM_KEYS.TIME]: data.timeFormat, + [PARAM_KEYS.DATE]: data.userInterfaceDateFormat, + [PARAM_KEYS.TIME]: data.userInterfaceTimeFormat, old_password: data.oldPassword, password: data.newPassword, lang: data.userInterfaceLanguage, diff --git a/src/web/pages/overrides/detailspage.jsx b/src/web/pages/overrides/detailspage.jsx index 5193f91237..aa47d15b18 100644 --- a/src/web/pages/overrides/detailspage.jsx +++ b/src/web/pages/overrides/detailspage.jsx @@ -108,11 +108,9 @@ ToolBarIcons.propTypes = { onOverrideEditClick: PropTypes.func.isRequired, }; -const Details = connect(rootState => { - return { - timezone: getTimezone(rootState), - }; -})(({entity, timezone, ...props}) => { +const Details = connect(rootState => ({ + timezone: getTimezone(rootState), +}))(({entity, timezone, ...props}) => { const {nvt} = entity; return ( diff --git a/src/web/pages/usersettings/usersettingspage.jsx b/src/web/pages/usersettings/usersettingspage.jsx index bf9f24896b..8fe9e75dfb 100644 --- a/src/web/pages/usersettings/usersettingspage.jsx +++ b/src/web/pages/usersettings/usersettingspage.jsx @@ -243,16 +243,6 @@ class UserSettings extends React.Component { const {userInterfaceLanguage = BROWSER_LANGUAGE, timezone} = data; - this.handleInteraction(); - await gmp.user.saveSetting( - 'd9857b7c-1159-4193-9bc0-18fae5473a69', - data.userInterfaceDateFormat, - ); - await gmp.user.saveSetting( - '11deb7ff-550b-4950-aacf-06faeb7c61b9', - data.userInterfaceTimeFormat, - ); - await gmp.user.saveSettings(data).then(() => { this.closeDialog(); this.props.setLocale(