feat(xo-web/backup-ng/new): use a modal for creating/editing a schedule (#3359)

Fixes #3138

CHANGELOG.md

@@ -7,6 +7,7 @@
 - [Remotes] Test the remote automatically on changes [#3323](https://github.com/vatesfr/xen-orchestra/issues/3323) (PR [#3397](https://github.com/vatesfr/xen-orchestra/pull/3397))
 - [Remotes] Use *WORKGROUP* as default domain for new SMB remote (PR [#3398](https://github.com/vatesfr/xen-orchestra/pull/3398))
 - [Backup NG form] Display a tip to encourage users to create vms on a thin-provisioned storage [#3334](https://github.com/vatesfr/xen-orchestra/issues/3334) (PR [#3402](https://github.com/vatesfr/xen-orchestra/pull/3402))
+- [Backup NG form] improve schedule's form [#3138](https://github.com/vatesfr/xen-orchestra/issues/3138) (PR [#3359](https://github.com/vatesfr/xen-orchestra/pull/3359))
 
 ### Bug fixes
 

packages/xo-web/src/common/intl/messages.js

@@ -349,6 +349,7 @@ const messages = {
   missingSnapshotRetention:
     'The Rolling Snapshot mode requires snapshot retention to be higher than 0!',
   retentionNeeded: 'One of the retentions needs to be higher than 0!',
+  newScheduleError: 'Invalid schedule',
   createRemoteMessage:
     'No remotes found, please click on the remotes settings button to create one!',
   remotesSettings: 'Remotes settings',

packages/xo-web/src/xo-app/backup-ng/new/index.js

@@ -3,6 +3,7 @@ import ActionButton from 'action-button'
 import defined, { get } from 'xo-defined'
 import Icon from 'icon'
 import Link from 'link'
+import moment from 'moment-timezone'
 import React from 'react'
 import renderXoItem, { renderXoItemFromId } from 'render-xo-item'
 import Select from 'form/select'
@@ -12,7 +13,9 @@ import { Card, CardBlock, CardHeader } from 'card'
 import { constructSmartPattern, destructSmartPattern } from 'smart-backup'
 import { Container, Col, Row } from 'grid'
 import { createGetObjectsOfType } from 'selectors'
+import { error } from 'notification'
 import { flatten, includes, isEmpty, keyBy, map, mapValues, some } from 'lodash'
+import { form } from 'modal'
 import { injectState, provideState } from '@julien-f/freactal'
 import { Map } from 'immutable'
 import { Number } from 'form'
@@ -34,10 +37,10 @@ import {
   subscribeRemotes,
 } from 'xo'
 
+import NewSchedule from './new-schedule'
 import Schedules from './schedules'
 import SmartBackup from './smart-backup'
 import {
-  DEFAULT_RETENTION,
   destructPattern,
   FormFeedback,
   FormGroup,
@@ -48,6 +51,15 @@ import {
 
 // ===================================================================
 
+const DEFAULT_RETENTION = 1
+const DEFAULT_SCHEDULE = {
+  copyRetention: DEFAULT_RETENTION,
+  exportRetention: DEFAULT_RETENTION,
+  snapshotRetention: DEFAULT_RETENTION,
+  cron: '0 0 * * *',
+  timezone: moment.tz.guess(),
+}
+
 const SR_BACKEND_FAILURE_LINK =
   'https://xen-orchestra.com/docs/backup_troubleshooting.html#srbackendfailure44-insufficient-space'
 
@@ -135,7 +147,6 @@ const getInitialState = () => ({
   crMode: false,
   deltaMode: false,
   drMode: false,
-  editionMode: undefined,
   formId: generateRandomId(),
   inputConcurrencyId: generateRandomId(),
   inputReportWhenId: generateRandomId(),
@@ -153,7 +164,6 @@ const getInitialState = () => ({
   tags: {
     notValues: ['Continuous Replication', 'Disaster Recovery'],
   },
-  tmpSchedule: undefined,
   vms: [],
 })
 
@@ -386,22 +396,32 @@ export default [
           ...destructVmsPattern(job.vms),
         }
       },
-      addSchedule: () => state => ({
+      showScheduleModal: (
-        ...state,
+        { saveSchedule },
-        editionMode: 'creation',
+        storedSchedule = DEFAULT_SCHEDULE
-      }),
+      ) => async ({ copyMode, exportMode, snapshotMode }) => {
-      cancelSchedule: () => state => ({
+        const schedule = await form({
-        ...state,
+          body: <NewSchedule modes={{ copyMode, exportMode, snapshotMode }} />,
-        tmpSchedule: undefined,
+          defaultValue: storedSchedule,
-        editionMode: undefined,
+          icon: 'schedule',
-      }),
+          size: 'large',
-      editSchedule: (_, schedule) => state => ({
+          title: _('schedule'),
-        ...state,
+        })
-        editionMode: 'editSchedule',
+        if (
-        tmpSchedule: {
+          !(
+            (exportMode && schedule.exportRetention > 0) ||
+            (copyMode && schedule.copyRetention > 0) ||
+            (snapshotMode && schedule.snapshotRetention > 0)
+          )
+        ) {
+          error(_('newScheduleError'), _('retentionNeeded'))
+        } else {
+          saveSchedule({
             ...schedule,
+            id: storedSchedule.id || generateRandomId(),
+          })
+        }
       },
-      }),
       deleteSchedule: (_, schedule) => ({
         schedules: oldSchedules,
         propSettings,
@@ -415,47 +435,34 @@ export default [
           settings: settings.delete(id),
         }
       },
-      saveSchedule: (_, { cron, timezone, name, ...setting }) => ({
+      saveSchedule: (
-        editionMode,
+        _,
-        propSettings,
+        {
-        schedules: oldSchedules,
+          copyRetention,
-        settings = propSettings,
+          cron,
-        tmpSchedule,
+          exportRetention,
-      }) => {
+          id,
-        if (editionMode === 'creation') {
+          name,
-          const id = generateRandomId()
+          snapshotRetention,
-          return {
+          timezone,
-            editionMode: undefined,
+        }
+      ) => ({ propSettings, schedules, settings = propSettings }) => ({
         schedules: {
-              ...oldSchedules,
+          ...schedules,
           [id]: {
+            ...schedules[id],
             cron,
             id,
             name,
             timezone,
           },
         },
-            settings: settings.set(id, setting),
+        settings: settings.set(id, {
-          }
+          exportRetention,
-        }
+          copyRetention,
-
+          snapshotRetention,
-        const id = tmpSchedule.id
+        }),
-        const schedules = { ...oldSchedules }
+      }),
-
-        schedules[id] = {
-          ...schedules[id],
-          cron,
-          name,
-          timezone,
-        }
-
-        return {
-          editionMode: undefined,
-          schedules,
-          settings: settings.set(id, setting),
-          tmpSchedule: undefined,
-        }
-      },
       setPowerState: (_, powerState) => state => ({
         ...state,
         powerState,

packages/xo-web/src/xo-app/backup-ng/new/new-schedule.js

@@ -1,6 +1,4 @@
 import _ from 'intl'
-import ActionButton from 'action-button'
-import moment from 'moment-timezone'
 import React from 'react'
 import Scheduler, { SchedulePreview } from 'scheduling'
 import { Card, CardBlock } from 'card'
@@ -8,34 +6,21 @@ import { generateRandomId } from 'utils'
 import { injectState, provideState } from '@julien-f/freactal'
 import { Number } from 'form'
 
-import { DEFAULT_RETENTION, FormFeedback, FormGroup, Input } from './../utils'
+import { FormGroup, Input } from './../utils'
-
-const DEFAULT_SCHEDULE = {
-  copyRetention: DEFAULT_RETENTION,
-  exportRetention: DEFAULT_RETENTION,
-  snapshotRetention: DEFAULT_RETENTION,
-  cron: '0 0 * * *',
-  timezone: moment.tz.guess(),
-}
 
 export default [
-  injectState,
   provideState({
     initialState: () => ({
       formId: generateRandomId(),
       idInputName: generateRandomId(),
-      schedule: undefined,
     }),
     effects: {
-      setSchedule: (_, params) => ({
+      setSchedule: (_, params) => (_, { value, onChange }) => {
-        tmpSchedule = DEFAULT_SCHEDULE,
+        onChange({
-        schedule = tmpSchedule,
+          ...value,
-      }) => ({
-        schedule: {
-          ...schedule,
           ...params,
+        })
       },
-      }),
       setExportRetention: ({ setSchedule }, exportRetention) => () => {
         setSchedule({
           exportRetention,
@@ -66,39 +51,10 @@ export default [
         })
       },
     },
-    computed: {
-      isScheduleInvalid: ({ retentionNeeded, scheduleNotEdited }) =>
-        retentionNeeded || scheduleNotEdited,
-      retentionNeeded: ({ copyMode, exportMode, schedule, snapshotMode }) =>
-        schedule !== undefined &&
-        !(
-          (exportMode && schedule.exportRetention > 0) ||
-          (copyMode && schedule.copyRetention > 0) ||
-          (snapshotMode && schedule.snapshotRetention > 0)
-        ),
-      scheduleNotEdited: ({ editionMode, schedule }) =>
-        editionMode !== 'creation' && schedule === undefined,
-    },
   }),
   injectState,
-  ({ effects, state }) => {
+  ({ effects, state, modes, value: schedule }) => (
-    const { tmpSchedule = DEFAULT_SCHEDULE, schedule = tmpSchedule } = state
+    <Card>
-    const {
-      copyRetention,
-      cron,
-      exportRetention,
-      name,
-      snapshotRetention,
-      timezone,
-    } = schedule
-
-    return (
-      <form id={state.formId}>
-        <FormFeedback
-          component={Card}
-          error={state.retentionNeeded}
-          message={_('retentionNeeded')}
-        >
       <CardBlock>
         <FormGroup>
           <label htmlFor={state.idInputName}>
@@ -107,10 +63,10 @@ export default [
           <Input
             id={state.idInputName}
             onChange={effects.setName}
-                value={name}
+            value={schedule.name}
           />
         </FormGroup>
-            {state.exportMode && (
+        {modes.exportMode && (
           <FormGroup>
             <label>
               <strong>{_('scheduleExportRetention')}</strong>
@@ -118,11 +74,11 @@ export default [
             <Number
               min='0'
               onChange={effects.setExportRetention}
-                  value={exportRetention}
+              value={schedule.exportRetention}
             />
           </FormGroup>
         )}
-            {state.copyMode && (
+        {modes.copyMode && (
           <FormGroup>
             <label>
               <strong>{_('scheduleCopyRetention')}</strong>
@@ -130,11 +86,11 @@ export default [
             <Number
               min='0'
               onChange={effects.setCopyRetention}
-                  value={copyRetention}
+              value={schedule.copyRetention}
             />
           </FormGroup>
         )}
-            {state.snapshotMode && (
+        {modes.snapshotMode && (
           <FormGroup>
             <label>
               <strong>{_('snapshotRetention')}</strong>
@@ -142,44 +98,20 @@ export default [
             <Number
               min='0'
               onChange={effects.setSnapshotRetention}
-                  value={snapshotRetention}
+              value={schedule.snapshotRetention}
             />
           </FormGroup>
         )}
         <Scheduler
           onChange={effects.setCronTimezone}
-              cronPattern={cron}
+          cronPattern={schedule.cron}
-              timezone={timezone}
+          timezone={schedule.timezone}
+        />
+        <SchedulePreview
+          cronPattern={schedule.cron}
+          timezone={schedule.timezone}
         />
-            <SchedulePreview cronPattern={cron} timezone={timezone} />
-            <br />
-            <ActionButton
-              btnStyle='primary'
-              data-copyRetention={copyRetention}
-              data-cron={cron}
-              data-exportRetention={exportRetention}
-              data-name={name}
-              data-snapshotRetention={snapshotRetention}
-              data-timezone={timezone}
-              disabled={state.isScheduleInvalid}
-              form={state.formId}
-              handler={effects.saveSchedule}
-              icon='save'
-              size='large'
-            >
-              {_('formSave')}
-            </ActionButton>
-            <ActionButton
-              className='pull-right'
-              handler={effects.cancelSchedule}
-              icon='cancel'
-              size='large'
-            >
-              {_('formCancel')}
-            </ActionButton>
       </CardBlock>
-        </FormFeedback>
+    </Card>
-      </form>
+  ),
-    )
-  },
 ].reduceRight((value, decorator) => decorator(value))

packages/xo-web/src/xo-app/backup-ng/new/schedules.js

@@ -7,7 +7,6 @@ import { Card, CardBlock, CardHeader } from 'card'
 import { injectState, provideState } from '@julien-f/freactal'
 import { isEmpty, find, size } from 'lodash'
 
-import NewSchedule from './new-schedule'
 import { FormFeedback } from './../utils'
 
 // ===================================================================
@@ -25,16 +24,15 @@ export default [
     computed: {
       disabledDeletion: state => size(state.schedules) <= 1,
       disabledEdition: state =>
-        state.editionMode !== undefined ||
+        !state.exportMode && !state.copyMode && !state.snapshotMode,
-        (!state.exportMode && !state.copyMode && !state.snapshotMode),
       error: state => find(FEEDBACK_ERRORS, error => state[error]),
       individualActions: (
         { disabledDeletion, disabledEdition },
-        { effects: { deleteSchedule, editSchedule } }
+        { effects: { deleteSchedule, showScheduleModal } }
       ) => [
         {
           disabled: disabledEdition,
-          handler: editSchedule,
+          handler: showScheduleModal,
           icon: 'edit',
           label: _('scheduleEdit'),
           level: 'primary',
@@ -129,7 +127,7 @@ export default [
           <ActionButton
             btnStyle='primary'
             className='pull-right'
-            handler={effects.addSchedule}
+            handler={effects.showScheduleModal}
             disabled={state.disabledEdition}
             icon='add'
             tooltip={_('scheduleAdd')}
@@ -148,7 +146,6 @@ export default [
           )}
         </CardBlock>
       </FormFeedback>
-      {state.editionMode !== undefined && <NewSchedule />}
     </div>
   ),
 ].reduceRight((value, decorator) => decorator(value))

packages/xo-web/src/xo-app/backup-ng/utils.js

@@ -2,8 +2,6 @@ import Icon from 'icon'
 import PropTypes from 'prop-types'
 import React from 'react'
 
-export const DEFAULT_RETENTION = 1
-
 export const FormGroup = props => <div {...props} className='form-group' />
 export const Input = props => <input {...props} className='form-control' />
 export const Ul = props => <ul {...props} className='list-group' />