address comments

greenbone · Oct 16, 2024 · c7b3f4b · c7b3f4b
1 parent 109bba5
commit c7b3f4b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/src/gmp/commands/users.js b/src/gmp/commands/users.js
@@ -260,8 +260,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
@@ -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 (
     <Layout flex="column">

diff --git a/src/web/pages/usersettings/generalpart.jsx b/src/web/pages/usersettings/generalpart.jsx
@@ -85,6 +85,10 @@ const GeneralPart = ({
   onChange,
 }) => {
   const [_] = useTranslation();
+  const [prevUserInterfaceTimeFormat, setPrevUserInterfaceTimeFormat] =
+    useState(undefined);
+  const [prevUserInterfaceDateFormat, setPrevUserInterfaceDateFormat] =
+    useState(undefined);
 
   const getSelectItems = category => {
     return Object.entries(dateTimeFormatOptions[category].options).map(
@@ -95,11 +99,6 @@ const GeneralPart = ({
     );
   };
 
-  const [prevUserInterfaceTimeFormat, setPrevUserInterfaceTimeFormat] =
-    useState(undefined);
-  const [prevUserInterfaceDateFormat, setPrevUserInterfaceDateFormat] =
-    useState(undefined);
-
   const handleSysDefaultChange = event => {
     const isSystemDefault = parseYesNo(event);
 

diff --git 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(