Merge pull request #1088 from bond95/user-settings

Added user settings part 1 - setting SSH key and impersistent blocking toast notifications

packaging/ovirt-web-ui.war/WEB-INF/web.xml

@@ -83,6 +83,7 @@
         <servlet-name>logout</servlet-name>
         <servlet-class>org.ovirt.engine.core.aaa.servlet.SsoLogoutServlet</servlet-class>
     </servlet>
+
     <servlet-mapping>
         <servlet-name>logout</servlet-name>
         <url-pattern>/sso/logout</url-pattern>
@@ -124,6 +125,7 @@
         <servlet-name>index</servlet-name>
         <url-pattern>/vm/*</url-pattern>
         <url-pattern>/pool/*</url-pattern>
+        <url-pattern>/settings/*</url-pattern>
     </servlet-mapping>
 
     <!-- Default page to serve -->

src/actions/index.js

@@ -1,10 +1,11 @@
-import AppConfiguration from '../config'
+import AppConfiguration from '_/config'
 import {
   APP_CONFIGURED,
   CHANGE_PAGE,
   CHECK_TOKEN_EXPIRED,
   GET_BY_PAGE,
   GET_OPTION,
+  GET_USER,
   GET_USER_GROUPS,
   MANUAL_REFRESH,
   SET_ADMINISTRATOR,
@@ -13,13 +14,16 @@ import {
   SET_DEFAULT_TIMEZONE,
   SET_USB_AUTOSHARE,
   SET_USB_FILTER,
+  SET_USER,
   SET_USER_FILTER_PERMISSION,
   SET_USER_GROUPS,
   SET_USER_SESSION_TIMEOUT_INTERVAL,
   SET_WEBSOCKET,
   SHOW_TOKEN_EXPIRED_MSG,
   START_SCHEDULER_FIXED_DELAY,
+  START_SCHEDULER_FOR_RESUMING_NOTIFICATIONS,
   STOP_SCHEDULER_FIXED_DELAY,
+  STOP_SCHEDULER_FOR_RESUMING_NOTIFICATIONS,
   UPDATE_PAGING_DATA,
 } from '_/constants'
 
@@ -67,6 +71,19 @@ export function stopSchedulerFixedDelay () {
   return { type: STOP_SCHEDULER_FIXED_DELAY }
 }
 
+export function startSchedulerForResumingNotifications (delayInSeconds) {
+  return {
+    type: START_SCHEDULER_FOR_RESUMING_NOTIFICATIONS,
+    payload: {
+      delayInSeconds,
+    },
+  }
+}
+
+export function stopSchedulerForResumingNotifications () {
+  return { type: STOP_SCHEDULER_FOR_RESUMING_NOTIFICATIONS }
+}
+
 export function setUserFilterPermission (filter) {
   return {
     type: SET_USER_FILTER_PERMISSION,
@@ -194,6 +211,19 @@ export function getUserGroups () {
   return { type: GET_USER_GROUPS }
 }
 
+export function setUser ({ user }) {
+  return {
+    type: SET_USER,
+    payload: {
+      user,
+    },
+  }
+}
+
+export function getUser () {
+  return { type: GET_USER }
+}
+
 export function setCpuTopologyOptions ({
   maxNumberOfSockets,
   maxNumberOfCores,

src/actions/options.js

@@ -1,10 +1,24 @@
+// @flow
+
+import type { UserOptionsType, SshKeyType } from '_/ovirtapi/types'
+import type { LoadUserOptionsActionType, SaveGlobalOptionsActionType } from '_/actions/types'
+
 import {
   GET_CONSOLE_OPTIONS,
   SAVE_CONSOLE_OPTIONS,
   SET_CONSOLE_OPTIONS,
+  GET_SSH_KEY,
+  SAVE_GLOBAL_OPTIONS,
+  SAVE_SSH_KEY,
+  SET_SSH_KEY,
+  SET_OPTION,
+  LOAD_USER_OPTIONS,
+  LOAD_USER_OPTIONS_IN_PROGRESS,
+  LOAD_USER_OPTIONS_FINISHED,
+  PERSIST_OPTIONS,
 } from '_/constants'
 
-export function setConsoleOptions ({ vmId, options }) {
+export function setConsoleOptions ({ vmId, options }: Object): Object {
   return {
     type: SET_CONSOLE_OPTIONS,
     payload: {
@@ -14,7 +28,7 @@ export function setConsoleOptions ({ vmId, options }) {
   }
 }
 
-export function getConsoleOptions ({ vmId }) {
+export function getConsoleOptions ({ vmId }: Object): Object {
   return {
     type: GET_CONSOLE_OPTIONS,
     payload: {
@@ -23,7 +37,7 @@ export function getConsoleOptions ({ vmId }) {
   }
 }
 
-export function saveConsoleOptions ({ vmId, options }) {
+export function saveConsoleOptions ({ vmId, options }: Object): Object {
   return {
     type: SAVE_CONSOLE_OPTIONS,
     payload: {
@@ -32,3 +46,90 @@ export function saveConsoleOptions ({ vmId, options }) {
     },
   }
 }
+
+export function getSSHKey ({ userId }: Object): Object {
+  return {
+    type: GET_SSH_KEY,
+    payload: {
+      userId,
+    },
+  }
+}
+
+export function setSSHKey ({ key, id }: SshKeyType): Object {
+  return {
+    type: SET_SSH_KEY,
+    payload: {
+      key,
+      id,
+    },
+  }
+}
+
+export function setOption ({ key, value }: Object): Object {
+  return {
+    type: SET_OPTION,
+    payload: {
+      key,
+      value,
+    },
+  }
+}
+
+export function loadUserOptions (userOptions: UserOptionsType): LoadUserOptionsActionType {
+  return {
+    type: LOAD_USER_OPTIONS,
+    payload: {
+      userOptions,
+    },
+  }
+}
+
+export function loadingUserOptionsInProgress (): Object {
+  return {
+    type: LOAD_USER_OPTIONS_IN_PROGRESS,
+  }
+}
+
+export function loadingUserOptionsFinished (): Object {
+  return {
+    type: LOAD_USER_OPTIONS_FINISHED,
+  }
+}
+
+export function saveGlobalOptions ({ values: { sshKey, language, showNotifications, notificationSnoozeDuration, updateRate } = {} }: Object, { transactionId }: Object): SaveGlobalOptionsActionType {
+  return {
+    type: SAVE_GLOBAL_OPTIONS,
+    payload: {
+      sshKey,
+      language,
+      showNotifications,
+      notificationSnoozeDuration,
+      updateRate,
+    },
+    meta: {
+      transactionId,
+    },
+  }
+}
+
+export function saveSSHKey ({ key, userId, sshId }: Object): Object {
+  return {
+    type: SAVE_SSH_KEY,
+    payload: {
+      key,
+      userId,
+      sshId,
+    },
+  }
+}
+
+export function persistUserOptions ({ options, userId }: Object): Object {
+  return {
+    type: PERSIST_OPTIONS,
+    payload: {
+      options,
+      userId,
+    },
+  }
+}

src/actions/types.js

@@ -0,0 +1,24 @@
+// @flow
+import * as C from '_/constants'
+import type { UserOptionsType } from '_/ovirtapi/types'
+
+export type LoadUserOptionsActionType = {
+  type: C.LOAD_USER_OPTIONS,
+  payload: {
+    userOptions: UserOptionsType
+  }
+}
+
+export type SaveGlobalOptionsActionType = {
+  type: C.SAVE_GLOBAL_OPTIONS,
+  payload: {|
+    updateRate?: number,
+    language?: string,
+    showNotifications?: boolean,
+    notificationSnoozeDuration?: number,
+    sshKey?: string
+  |},
+  meta: {|
+    transactionId: string
+  |}
+}

src/actions/userMessages.js

@@ -1,5 +1,6 @@
 import {
   ADD_USER_MESSAGE,
+  AUTO_ACKNOWLEDGE,
   CLEAR_USER_MSGS,
   DISMISS_EVENT,
   DISMISS_USER_MSG,
@@ -23,6 +24,15 @@ export function clearUserMessages () {
   return { type: CLEAR_USER_MSGS }
 }
 
+export function setAutoAcknowledge (autoAcknowledge) {
+  return {
+    type: AUTO_ACKNOWLEDGE,
+    payload: {
+      autoAcknowledge,
+    },
+  }
+}
+
 export function setNotificationNotified ({ eventId }) {
   return {
     type: SET_USERMSG_NOTIFIED,

src/components/CounterAlert.js

@@ -39,30 +39,35 @@ class CounterAlert extends React.Component {
       this.timer = null
     }
     this.setState({ showAlert: false })
+    this.props.onDismiss()
   }
 
   render () {
-    const { title, type } = this.props
+    const { title, type, children } = this.props
     return this.state.showAlert &&
       <Alert type={type} onDismiss={this.handleDismiss} className={style['text-align-left']}>
         {title}
+        {children}
       </Alert>
   }
 }
 
 CounterAlert.propTypes = {
-  title: PropTypes.string.isRequired,
-
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
+  children: PropTypes.node,
   /**
    * A timeout of <= 0 will force a manual dismiss of the alert.
    */
   timeout: PropTypes.number,
 
   type: PropTypes.string,
+
+  onDismiss: PropTypes.func,
 }
 
 CounterAlert.defaultProps = {
   type: 'success',
+  onDismiss: () => {},
 }
 
 export default CounterAlert