Merge branch 'main' into additional-doc-strings

greenbone · Jan 15, 2025 · 13fca8a · 13fca8a
2 parents baeba3b + b623e84
commit 13fca8a
Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/web/pages/usersettings/usersettingspage.jsx b/src/web/pages/usersettings/usersettingspage.jsx
@@ -823,7 +823,10 @@ UserSettings.propTypes = {
   credentials: PropTypes.array,
   credentialsFilter: PropTypes.object,
   cveFilter: PropTypes.object,
-  userInterfaceDateFormat: PropTypes.oneOf(['wdmy', 'wmdy', SYSTEM_DEFAULT]),
+  userInterfaceDateFormat: PropTypes.shape({
+    comment: PropTypes.string,
+    value: PropTypes.oneOf(['wdmy', 'wmdy', SYSTEM_DEFAULT]),
+  }),
   defaultAlert: PropTypes.object,
   defaultEsxiCredential: PropTypes.object,
   defaultOpenvasScanConfig: PropTypes.object,
@@ -883,7 +886,10 @@ UserSettings.propTypes = {
   tasksFilter: PropTypes.object,
   ticketsFilter: PropTypes.object,
   timezone: PropTypes.string,
-  userInterfaceTimeFormat: PropTypes.oneOf([12, 24, SYSTEM_DEFAULT]),
+  userInterfaceTimeFormat: PropTypes.shape({
+    comment: PropTypes.string,
+    value: PropTypes.oneOf([12, 24, SYSTEM_DEFAULT]),
+  }),
   tlsCertificatesFilter: PropTypes.object,
   userInterfaceLanguage: PropTypes.object,
   usersFilter: PropTypes.object,

diff --git a/vite.config.ts b/vite.config.ts
@@ -50,6 +50,7 @@ export default defineConfig({
   },
   server: {
     port: 8080,
+    host: '127.0.0.1',
   },
   build: {
     outDir: 'build',