5.13.0

Fixes #2330

.gitignore

@@ -1,5 +1,7 @@
 /dist/
 /node_modules/
+/src/common/intl/locales/index.js
+/src/common/themes/index.js
 
 npm-debug.log
 npm-debug.log.*

CHANGELOG.md

@@ -1,5 +1,245 @@
 # ChangeLog
 
+## **5.13.0** (2017-09-29)
+
+### Enhancements
+
+ * replace all '...' with the UTF-8 equivalent [#2391](https://github.com/vatesfr/xo-web/issues/2391)
+ * [SortedTable] Explicit when no items [#2388](https://github.com/vatesfr/xo-web/issues/2388)
+ * Auto select iqn or lun if there is only one [#2379](https://github.com/vatesfr/xo-web/issues/2379)
+ * [Sparklines] Hide points [#2370](https://github.com/vatesfr/xo-web/issues/2370)
+ * Allow xo-server-recover-account to generate a random password [#2360](https://github.com/vatesfr/xo-web/issues/2360)
+ * Add disk in existing VM as self user [#2348](https://github.com/vatesfr/xo-web/issues/2348)
+ * Sorted table for Settings/server [#2340](https://github.com/vatesfr/xo-web/issues/2340)
+ * Sign in should be case insensitive [#2337](https://github.com/vatesfr/xo-web/issues/2337)
+ * [SortedTable] Extend checkbox click to whole column [#2329](https://github.com/vatesfr/xo-web/issues/2329)
+ * [SortedTable] Ability to select all items (across pages) [#2324](https://github.com/vatesfr/xo-web/issues/2324)
+ * [SortedTable] Range selection [#2323](https://github.com/vatesfr/xo-web/issues/2323)
+ * Warning on SMB remote creation [#2316](https://github.com/vatesfr/xo-web/issues/2316)
+ * [Home | SortedTable] Add link to syntax doc in the filter input [#2305](https://github.com/vatesfr/xo-web/issues/2305)
+ * [SortedTable] Add optional binding of filter to an URL query [#2301](https://github.com/vatesfr/xo-web/issues/2301)
+ * [Home][Keyboard navigation] Allow selecting the objects [#2214](https://github.com/vatesfr/xo-web/issues/2214)
+ * SR view / Disks: option to display non managed VDIs [#1724](https://github.com/vatesfr/xo-web/issues/1724)
+ * Continuous Replication Retention  [#1692](https://github.com/vatesfr/xo-web/issues/1692)
+
+### Bugs
+
+ * iSCSI issue on LUN selector [#2374](https://github.com/vatesfr/xo-web/issues/2374)
+ * Errors in VM copy are not properly reported [#2347](https://github.com/vatesfr/xo-web/issues/2347)
+ * Removing a PIF IP fails [#2346](https://github.com/vatesfr/xo-web/issues/2346)
+ * Review and fix creating a VM from a snapshot [#2343](https://github.com/vatesfr/xo-web/issues/2343)
+ * iSCSI LUN Detection fails with authentification  [#2339](https://github.com/vatesfr/xo-web/issues/2339)
+ * Fix PoolActionBar to add a new SR [#2307](https://github.com/vatesfr/xo-web/issues/2307)
+ * [VM migration] Error if default SR not accessible to target host [#2180](https://github.com/vatesfr/xo-web/issues/2180)
+ * A job shouldn't executable more than once at the same time [#2053](https://github.com/vatesfr/xo-web/issues/2053)
+
+## **5.12.0** (2017-08-31)
+
+### Enhancements
+
+ * PIF selector with physical status [#2326](https://github.com/vatesfr/xo-web/issues/2326)
+ * [SortedTable] Range selection [#2323](https://github.com/vatesfr/xo-web/issues/2323)
+ * Self service filter for home/VM view [#2303](https://github.com/vatesfr/xo-web/issues/2303)
+ * SR/Disks Display total of VDIs to coalesce [#2300](https://github.com/vatesfr/xo-web/issues/2300)
+ * Pool filter in the task view [#2293](https://github.com/vatesfr/xo-web/issues/2293)
+ * "Loading" while fetching objects [#2285](https://github.com/vatesfr/xo-web/issues/2285)
+ * [SortedTable] Add grouped actions feature [#2276](https://github.com/vatesfr/xo-web/issues/2276)
+ * Add a filter to the backups' log [#2246](https://github.com/vatesfr/xo-web/issues/2246)
+ * It should not be possible to migrate a halted VM. [#2233](https://github.com/vatesfr/xo-web/issues/2233)
+ * [Home][Keyboard navigation] Allow selecting the objects [#2214](https://github.com/vatesfr/xo-web/issues/2214)
+ * Allow to set pool master [#2213](https://github.com/vatesfr/xo-web/issues/2213)
+ * Continuous Replication Retention  [#1692](https://github.com/vatesfr/xo-web/issues/1692)
+
+### Bugs
+
+ * Home pagination bug [#2310](https://github.com/vatesfr/xo-web/issues/2310)
+ * Fix PoolActionBar to add a new SR [#2307](https://github.com/vatesfr/xo-web/issues/2307)
+ * VM snapshots are not correctly deleted [#2304](https://github.com/vatesfr/xo-web/issues/2304)
+ * Parallel deletion of VMs fails [#2297](https://github.com/vatesfr/xo-web/issues/2297)
+ * Continous replication create multiple zombie disks [#2292](https://github.com/vatesfr/xo-web/issues/2292)
+ * Add user to Group issue [#2196](https://github.com/vatesfr/xo-web/issues/2196)
+ * [VM migration] Error if default SR not accessible to target host [#2180](https://github.com/vatesfr/xo-web/issues/2180)
+
+## **5.11.0** (2017-07-31)
+
+### Enhancements
+
+- Storage VHD chain health [\#2178](https://github.com/vatesfr/xo-web/issues/2178)
+
+### Bug fixes
+
+- No web VNC console [\#2258](https://github.com/vatesfr/xo-web/issues/2258)
+- Patching issues [\#2254](https://github.com/vatesfr/xo-web/issues/2254)
+- Advanced button in VM creation for self service user [\#2202](https://github.com/vatesfr/xo-web/issues/2202)
+- Hide "new VM" menu entry if not admin or not self service user [\#2191](https://github.com/vatesfr/xo-web/issues/2191)
+
+## **5.10.0** (2017-06-30)
+
+### Enhancements
+
+- Improve backup log display [\#2239](https://github.com/vatesfr/xo-web/issues/2239)
+- Patch SR detection improvement [\#2215](https://github.com/vatesfr/xo-web/issues/2215)
+- Less strict coalesce detection [\#2207](https://github.com/vatesfr/xo-web/issues/2207)
+- IP pool UI improvement [\#2203](https://github.com/vatesfr/xo-web/issues/2203)
+- Ability to clear "Auto power on" flag for DR-ed VM [\#2097](https://github.com/vatesfr/xo-web/issues/2097)
+- [Delta backup restoration] Choose SR for each VDIs [\#2070](https://github.com/vatesfr/xo-web/issues/2070)
+- Ability to forget an host (even if no longer present) [\#1934](https://github.com/vatesfr/xo-web/issues/1934)
+
+### Bug fixes
+
+- Cross pool migrate fail [\#2248](https://github.com/vatesfr/xo-web/issues/2248)
+- ActionButtons with modals stay in pending state forever [\#2222](https://github.com/vatesfr/xo-web/issues/2222)
+- Permission issue for a user on self service VMs [\#2212](https://github.com/vatesfr/xo-web/issues/2212)
+- Self-Service resource loophole [\#2198](https://github.com/vatesfr/xo-web/issues/2198)
+- Backup log no longer shows the name of destination VM [\#2195](https://github.com/vatesfr/xo-web/issues/2195)
+- State not restored when exiting modal dialog [\#2194](https://github.com/vatesfr/xo-web/issues/2194)
+- [Xapi#exportDeltaVm] Cannot read property 'managed' of undefined [\#2189](https://github.com/vatesfr/xo-web/issues/2189)
+- VNC keyboard layout change [\#404](https://github.com/vatesfr/xo-web/issues/404)
+
+## **5.9.0** (2017-05-31)
+
+### Enhancements
+
+- Allow DR to remove previous backup first [\#2157](https://github.com/vatesfr/xo-web/issues/2157)
+- Feature request - add amount of RAM to memory bars [\#2149](https://github.com/vatesfr/xo-web/issues/2149)
+- Make the acceptability of invalid certificates configurable [\#2138](https://github.com/vatesfr/xo-web/issues/2138)
+- label of VM names in tasks link [\#2135](https://github.com/vatesfr/xo-web/issues/2135)
+- Backup report timezone [\#2133](https://github.com/vatesfr/xo-web/issues/2133)
+- xo-server-recover-account [\#2129](https://github.com/vatesfr/xo-web/issues/2129)
+- Detect disks attached to control domain [\#2126](https://github.com/vatesfr/xo-web/issues/2126)
+- Add task description in Tasks view [\#2125](https://github.com/vatesfr/xo-web/issues/2125)
+- Host reboot warning after patching for 7.1 [\#2124](https://github.com/vatesfr/xo-web/issues/2124)
+- Continuous Replication - possibility run VM without a clone [\#2119](https://github.com/vatesfr/xo-web/issues/2119)
+- Unreachable host should be detected [\#2099](https://github.com/vatesfr/xo-web/issues/2099)
+- Orange icon when host is is disabled [\#2098](https://github.com/vatesfr/xo-web/issues/2098)
+- Enhanced backup report logs [\#2096](https://github.com/vatesfr/xo-web/issues/2096)
+- Only show failures when configured to report on failures [\#2095](https://github.com/vatesfr/xo-web/issues/2095)
+- "Add all" button in self service [\#2081](https://github.com/vatesfr/xo-web/issues/2081)
+- Patch and pack mechanism changed on Ely [\#2058](https://github.com/vatesfr/xo-web/issues/2058)
+- Tip or ask people to patch from pool view [\#2057](https://github.com/vatesfr/xo-web/issues/2057)
+- File restore - Remind compatible backup [\#1930](https://github.com/vatesfr/xo-web/issues/1930)
+- Reporting for halted vm time [\#1613](https://github.com/vatesfr/xo-web/issues/1613)
+- Add standalone XS server to a pool and patch it to the pool level [\#878](https://github.com/vatesfr/xo-web/issues/878)
+- Add Cores-per-sockets [\#130](https://github.com/vatesfr/xo-web/issues/130)
+
+### Bug fixes
+
+- VM creation is broken for non-admins [\#2168](https://github.com/vatesfr/xo-web/issues/2168)
+- Can't create cloud config drive [\#2162](https://github.com/vatesfr/xo-web/issues/2162)
+- Select is "moving" [\#2142](https://github.com/vatesfr/xo-web/issues/2142)
+- Select issue for affinity host [\#2141](https://github.com/vatesfr/xo-web/issues/2141)
+- Dashboard Storage Usage incorrect [\#2123](https://github.com/vatesfr/xo-web/issues/2123)
+- Detect unmerged *base copy* and prevent too long chains [\#2047](https://github.com/vatesfr/xo-web/issues/2047)
+
+
+## **5.8.0** (2017-04-28)
+
+### Enhancements
+
+- Limit About view info for non-admins [\#2109](https://github.com/vatesfr/xo-web/issues/2109)
+- Enabling/disabling boot device on HVM VM [\#2105](https://github.com/vatesfr/xo-web/issues/2105)
+- Filter: Hide snapshots in SR disk view [\#2102](https://github.com/vatesfr/xo-web/issues/2102)
+- Smarter XOSAN install [\#2084](https://github.com/vatesfr/xo-web/issues/2084)
+- PL translation [\#2079](https://github.com/vatesfr/xo-web/issues/2079)
+- Remove the "share this VM" option if not in self service [\#2061](https://github.com/vatesfr/xo-web/issues/2061)
+- "connected" status graphics are not the same on the host storage and networking tabs [\#2060](https://github.com/vatesfr/xo-web/issues/2060)
+- Ability to view and edit `vga` and `videoram` fields in VM view [\#158](https://github.com/vatesfr/xo-web/issues/158)
+- Performances [\#1](https://github.com/vatesfr/xen-api/issues/1)
+
+### Bug fixes
+
+- Dashboard display issues [\#2108](https://github.com/vatesfr/xo-web/issues/2108)
+- Dashboard CPUs Usage [\#2105](https://github.com/vatesfr/xo-web/issues/2105)
+- [Dashboard/Overview] Warning [\#2090](https://github.com/vatesfr/xo-web/issues/2090)
+- VM creation displays all networks [\#2086](https://github.com/vatesfr/xo-web/issues/2086)
+- Cannot change HA mode for a VM [\#2080](https://github.com/vatesfr/xo-web/issues/2080)
+- [Smart backup] Tags selection does not work [\#2077](https://github.com/vatesfr/xo-web/issues/2077)
+- [Backup jobs] Timeout should be in seconds, not milliseconds [\#2076](https://github.com/vatesfr/xo-web/issues/2076)
+- Missing VM templates [\#2075](https://github.com/vatesfr/xo-web/issues/2075)
+- [transport-email] From header not set [\#2074](https://github.com/vatesfr/xo-web/issues/2074)
+- Missing objects should be displayed in backup edition [\#2052](https://github.com/vatesfr/xo-web/issues/2052)
+
+## **5.7.0** (2017-03-31)
+
+### Enhancements
+
+- Improve ActionButton error reporting [\#2048](https://github.com/vatesfr/xo-web/issues/2048)
+- Home view master checkbox UI issue [\#2027](https://github.com/vatesfr/xo-web/issues/2027)
+- HU Translation [\#2019](https://github.com/vatesfr/xo-web/issues/2019)
+- [Usage report] Add name for all objects [\#2017](https://github.com/vatesfr/xo-web/issues/2017)
+- [Home] Improve inter-types linkage [\#2012](https://github.com/vatesfr/xo-web/issues/2012)
+- Remove bootable checkboxes in VM creation [\#2007](https://github.com/vatesfr/xo-web/issues/2007)
+- Do not display bootable toggles for disks of non-PV VMs [\#1996](https://github.com/vatesfr/xo-web/issues/1996)
+- Try to match network VLAN for VM migration modal [\#1990](https://github.com/vatesfr/xo-web/issues/1990)
+- [Usage reports] Add VM names in addition to UUIDs [\#1984](https://github.com/vatesfr/xo-web/issues/1984)
+- Host affinity in "advanced" VM creation [\#1983](https://github.com/vatesfr/xo-web/issues/1983)
+- Add job tag in backup logs [\#1982](https://github.com/vatesfr/xo-web/issues/1982)
+- Possibility to add a label/description to servers [\#1965](https://github.com/vatesfr/xo-web/issues/1965)
+- Possibility to create shared VM in a resource set [\#1964](https://github.com/vatesfr/xo-web/issues/1964)
+- Clearer display of disabled (backup) jobs [\#1958](https://github.com/vatesfr/xo-web/issues/1958)
+- Job should have a configurable timeout [\#1956](https://github.com/vatesfr/xo-web/issues/1956)
+- Sort failed VMs in backup report [\#1950](https://github.com/vatesfr/xo-web/issues/1950)
+- Support for UNIX socket path [\#1944](https://github.com/vatesfr/xo-web/issues/1944)
+- Interface - Host Patching - Button Verbiage [\#1911](https://github.com/vatesfr/xo-web/issues/1911)
+- Display if a VM is in Self Service (and which group) [\#1905](https://github.com/vatesfr/xo-web/issues/1905)
+- Install supplemental pack on a whole pool [\#1896](https://github.com/vatesfr/xo-web/issues/1896)
+- Allow VM snapshots with ACLs [\#1865](https://github.com/vatesfr/xo-web/issues/1886)
+- Icon to indicate if a snapshot is quiesce [\#1858](https://github.com/vatesfr/xo-web/issues/1858)
+- Pool Ips input too permissive [\#1731](https://github.com/vatesfr/xo-web/issues/1731)
+- Select is going on top after each choice [\#1359](https://github.com/vatesfr/xo-web/issues/1359)
+
+### Bug fixes
+
+- Missing objects should be displayed in backup edition [\#2052](https://github.com/vatesfr/xo-web/issues/2052)
+- Search bar content changes while typing [\#2035](https://github.com/vatesfr/xo-web/issues/2035)
+- VM.$guest_metrics.PV_drivers_up_to_date is deprecated in XS 7.1 [\#2024](https://github.com/vatesfr/xo-web/issues/2024)
+- Bootable flag selection checkbox for extra disk not fetched [\#1994](https://github.com/vatesfr/xo-web/issues/1994)
+- Home view − Changing type must reset paging [\#1993](https://github.com/vatesfr/xo-web/issues/1993)
+- XOSAN menu item should only be displayed to admins [\#1968](https://github.com/vatesfr/xo-web/issues/1968)
+- Object type change are not correctly handled in UI [\#1967](https://github.com/vatesfr/xo-web/issues/1967)
+- VM creation is stuck when using ISO/DVD as install method [\#1966](https://github.com/vatesfr/xo-web/issues/1966)
+- Install pack on whole pool fails [\#1957](https://github.com/vatesfr/xo-web/issues/1957)
+- Consoles are broken in next-release [\#1954](https://github.com/vatesfr/xo-web/issues/1954)
+- [VHD merge] Increase BAT when necessary [\#1939](https://github.com/vatesfr/xo-web/issues/1939)
+- Issue on VM restore time [\#1936](https://github.com/vatesfr/xo-web/issues/1936)
+- Two remotes should not be able to have the same name [\#1879](https://github.com/vatesfr/xo-web/issues/1879)
+- Selfservice limits not honored after VM creation [\#1695](https://github.com/vatesfr/xo-web/issues/1695)
+
+## **5.6.0** (2017-01-27)
+
+Reporting, LVM File level restore.
+
+### Enhancements
+
+- Do not stop patches install if already applied [\#1904](https://github.com/vatesfr/xo-web/issues/1904)
+- Improve scheduling UI [\#1893](https://github.com/vatesfr/xo-web/issues/1893)
+- Smart backup and tag [\#1885](https://github.com/vatesfr/xo-web/issues/1885)
+- Missing embeded API documention [\#1882](https://github.com/vatesfr/xo-web/issues/1882)
+- Add local DVD in CD selector [\#1880](https://github.com/vatesfr/xo-web/issues/1880)
+- File level restore for LVM [\#1878](https://github.com/vatesfr/xo-web/issues/1878)
+- Restore multiple files from file level restore [\#1877](https://github.com/vatesfr/xo-web/issues/1877)
+- Add a VM tab for host & pool views [\#1864](https://github.com/vatesfr/xo-web/issues/1864)
+- Icon to indicate if a snapshot is quiesce [\#1858](https://github.com/vatesfr/xo-web/issues/1858)
+- UI for disconnect hosts comp [\#1833](https://github.com/vatesfr/xo-web/issues/1833)
+- Eject all xs-guest.iso in a pool [\#1798](https://github.com/vatesfr/xo-web/issues/1798)
+- Display installed supplemental pack on host [\#1506](https://github.com/vatesfr/xo-web/issues/1506)
+- Install supplemental pack on host comp [\#1460](https://github.com/vatesfr/xo-web/issues/1460)
+- Pool-wide combined stats [\#1324](https://github.com/vatesfr/xo-web/issues/1324)
+
+### Bug fixes
+
+- IP-address not released when VM removed [\#1906](https://github.com/vatesfr/xo-web/issues/1906)
+- Interface broken due to new Bootstrap Alpha [\#1871](https://github.com/vatesfr/xo-web/issues/1871)
+- Self service recompute all limits broken [\#1866](https://github.com/vatesfr/xo-web/issues/1866)
+- Patch not found error for XS 6.5 [\#1863](https://github.com/vatesfr/xo-web/issues/1863)
+- Convert To Template issues [\#1855](https://github.com/vatesfr/xo-web/issues/1855)
+- Removing PIF seems to fail [\#1853](https://github.com/vatesfr/xo-web/issues/1853)
+- Depth should be >= 1 in backup creation [\#1851](https://github.com/vatesfr/xo-web/issues/1851)
+- Wrong link in Dashboard > Health [\#1850](https://github.com/vatesfr/xo-web/issues/1850)
+- Incorrect file dates shown in new File Restore feature [\#1840](https://github.com/vatesfr/xo-web/issues/1840)
+- IP allocation problem [\#1747](https://github.com/vatesfr/xo-web/issues/1747)
+- Selfservice limits not honored after VM creation [\#1695](https://github.com/vatesfr/xo-web/issues/1695)
+
 ## **5.5.0** (2016-12-20)
 
 File level restore.
@@ -177,7 +417,7 @@ File level restore.
 - Tooltip on OS icon in VM view [\#1416](https://github.com/vatesfr/xo-web/issues/1416)
 - Display pool master [\#1407](https://github.com/vatesfr/xo-web/issues/1407)
 - Missing tooltips in VM creation view [\#1402](https://github.com/vatesfr/xo-web/issues/1402)
-- Handle VDB disconnect and connect [\#1397](https://github.com/vatesfr/xo-web/issues/1397)
+- Handle VBD disconnect and connect [\#1397](https://github.com/vatesfr/xo-web/issues/1397)
 - Eject host from a pool [\#1395](https://github.com/vatesfr/xo-web/issues/1395)
 - Improve pool general view [\#1393](https://github.com/vatesfr/xo-web/issues/1393)
 - Improve patching system [\#1392](https://github.com/vatesfr/xo-web/issues/1392)

gulpfile.js

@@ -258,7 +258,7 @@ gulp.task(function buildScripts () {
       ]
     }),
     require('gulp-sourcemaps').init({ loadMaps: true }),
-    PRODUCTION && require('gulp-uglify')(),
+    PRODUCTION && require('gulp-uglify/composer')(require('uglify-es'))(),
     dest()
   )
 })

package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-web",
-  "version": "5.6.1",
+  "version": "5.13.0",
   "license": "AGPL-3.0",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [
@@ -31,9 +31,11 @@
     "npm": ">=3"
   },
   "devDependencies": {
+    "@nraynaud/novnc": "^0.6.1-1",
     "ansi_up": "^1.3.0",
-    "asap": "^2.0.4",
+    "asap": "^2.0.6",
     "babel-eslint": "^7.0.0",
+    "babel-plugin-dev": "^1.0.0",
     "babel-plugin-lodash": "^3.2.11",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-react-constant-elements": "^6.5.0",
@@ -44,43 +46,44 @@
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
-    "babel-register": "^6.16.3",
-    "babel-runtime": "^6.6.1",
+    "babel-register": "^6.26.0",
+    "babel-runtime": "^6.26.0",
     "babelify": "^7.2.0",
     "benchmark": "^2.1.0",
     "bootstrap": "4.0.0-alpha.5",
     "browserify": "^14.1.0",
-    "bundle-collapser": "^1.2.1",
+    "bundle-collapser": "^1.3.0",
     "chartist": "^0.10.1",
     "chartist-plugin-legend": "^0.6.1",
     "chartist-plugin-tooltip": "0.0.11",
     "classnames": "^2.2.3",
     "cookies-js": "^1.2.2",
-    "d3": "^4.2.8",
+    "d3": "^4.10.2",
     "dependency-check": "^2.5.1",
-    "enzyme": "^2.6.0",
+    "enzyme": "^2.9.1",
     "enzyme-to-json": "^1.4.4",
-    "event-to-promise": "^0.7.0",
+    "event-to-promise": "^0.8.0",
     "font-awesome": "^4.7.0",
     "font-mfizz": "github:fizzed/font-mfizz",
     "get-stream": "^2.3.0",
     "globby": "^6.0.0",
     "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-autoprefixer": "^3.1.0",
-    "gulp-csso": "^2.0.0",
+    "gulp-autoprefixer": "^4.0.0",
+    "gulp-csso": "^3.0.0",
     "gulp-embedlr": "^0.5.2",
     "gulp-plumber": "^1.1.0",
     "gulp-pug": "^3.1.0",
     "gulp-refresh": "^1.1.0",
     "gulp-sass": "^3.0.0",
     "gulp-sourcemaps": "^2.2.3",
-    "gulp-uglify": "^2.0.0",
+    "gulp-uglify": "^3.0.0",
     "gulp-watch": "^4.3.5",
-    "human-format": "^0.7.0",
-    "husky": "^0.12.0",
-    "index-modules": "^0.2.1",
+    "human-format": "^0.8.0",
+    "husky": "^0.14.3",
+    "immutable": "^3.8.1",
+    "index-modules": "^0.3.0",
     "is-ip": "^1.0.0",
-    "jest": "^18.0.0",
+    "jest": "^21.0.2",
     "jsonrpc-websocket-client": "^0.1.1",
     "kindof": "^2.0.0",
     "later": "^1.2.0",
@@ -88,50 +91,53 @@
     "loose-envify": "^1.1.0",
     "make-error": "^1.2.1",
     "marked": "^0.3.5",
-    "modular-css": "^3.0.0",
+    "modular-css": "^6.0.2",
     "moment": "^2.13.0",
     "moment-timezone": "^0.5.4",
     "notifyjs": "^3.0.0",
-    "novnc-node": "^0.5.3",
-    "promise-toolbox": "^0.8.0",
+    "promise-toolbox": "^0.9.5",
     "random-password": "^0.1.2",
     "react": "^15.4.1",
     "react-addons-shallow-compare": "^15.1.0",
     "react-addons-test-utils": "^15.4.1",
     "react-bootstrap-4": "^0.29.1",
-    "react-chartist": "^0.12.0",
-    "react-copy-to-clipboard": "^4.0.2",
-    "react-debounce-input": "^2.4.0",
-    "react-dnd": "^2.1.4",
-    "react-dnd-html5-backend": "^2.1.2",
+    "react-chartist": "^0.13.0",
+    "react-copy-to-clipboard": "^5.0.0",
+    "react-debounce-input": "^3.0.1",
+    "react-dnd": "^2.5.1",
+    "react-dnd-html5-backend": "^2.5.1",
     "react-document-title": "^2.0.2",
     "react-dom": "^15.4.1",
-    "react-dropzone": "^3.5.0",
-    "react-intl": "^2.0.1",
-    "react-key-handler": "^0.3.0",
-    "react-notify": "^2.0.1",
-    "react-overlays": "^0.6.0",
-    "react-redux": "^5.0.0",
+    "react-dropzone": "^4.1.2",
+    "react-intl": "^2.4.0",
+    "react-key-handler": "^1.0.0",
+    "react-notify": "^3.0.0",
+    "react-overlays": "^0.8.0",
+    "react-redux": "^5.0.6",
     "react-router": "^3.0.0",
-    "react-select": "^1.0.0-beta13",
-    "react-shortcuts": "^1.3.1",
-    "react-sparklines": "^1.5.0",
+    "react-select": "^1.0.0-rc.8",
+    "react-shortcuts": "^1.6.1",
+    "react-sparklines": "1.6.0",
     "react-virtualized": "^8.0.8",
-    "readable-stream": "^2.0.6",
-    "redux": "^3.3.1",
+    "readable-stream": "^2.3.3",
+    "redux": "^3.7.2",
     "redux-devtools": "^3.1.1",
     "redux-devtools-dock-monitor": "^1.1.0",
     "redux-devtools-log-monitor": "^1.0.5",
     "redux-thunk": "^2.0.1",
-    "reselect": "^2.2.1",
-    "standard": "^8.4.0",
-    "superagent": "^2.0.0",
+    "reselect": "^2.5.4",
+    "semver": "^5.4.1",
+    "standard": "^10.0.3",
+    "styled-components": "^2.1.2",
+    "superagent": "^3.6.0",
     "tar-stream": "^1.5.2",
-    "vinyl": "^2.0.0",
+    "uglify-es": "^3.1.0",
+    "uncontrollable-input": "^0.0.1",
+    "vinyl": "^2.1.0",
     "watchify": "^3.7.0",
-    "xml2js": "^0.4.17",
+    "xml2js": "^0.4.19",
     "xo-acl-resolver": "^0.2.3",
-    "xo-common": "0.1.0",
+    "xo-common": "^0.1.1",
     "xo-lib": "^0.8.0",
     "xo-remote-parser": "^0.3"
   },
@@ -139,6 +145,7 @@
     "benchmarks": "./tools/run-benchmarks.js 'src/**/*.bench.js'",
     "build": "npm run build-indexes && NODE_ENV=production gulp build",
     "build-indexes": "index-modules --auto src",
+    "commitmsg": "npm test",
     "dev": "npm run build-indexes && NODE_ENV=development gulp build",
     "dev-test": "jest --watch",
     "lint": "standard",
@@ -168,6 +175,8 @@
       }
     },
     "plugins": [
+      "dev",
+      "lodash",
       "transform-decorators-legacy",
       "transform-runtime"
     ],
@@ -177,17 +186,15 @@
       "stage-0"
     ]
   },
-  "config": {
-    "ghooks": {
-      "commit-msg": "npm test"
-    }
-  },
   "jest": {
     "snapshotSerializers": [
       "enzyme-to-json/serializer"
     ]
   },
   "standard": {
+    "globals": [
+      "__DEV__"
+    ],
     "ignore": [
       "dist"
     ],

src/common/__snapshots__/grid.spec.js.snap

@@ -1,14 +1,19 @@
-exports[`test Col 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Col 1`] = `
 <div
-  className="col-xs-12" />
+  className="col-xs-12"
+/>
 `;
 
-exports[`test Container 1`] = `
+exports[`Container 1`] = `
 <div
-  className="container-fluid" />
+  className="container-fluid"
+/>
 `;
 
-exports[`test Row 1`] = `
+exports[`Row 1`] = `
 <div
-  className=" row" />
+  className=" row"
+/>
 `;

src/common/action-bar.js

@@ -1,46 +1,50 @@
-import _ from 'intl'
 import ActionButton from 'action-button'
-import map from 'lodash/map'
-import React from 'react'
-import Tooltip from 'tooltip'
-import {
-  ButtonGroup
-} from 'react-bootstrap-4/lib'
-import {
-  noop
-} from 'utils'
+import propTypes from 'prop-types-decorator'
+import React, { cloneElement } from 'react'
+import { noop } from 'lodash'
 
-const ActionBar = ({ actions, param }) => (
+import ButtonGroup from './button-group'
+
+export const Action = ({ display, handler, handlerParam, icon, label, pending, redirectOnSuccess }) =>
+  <ActionButton
+    handler={handler}
+    handlerParam={handlerParam}
+    icon={icon}
+    pending={pending}
+    redirectOnSuccess={redirectOnSuccess}
+    size='large'
+    tooltip={display === 'icon' ? label : undefined}
+  >
+    {display === 'both' && label}
+  </ActionButton>
+
+Action.propTypes = {
+  display: propTypes.oneOf([ 'icon', 'both' ]),
+  handler: propTypes.func.isRequired,
+  icon: propTypes.string.isRequired,
+  label: propTypes.node,
+  pending: propTypes.bool,
+  redirectOnSuccess: propTypes.string
+}
+
+const ActionBar = ({ children, handlerParam = noop, display = 'both' }) =>
   <ButtonGroup>
-    {map(actions, (button, index) => {
-      if (!button) {
+    {React.Children.map(children, (child, key) => {
+      if (!child) {
         return
       }
 
-      const { handler, handlerParam = param, label, icon, redirectOnSuccess } = button
-      return <Tooltip key={index} content={_(label)}>
-        <ActionButton
-          key={index}
-          btnStyle='secondary'
-          handler={handler || noop}
-          handlerParam={handlerParam}
-          icon={icon}
-          redirectOnSuccess={redirectOnSuccess}
-          size='large'
-        />
-      </Tooltip>
+      const { props } = child
+      return cloneElement(child, {
+        display: props.display || display,
+        handlerParam: props.handlerParam || handlerParam,
+        key
+      })
     })}
   </ButtonGroup>
-)
+
 ActionBar.propTypes = {
-  actions: React.PropTypes.arrayOf(
-    React.PropTypes.shape({
-      label: React.PropTypes.string.isRequired,
-      icon: React.PropTypes.string.isRequired,
-      handler: React.PropTypes.func,
-      redirectOnSuccess: React.PropTypes.string
-    })
-  ).isRequired,
-  display: React.PropTypes.oneOf(['icon', 'text', 'both'])
+  display: propTypes.oneOf([ 'icon', 'both' ]),
+  handlerParam: propTypes.any
 }
 export { ActionBar as default }

src/common/action-button.js

@@ -1,59 +1,82 @@
-import Icon from 'icon'
 import isFunction from 'lodash/isFunction'
 import React from 'react'
-import { Button } from 'react-bootstrap-4/lib'
 
+import Button from './button'
 import Component from './base-component'
+import Icon from './icon'
 import logError from './log-error'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import Tooltip from './tooltip'
+import { error as _error } from './notification'
 
 @propTypes({
-  btnStyle: propTypes.string,
+  // React element to use as button content
+  children: propTypes.node,
+
+  // whether this button is disabled (default to false)
   disabled: propTypes.bool,
+
+  // form identifier
+  //
+  // if provided, this button and its action are associated to this
+  // form for the submit event
   form: propTypes.string,
+
+  // function to call when the action is triggered (via a clik on the
+  // button or submit on the form)
   handler: propTypes.func.isRequired,
+
+  // optional value which will be passed as first param to the handler
   handlerParam: propTypes.any,
+
+  // XO icon to use for this button
   icon: propTypes.string.isRequired,
+
+  // whether the action of this action is already underway
+  pending: propTypes.bool,
+
+  // path to redirect to when the triggered action finish successfully
+  //
+  // if a function, it will be called with the result of the action to
+  // compute the path
   redirectOnSuccess: propTypes.oneOfType([
     propTypes.func,
     propTypes.string
   ]),
-  size: propTypes.oneOf([
-    'large',
-    'small'
-  ]),
+
+  // React element to use tooltip for the component
   tooltip: propTypes.node
 })
 export default class ActionButton extends Component {
   static contextTypes = {
-    router: React.PropTypes.object
+    router: propTypes.object
   }
 
   async _execute () {
-    if (this.state.working) {
+    if (this.props.pending || this.state.working) {
       return
     }
 
     const {
+      children,
       handler,
-      handlerParam
+      handlerParam,
+      tooltip
     } = this.props
 
     try {
       this.setState({
-        error: null,
+        error: undefined,
         working: true
       })
 
       const result = await handler(handlerParam)
 
-      let { redirectOnSuccess } = this.props
+      const { redirectOnSuccess } = this.props
       if (redirectOnSuccess) {
-        if (isFunction(redirectOnSuccess)) {
-          redirectOnSuccess = redirectOnSuccess(result)
-        }
-        return this.context.router.push(redirectOnSuccess)
+        return this.context.router.push(
+          isFunction(redirectOnSuccess) ? redirectOnSuccess(result) : redirectOnSuccess
+        )
       }
 
       this.setState({
@@ -68,6 +91,7 @@ export default class ActionButton extends Component {
       // ignore when undefined because it usually means that the action has been canceled
       if (error !== undefined) {
         logError(error)
+        _error(children || tooltip || error.name, error.message || String(error))
       }
     }
   }
@@ -97,28 +121,30 @@ export default class ActionButton extends Component {
   render () {
     const {
       props: {
-        btnStyle,
         children,
-        className,
-        disabled,
-        form,
         icon,
-        size: bsSize,
-        style,
-        tooltip
+        pending,
+        tooltip,
+        ...props
       },
       state: { error, working }
     } = this
 
-    const button = <Button
-      bsStyle={error ? 'warning' : btnStyle}
-      form={form}
-      onClick={!form && this._execute}
-      disabled={working || disabled}
-      type={form ? 'submit' : 'button'}
-      {...{ bsSize, className, style }}
-    >
-      <Icon icon={working ? 'loading' : icon} fixedWidth />
+    if (error !== undefined) {
+      props.btnStyle = 'warning'
+    }
+    if (pending || working) {
+      props.disabled = true
+    }
+    delete props.handler
+    delete props.handlerParam
+    if (props.form === undefined) {
+      props.onClick = this._execute
+    }
+    delete props.redirectOnSuccess
+
+    const button = <Button {...props}>
+      <Icon icon={pending || working ? 'loading' : icon} fixedWidth />
       {children && ' '}
       {children}
     </Button>

src/common/action-toggle.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import ActionButton from './action-button'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 const ActionToggle = ({ className, value, ...props }) =>
   <ActionButton

src/common/auto-controlled-input.js

@@ -1,87 +0,0 @@
-import React from 'react'
-import { isFunction, omit } from 'lodash'
-
-import Component from './base-component'
-import getEventValue from './get-event-value'
-
-const __DEV__ = process.env.NODE_ENV !== 'production'
-
-// This decorator can be used on a controlled input component to make
-// it able to automatically handled the uncontrolled mode.
-export default options => ControlledInput => {
-  class AutoControlledInput extends Component {
-    constructor (props) {
-      super()
-
-      const opts = isFunction(options) ? options(props) : options
-      const controlled = this._controlled = 'value' in props
-      if (!controlled) {
-        this.state.value = props.defaultValue || opts && opts.defaultValue
-
-        this._onChange = event => {
-          let defaultPrevented = false
-
-          const { onChange } = this.props
-          if (onChange) {
-            onChange(event)
-            defaultPrevented = event && event.defaultPrevented
-          }
-
-          if (!defaultPrevented) {
-            this.setState({ value: getEventValue(event) })
-          }
-        }
-      } else if (__DEV__ && 'defaultValue' in props) {
-        throw new Error(`${this.constructor.name}: controlled component should not have a default value`)
-      }
-    }
-
-    get value () {
-      return this._controlled
-        ? this.props.value
-        : this.state.value
-    }
-
-    set value (value) {
-      if (__DEV__ && this._controlled) {
-        throw new Error(`${this.constructor.name}: should not set value on controlled component`)
-      }
-
-      this.setState({ value })
-    }
-
-    render () {
-      if (this._controlled) {
-        return <ControlledInput {...this.props} />
-      }
-
-      return <ControlledInput
-        {...omit(this.props, 'defaultValue')}
-        onChange={this._onChange}
-        value={this.state.value}
-      />
-    }
-  }
-
-  if (__DEV__) {
-    AutoControlledInput.prototype.componentWillReceiveProps = function (newProps) {
-      const { name } = this.constructor
-      const controlled = this._controlled
-      const newControlled = 'value' in newProps
-
-      if (!controlled) {
-        if (newControlled) {
-          throw new Error(`${name}: uncontrolled component should not become controlled`)
-        }
-      } else if (!newControlled) {
-        throw new Error(`${name}: controlled component should not become uncontrolled`)
-      }
-
-      if (newProps.defaultValue !== this.props.defaultValue) {
-        throw new Error(`${name}: default value should not change`)
-      }
-    }
-  }
-
-  return AutoControlledInput
-}

src/common/base-component.js

@@ -1,30 +1,19 @@
-import clone from 'lodash/clone'
-import includes from 'lodash/includes'
-import isArray from 'lodash/isArray'
-import forEach from 'lodash/forEach'
-import map from 'lodash/map'
-import { Component } from 'react'
+import { PureComponent } from 'react'
+import { cowSet } from 'utils'
+import {
+  includes,
+  isArray,
+  forEach,
+  map
+} from 'lodash'
 
 import getEventValue from './get-event-value'
-import invoke from './invoke'
-import shallowEqual from './shallow-equal'
 
 // Should components logs every renders?
 //
 // Usually set to process.env.NODE_ENV !== 'production'.
 const VERBOSE = false
 
-const cowSet = (object, path, value, depth) => {
-  if (depth >= path.length) {
-    return value
-  }
-
-  object = clone(object)
-  const prop = path[depth]
-  object[prop] = cowSet(object[prop], path, value, depth + 1)
-  return object
-}
-
 const get = (object, path, depth) => {
   if (depth >= path.length) {
     return object
@@ -36,7 +25,7 @@ const get = (object, path, depth) => {
     : get(object[prop], path, depth)
 }
 
-export default class BaseComponent extends Component {
+export default class BaseComponent extends PureComponent {
   constructor (props, context) {
     super(props, context)
 
@@ -46,30 +35,30 @@ export default class BaseComponent extends Component {
     this._linkedState = null
 
     if (VERBOSE) {
-      this.render = invoke(this.render, render => () => {
+      this.render = (render => () => {
         console.log('render', this.constructor.name)
 
         return render.call(this)
-      })
+      })(this.render)
     }
   }
 
   // See https://preactjs.com/guide/linked-state
   linkState (name, targetPath) {
-    const key = targetPath
+    const key = targetPath !== undefined
       ? `${name}##${targetPath}`
       : name
 
     let linkedState = this._linkedState
     let cb
-    if (!linkedState) {
+    if (linkedState === null) {
       linkedState = this._linkedState = {}
-    } else if ((cb = linkedState[key])) {
+    } else if ((cb = linkedState[key]) !== undefined) {
       return cb
     }
 
     let getValue
-    if (targetPath) {
+    if (targetPath !== undefined) {
       const path = targetPath.split('.')
       getValue = event => get(getEventValue(event), path, 0)
     } else {
@@ -93,9 +82,9 @@ export default class BaseComponent extends Component {
   toggleState (name) {
     let linkedState = this._linkedState
     let cb
-    if (!linkedState) {
+    if (linkedState === null) {
       linkedState = this._linkedState = {}
-    } else if ((cb = linkedState[name])) {
+    } else if ((cb = linkedState[name]) !== undefined) {
       return cb
     }
 
@@ -112,13 +101,6 @@ export default class BaseComponent extends Component {
       })
     })
   }
-
-  shouldComponentUpdate (newProps, newState) {
-    return !(
-      shallowEqual(this.props, newProps) &&
-      shallowEqual(this.state, newState)
-    )
-  }
 }
 
 if (VERBOSE) {

src/common/button-group.js

@@ -0,0 +1,8 @@
+import React from 'react'
+
+const ButtonGroup = ({ children }) =>
+  <div className='btn-group' role='group'>
+    {children}
+  </div>
+
+export { ButtonGroup as default }

src/common/button.js

@@ -0,0 +1,56 @@
+import classNames from 'classnames'
+import React from 'react'
+
+import propTypes from './prop-types-decorator'
+
+const Button = ({
+  active,
+  block,
+  btnStyle = 'secondary',
+  children,
+  outline,
+  size,
+  ...props
+}) => {
+  props.className = classNames(
+    props.className,
+    'btn',
+    `btn${outline ? '-outline' : ''}-${btnStyle}`,
+    active !== undefined && 'active',
+    block && 'btn-block',
+    size === 'large' ? 'btn-lg' : size === 'small' ? 'btn-sm' : null
+  )
+  if (props.type === undefined && props.form === undefined) {
+    props.type = 'button'
+  }
+
+  return <button {...props}>{children}</button>
+}
+
+propTypes({
+  active: propTypes.bool,
+  block: propTypes.bool,
+
+  // Bootstrap button style
+  //
+  // See https://v4-alpha.getbootstrap.com/components/buttons/#examples
+  //
+  // The default value (secondary) is not listed here because it does
+  // not make sense to explicit it.
+  btnStyle: propTypes.oneOf([
+    'danger',
+    'info',
+    'link',
+    'primary',
+    'success',
+    'warning'
+  ]),
+
+  outline: propTypes.bool,
+  size: propTypes.oneOf([
+    'large',
+    'small'
+  ])
+})(Button)
+
+export { Button as default }

src/common/card.js

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 const CARD_STYLE = {
   minHeight: '100%'
@@ -17,16 +17,16 @@ const CARD_HEADER_STYLE = {
 }
 
 export const Card = propTypes({
-  disableMaxHeight: propTypes.bool,
   shadow: propTypes.bool
 })(({
-  children,
-  shadow
-}) => (
-  <div className='card' style={shadow ? CARD_STYLE_WITH_SHADOW : CARD_STYLE}>
-    {children}
-  </div>
-))
+  shadow,
+  ...props
+}) => {
+  props.className = 'card'
+  props.style = shadow ? CARD_STYLE_WITH_SHADOW : CARD_STYLE
+
+  return <div {...props} />
+})
 
 export const CardHeader = propTypes({
   className: propTypes.string

src/common/collapse.js

@@ -1,8 +1,9 @@
 import React from 'react'
 
+import Button from './button'
 import Component from './base-component'
 import Icon from './icon'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 @propTypes({
   children: propTypes.any.isRequired,
@@ -27,9 +28,9 @@ export default class Collapse extends Component {
 
     return (
       <div className={props.className}>
-        <button className='btn btn-lg btn-primary btn-block' onClick={this._onClick}>
+        <Button block btnStyle='primary' size='large' onClick={this._onClick}>
           {props.buttonText} <Icon icon={`chevron-${isOpened ? 'up' : 'down'}`} />
-        </button>
+        </Button>
         {isOpened && props.children}
       </div>
     )

src/common/combobox.js

@@ -0,0 +1,64 @@
+import React from 'react'
+import uncontrollableInput from 'uncontrollable-input'
+import { isEmpty, map } from 'lodash'
+import {
+  DropdownButton,
+  MenuItem
+} from 'react-bootstrap-4/lib'
+
+import Component from './base-component'
+import propTypes from './prop-types-decorator'
+
+@uncontrollableInput({
+  defaultValue: ''
+})
+@propTypes({
+  disabled: propTypes.bool,
+  options: propTypes.oneOfType([
+    propTypes.arrayOf(propTypes.string),
+    propTypes.objectOf(propTypes.string)
+  ]),
+  onChange: propTypes.func.isRequired,
+  value: propTypes.string.isRequired
+})
+export default class Combobox extends Component {
+  _handleChange = event => {
+    this.props.onChange(event.target.value)
+  }
+
+  _setText (value) {
+    this.props.onChange(value)
+  }
+
+  render () {
+    const { options, ...props } = this.props
+
+    props.className = 'form-control'
+    props.onChange = this._handleChange
+    const Input = <input {...props} />
+
+    if (isEmpty(options)) {
+      return Input
+    }
+
+    return (
+      <div className='input-group'>
+        <div className='input-group-btn'>
+          <DropdownButton
+            bsStyle='secondary'
+            disabled={props.disabled}
+            id='selectInput'
+            title=''
+          >
+            {map(options, option =>
+              <MenuItem key={option} onClick={() => this._setText(option)}>
+                {option}
+              </MenuItem>
+            )}
+          </DropdownButton>
+        </div>
+        {Input}
+      </div>
+    )
+  }
+}

src/common/combobox/index.css

@@ -1,3 +0,0 @@
-.button {
-    border-radius: 0px;
-};

src/common/combobox/index.js

@@ -1,105 +0,0 @@
-import map from 'lodash/map'
-import React from 'react'
-import size from 'lodash/size'
-
-import Component from '../base-component'
-import propTypes from '../prop-types'
-import { ensureArray } from '../utils'
-import {
-  DropdownButton,
-  MenuItem
-} from 'react-bootstrap-4/lib'
-
-import styles from './index.css'
-
-@propTypes({
-  defaultValue: propTypes.any,
-  disabled: propTypes.bool,
-  max: propTypes.number,
-  min: propTypes.number,
-  options: propTypes.oneOfType([
-    propTypes.arrayOf(propTypes.string),
-    propTypes.number,
-    propTypes.objectOf(propTypes.string),
-    propTypes.string
-  ]),
-  onChange: propTypes.func,
-  placeholder: propTypes.string,
-  required: propTypes.bool,
-  step: propTypes.any,
-  type: propTypes.string,
-  value: propTypes.any
-})
-export default class Combobox extends Component {
-  static defaultProps = {
-    type: 'text'
-  }
-
-  get value () {
-    return this.refs.input.value
-  }
-
-  set value (value) {
-    this.refs.input.value = value
-  }
-
-  _handleChange = event => {
-    const { onChange } = this.props
-
-    if (onChange) {
-      onChange(event.target.value)
-    }
-  }
-
-  _setText (value) {
-    this.refs.input.value = value
-  }
-
-  render () {
-    const { props } = this
-    const options = ensureArray(props.options)
-
-    const Input = (
-      <input
-        className='form-control'
-        defaultValue={props.defaultValue}
-        disabled={props.disabled}
-        max={props.max}
-        min={props.min}
-        options={options}
-        onChange={this._handleChange}
-        placeholder={props.placeholder}
-        ref='input'
-        required={props.required}
-        step={props.step}
-        type={props.type}
-        value={props.value}
-      />
-    )
-
-    if (!size(options)) {
-      return Input
-    }
-
-    return (
-      <div className='input-group'>
-        <div className='input-group-btn'>
-          <DropdownButton
-            bsStyle='secondary'
-            className={styles.button}
-            disabled={props.disabled}
-            id='selectInput'
-            title=''
-          >
-            {map(options, option => (
-              <MenuItem key={option} onClick={() => this._setText(option)}>
-                {option}
-              </MenuItem>
-            ))}
-          </DropdownButton>
-        </div>
-        {Input}
-      </div>
-    )
-  }
-}

src/common/complex-matcher/index.js

@@ -294,10 +294,10 @@ export const getPropertyClausesStrings = function () {
 
 export const removePropertyClause = function (name) {
   let type
-  if (
-    !this ||
-    (type = this.type) === 'property' && this.name === name
-  ) {
+  if (!this || (
+    (type = this.type) === 'property' &&
+    this.name === name
+  )) {
     return
   }
 
@@ -335,7 +335,7 @@ export const setPropertyClause = function (name, child) {
   return _addAndClause(
     this,
     property,
-    node => node.type === 'property' && node.name === name,
+    node => node.type === 'property' && node.name === name
   )
 }
 

src/common/copiable/index.js

@@ -1,11 +1,12 @@
-import _ from 'intl'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import classNames from 'classnames'
-import Tooltip from 'tooltip'
 import React, { createElement } from 'react'
 
+import _ from '../intl'
+import Button from '../button'
 import Icon from '../icon'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
+import Tooltip from '../tooltip'
 
 import styles from './index.css'
 
@@ -22,9 +23,9 @@ const Copiable = propTypes({
   ' ',
   <Tooltip content={_('copyToClipboard')}>
     <CopyToClipboard text={props.data || props.children}>
-      <button className={classNames('btn btn-sm btn-secondary', styles.button)}>
+      <Button className={styles.button} size='small'>
         <Icon icon='clipboard' />
-      </button>
+      </Button>
     </CopyToClipboard>
   </Tooltip>
 ))

src/common/dropzone/index.js

@@ -1,5 +1,5 @@
 import Component from 'base-component'
-import propTypes from 'prop-types'
+import propTypes from 'prop-types-decorator'
 import React from 'react'
 import ReactDropzone from 'react-dropzone'
 

src/common/editable/index.js

@@ -11,7 +11,7 @@ import Component from '../base-component'
 import getEventValue from '../get-event-value'
 import Icon from '../icon'
 import logError from '../log-error'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import Tooltip from '../tooltip'
 import { formatSize } from '../utils'
 import { SizeInput } from '../form'
@@ -390,11 +390,10 @@ const MAP_TYPE_SELECT = {
 }
 
 @propTypes({
-  labelProp: propTypes.string.isRequired,
   value: propTypes.oneOfType([
     propTypes.string,
     propTypes.object
-  ]).isRequired
+  ])
 })
 export class XoSelect extends Editable {
   get value () {

src/common/form-grid.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import * as Grid from './grid'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 export const LabelCol = propTypes({
   children: propTypes.any.isRequired

src/common/form/index.js

@@ -12,11 +12,12 @@ import {
   MenuItem
 } from 'react-bootstrap-4/lib'
 
+import Button from '../button'
 import Component from '../base-component'
+import defined from '../xo-defined'
 import getEventValue from '../get-event-value'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import {
-  firstDefined,
   formatSizeRaw,
   parseSize
 } from '../utils'
@@ -70,9 +71,9 @@ export class Password extends Component {
 
     return <div className='input-group'>
       {enableGenerator && <span className='input-group-btn'>
-        <button type='button' className='btn btn-secondary' onClick={this._generate}>
+        <Button onClick={this._generate}>
           <Icon icon='password' />
-        </button>
+        </Button>
       </span>}
       <input
         {...props}
@@ -81,9 +82,9 @@ export class Password extends Component {
         type={visible ? 'text' : 'password'}
       />
       <span className='input-group-btn'>
-        <button type='button' className='btn btn-secondary' onClick={this._toggleVisibility}>
+        <Button onClick={this._toggleVisibility}>
           <Icon icon={visible ? 'shown' : 'hidden'} />
-        </button>
+        </Button>
       </span>
     </div>
   }
@@ -157,7 +158,7 @@ export class SizeInput extends BaseComponent {
   constructor (props) {
     super(props)
 
-    this.state = this._createStateFromBytes(firstDefined(props.value, props.defaultValue, null))
+    this.state = this._createStateFromBytes(defined(props.value, props.defaultValue, null))
   }
 
   componentWillReceiveProps (props) {

src/common/form/select-plain-object.js

@@ -1,10 +1,10 @@
-import autoControlledInput from 'auto-controlled-input'
+import uncontrollableInput from 'uncontrollable-input'
 import Component from 'base-component'
 import find from 'lodash/find'
 import map from 'lodash/map'
 import React from 'react'
 
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 
 import Select from './select'
 
@@ -15,12 +15,12 @@ import Select from './select'
   multi: propTypes.bool,
   onChange: propTypes.func,
   options: propTypes.array,
-  placeholder: propTypes.string,
+  placeholder: propTypes.node,
   predicate: propTypes.func,
   required: propTypes.bool,
   value: propTypes.any
 })
-@autoControlledInput()
+@uncontrollableInput()
 export default class SelectPlainObject extends Component {
   componentDidMount () {
     const { options, value } = this.props

src/common/form/select.js

@@ -8,7 +8,7 @@ import {
   List
 } from 'react-virtualized'
 
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 
 const SELECT_MENU_STYLE = {
   overflow: 'hidden'

src/common/form/toggle.js

@@ -0,0 +1,46 @@
+import React from 'react'
+import classNames from 'classnames'
+import uncontrollableInput from 'uncontrollable-input'
+
+import Component from '../base-component'
+import Icon from '../icon'
+import propTypes from '../prop-types-decorator'
+
+@uncontrollableInput()
+@propTypes({
+  className: propTypes.string,
+  onChange: propTypes.func,
+  icon: propTypes.string,
+  iconOn: propTypes.string,
+  iconOff: propTypes.string,
+  iconSize: propTypes.number,
+  value: propTypes.bool
+})
+export default class Toggle extends Component {
+  static defaultProps = {
+    iconOn: 'toggle-on',
+    iconOff: 'toggle-off',
+    iconSize: 2
+  }
+
+  _toggle = () => {
+    const { props } = this
+    props.onChange(!props.value)
+  }
+
+  render () {
+    const { props } = this
+
+    return (
+      <Icon
+        className={classNames(
+          props.disabled ? 'text-muted' : props.value ? 'text-success' : null,
+          props.className
+        )}
+        icon={props.icon || (props.value ? props.iconOn : props.iconOff)}
+        onClick={this._toggle}
+        size={props.iconSize}
+      />
+    )
+  }
+}

src/common/form/toggle/index.css

@@ -1,3 +0,0 @@
-.checkbox {
-    display: none;
-}

src/common/form/toggle/index.js

@@ -1,90 +0,0 @@
-import React from 'react'
-import classNames from 'classnames'
-
-import Component from '../../base-component'
-import Icon from '../../icon'
-import propTypes from '../../prop-types'
-
-import styles from './index.css'
-
-@propTypes({
-  className: propTypes.string,
-  defaultValue: propTypes.bool,
-  onChange: propTypes.func,
-  icon: propTypes.string,
-  iconOn: propTypes.string,
-  iconOff: propTypes.string,
-  iconSize: propTypes.number,
-  value: propTypes.bool
-})
-export default class Toggle extends Component {
-  static defaultProps = {
-    iconOn: 'toggle-on',
-    iconOff: 'toggle-off',
-    iconSize: 2
-  }
-
-  get value () {
-    const { props } = this
-
-    const { value } = props
-    if (value != null) {
-      return value
-    }
-
-    const { input } = this.refs
-    if (input) {
-      return input.checked
-    }
-
-    return props.defaultValue || false
-  }
-
-  set value (value) {
-    if (
-      process.env.NODE_ENV !== 'production' &&
-      this.props.value != null
-    ) {
-      throw new Error('cannot set value of controlled Toggle')
-    }
-
-    this.refs.input.checked = Boolean(value)
-    this.forceUpdate()
-  }
-
-  _onChange = event => {
-    if (this.props.value == null) {
-      this.forceUpdate()
-    }
-
-    const { onChange } = this.props
-    onChange && onChange(event.target.checked)
-  }
-
-  render () {
-    const { props, value } = this
-
-    return (
-      <label
-        className={classNames(
-          props.disabled ? 'text-muted' : value ? 'text-success' : null,
-          props.className
-        )}
-      >
-        <Icon
-          icon={props.icon || (value ? props.iconOn : props.iconOff)}
-          size={props.iconSize}
-        />
-        <input
-          checked={props.value}
-          className={styles.checkbox}
-          defaultChecked={props.defaultValue}
-          disabled={props.disabled}
-          onChange={this._onChange}
-          ref='input'
-          type='checkbox'
-        />
-      </label>
-    )
-  }
-}

src/common/grid.js

@@ -1,7 +1,7 @@
 import classNames from 'classnames'
 import React from 'react'
 
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 export const Col = propTypes({
   className: propTypes.string,

src/common/home-filters.js

@@ -1,4 +1,9 @@
+const common = {
+  homeFilterNone: ''
+}
+
 export const VM = {
+  ...common,
   homeFilterPendingVms: 'current_operations:"" ',
   homeFilterNonRunningVms: '!power_state:running ',
   homeFilterHvmGuests: 'virtualizationMode:hvm ',
@@ -7,18 +12,22 @@ export const VM = {
 }
 
 export const host = {
+  ...common,
   homeFilterRunningHosts: 'power_state:running ',
   homeFilterTags: 'tags:'
 }
 
 export const pool = {
+  ...common,
   homeFilterTags: 'tags:'
 }
 
 export const vmTemplate = {
+  ...common,
   homeFilterTags: 'tags:'
 }
 
 export const SR = {
+  ...common,
   homeFilterTags: 'tags:'
 }

src/common/home-tags.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import Component from './base-component'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import Tags from './tags'
 import { createString, createProperty, toString } from './complex-matcher'
 

src/common/hosts-patches-table.js

@@ -9,7 +9,7 @@ import ActionButton from './action-button'
 import Component from './base-component'
 import forEach from 'lodash/forEach'
 import Link from './link'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import SortedTable from './sorted-table'
 import TabButton from './tab-button'
 import { connectStore } from './utils'
@@ -19,9 +19,9 @@ import {
   createSelector
 } from './selectors'
 import {
-  getHostMissingPatches,
   installAllHostPatches,
-  installAllPatchesOnPool
+  installAllPatchesOnPool,
+  subscribeHostMissingPatches
 } from './xo'
 
 // ===================================================================
@@ -64,6 +64,15 @@ const POOLS_MISSING_PATCHES_COLUMNS = [{
   sortCriteria: (host, { pools }) => pools[host.$pool].name_label
 }].concat(MISSING_PATCHES_COLUMNS)
 
+// Small component to homogenize Button usage in HostsPatchesTable
+const ActionButton_ = ({ children, labelId, ...props }) =>
+  <ActionButton
+    {...props}
+    tooltip={_(labelId)}
+  >
+    {children}
+  </ActionButton>
+
 // ===================================================================
 
 class HostsPatchesTable extends Component {
@@ -80,11 +89,25 @@ class HostsPatchesTable extends Component {
     )
   )
 
-  _refreshMissingPatches = () => (
-    Promise.all(
-      map(this.props.hosts, this._refreshHostMissingPatches)
+  _subscribeMissingPatches = (hosts = this.props.hosts) => {
+    const unsubs = map(hosts, host =>
+      subscribeHostMissingPatches(
+        host,
+        patches => this.setState({
+          missingPatches: {
+            ...this.state.missingPatches,
+            [host.id]: patches.length
+          }
+        })
+      )
     )
-  )
+
+    if (this.unsubscribeMissingPatches !== undefined) {
+      this.unsubscribeMissingPatches()
+    }
+
+    this.unsubscribeMissingPatches = () => forEach(unsubs, unsub => unsub())
+  }
 
   _installAllMissingPatches = () => {
     const pools = {}
@@ -95,80 +118,43 @@ class HostsPatchesTable extends Component {
     return Promise.all(map(
       keys(pools),
       installAllPatchesOnPool
-    )).then(this._refreshMissingPatches)
-  }
-
-  _refreshHostMissingPatches = host => (
-    getHostMissingPatches(host).then(patches => {
-      this.setState({
-        missingPatches: {
-          ...this.state.missingPatches,
-          [host.id]: patches.length
-        }
-      })
-    })
-  )
-
-  _installAllHostPatches = host => (
-    installAllHostPatches(host).then(() =>
-      this._refreshHostMissingPatches(host)
-    )
-  )
-
-  componentWillMount () {
-    this._refreshMissingPatches()
+    ))
   }
 
   componentDidMount () {
     // Force one Portal refresh.
     // Because Portal cannot see the container reference at first rendering.
     this.forceUpdate()
+    this._subscribeMissingPatches()
   }
 
   componentWillReceiveProps (nextProps) {
-    forEach(nextProps.hosts, host => {
-      const { id } = host
+    if (nextProps.hosts !== this.props.hosts) {
+      this._subscribeMissingPatches(nextProps.hosts)
+    }
+  }
 
-      if (this.state.missingPatches[id] !== undefined) {
-        return
-      }
-
-      this.setState({
-        missingPatches: {
-          ...this.state.missingPatches,
-          [id]: 0
-        }
-      })
-
-      this._refreshHostMissingPatches(host)
-    })
+  componentWillUnmount () {
+    this.unsubscribeMissingPatches()
   }
 
   render () {
+    const {
+      buttonsGroupContainer,
+      container,
+      displayPools,
+      pools,
+      useTabButton
+    } = this.props
+
     const hosts = this._getHosts()
     const noPatches = isEmpty(hosts)
-    const { props } = this
 
-    const Container = props.container || 'div'
-    const Button = props.useTabButton ? TabButton : ActionButton
+    const Container = container || 'div'
 
-    const Buttons = (
-      <Container>
-        <Button
-          btnStyle='secondary'
-          handler={this._refreshMissingPatches}
-          icon='refresh'
-          labelId='refreshPatches'
-        />
-        <Button
-          btnStyle='primary'
-          disabled={noPatches}
-          handler={this._installAllMissingPatches}
-          icon='host-patch-update'
-          labelId='installPoolPatches'
-        />
-      </Container>
-    )
+    const Button = useTabButton
+      ? TabButton
+      : ActionButton_
 
     return (
       <div>
@@ -176,17 +162,25 @@ class HostsPatchesTable extends Component {
           ? (
             <SortedTable
               collection={hosts}
-              columns={props.displayPools ? POOLS_MISSING_PATCHES_COLUMNS : MISSING_PATCHES_COLUMNS}
+              columns={displayPools ? POOLS_MISSING_PATCHES_COLUMNS : MISSING_PATCHES_COLUMNS}
               userData={{
-                installAllHostPatches: this._installAllHostPatches,
+                installAllHostPatches,
                 missingPatches: this.state.missingPatches,
-                pools: props.pools
+                pools
               }}
             />
           ) : <p>{_('patchNothing')}</p>
         }
-        <Portal container={() => props.buttonsGroupContainer()}>
-          {Buttons}
+        <Portal container={() => buttonsGroupContainer()}>
+          <Container>
+            <Button
+              btnStyle='primary'
+              disabled={noPatches}
+              handler={this._installAllMissingPatches}
+              icon='host-patch-update'
+              labelId='installPoolPatches'
+            />
+          </Container>
         </Portal>
       </div>
     )

src/common/icon.js

@@ -1,21 +1,27 @@
 import classNames from 'classnames'
 import isInteger from 'lodash/isInteger'
-import React, { PropTypes } from 'react'
+import React from 'react'
 
-const Icon = ({ className, icon, size = 1, fixedWidth }) => (
-  <i className={classNames(
-      className,
-      icon ? `xo-icon-${icon}` : 'fa', // Without icon prop, is a placeholder.
-      isInteger(size) ? `fa-${size}x` : `fa-${size}`,
-      fixedWidth && 'fa-fw'
-  )} />
-)
-Icon.propTypes = {
-  fixedWidth: PropTypes.bool,
-  icon: PropTypes.string,
-  size: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.number
-  ])
+import propTypes from './prop-types-decorator'
+
+const Icon = ({ icon, size = 1, color, fixedWidth, ...props }) => {
+  props.className = classNames(
+    props.className,
+    icon !== undefined ? `xo-icon-${icon}` : 'fa', // Without icon prop, is a placeholder.
+    isInteger(size) ? `fa-${size}x` : `fa-${size}`,
+    color,
+    fixedWidth && 'fa-fw'
+  )
+
+  return <i {...props} />
 }
+propTypes(Icon)({
+  color: propTypes.string,
+  fixedWidth: propTypes.bool,
+  icon: propTypes.string,
+  size: propTypes.oneOfType([
+    propTypes.string,
+    propTypes.number
+  ])
+})
 export default Icon

src/common/intl/index.js

@@ -48,6 +48,10 @@ const getMessage = (props, messageId, values, render) => {
     {render}
   </FormattedMessage>
 }
+getMessage.keyValue = (key, value) => getMessage('keyValue', {
+  key: <strong>{key}</strong>,
+  value
+})
 
 export { getMessage as default }
 

src/common/intl/locales/.gitignore

@@ -1 +0,0 @@
-/index.js

src/common/intl/locales/he.js

@@ -204,7 +204,7 @@ export default {
   editUserProfile: undefined,
 
   // Original text: "Fetching data…"
-  homeFetchingData: 'מקבל נתונים, נא להמתין...',
+  homeFetchingData: 'מקבל נתונים, נא להמתין…',
 
   // Original text: "Welcome on Xen Orchestra!"
   homeWelcome: 'ברוכים הבאים',
@@ -228,7 +228,7 @@ export default {
   homeNoVms: 'אין מכונות',
 
   // Original text: "Or…"
-  homeNoVmsOr: 'או...',
+  homeNoVmsOr: 'או…',
 
   // Original text: "Import VM"
   homeImportVm: 'ההלעה של מכונה',
@@ -330,7 +330,7 @@ export default {
   homeMore: 'עוד',
 
   // Original text: "Migrate to…"
-  homeMigrateTo: 'העבר ל...',
+  homeMigrateTo: 'העבר ל…',
 
   // Original text: 'Missing patches'
   homeMissingPaths: undefined,
@@ -627,7 +627,7 @@ export default {
   editBackupReportTitle: undefined,
 
   // Original text: 'Enable immediately after creation'
-  editBackupReportEnable: undefined,
+  editBackupScheduleEnabled: undefined,
 
   // Original text: 'Depth'
   editBackupDepthTitle: undefined,
@@ -1605,10 +1605,10 @@ export default {
   vdiRemove: undefined,
 
   // Original text: 'Boot flag'
-  vdbBootableStatus: undefined,
+  vbdBootableStatus: undefined,
 
   // Original text: 'Status'
-  vdbStatus: undefined,
+  vbdStatus: undefined,
 
   // Original text: 'Connected'
   vbdStatusConnected: undefined,
@@ -1626,19 +1626,19 @@ export default {
   vbdDisconnect: undefined,
 
   // Original text: 'Bootable'
-  vdbBootable: undefined,
+  vbdBootable: undefined,
 
   // Original text: 'Readonly'
-  vdbReadonly: undefined,
+  vbdReadonly: undefined,
 
   // Original text: 'Create'
-  vdbCreate: undefined,
+  vbdCreate: undefined,
 
   // Original text: 'Disk name'
-  vdbNamePlaceHolder: undefined,
+  vbdNamePlaceHolder: undefined,
 
   // Original text: 'Size'
-  vdbSizePlaceHolder: undefined,
+  vbdSizePlaceHolder: undefined,
 
   // Original text: 'Save'
   saveBootOption: undefined,

src/common/intl/locales/pt.js

@@ -204,7 +204,7 @@ export default {
   editUserProfile: undefined,
 
   // Original text: "Fetching data…"
-  homeFetchingData: 'Obtendo dados...',
+  homeFetchingData: 'Obtendo dados…',
 
   // Original text: "Welcome on Xen Orchestra!"
   homeWelcome: 'Bem-vindo ao Xen Orchestra',
@@ -228,7 +228,7 @@ export default {
   homeNoVms: 'Não foram encontradas VMs!',
 
   // Original text: "Or…"
-  homeNoVmsOr: 'Ou...',
+  homeNoVmsOr: 'Ou…',
 
   // Original text: "Import VM"
   homeImportVm: 'Importar VM',
@@ -330,7 +330,7 @@ export default {
   homeMore: 'Mais',
 
   // Original text: "Migrate to…"
-  homeMigrateTo: 'Migrar para...',
+  homeMigrateTo: 'Migrar para…',
 
   // Original text: 'Missing patches'
   homeMissingPaths: undefined,
@@ -360,28 +360,28 @@ export default {
   selectSubjects: 'Escolha um usuário(s) e/ou grupo(s)',
 
   // Original text: "Select Object(s)…"
-  selectObjects: 'Selecionar Objeto(s)...',
+  selectObjects: 'Selecionar Objeto(s)…',
 
   // Original text: "Choose a role"
   selectRole: 'Escolha uma função',
 
   // Original text: "Select Host(s)…"
-  selectHosts: 'Selecionar Host(s)...',
+  selectHosts: 'Selecionar Host(s)…',
 
   // Original text: "Select object(s)…"
-  selectHostsVms: 'Selecionar Objeto(s)...',
+  selectHostsVms: 'Selecionar Objeto(s)…',
 
   // Original text: "Select Network(s)…"
-  selectNetworks: 'Selecionar Rede(s)...',
+  selectNetworks: 'Selecionar Rede(s)…',
 
   // Original text: "Select PIF(s)…"
-  selectPifs: 'Selecionar PIF(s)...',
+  selectPifs: 'Selecionar PIF(s)…',
 
   // Original text: "Select Pool(s)…"
-  selectPools: 'Selecionar Pool(s)...',
+  selectPools: 'Selecionar Pool(s)…',
 
   // Original text: "Select Remote(s)…"
-  selectRemotes: 'Selecionar Remote(s)...',
+  selectRemotes: 'Selecionar Remote(s)…',
 
   // Original text: 'Select resource set(s)…'
   selectResourceSets: undefined,
@@ -402,19 +402,19 @@ export default {
   selectSshKey: undefined,
 
   // Original text: "Select SR(s)…"
-  selectSrs: 'Selecionar SR(s)...',
+  selectSrs: 'Selecionar SR(s)…',
 
   // Original text: "Select VM(s)…"
-  selectVms: 'Selecionar VM(s)...',
+  selectVms: 'Selecionar VM(s)…',
 
   // Original text: "Select VM template(s)…"
-  selectVmTemplates: 'Selecionar VM(s) modelo(s)...',
+  selectVmTemplates: 'Selecionar VM(s) modelo(s)…',
 
   // Original text: "Select tag(s)…"
-  selectTags: 'Selecionar etiqueta(s)...',
+  selectTags: 'Selecionar etiqueta(s)…',
 
   // Original text: "Select disk(s)…"
-  selectVdis: 'Selecionar disco(s)...',
+  selectVdis: 'Selecionar disco(s)…',
 
   // Original text: 'Select timezone…'
   selectTimezone: undefined,
@@ -627,7 +627,7 @@ export default {
   editBackupReportTitle: undefined,
 
   // Original text: 'Enable immediately after creation'
-  editBackupReportEnable: undefined,
+  editBackupScheduleEnabled: undefined,
 
   // Original text: 'Depth'
   editBackupDepthTitle: undefined,
@@ -1605,10 +1605,10 @@ export default {
   vdiRemove: undefined,
 
   // Original text: "Boot flag"
-  vdbBootableStatus: 'Indicador de inicialização',
+  vbdBootableStatus: 'Indicador de inicialização',
 
   // Original text: "Status"
-  vdbStatus: 'Status',
+  vbdStatus: 'Status',
 
   // Original text: "Connected"
   vbdStatusConnected: 'Conectado',
@@ -1626,19 +1626,19 @@ export default {
   vbdDisconnect: undefined,
 
   // Original text: 'Bootable'
-  vdbBootable: undefined,
+  vbdBootable: undefined,
 
   // Original text: 'Readonly'
-  vdbReadonly: undefined,
+  vbdReadonly: undefined,
 
   // Original text: 'Create'
-  vdbCreate: undefined,
+  vbdCreate: undefined,
 
   // Original text: 'Disk name'
-  vdbNamePlaceHolder: undefined,
+  vbdNamePlaceHolder: undefined,
 
   // Original text: 'Size'
-  vdbSizePlaceHolder: undefined,
+  vbdSizePlaceHolder: undefined,
 
   // Original text: 'Save'
   saveBootOption: undefined,
@@ -1968,7 +1968,7 @@ export default {
   statsDashboardSelectObjects: 'Selecionar',
 
   // Original text: "Loading…"
-  metricsLoading: 'Carregando...',
+  metricsLoading: 'Carregando…',
 
   // Original text: "Coming soon!"
   comingSoon: 'Em breve!',
@@ -2292,10 +2292,10 @@ export default {
   vmImportFailed: 'Falha na importação',
 
   // Original text: "Import starting…"
-  startVmImport: 'Iniciando importação...',
+  startVmImport: 'Iniciando importação…',
 
   // Original text: "Export starting…"
-  startVmExport: 'Iniciando exportação...',
+  startVmExport: 'Iniciando exportação…',
 
   // Original text: 'N CPUs'
   nCpus: undefined,
@@ -2559,7 +2559,7 @@ export default {
   importBackupModalStart: 'Iniciar VM após restauração',
 
   // Original text: "Select your backup…"
-  importBackupModalSelectBackup: 'Selecionar backup...',
+  importBackupModalSelectBackup: 'Selecionar backup…',
 
   // Original text: "Are you sure you want to remove all orphaned snapshot VDIs?"
   removeAllOrphanedModalWarning: 'Você tem certeza que deseja remover todos as VDIs orfãs?',

src/common/intl/locales/zh.js

@@ -285,7 +285,7 @@ export default {
   homeMore: '更多',
 
   // Original text: "Migrate to…"
-  homeMigrateTo: '迁移至...',
+  homeMigrateTo: '迁移至…',
 
   // Original text: "Missing patches"
   homeMissingPaths: '缺少补丁',
@@ -1203,10 +1203,10 @@ export default {
   vdiVm: '虚拟机',
 
   // Original text: "Boot flag"
-  vdbBootableStatus: '启动标识',
+  vbdBootableStatus: '启动标识',
 
   // Original text: "Status"
-  vdbStatus: '状态',
+  vbdStatus: '状态',
 
   // Original text: "Connected"
   vbdStatusConnected: '已连接',
@@ -1467,7 +1467,7 @@ export default {
   statsDashboardSelectObjects: '选择',
 
   // Original text: "Loading…"
-  metricsLoading: '加载中....',
+  metricsLoading: '加载中….',
 
   // Original text: "Coming soon!"
   comingSoon: '即将呈现',
@@ -1947,7 +1947,7 @@ export default {
   importBackupModalStart: '恢复后启动虚拟机',
 
   // Original text: "Select your backup…"
-  importBackupModalSelectBackup: '选择你的备份...',
+  importBackupModalSelectBackup: '选择你的备份…',
 
   // Original text: "Are you sure you want to remove all orphaned VDIs?"
   removeAllOrphanedModalWarning: '你确定要删除所有孤立的虚拟磁盘？',

src/common/intl/messages.js

@@ -5,6 +5,8 @@ var forEach = require('lodash/forEach')
 var isString = require('lodash/isString')
 
 var messages = {
+  keyValue: '{key}: {value}',
+
   statusConnecting: 'Connecting',
   statusDisconnected: 'Disconnected',
   statusLoading: 'Loading…',
@@ -18,11 +20,18 @@ var messages = {
   // ----- Modals -----
   alertOk: 'OK',
   confirmOk: 'OK',
-  confirmCancel: 'Cancel',
+  genericCancel: 'Cancel',
 
   // ----- Filters -----
   onError: 'On error',
   successful: 'Successful',
+  filterOnlyManaged: 'Managed disks',
+  filterOnlyOrphaned: 'Orphaned disks',
+  filterOnlyRegular: 'Normal disks',
+  filterOnlySnapshots: 'Snapshot disks',
+  filterOnlyUnmanaged: 'Unmanaged disks',
+  filterSaveAs: 'Save…',
+  filterSyntaxLinkTooltip: 'Explore the search syntax in the documentation',
 
   // ----- Copiable component -----
   copyToClipboard: 'Copy to clipboard',
@@ -96,7 +105,7 @@ var messages = {
 
   // ----- Home view ------
   homeFetchingData: 'Fetching data…',
-  homeWelcome: 'Welcome on Xen Orchestra!',
+  homeWelcome: 'Welcome to Xen Orchestra!',
   homeWelcomeText: 'Add your XenServer hosts or pools',
   homeConnectServerText: 'Some XenServers have been registered but are not connected',
   homeHelp: 'Want some help?',
@@ -122,7 +131,9 @@ var messages = {
   homeAllPools: 'Pools',
   homeAllHosts: 'Hosts',
   homeAllTags: 'Tags',
+  homeAllResourceSets: 'Resource sets',
   homeNewVm: 'New VM',
+  homeFilterNone: 'None',
   homeFilterRunningHosts: 'Running hosts',
   homeFilterDisabledHosts: 'Disabled hosts',
   homeFilterRunningVms: 'Running VMs',
@@ -151,6 +162,14 @@ var messages = {
   srSharedType: 'Shared {type}',
   srNotSharedType: 'Not shared {type}',
 
+  // ----- Common components -----
+  sortedTableAllItemsSelected: 'All of them are selected',
+  sortedTableNoItems: 'No items found',
+  sortedTableNumberOfFilteredItems: '{nFiltered, number} of {nTotal, number} items',
+  sortedTableNumberOfItems: '{nTotal, number} items',
+  sortedTableNumberOfSelectedItems: '{nSelected, number} selected',
+  sortedTableSelectAllItems: 'Click here to select all items',
+
   // ----- Forms -----
   add: 'Add',
   selectAll: 'Select all',
@@ -212,8 +231,16 @@ var messages = {
   cronPattern: 'Cron Pattern:',
   backupEditNotFoundTitle: 'Cannot edit backup',
   backupEditNotFoundMessage: 'Missing required info for edition',
+  successfulJobCall: 'Successful',
+  failedJobCall: 'Failed',
+  jobCallInProgess: 'In progress',
+  jobTransferredDataSize: 'size:',
+  jobTransferredDataSpeed: 'speed:',
+  allJobCalls: 'All',
   job: 'Job',
-  jobId: 'Job ID',
+  jobModalTitle: 'Job {job}',
+  jobId: 'ID',
+  jobType: 'Type',
   jobName: 'Name',
   jobNamePlaceholder: 'Name of your job (forbidden: "_")',
   jobStart: 'Start',
@@ -224,6 +251,8 @@ var messages = {
   jobTag: 'Tag',
   jobScheduling: 'Scheduling',
   jobState: 'State',
+  jobStateEnabled: 'Enabled',
+  jobStateDisabled: 'Disabled',
   jobTimezone: 'Timezone',
   jobServerTimezone: 'Server',
   runJob: 'Run job',
@@ -240,6 +269,7 @@ var messages = {
   noJobs: 'No jobs found.',
   noSchedules: 'No schedules found',
   jobActionPlaceHolder: 'Select a xo-server API command',
+  jobTimeoutPlaceHolder: 'Timeout (number of seconds after which a VM is considered failed)',
   jobSchedules: 'Schedules',
   jobScheduleNamePlaceHolder: 'Name of your schedule',
   jobScheduleJobPlaceHolder: 'Select a Job',
@@ -265,9 +295,10 @@ var messages = {
   editBackupNot: 'Reverse',
   editBackupTagTitle: 'Tag',
   editBackupReportTitle: 'Report',
-  editBackupReportEnable: 'Enable immediately after creation',
+  editBackupScheduleEnabled: 'Automatically run as scheduled',
   editBackupDepthTitle: 'Depth',
   editBackupRemoteTitle: 'Remote',
+  deleteOldBackupsFirst: 'Delete the old backups first',
 
   // ------ New Remote -----
   remoteList: 'Remote stores for backup',
@@ -276,6 +307,7 @@ var messages = {
   remoteTypeNfs: 'NFS',
   remoteTypeSmb: 'SMB',
   remoteType: 'Type',
+  remoteSmbWarningMessage: 'SMB remotes are meant to work on Windows Server. For other systems (Linux Samba, which means almost all NAS), please use NFS.',
   remoteTestTip: 'Test your remote',
   testRemote: 'Test Remote',
   remoteTestFailure: 'Test failed for {name}',
@@ -283,7 +315,10 @@ var messages = {
   remoteTestError: 'Error',
   remoteTestStep: 'Test Step',
   remoteTestFile: 'Test file',
+  remoteTestName: 'Test name',
+  remoteTestNameFailure: 'Remote name already exists!',
   remoteTestSuccessMessage: 'The remote appears to work correctly',
+  remoteConnectionFailed: 'Connection failed',
 
   // ------ Remote -----
   remoteName: 'Name',
@@ -291,11 +326,14 @@ var messages = {
   remoteState: 'State',
   remoteDevice: 'Device',
   remoteShare: 'Share',
+  remoteAction: 'Action',
   remoteAuth: 'Auth',
   remoteMounted: 'Mounted',
   remoteUnmounted: 'Unmounted',
   remoteConnectTip: 'Connect',
   remoteDisconnectTip: 'Disconnect',
+  remoteConnected: 'Connected',
+  remoteDisconnected: 'Disconnected',
   remoteDeleteTip: 'Delete',
   remoteNamePlaceHolder: 'remote name *',
   remoteMyNamePlaceHolder: 'Name *',
@@ -370,7 +408,7 @@ var messages = {
   userLabel: 'User',
   adminLabel: 'Admin',
   noUserInGroup: 'No user in group',
-  countUsers: '{users} user{users, plural, one {} other {s}}',
+  countUsers: '{users, number} user{users, plural, one {} other {s}}',
   selectPermission: 'Select Permission',
 
   // ----- Plugins ------
@@ -425,7 +463,13 @@ var messages = {
   convertVmToTemplateLabel: 'Convert to template',
   vmConsoleLabel: 'Console',
 
-  // ----- SR tabs -----
+  // ----- SR advanced tab -----
+
+  srUnhealthyVdiNameLabel: 'Name',
+  srUnhealthyVdiSize: 'Size',
+  srUnhealthyVdiDepth: 'Depth',
+  srUnhealthyVdiTitle: 'VDI to coalesce ({total, number})',
+
   // ----- SR actions -----
   srRescan: 'Rescan all disks',
   srReconnectAll: 'Connect to all hosts',
@@ -443,10 +487,13 @@ var messages = {
   displayAllVMs: 'Display all VMs of this pool',
   // ----- Pool tabs -----
   hostsTabName: 'Hosts',
+  vmsTabName: 'Vms',
+  srsTabName: 'Srs',
   // ----- Pool advanced tab -----
   poolHaStatus: 'High Availability',
   poolHaEnabled: 'Enabled',
   poolHaDisabled: 'Disabled',
+  setpoolMaster: 'Master',
   // ----- Pool host tab -----
   hostNameLabel: 'Name',
   hostDescription: 'Description',
@@ -473,6 +520,10 @@ var messages = {
   addSrLabel: 'Add SR',
   addVmLabel: 'Add VM',
   addHostLabel: 'Add Host',
+  hostNeedsPatchUpdate: 'This host needs to install {patches, number} patch{patches, plural, one {} other {es}} before it can be added to the pool. This operation may be long.',
+  hostNeedsPatchUpdateNoInstall: 'This host cannot be added to the pool because it\'s missing some patches.',
+  addHostErrorTitle: 'Adding host failed',
+  addHostNotHomogeneousErrorMessage: 'Host patches could not be homogenized.',
   disconnectServer: 'Disconnect',
 
   // ----- Host actions ------
@@ -486,7 +537,7 @@ var messages = {
   noHostsAvailableErrorTitle: 'Error while restarting host',
   noHostsAvailableErrorMessage: 'Some VMs cannot be migrated before restarting this host. Please try force reboot.',
   failHostBulkRestartTitle: 'Error while restarting hosts',
-  failHostBulkRestartMessage: '{failedHosts}/{totalHosts} host{failedHosts, plural, one {} other {s}} could not be restarted.',
+  failHostBulkRestartMessage: '{failedHosts, number}/{totalHosts, number} host{failedHosts, plural, one {} other {s}} could not be restarted.',
   rebootUpdateHostLabel: 'Reboot to apply updates',
   emergencyModeLabel: 'Emergency mode',
   // ----- Host tabs -----
@@ -511,7 +562,7 @@ var messages = {
   hostCpusNumber: 'Core (socket)',
   hostManufacturerinfo: 'Manufacturer info',
   hostBiosinfo: 'BIOS info',
-  licenseHostSettingsLabel: 'Licence',
+  licenseHostSettingsLabel: 'License',
   hostLicenseType: 'Type',
   hostLicenseSocket: 'Socket',
   hostLicenseExpiry: 'Expiry',
@@ -520,7 +571,7 @@ var messages = {
   supplementalPackPoolNew: 'Install supplemental pack on every host',
   supplementalPackTitle: '{name} (by {author})',
   supplementalPackInstallStartedTitle: 'Installation started',
-  supplementalPackInstallStartedMessage: 'Installing new supplemental pack...',
+  supplementalPackInstallStartedMessage: 'Installing new supplemental pack…',
   supplementalPackInstallErrorTitle: 'Installation error',
   supplementalPackInstallErrorMessage: 'The installation of the supplemental pack failed.',
   supplementalPackInstallSuccessTitle: 'Installation success',
@@ -540,6 +591,7 @@ var messages = {
   pifStatusDisconnected: 'Disconnected',
   pifNoInterface: 'No physical interface detected',
   pifInUse: 'This interface is currently in use',
+  pifAction: 'Action',
   defaultLockingMode: 'Default locking mode',
   pifConfigureIp: 'Configure IP address',
   configIpErrorTitle: 'Invalid parameters',
@@ -552,6 +604,7 @@ var messages = {
   addSrDeviceButton: 'Add a storage',
   srNameLabel: 'Name',
   srType: 'Type',
+  pbdAction: 'Action',
   pbdStatus: 'Status',
   pbdStatusConnected: 'Connected',
   pbdStatusDisconnected: 'Disconnected',
@@ -570,13 +623,17 @@ var messages = {
   patchStatus: 'Status',
   patchStatusApplied: 'Applied',
   patchStatusNotApplied: 'Missing patches',
-  patchNothing: 'No patch detected',
+  patchNothing: 'No patches detected',
   patchReleaseDate: 'Release date',
   patchGuidance: 'Guidance',
   patchAction: 'Action',
   hostAppliedPatches: 'Applied patches',
   hostMissingPatches: 'Missing patches',
   hostUpToDate: 'Host up-to-date!',
+  installPatchWarningTitle: 'Non-recommended patch install',
+  installPatchWarningContent: 'This will install a patch only on this host. This is NOT the recommended way: please go into the Pool patch view and follow instructions there. If you are sure about this, you can continue anyway',
+  installPatchWarningReject: 'Go to pool',
+  installPatchWarningResolve: 'Install',
   // ----- Pool patch tabs -----
   refreshPatches: 'Refresh patches',
   installPoolPatches: 'Install pool patches',
@@ -606,6 +663,7 @@ var messages = {
   vmSettings: 'Started {ago}',
   vmCurrentStatus: 'Current status:',
   vmNotRunning: 'Not running',
+  vmHaltedSince: 'Halted {ago}',
 
   // ----- VM general tab -----
   noToolsDetected: 'No Xen tools detected',
@@ -630,7 +688,6 @@ var messages = {
   copyToClipboardLabel: 'Copy',
   ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
   tipLabel: 'Tip:',
-  tipConsoleLabel: 'Due to a XenServer issue, non-US keyboard layouts aren\'t well supported. Switch your own layout to US to workaround it.',
   hideHeaderTooltip: 'Hide infos',
   showHeaderTooltip: 'Show infos',
 
@@ -654,6 +711,8 @@ var messages = {
   vdiBootOrder: 'Boot order',
   vdiNameLabel: 'Name',
   vdiNameDescription: 'Description',
+  vdiPool: 'Pool',
+  vdiDisconnect: 'Disconnect',
   vdiTags: 'Tags',
   vdiSize: 'Size',
   vdiSr: 'SR',
@@ -665,20 +724,28 @@ var messages = {
   vdiMigrateNoSrMessage: 'A target SR is required to migrate a VDI',
   vdiForget: 'Forget',
   vdiRemove: 'Remove VDI',
-  vdbBootableStatus: 'Boot flag',
-  vdbStatus: 'Status',
+  noControlDomainVdis: 'No VDIs attached to Control Domain',
+  vbdBootableStatus: 'Boot flag',
+  vbdStatus: 'Status',
   vbdStatusConnected: 'Connected',
   vbdStatusDisconnected: 'Disconnected',
   vbdNoVbd: 'No disks',
   vbdConnect: 'Connect VBD',
   vbdDisconnect: 'Disconnect VBD',
-  vdbBootable: 'Bootable',
-  vdbReadonly: 'Readonly',
-  vdbCreate: 'Create',
-  vdbNamePlaceHolder: 'Disk name',
-  vdbSizePlaceHolder: 'Size',
+  vbdBootable: 'Bootable',
+  vbdReadonly: 'Readonly',
+  vbdAction: 'Action',
+  vbdCreate: 'Create',
+  vbdNamePlaceHolder: 'Disk name',
+  vbdSizePlaceHolder: 'Size',
+  cdDriveNotInstalled: 'CD drive not completely installed',
+  cdDriveInstallation: 'Stop and start the VM to install the CD drive',
   saveBootOption: 'Save',
   resetBootOption: 'Reset',
+  deleteSelectedVdis: 'Delete selected VDIs',
+  deleteSelectedVdi: 'Delete selected VDI',
+  useQuotaWarning: 'Creating this disk will use the disk space quota from the resource set {resourceSet} ({spaceLeft} left)',
+  notEnoughSpaceInResourceSet: 'Not enough space in resource set {resourceSet} ({spaceLeft} left)',
 
   // ----- VM network tab -----
   vifCreateDeviceButton: 'New device',
@@ -701,6 +768,7 @@ var messages = {
   vifLockedNetworkNoIps: 'Network locked and no IPs are allowed for this interface',
   vifUnLockedNetwork: 'Network not locked',
   vifUnknownNetwork: 'Unknown network',
+  vifAction: 'Action',
   vifCreate: 'Create',
 
   // ----- VM snapshot tab -----
@@ -746,12 +814,21 @@ var messages = {
   osKernel: 'OS kernel',
   autoPowerOn: 'Auto power on',
   ha: 'HA',
+  vmAffinityHost: 'Affinity host',
+  vmVga: 'VGA',
+  vmVideoram: 'Video RAM',
+  noAffinityHost: 'None',
   originalTemplate: 'Original template',
   unknownOsName: 'Unknown',
   unknownOsKernel: 'Unknown',
   unknownOriginalTemplate: 'Unknown',
   vmLimitsLabel: 'VM limits',
   vmCpuLimitsLabel: 'CPU limits',
+  vmCpuTopology: 'Topology',
+  vmChooseCoresPerSocket: 'Default behavior',
+  vmCoresPerSocket: '{nSockets, number} socket{nSockets, plural, one {} other {s}} with {nCores, number} core{nCores, plural, one {} other {s}} per socket',
+  vmCoresPerSocketIncorrectValue: 'Incorrect cores per socket value',
+  vmCoresPerSocketIncorrectValueSolution: 'Please change the selected value to fix it.',
   vmMemoryLimitsLabel: 'Memory limits (min/max)',
   vmMaxVcpus: 'vCPUs max:',
   vmMaxRam: 'Memory max:',
@@ -793,7 +870,7 @@ var messages = {
   srFree: 'free',
   srUsageStatePanel: 'Storage Usage',
   srTopUsageStatePanel: 'Top 5 SR Usage (in %)',
-  vmsStates: '{running} running ({halted} halted)',
+  vmsStates: '{running, number} running ({halted, number} halted)',
   dashboardStatsButtonRemoveAll: 'Clear selection',
   dashboardStatsButtonAddAllHost: 'Add all hosts',
   dashboardStatsButtonAddAllVM: 'Add all VMs',
@@ -818,6 +895,7 @@ var messages = {
   orphanedVms: 'Orphaned VMs snapshot',
   noOrphanedObject: 'No orphans',
   removeAllOrphanedObject: 'Remove all orphaned snapshot VDIs',
+  vdisOnControlDomain: 'VDIs attached to Control Domain',
   vmNameLabel: 'Name',
   vmNameDescription: 'Description',
   vmContainer: 'Resident on',
@@ -832,7 +910,6 @@ var messages = {
 
   // ----- New VM -----
   newVmCreateNewVmOn: 'Create a new VM on {select}',
-  newVmCreateNewVmOn2: 'Create a new VM on {select1} or {select2}',
   newVmCreateNewVmNoPermission: 'You have no permission to create a VM',
   newVmInfoPanel: 'Infos',
   newVmNameLabel: 'Name',
@@ -855,7 +932,6 @@ var messages = {
   newVmAddInterface: 'Add interface',
   newVmDisksPanel: 'Disks',
   newVmSrLabel: 'SR',
-  newVmBootableLabel: 'Bootable',
   newVmSizeLabel: 'Size',
   newVmAddDisk: 'Add disk',
   newVmSummaryPanel: 'Summary',
@@ -873,7 +949,7 @@ var messages = {
   newVmDefaultCpuCap: 'Default: {value, number}',
   newVmCloudConfig: 'Cloud config',
   newVmCreateVms: 'Create VMs',
-  newVmCreateVmsConfirm: 'Are you sure you want to create {nbVms} VMs?',
+  newVmCreateVmsConfirm: 'Are you sure you want to create {nbVms, number} VMs?',
   newVmMultipleVms: 'Multiple VMs:',
   newVmSelectResourceSet: 'Select a resource set:',
   newVmMultipleVmsPattern: 'Name pattern:',
@@ -881,9 +957,11 @@ var messages = {
   newVmFirstIndex: 'First index:',
   newVmNumberRecalculate: 'Recalculate VMs number',
   newVmNameRefresh: 'Refresh VMs name',
+  newVmAffinityHost: 'Affinity host',
   newVmAdvancedPanel: 'Advanced',
   newVmShowAdvanced: 'Show advanced settings',
   newVmHideAdvanced: 'Hide advanced settings',
+  newVmShare: 'Share this VM',
 
   // ----- Self -----
   resourceSets: 'Resource sets',
@@ -952,6 +1030,7 @@ var messages = {
   delta: 'delta',
   restoreBackups: 'Restore Backups',
   restoreBackupsInfo: 'Click on a VM to display restore options',
+  restoreDeltaBackupsInfo: 'Only the files of Delta Backup which are not on a SMB remote can be restored',
   remoteEnabled: 'Enabled',
   remoteError: 'Error',
   noBackup: 'No backup available',
@@ -961,6 +1040,10 @@ var messages = {
   availableBackupsColumn: 'Available Backups',
   backupRestoreErrorTitle: 'Missing parameters',
   backupRestoreErrorMessage: 'Choose a SR and a backup',
+  backupRestoreSelectDefaultSr: 'Select default SR…',
+  backupRestoreChooseSrForEachVdis: 'Choose a SR for each VDI',
+  backupRestoreVdiLabel: 'VDI',
+  backupRestoreSrLabel: 'SR',
   displayBackup: 'Display backups',
   importBackupTitle: 'Import VM',
   importBackupMessage: 'Starting your backup import',
@@ -985,7 +1068,7 @@ var messages = {
 
   // ----- Modals -----
   emergencyShutdownHostsModalTitle: 'Emergency shutdown Host{nHosts, plural, one {} other {s}}',
-  emergencyShutdownHostsModalMessage: 'Are you sure you want to shutdown {nHosts} Host{nHosts, plural, one {} other {s}}?',
+  emergencyShutdownHostsModalMessage: 'Are you sure you want to shutdown {nHosts, number} Host{nHosts, plural, one {} other {s}}?',
   stopHostModalTitle: 'Shutdown host',
   stopHostModalMessage: 'This will shutdown your host. Do you want to continue? If it\'s the pool master, your connection to the pool will be lost',
   addHostModalTitle: 'Add host',
@@ -993,44 +1076,57 @@ var messages = {
   restartHostModalTitle: 'Restart host',
   restartHostModalMessage: 'This will restart your host. Do you want to continue?',
   restartHostsAgentsModalTitle: 'Restart Host{nHosts, plural, one {} other {s}} agent{nHosts, plural, one {} other {s}}',
-  restartHostsAgentsModalMessage: 'Are you sure you want to restart {nHosts} Host{nHosts, plural, one {} other {s}} agent{nHosts, plural, one {} other {s}}?',
+  restartHostsAgentsModalMessage: 'Are you sure you want to restart {nHosts, number} Host{nHosts, plural, one {} other {s}} agent{nHosts, plural, one {} other {s}}?',
   restartHostsModalTitle: 'Restart Host{nHosts, plural, one {} other {s}}',
-  restartHostsModalMessage: 'Are you sure you want to restart {nHosts} Host{nHosts, plural, one {} other {s}}?',
+  restartHostsModalMessage: 'Are you sure you want to restart {nHosts, number} Host{nHosts, plural, one {} other {s}}?',
   startVmsModalTitle: 'Start VM{vms, plural, one {} other {s}}',
-  startVmsModalMessage: 'Are you sure you want to start {vms} VM{vms, plural, one {} other {s}}?',
+  cloneAndStartVM: 'Start a copy',
+  forceStartVm: 'Force start',
+  forceStartVmModalTitle: 'Forbidden operation',
+  blockedStartVmModalMessage: 'Start operation for this vm is blocked.',
+  blockedStartVmsModalMessage: 'Forbidden operation start for {nVms, number} vm{nVms, plural, one {} other {s}}.',
+  startVmsModalMessage: 'Are you sure you want to start {vms, number} VM{vms, plural, one {} other {s}}?',
+  failedVmsErrorMessage: '{nVms, number} vm{nVms, plural, one {} other {s}} are failed. Please see your logs to get more information',
+  failedVmsErrorTitle: 'Start failed',
   stopHostsModalTitle: 'Stop Host{nHosts, plural, one {} other {s}}',
-  stopHostsModalMessage: 'Are you sure you want to stop {nHosts} Host{nHosts, plural, one {} other {s}}?',
+  stopHostsModalMessage: 'Are you sure you want to stop {nHosts, number} Host{nHosts, plural, one {} other {s}}?',
   stopVmsModalTitle: 'Stop VM{vms, plural, one {} other {s}}',
-  stopVmsModalMessage: 'Are you sure you want to stop {vms} VM{vms, plural, one {} other {s}}?',
+  stopVmsModalMessage: 'Are you sure you want to stop {vms, number} VM{vms, plural, one {} other {s}}?',
   restartVmModalTitle: 'Restart VM',
   restartVmModalMessage: 'Are you sure you want to restart {name}?',
   stopVmModalTitle: 'Stop VM',
   stopVmModalMessage: 'Are you sure you want to stop {name}?',
   restartVmsModalTitle: 'Restart VM{vms, plural, one {} other {s}}',
-  restartVmsModalMessage: 'Are you sure you want to restart {vms} VM{vms, plural, one {} other {s}}?',
+  restartVmsModalMessage: 'Are you sure you want to restart {vms, number} VM{vms, plural, one {} other {s}}?',
   snapshotVmsModalTitle: 'Snapshot VM{vms, plural, one {} other {s}}',
-  snapshotVmsModalMessage: 'Are you sure you want to snapshot {vms} VM{vms, plural, one {} other {s}}?',
+  snapshotVmsModalMessage: 'Are you sure you want to snapshot {vms, number} VM{vms, plural, one {} other {s}}?',
   deleteVmsModalTitle: 'Delete VM{vms, plural, one {} other {s}}',
-  deleteVmsModalMessage: 'Are you sure you want to delete {vms} VM{vms, plural, one {} other {s}}? ALL VM DISKS WILL BE REMOVED',
+  deleteVmsModalMessage: 'Are you sure you want to delete {vms, number} VM{vms, plural, one {} other {s}}? ALL VM DISKS WILL BE REMOVED',
   deleteVmModalTitle: 'Delete VM',
   deleteVmModalMessage: 'Are you sure you want to delete this VM? ALL VM DISKS WILL BE REMOVED',
   migrateVmModalTitle: 'Migrate VM',
   migrateVmSelectHost: 'Select a destination host:',
   migrateVmSelectMigrationNetwork: 'Select a migration network:',
-  migrateVmSelectSrs: 'For each VDI, select an SR:',
   migrateVmSelectNetworks: 'For each VIF, select a network:',
   migrateVmsSelectSr: 'Select a destination SR:',
   migrateVmsSelectSrIntraPool: 'Select a destination SR for local disks:',
   migrateVmsSelectNetwork: 'Select a network on which to connect each VIF:',
   migrateVmsSmartMapping: 'Smart mapping',
-  migrateVmName: 'Name',
-  migrateVmSr: 'SR',
   migrateVmVif: 'VIF',
   migrateVmNetwork: 'Network',
   migrateVmNoTargetHost: 'No target host',
   migrateVmNoTargetHostMessage: 'A target host is required to migrate a VM',
+  migrateVmNoDefaultSrError: 'No default SR',
+  migrateVmNotConnectedDefaultSrError: 'Default SR not connected to host',
+  chooseSrForEachVdisModalSelectSr: 'For each VDI, select an SR:',
+  chooseSrForEachVdisModalMainSr: 'Select main SR…',
+  chooseSrForEachVdisModalVdiLabel: 'VDI',
+  chooseSrForEachVdisModalSrLabel: 'SR*',
+  chooseSrForEachVdisModalOptionalEntry: '* optional',
   deleteVdiModalTitle: 'Delete VDI',
   deleteVdiModalMessage: 'Are you sure you want to delete this disk? ALL DATA ON THIS DISK WILL BE LOST',
+  deleteVdisModalTitle: 'Delete VDI{nVdis, plural, one {} other {s}}',
+  deleteVdisModalMessage: 'Are you sure you want to delete {nVdis, number} disk{nVdis, plural, one {} other {s}}? ALL DATA ON THESE DISKS WILL BE LOST',
   revertVmModalTitle: 'Revert your VM',
   deleteSnapshotModalTitle: 'Delete snapshot',
   deleteSnapshotModalMessage: 'Are you sure you want to delete this snapshot?',
@@ -1053,25 +1149,32 @@ var messages = {
   trialReadyModalText: 'During the trial period, XOA need to have a working internet connection. This limitation does not apply for our paid plans!',
 
   // ----- Servers -----
+  serverLabel: 'Label',
   serverHost: 'Host',
   serverUsername: 'Username',
   serverPassword: 'Password',
   serverAction: 'Action',
   serverReadOnly: 'Read Only',
+  serverUnauthorizedCertificates: 'Unauthorized Certificates',
+  serverAllowUnauthorizedCertificates: 'Allow Unauthorized Certificates',
+  serverUnauthorizedCertificatesInfo: 'Enable it if your certificate is rejected, but it\'s not recommended because your connection will not be secured.',
   serverDisconnect: 'Disconnect server',
   serverPlaceHolderUser: 'username',
   serverPlaceHolderPassword: 'password',
   serverPlaceHolderAddress: 'address[:port]',
+  serverPlaceHolderLabel: 'label',
   serverConnect: 'Connect',
   serverError: 'Error',
   serverAddFailed: 'Adding server failed',
   serverStatus: 'Status',
-  serverConnectionFailed: 'Connection failed',
-  serverConnecting: 'Connecting...',
+  serverConnectionFailed: 'Connection failed. Click for more information.',
+  serverConnecting: 'Connecting…',
   serverConnected: 'Connected',
   serverDisconnected: 'Disconnected',
   serverAuthFailed: 'Authentication error',
   serverUnknownError: 'Unknown error',
+  serverSelfSignedCertError: 'Invalid self-signed certificate',
+  serverSelfSignedCertQuestion: 'Do you want to accept self-signed certificate for this server even though it would decrease security?',
 
   // ----- Copy VM -----
   copyVm: 'Copy VM',
@@ -1090,6 +1193,16 @@ var messages = {
   detachHostModalMessage: 'Are you sure you want to detach {host} from its pool? THIS WILL REMOVE ALL VMs ON ITS LOCAL STORAGE AND REBOOT THE HOST.',
   detachHost: 'Detach',
 
+  // ----- Forget host -----
+  forgetHostModalTitle: 'Forget host',
+  forgetHostModalMessage: 'Are you sure you want to forget {host} from its pool? Be sure this host can\'t be back online, or use detach instead.',
+  forgetHost: 'Forget',
+
+  // ----- Set pool master -----
+
+  setPoolMasterModalTitle: 'Designate a new master',
+  setPoolMasterModalMessage: 'This operation may take several minutes. Do you want to continue?',
+
   // ----- Network -----
   newNetworkCreate: 'Create network',
   newBondedNetworkCreate: 'Create bonded network',
@@ -1159,7 +1272,7 @@ var messages = {
   refresh: 'Refresh',
   upgrade: 'Upgrade',
   noUpdaterCommunity: 'No updater available for Community Edition',
-  considerSubscribe: 'Please consider subscribe and try it with all features for free during 15 days on {link}.',
+  considerSubscribe: 'Please consider subscribing and trying it with all the features for free during 15 days on {link}.',
   noUpdaterWarning: 'Manual update could break your current installation due to dependencies issues, do it with caution',
   currentVersion: 'Current version:',
   register: 'Register',
@@ -1191,6 +1304,10 @@ var messages = {
   disconnectPifConfirm: 'Are you sure you want to disconnect this PIF?',
   deletePif: 'Delete PIF',
   deletePifConfirm: 'Are you sure you want to delete this PIF?',
+  pifConnected: 'Connected',
+  pifDisconnected: 'Disconnected',
+  pifPhysicallyConnected: 'Physically connected',
+  pifPhysicallyDisconnected: 'Physically disconnected',
 
   // ----- User -----
   username: 'Username',
@@ -1236,6 +1353,8 @@ var messages = {
   logDeleteAll: 'Delete all logs',
   logDeleteAllTitle: 'Delete all logs',
   logDeleteAllMessage: 'Are you sure you want to delete all the logs?',
+  logIndicationToEnable: 'Click to enable',
+  logIndicationToDisable: 'Click to disable',
   reportBug: 'Report a bug',
 
   // ----- IPs ------
@@ -1250,23 +1369,30 @@ var messages = {
   ipsVifs: 'VIFs',
   ipsNotUsed: 'Not used',
   ipPoolUnknownVif: 'unknown VIF',
+  ipPoolNameAlreadyExists: 'Name already exists',
 
   // ----- Shortcuts -----
   shortcutModalTitle: 'Keyboard shortcuts',
   shortcut_XoApp: 'Global',
-  shortcut_GO_TO_HOSTS: 'Go to hosts list',
-  shortcut_GO_TO_POOLS: 'Go to pools list',
-  shortcut_GO_TO_VMS: 'Go to VMs list',
-  shortcut_GO_TO_SRS: 'Go to SRs list',
-  shortcut_CREATE_VM: 'Create a new VM',
-  shortcut_UNFOCUS: 'Unfocus field',
-  shortcut_HELP: 'Show shortcuts key bindings',
+  shortcut_XoApp_GO_TO_HOSTS: 'Go to hosts list',
+  shortcut_XoApp_GO_TO_POOLS: 'Go to pools list',
+  shortcut_XoApp_GO_TO_VMS: 'Go to VMs list',
+  shortcut_XoApp_GO_TO_SRS: 'Go to SRs list',
+  shortcut_XoApp_CREATE_VM: 'Create a new VM',
+  shortcut_XoApp_UNFOCUS: 'Unfocus field',
+  shortcut_XoApp_HELP: 'Show shortcuts key bindings',
   shortcut_Home: 'Home',
-  shortcut_SEARCH: 'Focus search bar',
-  shortcut_NAV_DOWN: 'Next item',
-  shortcut_NAV_UP: 'Previous item',
-  shortcut_SELECT: 'Select item',
-  shortcut_JUMP_INTO: 'Open',
+  shortcut_Home_SEARCH: 'Focus search bar',
+  shortcut_Home_NAV_DOWN: 'Next item',
+  shortcut_Home_NAV_UP: 'Previous item',
+  shortcut_Home_SELECT: 'Select item',
+  shortcut_Home_JUMP_INTO: 'Open',
+  shortcut_SortedTable: 'Supported tables',
+  shortcut_SortedTable_SEARCH: 'Focus the table search bar',
+  shortcut_SortedTable_NAV_DOWN: 'Next item',
+  shortcut_SortedTable_NAV_UP: 'Previous item',
+  shortcut_SortedTable_SELECT: 'Select item',
+  shortcut_SortedTable_ROW_ACTION: 'Action',
 
   // ----- Settings/ACLs -----
   settingsAclsButtonTooltipVM: 'VM',
@@ -1308,34 +1434,96 @@ var messages = {
   xosanSuggestions: 'Suggestions',
   xosanName: 'Name',
   xosanHost: 'Host',
-  xosanHosts: 'Hosts',
+  xosanHosts: 'Connected Hosts',
+  xosanPool: 'Pool',
   xosanVolumeId: 'Volume ID',
   xosanSize: 'Size',
   xosanUsedSpace: 'Used space',
   xosanNeedPack: 'XOSAN pack needs to be installed on each host of the pool.',
   xosanInstallIt: 'Install it now!',
+  xosanNeedRestart: 'Some hosts need their toolstack to be restarted before you can create an XOSAN',
+  xosanRestartAgents: 'Restart toolstacks',
+  xosanMasterOffline: 'Pool master is not running',
   xosanInstallPackTitle: 'Install XOSAN pack on {pool}',
   xosanSelect2Srs: 'Select at least 2 SRs',
   xosanLayout: 'Layout',
   xosanRedundancy: 'Redundancy',
-  xosanRedundancyN: 'Redundancy {redundancy}',
   xosanCapacity: 'Capacity',
   xosanAvailableSpace: 'Available space',
   xosanDiskLossLegend: '* Can fail without data loss',
-  xosanCreate: 'Create XOSAN',
-  xosanInstalling: 'Installing XOSAN. Please wait...',
-  xosanBadVersion: 'You need XenServer 7 to install XOSAN',
+  xosanCreate: 'Create',
+  xosanAdd: 'Add',
+  xosanInstalling: 'Installing XOSAN. Please wait…',
   xosanCommunity: 'No XOSAN available for Community Edition',
+  xosanNew: 'New',
+  xosanAdvanced: 'Advanced',
+  xosanRemoveSubvolumes: 'Remove subvolumes',
+  xosanAddSubvolume: 'Add subvolume…',
+  xosanWarning: 'This version of XOSAN SR is from the first beta phase. You can keep using it, but to modify it you\'ll have to save your disks and re-create it.',
+  xosanVlan: 'VLAN',
+  xosanNoSrs: 'No XOSAN found',
+  xosanPbdsDetached: 'Some SRs are detached from the XOSAN',
+  xosanBadStatus: 'Something is wrong with: {badStatuses}',
+  xosanRunning: 'Running',
+  xosanDelete: 'Delete XOSAN',
+  xosanFixIssue: 'Fix',
+  xosanCreatingOn: 'Creating XOSAN on {pool}',
+  xosanState_configuringNetwork: 'Configuring network…',
+  xosanState_importingVm: 'Importing VM…',
+  xosanState_copyingVms: 'Copying VMs…',
+  xosanState_configuringVms: 'Configuring VMs…',
+  xosanState_configuringGluster: 'Configuring gluster…',
+  xosanState_creatingSr: 'Creating SR…',
+  xosanState_scanningSr: 'Scanning SR…',
   // Pack download modal
   xosanInstallCloudPlugin: 'Install cloud plugin first',
   xosanLoadCloudPlugin: 'Load cloud plugin first',
-  xosanLoading: 'Loading...',
+  xosanLoading: 'Loading…',
   xosanNotAvailable: 'XOSAN is not available at the moment',
   xosanRegisterBeta: 'Register for the XOSAN beta',
   xosanSuccessfullyRegistered: 'You have successfully registered for the XOSAN beta. Please wait until your request has been approved.',
   xosanInstallPackOnHosts: 'Install XOSAN pack on these hosts:',
-  xosanInstallPack: 'Install {pack} v{version}?'
-
+  xosanInstallPack: 'Install {pack} v{version}?',
+  xosanNoPackFound: 'No compatible XOSAN pack found for your XenServer versions.',
+  xosanPackRequirements: 'At least one of these version requirements must be satisfied by all the hosts in this pool:',
+  // SR tab XOSAN
+  xosanVmsNotRunning: 'Some XOSAN Virtual Machines are not running',
+  xosanVmsNotFound: 'Some XOSAN Virtual Machines could not be found',
+  xosanFilesNeedingHealing: 'Files needing healing',
+  xosanFilesNeedHealing: 'Some XOSAN Virtual Machines have files needing healing',
+  xosanHostNotInNetwork: 'Host {hostName} is not in XOSAN network',
+  xosanVm: 'VM controller',
+  xosanUnderlyingStorage: 'SR',
+  xosanReplace: 'Replace…',
+  xosanOnSameVm: 'On same VM',
+  xosanBrickName: 'Brick name',
+  xosanBrickUuid: 'Brick UUID',
+  xosanBrickSize: 'Brick size',
+  xosanMemorySize: 'Memory size',
+  xosanStatus: 'Status',
+  xosanArbiter: 'Arbiter',
+  xosanUsedInodes: 'Used Inodes',
+  xosanBlockSize: 'Block size',
+  xosanDevice: 'Device',
+  xosanFsName: 'FS name',
+  xosanMountOptions: 'Mount options',
+  xosanPath: 'Path',
+  xosanJob: 'Job',
+  xosanPid: 'PID',
+  xosanPort: 'Port',
+  xosanReplaceBrickErrorTitle: 'Missing values',
+  xosanReplaceBrickErrorMessage: 'You need to select a SR and a size',
+  xosanAddSubvolumeErrorTitle: 'Bad values',
+  xosanAddSubvolumeErrorMessage: 'You need to select {nSrs, number} and a size',
+  xosanSelectNSrs: 'Select {nSrs, number} SRs',
+  xosanRun: 'Run',
+  xosanRemove: 'Remove',
+  xosanVolume: 'Volume',
+  xosanVolumeOptions: 'Volume options',
+  xosanCouldNotFindVM: 'Could not find VM',
+  xosanUnderlyingStorageUsage: 'Using {usage}',
+  xosanCustomIpNetwork: 'Custom IP network (/24)',
+  xosanIssueHostNotInNetwork: 'Will configure the host xosan network device with a static IP address and plug it in.'
 }
 forEach(messages, function (message, id) {
   if (isString(message)) {

src/common/ip.js

@@ -28,7 +28,7 @@ function assertIpv4 (str, msg) {
   if (!ipv4.test(str)) { throw new Error(msg) }
 }
 
-function *range (ip1, ip2) {
+function * range (ip1, ip2) {
   assertIpv4(ip1, 'argument "ip1" must be a valid IPv4 address')
   assertIpv4(ip2, 'argument "ip2" must be a valid IPv4 address')
 

src/common/iso-device.js

@@ -1,8 +1,12 @@
 import React from 'react'
 
+import _ from 'intl'
 import ActionButton from './action-button'
 import Component from './base-component'
-import propTypes from './prop-types'
+import Icon from 'icon'
+import propTypes from './prop-types-decorator'
+import Tooltip from 'tooltip'
+import { alert } from 'modal'
 import { connectStore } from './utils'
 import { SelectVdi } from './select-objects'
 import {
@@ -51,8 +55,9 @@ export default class IsoDevice extends Component {
       const samePool = vmPool === sr.$pool
 
       return (
-        samePool && (vmRunning ? sr.shared || sameHost : true) &&
-        sr.SR_type === 'iso' || sr.SR_type === 'udev' && sr.size
+        samePool &&
+        (vmRunning ? sr.shared || sameHost : true) &&
+        (sr.SR_type === 'iso' || (sr.SR_type === 'udev' && sr.size))
       )
     }
   )
@@ -69,8 +74,10 @@ export default class IsoDevice extends Component {
 
   _handleEject = () => ejectCd(this.props.vm)
 
+  _showWarning = () => alert(_('cdDriveNotInstalled'), _('cdDriveInstallation'))
+
   render () {
-    const { mountedIso } = this.props
+    const {cdDrive, mountedIso} = this.props
 
     return (
       <div className='input-group'>
@@ -81,12 +88,24 @@ export default class IsoDevice extends Component {
         />
         <span className='input-group-btn'>
           <ActionButton
-            btnStyle='secondary'
             disabled={!mountedIso}
             handler={this._handleEject}
             icon='vm-eject'
           />
         </span>
+        {mountedIso && !cdDrive.device &&
+          <Tooltip content={_('cdDriveNotInstalled')}>
+            <a
+              className='text-warning btn btn-link'
+              onClick={this._showWarning}
+            >
+              <Icon
+                icon='alarm'
+                size='lg'
+              />
+            </a>
+          </Tooltip>
+        }
       </div>
     )
   }

src/common/json-schema-input/abstract-input.js

@@ -1,26 +0,0 @@
-import { Component } from 'react'
-
-import propTypes from '../prop-types'
-
-// ===================================================================
-
-@propTypes({
-  disabled: propTypes.bool,
-  label: propTypes.any.isRequired,
-  onChange: propTypes.func,
-  placeholder: propTypes.string,
-  required: propTypes.bool,
-  schema: propTypes.object.isRequired,
-  uiSchema: propTypes.object,
-  defaultValue: propTypes.any
-})
-export default class AbstractInput extends Component {
-  set value (value) {
-    this.refs.input.value = value === undefined ? '' : String(value)
-  }
-
-  get value () {
-    const { value } = this.refs.input
-    return !value ? undefined : value
-  }
-}

src/common/json-schema-input/array-input.js

@@ -1,10 +1,12 @@
-import React, { Component, cloneElement } from 'react'
-import map from 'lodash/map'
-import filter from 'lodash/filter'
+import React from 'react'
+import uncontrollableInput from 'uncontrollable-input'
+import { filter, map } from 'lodash'
 
 import _ from '../intl'
-import propTypes from '../prop-types'
-import { propsEqual } from '../utils'
+import Button from '../button'
+import Component from '../base-component'
+import propTypes from '../prop-types-decorator'
+import { EMPTY_ARRAY } from '../utils'
 
 import GenericInput from './generic-input'
 import {
@@ -12,175 +14,110 @@ import {
   forceDisplayOptionalAttr
 } from './helpers'
 
-// ===================================================================
-
-class ArrayItem extends Component {
-  get value () {
-    return this.refs.input.value
-  }
-
-  set value (value) {
-    this.setState({
-      use: true
-    }, () => {
-      this.refs.input.value = value
-    })
-  }
-
-  render () {
-    const { children } = this.props
-
-    return (
-      <li className='list-group-item clearfix'>
-        {cloneElement(children, {
-          ref: 'input'
-        })}
-        <button disabled={children.props.disabled} className='btn btn-danger pull-right' type='button' onClick={this.props.onDelete}>
-          {_('remove')}
-        </button>
-      </li>
-    )
-  }
-}
-
-// ===================================================================
-
 @propTypes({
   depth: propTypes.number,
   disabled: propTypes.bool,
   label: propTypes.any.isRequired,
   required: propTypes.bool,
   schema: propTypes.object.isRequired,
-  uiSchema: propTypes.object,
-  defaultValue: propTypes.array
+  uiSchema: propTypes.object
 })
-export default class ArrayInput extends Component {
-  constructor (props) {
-    super(props)
-
-    this._nextChildKey = 0
-
-    this.state = {
-      use: props.required || forceDisplayOptionalAttr(props),
-      children: this._makeChildren(props)
-    }
+@uncontrollableInput()
+export default class ObjectInput extends Component {
+  state = {
+    use: this.props.required || forceDisplayOptionalAttr(this.props)
   }
 
-  get value () {
-    if (this.state.use) {
-      return map(this.refs, 'value')
-    }
+  _onAddItem = () => {
+    const { props } = this
+    props.onChange((props.value || EMPTY_ARRAY).concat(undefined))
   }
 
-  set value (value = []) {
-    this.setState({
-      children: this._makeChildren({ ...this.props, value })
-    })
+  _onChangeItem = (value, name) => {
+    const key = Number(name)
+
+    const { props } = this
+    const newValue = (props.value || EMPTY_ARRAY).slice()
+    newValue[key] = value
+    props.onChange(newValue)
   }
 
-  _handleOptionalChange = event => {
-    this.setState({
-      use: event.target.checked
-    })
-  }
-
-  _handleAdd = () => {
-    const { children } = this.state
-    this.setState({
-      children: children.concat(this._makeChild(this.props))
-    })
-  }
-
-  _remove (key) {
-    this.setState({
-      children: filter(this.state.children, child => child.key !== key)
-    })
-  }
-
-  _makeChild (props, defaultValue) {
-    const key = String(this._nextChildKey++)
-    const {
-      schema: {
-        items
-      }
-    } = props
-
-    return (
-      <ArrayItem key={key} onDelete={() => { this._remove(key) }}>
-        <GenericInput
-          depth={props.depth}
-          disabled={props.disabled}
-          label={items.title || _('item')}
-          required
-          schema={items}
-          uiSchema={props.uiSchema.items}
-          defaultValue={defaultValue}
-        />
-      </ArrayItem>
-    )
-  }
-
-  _makeChildren (props) {
-    return map(props.defaultValue, defaultValue =>
-      this._makeChild(props, defaultValue)
-    )
-  }
-
-  componentWillReceiveProps (props) {
-    if (
-      !propsEqual(
-        this.props,
-        props,
-        [ 'depth', 'disabled', 'label', 'required', 'schema', 'uiSchema' ]
-      )
-    ) {
-      this.setState({
-        children: this._makeChildren(props)
-      })
-    }
+  _onRemoveItem = key => {
+    const { props } = this
+    props.onChange(filter(props.value, (_, i) => i !== key))
   }
 
   render () {
     const {
-      props,
-      state
+      props: {
+        depth = 0,
+        disabled,
+        label,
+        required,
+        schema,
+        uiSchema,
+        value = EMPTY_ARRAY
+      },
+      state: { use }
     } = this
-    const {
-      disabled,
-      schema
-    } = props
-    const { use } = state
-    const depth = props.depth || 0
+
+    const childDepth = depth + 2
+    const itemSchema = schema.items
+    const itemUiSchema = uiSchema && uiSchema.items
+
+    const itemLabel = itemSchema.title || _('item')
 
     return (
       <div style={{'paddingLeft': `${depth}em`}}>
-        <legend>{props.label}</legend>
+        <legend>{label}</legend>
         {descriptionRender(schema.description)}
         <hr />
-        {!props.required &&
-          <div className='checkbox'>
-            <label>
-              <input
-                checked={use}
-                disabled={disabled}
-                onChange={this._handleOptionalChange}
-                type='checkbox'
-              /> {_('fillOptionalInformations')}
-            </label>
-          </div>
-        }
-        {use &&
-          <div className={'card-block'}>
-            <ul style={{'paddingLeft': 0}} >
-              {map(this.state.children, (child, index) =>
-                cloneElement(child, { ref: index })
-              )}
-            </ul>
-            <button disabled={disabled} className='btn btn-primary pull-right mt-1 mr-1' type='button' onClick={this._handleAdd}>
-              {_('add')}
-            </button>
-          </div>
-        }
+        {!required && <div className='checkbox'>
+          <label>
+            <input
+              checked={use}
+              disabled={disabled}
+              onChange={this.linkState('use')}
+              type='checkbox'
+            /> {_('fillOptionalInformations')}
+          </label>
+        </div>}
+        {use && <div className='card-block'>
+          <ul style={{'paddingLeft': 0}} >
+            {map(value, (value, key) =>
+              <li className='list-group-item clearfix' key={key}>
+                <GenericInput
+                  depth={childDepth}
+                  disabled={disabled}
+                  label={itemLabel}
+                  name={key}
+                  onChange={this._onChangeItem}
+                  required
+                  schema={itemSchema}
+                  uiSchema={itemUiSchema}
+                  value={value}
+                />
+                <Button
+                  btnStyle='danger'
+                  className='pull-right'
+                  disabled={disabled}
+                  name={key}
+                  onClick={() => this._onRemoveItem(key)}
+                >
+                  {_('remove')}
+                </Button>
+              </li>
+            )}
+          </ul>
+          <Button
+            btnStyle='primary'
+            className='pull-right mt-1 mr-1'
+            disabled={disabled}
+            onClick={this._onAddItem}
+          >
+            {_('add')}
+          </Button>
+        </div>}
       </div>
     )
   }

src/common/json-schema-input/boolean-input.js

@@ -1,32 +1,30 @@
 import React from 'react'
-import { Toggle } from 'form'
 
-import AbstractInput from './abstract-input'
+import uncontrollableInput from 'uncontrollable-input'
+import Component from '../base-component'
+import { Toggle } from '../form'
+
 import { PrimitiveInputWrapper } from './helpers'
 
 // ===================================================================
 
-export default class BooleanInput extends AbstractInput {
-
-  get value () {
-    return this.refs.input.value
-  }
-
-  set value (value) {
-    this.refs.input.value = value
-  }
-
+@uncontrollableInput()
+export default class BooleanInput extends Component {
   render () {
-    const { props } = this
+    const {
+      disabled,
+      onChange,
+      value,
+      ...props
+    } = this.props
 
     return (
       <PrimitiveInputWrapper {...props}>
         <div className='checkbox form-control'>
           <Toggle
-            defaultValue={props.defaultValue}
-            disabled={props.disabled}
-            onChange={props.onChange}
-            ref='input'
+            disabled={disabled}
+            onChange={onChange}
+            value={value}
           />
         </div>
       </PrimitiveInputWrapper>

src/common/json-schema-input/enum-input.js

@@ -1,33 +1,54 @@
-import React from 'react'
 import _ from 'intl'
-import map from 'lodash/map'
+import uncontrollableInput from 'uncontrollable-input'
+import Component from 'base-component'
+import React from 'react'
+import { createSelector } from 'reselect'
+import { findIndex, map } from 'lodash'
 
-import AbstractInput from './abstract-input'
 import { PrimitiveInputWrapper } from './helpers'
 
 // ===================================================================
 
-export default class EnumInput extends AbstractInput {
+@uncontrollableInput()
+export default class EnumInput extends Component {
+  _getSelectedIndex = createSelector(
+    () => this.props.schema.enum,
+    () => {
+      const {
+        schema,
+        value = schema.default
+      } = this.props
+      return value
+    },
+    (enumValues, value) => {
+      const index = findIndex(enumValues, current => current === value)
+      return index === -1 ? '' : index
+    }
+  )
+
+  _onChange = event => {
+    this.props.onChange(this.props.schema.enum[event.target.value])
+  }
+
   render () {
-    const { props } = this
     const {
-      onChange,
+      disabled,
+      schema: { enum: enumValues, enumNames = enumValues },
       required
-    } = props
+    } = this.props
 
     return (
-      <PrimitiveInputWrapper {...props}>
+      <PrimitiveInputWrapper {...this.props}>
         <select
           className='form-control'
-          defaultValue={props.defaultValue || ''}
-          disabled={props.disabled}
-          onChange={onChange && (event => onChange(event.target.value))}
-          ref='input'
+          disabled={disabled}
+          onChange={this._onChange}
           required={required}
+          value={this._getSelectedIndex()}
         >
           {_('noSelectedValue', message => <option value=''>{message}</option>)}
-          {map(props.schema.enum, (value, index) =>
-            <option value={value} key={index}>{value}</option>
+          {map(enumNames, (name, index) =>
+            <option value={index} key={index}>{name}</option>
           )}
         </select>
       </PrimitiveInputWrapper>

src/common/json-schema-input/generic-input.js

@@ -1,6 +1,8 @@
 import React, { Component } from 'react'
 
-import propTypes from '../prop-types'
+import getEventValue from '../get-event-value'
+import propTypes from '../prop-types-decorator'
+import uncontrollableInput from 'uncontrollable-input'
 import { EMPTY_OBJECT } from '../utils'
 
 import ArrayInput from './array-input'
@@ -30,35 +32,31 @@ const InputByType = {
   depth: propTypes.number,
   disabled: propTypes.bool,
   label: propTypes.any.isRequired,
-  onChange: propTypes.func,
   required: propTypes.bool,
   schema: propTypes.object.isRequired,
-  uiSchema: propTypes.object,
-  defaultValue: propTypes.any
+  uiSchema: propTypes.object
 })
+@uncontrollableInput()
 export default class GenericInput extends Component {
-  get value () {
-    return this.refs.input.value
-  }
-
-  set value (value) {
-    this.refs.input.value = value
+  _onChange = event => {
+    const { name, onChange } = this.props
+    onChange && onChange(getEventValue(event), name)
   }
 
   render () {
     const {
       schema,
-      defaultValue = schema.default,
+      value = schema.default,
       uiSchema = EMPTY_OBJECT,
       ...opts
     } = this.props
 
     const props = {
       ...opts,
-      defaultValue,
+      onChange: this._onChange,
       schema,
       uiSchema,
-      ref: 'input'
+      value
     }
 
     // Enum, special case.

src/common/json-schema-input/helpers.js

@@ -62,19 +62,19 @@ export const PrimitiveInputWrapper = ({ label, required = false, schema, childre
 
 // ===================================================================
 
-export const forceDisplayOptionalAttr = ({ schema, defaultValue }) => {
-  if (!schema || !defaultValue) {
+export const forceDisplayOptionalAttr = ({ schema, value }) => {
+  if (!schema || !value) {
     return false
   }
 
   // Array
-  if (schema.items && Array.isArray(defaultValue)) {
+  if (schema.items && Array.isArray(value)) {
     return true
   }
 
   // Object
   for (const key in schema.properties) {
-    if (defaultValue[key]) {
+    if (value[key]) {
       return true
     }
   }

src/common/json-schema-input/integer-input.js

@@ -1,40 +1,42 @@
 import React from 'react'
 
-import AbstractInput from './abstract-input'
+import uncontrollableInput from 'uncontrollable-input'
 import Combobox from '../combobox'
+import Component from '../base-component'
+import getEventValue from '../get-event-value'
+
 import { PrimitiveInputWrapper } from './helpers'
 
 // ===================================================================
 
-export default class IntegerInput extends AbstractInput {
-  get value () {
-    const { value } = this.refs.input
-    return !value ? undefined : +value
-  }
-
-  set value (value) {
-    // Getter/Setter are always inherited together.
-    // `get value` is defined in the subclass, so `set value`
-    // must be defined too.
-    super.value = value
+@uncontrollableInput()
+export default class IntegerInput extends Component {
+  _onChange = event => {
+    const value = getEventValue(event)
+    this.props.onChange(value ? +value : undefined)
   }
 
   render () {
-    const { props } = this
-    const { schema } = props
+    const { required, schema } = this.props
+    const {
+      disabled,
+      onChange, // eslint-disable-line no-unused-vars
+      placeholder = schema.default,
+      value,
+      ...props
+    } = this.props
 
     return (
       <PrimitiveInputWrapper {...props}>
         <Combobox
-          defaultValue={props.defaultValue}
-          disabled={props.disabled}
+          value={value === undefined ? '' : String(value)}
+          disabled={disabled}
           max={schema.max}
           min={schema.min}
-          onChange={props.onChange}
+          onChange={this._onChange}
           options={schema.defaults}
-          placeholder={props.placeholder || schema.default}
-          ref='input'
-          required={props.required}
+          placeholder={placeholder}
+          required={required}
           step={1}
           type='number'
         />

src/common/json-schema-input/number-input.js

@@ -1,40 +1,42 @@
 import React from 'react'
 
-import AbstractInput from './abstract-input'
+import uncontrollableInput from 'uncontrollable-input'
 import Combobox from '../combobox'
+import Component from '../base-component'
+import getEventValue from '../get-event-value'
+
 import { PrimitiveInputWrapper } from './helpers'
 
 // ===================================================================
 
-export default class NumberInput extends AbstractInput {
-  get value () {
-    const { value } = this.refs.input
-    return !value ? undefined : +value
-  }
-
-  set value (value) {
-    // Getter/Setter are always inherited together.
-    // `get value` is defined in the subclass, so `set value`
-    // must be defined too.
-    super.value = value
+@uncontrollableInput()
+export default class NumberInput extends Component {
+  _onChange = event => {
+    const value = getEventValue(event)
+    this.props.onChange(value ? +value : undefined)
   }
 
   render () {
-    const { props } = this
-    const { schema } = props
+    const { required, schema } = this.props
+    const {
+      disabled,
+      onChange, // eslint-disable-line no-unused-vars
+      placeholder = schema.default,
+      value,
+      ...props
+    } = this.props
 
     return (
       <PrimitiveInputWrapper {...props}>
         <Combobox
-          defaultValue={props.defaultValue}
-          disabled={props.disabled}
+          value={value === undefined ? '' : String(value)}
+          disabled={disabled}
           max={schema.max}
           min={schema.min}
-          onChange={props.onChange}
+          onChange={this._onChange}
           options={schema.defaults}
-          placeholder={props.placeholder || schema.default}
-          ref='input'
-          required={props.required}
+          placeholder={placeholder}
+          required={required}
           step='any'
           type='number'
         />

src/common/json-schema-input/object-input.js

@@ -1,167 +1,97 @@
-import _ from 'intl'
-import React, { Component, cloneElement } from 'react'
-import forEach from 'lodash/forEach'
-import includes from 'lodash/includes'
-import map from 'lodash/map'
+import React from 'react'
+import uncontrollableInput from 'uncontrollable-input'
+import { createSelector } from 'reselect'
+import { keyBy, map } from 'lodash'
 
-import propTypes from '../prop-types'
-import { propsEqual } from '../utils'
+import _ from '../intl'
+import Component from '../base-component'
+import propTypes from '../prop-types-decorator'
+import { EMPTY_OBJECT } from '../utils'
 
 import GenericInput from './generic-input'
-
 import {
   descriptionRender,
   forceDisplayOptionalAttr
 } from './helpers'
 
-// ===================================================================
-
-class ObjectItem extends Component {
-  get value () {
-    return this.refs.input.value
-  }
-
-  set value (value) {
-    this.refs.input.value = value
-  }
-
-  render () {
-    const { props } = this
-
-    return (
-      <div className='pb-1'>
-        {cloneElement(props.children, {
-          ref: 'input'
-        })}
-      </div>
-    )
-  }
-}
-
-// ===================================================================
-
 @propTypes({
   depth: propTypes.number,
   disabled: propTypes.bool,
   label: propTypes.any.isRequired,
   required: propTypes.bool,
   schema: propTypes.object.isRequired,
-  uiSchema: propTypes.object,
-  defaultValue: propTypes.object
+  uiSchema: propTypes.object
 })
+@uncontrollableInput()
 export default class ObjectInput extends Component {
-  constructor (props) {
-    super(props)
-    this.state = {
-      use: Boolean(props.required) || forceDisplayOptionalAttr(props),
-      children: this._makeChildren(props)
-    }
+  state = {
+    use: this.props.required || forceDisplayOptionalAttr(this.props)
   }
 
-  get value () {
-    if (!this.state.use) {
-      return
-    }
-
-    const obj = {}
-
-    forEach(this.refs, (instance, key) => {
-      obj[key] = instance.value
-    })
-
-    return obj
-  }
-
-  set value (value = {}) {
-    this.setState({
-      use: true
-    }, () => {
-      forEach(this.refs, (instance, id) => {
-        instance.value = value[id]
-      })
+  _onChildChange = (value, key) => {
+    this.props.onChange({
+      ...this.props.value,
+      [key]: value
     })
   }
 
-  _handleOptionalChange = event => {
-    const { checked } = event.target
-
-    this.setState({
-      use: checked
-    })
-  }
-
-  _makeChildren (props) {
-    const {
-      depth = 0,
-      schema,
-      uiSchema = {},
-      defaultValue = {}
-    } = props
-    const obj = {}
-    const { properties } = uiSchema
-
-    forEach(schema.properties, (childSchema, key) => {
-      obj[key] = (
-        <ObjectItem key={key}>
-          <GenericInput
-            depth={depth + 2}
-            disabled={props.disabled}
-            label={childSchema.title || key}
-            required={includes(schema.required, key)}
-            schema={childSchema}
-            uiSchema={properties && properties[key]}
-            defaultValue={defaultValue[key]}
-          />
-        </ObjectItem>
-      )
-    })
-
-    return obj
-  }
-
-  componentWillReceiveProps (props) {
-    if (
-      !propsEqual(
-        this.props,
-        props,
-        [ 'depth', 'disabled', 'label', 'required', 'schema', 'uiSchema' ]
-      )
-    ) {
-      this.setState({
-        children: this._makeChildren(props)
-      })
-    }
-  }
+  _getRequiredProps = createSelector(
+    () => this.props.schema.required,
+    required => required
+      ? keyBy(required)
+      : EMPTY_OBJECT
+  )
 
   render () {
-    const { props, state } = this
-    const { use } = state
-    const depth = props.depth || 0
+    const {
+      props: {
+        depth = 0,
+        disabled,
+        label,
+        required,
+        schema,
+        uiSchema,
+        value = EMPTY_OBJECT
+      },
+      state: { use }
+    } = this
+
+    const childDepth = depth + 2
+    const properties = (uiSchema != null && uiSchema.properties) || EMPTY_OBJECT
+    const requiredProps = this._getRequiredProps()
 
     return (
       <div style={{'paddingLeft': `${depth}em`}}>
-        <legend>{props.label}</legend>
-        {descriptionRender(props.schema.description)}
+        <legend>{label}</legend>
+        {descriptionRender(schema.description)}
         <hr />
-        {!props.required &&
-          <div className='checkbox'>
-            <label>
-              <input
-                checked={use}
-                disabled={props.disabled}
-                onChange={this._handleOptionalChange}
-                type='checkbox'
-              /> {_('fillOptionalInformations')}
-            </label>
-          </div>
-        }
-        {use &&
-          <div className='card-block'>
-            {map(state.children, (child, index) =>
-              cloneElement(child, { ref: index })
-            )}
-          </div>
-        }
+        {!required && <div className='checkbox'>
+          <label>
+            <input
+              checked={use}
+              disabled={disabled}
+              onChange={this.linkState('use')}
+              type='checkbox'
+            /> {_('fillOptionalInformations')}
+          </label>
+        </div>}
+        {use && <div className='card-block'>
+          {map(schema.properties, (childSchema, key) =>
+            <div className='pb-1' key={key}>
+              <GenericInput
+                depth={childDepth}
+                disabled={disabled}
+                label={childSchema.title || key}
+                name={key}
+                onChange={this._onChildChange}
+                required={Boolean(requiredProps[key])}
+                schema={childSchema}
+                uiSchema={properties[key]}
+                value={value[key]}
+              />
+            </div>
+          )}
+        </div>}
       </div>
     )
   }

src/common/json-schema-input/string-input.js

@@ -1,8 +1,11 @@
 import React from 'react'
+import uncontrollableInput from 'uncontrollable-input'
 
-import AbstractInput from './abstract-input'
 import Combobox from '../combobox'
-import propTypes from '../prop-types'
+import Component from '../base-component'
+import getEventValue from '../get-event-value'
+import propTypes from '../prop-types-decorator'
+
 import { PrimitiveInputWrapper } from './helpers'
 
 // ===================================================================
@@ -10,22 +13,36 @@ import { PrimitiveInputWrapper } from './helpers'
 @propTypes({
   password: propTypes.bool
 })
-export default class StringInput extends AbstractInput {
+@uncontrollableInput()
+export default class StringInput extends Component {
+  // the value of this input  is undefined not '' when empty to make
+  // it homogenous with when the user has never touched this input
+  _onChange = event => {
+    const value = getEventValue(event)
+    this.props.onChange(value !== '' ? value : undefined)
+  }
+
   render () {
-    const { props } = this
-    const { schema } = props
+    const { required, schema } = this.props
+    const {
+      disabled,
+      password,
+      placeholder = schema.default,
+      value,
+      ...props
+    } = this.props
+    delete props.onChange
 
     return (
       <PrimitiveInputWrapper {...props}>
         <Combobox
-          defaultValue={props.defaultValue}
-          disabled={props.disabled}
-          onChange={props.onChange}
+          value={value !== undefined ? value : ''}
+          disabled={disabled}
+          onChange={this._onChange}
           options={schema.defaults}
-          placeholder={props.placeholder || schema.default}
-          ref='input'
-          required={props.required}
-          type={props.password && 'password'}
+          placeholder={placeholder || schema.default}
+          required={required}
+          type={password && 'password'}
         />
       </PrimitiveInputWrapper>
     )

src/common/link.js

@@ -3,7 +3,7 @@ import React from 'react'
 import { routerShape } from 'react-router/lib/PropTypes'
 
 import Component from './base-component'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 // ===================================================================
 
@@ -19,6 +19,7 @@ const _IGNORED_TAGNAMES = {
 }
 
 @propTypes({
+  className: propTypes.string,
   tagName: propTypes.string
 })
 export class BlockLink extends Component {
@@ -44,11 +45,22 @@ export class BlockLink extends Component {
     }
   }
 
+  _addAuxClickListener = ref => {
+    // FIXME: when https://github.com/facebook/react/issues/8529 is fixed,
+    // remove and use onAuxClickCapture.
+    // In Chrome ^55, middle-clicking triggers auxclick event instead of click
+    if (ref !== null) {
+      ref.addEventListener('auxclick', this._onClickCapture)
+    }
+  }
+
   render () {
-    const { children, tagName = 'div' } = this.props
+    const { children, tagName = 'div', className } = this.props
     const Component = tagName
     return (
       <Component
+        className={className}
+        ref={this._addAuxClickListener}
         style={this._style}
         onClickCapture={this._onClickCapture}
       >

src/common/modal.js

@@ -1,11 +1,14 @@
-import _ from 'intl'
-import Icon from 'icon'
 import isArray from 'lodash/isArray'
 import isString from 'lodash/isString'
+import map from 'lodash/map'
 import React, { Component, cloneElement } from 'react'
-import { Button, Modal as ReactModal } from 'react-bootstrap-4/lib'
+import { Modal as ReactModal } from 'react-bootstrap-4/lib'
 
-import propTypes from './prop-types'
+import _ from './intl'
+import Button from './button'
+import Icon from './icon'
+import propTypes from './prop-types-decorator'
+import Tooltip from './tooltip'
 import {
   disable as disableShortcuts,
   enable as enableShortcuts
@@ -22,28 +25,108 @@ const modal = (content, onClose) => {
   instance.setState({ content, onClose, showModal: true }, disableShortcuts)
 }
 
-export const alert = (title, body) => {
-  return new Promise(resolve => {
-    const { Body, Footer, Header, Title } = ReactModal
-    modal(
-      <div>
-        <Header closeButton>
-          <Title>{title}</Title>
-        </Header>
-        <Body>{body}</Body>
-        <Footer>
-          <Button bsStyle='primary' onClick={() => {
-            resolve()
-            instance.close()
-          }}>
-            {_('alertOk')}
+@propTypes({
+  buttons: propTypes.arrayOf(propTypes.shape({
+    btnStyle: propTypes.string,
+    icon: propTypes.string,
+    label: propTypes.node.isRequired,
+    tooltip: propTypes.node,
+    value: propTypes.any
+  })).isRequired,
+  children: propTypes.node.isRequired,
+  icon: propTypes.string,
+  title: propTypes.node.isRequired
+})
+class GenericModal extends Component {
+  _getBodyValue = () => {
+    const { body } = this.refs
+    if (body !== undefined) {
+      return body.getWrappedInstance === undefined
+        ? body.value
+        : body.getWrappedInstance().value
+    }
+  }
+
+  _resolve = (value = this._getBodyValue()) => {
+    this.props.resolve(value)
+    instance.close()
+  }
+
+  _reject = () => {
+    this.props.reject()
+    instance.close()
+  }
+
+  render () {
+    const {
+      buttons,
+      icon,
+      title
+    } = this.props
+
+    const body = _addRef(this.props.children, 'body')
+
+    return <div>
+      <ReactModal.Header closeButton>
+        <ReactModal.Title>
+          {icon
+            ? <span><Icon icon={icon} /> {title}</span>
+            : title
+          }
+        </ReactModal.Title>
+      </ReactModal.Header>
+      <ReactModal.Body>
+        {body}
+      </ReactModal.Body>
+      <ReactModal.Footer>
+        {map(buttons, ({
+          label,
+          tooltip,
+          value,
+          icon,
+          ...props
+        }, key) => {
+          const button = <Button
+            onClick={() => this._resolve(value)}
+            {...props}
+          >
+            {icon !== undefined && <Icon icon={icon} fixedWidth />}
+            {label}
           </Button>
-        </Footer>
-      </div>,
+          return <span key={key}>
+            {tooltip !== undefined
+              ? <Tooltip content={tooltip}>{button}</Tooltip>
+              : button
+            }
+            {' '}
+          </span>
+        })}
+        {this.props.reject !== undefined &&
+          <Button onClick={this._reject} >
+            {_('genericCancel')}
+          </Button>
+        }
+      </ReactModal.Footer>
+    </div>
+  }
+}
+
+const ALERT_BUTTONS = [ { label: _('alertOk'), value: 'ok' } ]
+
+export const alert = (title, body) => (
+  new Promise(resolve => {
+    modal(
+      <GenericModal
+        buttons={ALERT_BUTTONS}
+        resolve={resolve}
+        title={title}
+      >
+        {body}
+      </GenericModal>,
       resolve
     )
   })
-}
+)
 
 const _addRef = (component, ref) => {
   if (isString(component) || isArray(component)) {
@@ -56,79 +139,38 @@ const _addRef = (component, ref) => {
   return component
 }
 
-@propTypes({
-  children: propTypes.node.isRequired,
-  title: propTypes.node.isRequired,
-  icon: propTypes.string
-})
-class Confirm extends Component {
-  _resolve = () => {
-    const { body } = this.refs
-    this.props.resolve(body && (body.getWrappedInstance
-      ? body.getWrappedInstance().value
-      : body.value
-    ))
-    instance.close()
-  }
-  _reject = () => {
-    this.props.reject()
-    instance.close()
-  }
-
-  _style = { marginRight: '0.5em' }
-
-  render () {
-    const { Body, Footer, Header, Title } = ReactModal
-    const { title, icon } = this.props
-
-    const body = _addRef(this.props.children, 'body')
-
-    return <div>
-      <Header closeButton>
-        <Title>
-          {icon
-            ? <span><Icon icon={icon} /> {title}</span>
-            : title
-          }
-        </Title>
-      </Header>
-      <Body>
-        {body}
-      </Body>
-      <Footer>
-        <Button
-          bsStyle='primary'
-          onClick={this._resolve}
-          style={this._style}
-        >
-          {_('confirmOk')}
-        </Button>
-        <Button
-          bsStyle='secondary'
-          onClick={this._reject}
-        >
-          {_('confirmCancel')}
-        </Button>
-      </Footer>
-    </div>
-  }
-}
+const CONFIRM_BUTTONS = [ { btnStyle: 'primary', label: _('confirmOk') } ]
 
 export const confirm = ({
   body,
-  title,
-  icon = 'alarm'
+  icon = 'alarm',
+  title
+}) => (
+  chooseAction({
+    body,
+    buttons: CONFIRM_BUTTONS,
+    icon,
+    title
+  })
+)
+
+export const chooseAction = ({
+  body,
+  buttons,
+  icon,
+  title
 }) => {
   return new Promise((resolve, reject) => {
     modal(
-      <Confirm
-        title={title}
-        resolve={resolve}
-        reject={reject}
+      <GenericModal
+        buttons={buttons}
         icon={icon}
+        reject={reject}
+        resolve={resolve}
+        title={title}
       >
         {body}
-      </Confirm>,
+      </GenericModal>,
       reject
     )
   })
@@ -164,14 +206,8 @@ export default class Modal extends Component {
   }
 
   render () {
-    const { showModal } = this.state
-    /* TODO: remove this work-around and use
-     * ReactModal.Body, ReactModal.Header, ...
-     * after this issue has been fixed:
-     * https://phabricator.babeljs.io/T6976
-     */
     return (
-      <ReactModal show={showModal} onHide={this._onHide}>
+      <ReactModal show={this.state.showModal} onHide={this._onHide}>
         {this.state.content}
       </ReactModal>
     )

src/common/no-objects.js

@@ -0,0 +1,30 @@
+import React from 'react'
+import { isEmpty } from 'lodash'
+
+import propTypes from './prop-types-decorator'
+
+// This component returns :
+//  - A loading icon when the objects are not fetched
+//  - A default message if the objects are fetched and the collection is empty
+//  - The children if the objects are fetched and the collection is not empty
+//
+// ```js
+//  <NoObjects collection={collection} emptyMessage={message}>
+//    {children}
+// </NoObjects>
+// ````
+const NoObjects = ({ children, collection, emptyMessage }) => collection == null
+  ? <img src='assets/loading.svg' alt='loading' />
+  : isEmpty(collection)
+    ? <p>{emptyMessage}</p>
+    : <div>{children}</div>
+
+propTypes(NoObjects)({
+  children: propTypes.node.isRequired,
+  collection: propTypes.oneOfType([
+    propTypes.array,
+    propTypes.object
+  ]).isRequired,
+  emptyMessage: propTypes.node.isRequired
+})
+export default NoObjects

src/common/prop-types-decorator.js

@@ -0,0 +1,33 @@
+import assign from 'lodash/assign'
+import { PropTypes } from 'react'
+
+// Decorators to help declaring properties and context types on React
+// components without using the tedious static properties syntax.
+//
+// ```js
+// @propTypes({
+//   children: propTypes.node.isRequired
+// }, {
+//   store: propTypes.object.isRequired
+// })
+// class MyComponent extends React.Component {}
+// ```
+const propTypes = (propTypes, contextTypes) => target => {
+  if (propTypes !== undefined) {
+    target.propTypes = {
+      ...target.propTypes,
+      ...propTypes
+    }
+  }
+  if (contextTypes !== undefined) {
+    target.contextTypes = {
+      ...target.contextTypes,
+      ...contextTypes
+    }
+  }
+
+  return target
+}
+assign(propTypes, PropTypes)
+
+export { propTypes as default }

src/common/prop-types.js

@@ -1,22 +0,0 @@
-import assign from 'lodash/assign'
-import { PropTypes } from 'react'
-
-// Decorators to help declaring on React components without using the
-// tedious static properties syntax.
-//
-// ```js
-// @propTypes({
-//   children: propTypes.node.isRequired
-// })
-// class MyComponent extends React.Component {}
-// ```
-const propTypes = types => target => {
-  target.propTypes = {
-    ...target.propTypes,
-    ...types
-  }
-
-  return target
-}
-assign(propTypes, PropTypes)
-export { propTypes as default }

src/common/react-novnc.js

@@ -1,14 +1,13 @@
 import React, { Component } from 'react'
+import RFB from '@nraynaud/novnc/lib/rfb'
 import { createBackoff } from 'jsonrpc-websocket-client'
-import { RFB } from 'novnc-node'
 import {
-  format as formatUrl,
   parse as parseUrl,
   resolve as resolveUrl
 } from 'url'
 import { enable as enableShortcuts, disable as disableShortcuts } from 'shortcuts'
 
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 const parseRelativeUrl = url => parseUrl(resolveUrl(String(window.location), url))
 
@@ -42,7 +41,7 @@ export default class NoVnc extends Component {
         }
       }
 
-      if (state !== 'disconnected') {
+      if (state !== 'disconnected' || this.refs.canvas == null) {
         return
       }
 
@@ -77,6 +76,11 @@ export default class NoVnc extends Component {
   _connect = () => {
     this._clean()
 
+    const { canvas } = this.refs
+    if (!canvas) {
+      return
+    }
+
     const url = parseRelativeUrl(this.props.url)
     fixProtocol(url)
 
@@ -86,14 +90,23 @@ export default class NoVnc extends Component {
     const rfb = this._rfb = new RFB({
       encrypt: isSecure,
       target: this.refs.canvas,
-      wsProtocols: [ 'chat' ],
       onClipboard: onClipboardChange && ((_, text) => {
         onClipboardChange(text)
       }),
       onUpdateState: this._onUpdateState
     })
 
-    rfb.connect(formatUrl(url))
+    // remove leading slashes from the path
+    //
+    // a leading slassh will be added by noVNC
+    const clippedPath = url.path.replace(/^\/+/, '')
+
+    // a port is required
+    //
+    // if not available from the URL, use the default ones
+    const port = url.port || (isSecure ? 443 : 80)
+
+    rfb.connect(url.hostname, port, null, clippedPath)
     disableShortcuts()
   }
 

src/common/render-xo-item.js

@@ -2,7 +2,7 @@ import _ from 'intl'
 import React from 'react'
 
 import Icon from './icon'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import { createGetObject } from './selectors'
 import { isSrWritable } from './xo'
 import {
@@ -165,7 +165,7 @@ const xoItemToRender = {
   // PIF.
   PIF: pif => (
     <span>
-      <Icon icon='network' /> {pif.device} ({pif.deviceName})
+      <Icon icon='network' color={pif.carrier ? 'text-success' : 'text-danger'} /> {pif.device} ({pif.deviceName})
     </span>
   ),
 
@@ -182,6 +182,10 @@ const renderXoItem = (item, {
 } = {}) => {
   const { id, type, label } = item
 
+  if (item.removed) {
+    return <span key={id} className='text-danger'> <Icon icon='alarm' /> {id}</span>
+  }
+
   if (!type) {
     if (process.env.NODE_ENV !== 'production' && !label) {
       throw new Error(`an item must have at least either a type or a label`)
@@ -218,7 +222,9 @@ const GenericXoItem = connectStore(() => {
   })
 })(({ xoItem, ...props }) => xoItem
   ? renderXoItem(xoItem, props)
-  : <span className='text-muted'>{_('errorNoSuchItem')}</span>
+  : renderXoUnknownItem()
 )
 
 export const renderXoItemFromId = (id, props) => <GenericXoItem {...props} id={id} />
+
+export const renderXoUnknownItem = () => <span className='text-muted'>{_('errorNoSuchItem')}</span>

src/common/scheduling.js

@@ -1,9 +1,6 @@
 import classNames from 'classnames'
-import Icon from 'icon'
 import later from 'later'
 import React from 'react'
-import Tooltip from 'tooltip'
-import { Toggle } from 'form'
 import { FormattedDate, FormattedTime } from 'react-intl'
 import {
   forEach,
@@ -14,12 +11,15 @@ import {
 } from 'lodash'
 
 import _ from './intl'
+import Button from './button'
 import Component from './base-component'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import TimezonePicker from './timezone-picker'
+import Icon from './icon'
+import Tooltip from './tooltip'
 import { Card, CardHeader, CardBlock } from './card'
 import { Col, Row } from './grid'
-import { Range } from './form'
+import { Range, Toggle } from './form'
 
 // ===================================================================
 
@@ -259,9 +259,12 @@ class TableSelect extends Component {
           ))}
         </tbody>
       </table>
-      <button className='btn btn-secondary pull-right' onClick={this._reset}>
+      <Button
+        className='pull-right'
+        onClick={this._reset}
+      >
         {_(`selectTableAll${labelId}`)} {value && !value.length && <Icon icon='success' />}
-      </button>
+      </Button>
     </div>
   }
 }
@@ -447,23 +450,27 @@ class DayPicker extends Component {
 // ===================================================================
 
 @propTypes({
-  cronPattern: propTypes.string.isRequired,
+  cronPattern: propTypes.string,
   onChange: propTypes.func,
-  timezone: propTypes.string
+  timezone: propTypes.string,
+  value: propTypes.shape({
+    cronPattern: propTypes.string.isRequired,
+    timezone: propTypes.string
+  })
 })
 export default class Scheduler extends Component {
   constructor (props) {
     super(props)
 
     this._onCronChange = newCrons => {
-      const cronPattern = this.props.cronPattern.split(' ')
+      const cronPattern = this._getCronPattern().split(' ')
       forEach(newCrons, (cron, unit) => {
         cronPattern[PICKTIME_TO_ID[unit]] = cron
       })
 
       this.props.onChange({
         cronPattern: cronPattern.join(' '),
-        timezone: this.props.timezone
+        timezone: this._getTimezone()
       })
     }
 
@@ -475,17 +482,24 @@ export default class Scheduler extends Component {
 
   _onTimezoneChange = timezone => {
     this.props.onChange({
-      cronPattern: this.props.cronPattern,
+      cronPattern: this._getCronPattern(),
       timezone
     })
   }
 
+  _getCronPattern = () => {
+    const { value, cronPattern = value.cronPattern } = this.props
+    return cronPattern
+  }
+
+  _getTimezone = () => {
+    const { value, timezone = value && value.timezone } = this.props
+    return timezone
+  }
+
   render () {
-    const {
-      cronPattern,
-      timezone
-    } = this.props
-    const cronPatternArr = cronPattern.split(' ')
+    const cronPatternArr = this._getCronPattern().split(' ')
+    const timezone = this._getTimezone()
 
     return (
       <div className='card-block'>

src/common/select-files.js

@@ -1,7 +1,7 @@
 import _ from 'intl'
 import Component from 'base-component'
 import Icon from 'icon'
-import propTypes from 'prop-types'
+import propTypes from 'prop-types-decorator'
 import React from 'react'
 import { omit } from 'lodash'
 

src/common/select-objects.js

@@ -1,9 +1,5 @@
 import React from 'react'
 import classNames from 'classnames'
-import Icon from 'icon'
-import store from 'store'
-import Tooltip from 'tooltip'
-import { Button } from 'react-bootstrap-4/lib'
 import { parse as parseRemote } from 'xo-remote-parser'
 import {
   assign,
@@ -26,10 +22,14 @@ import {
 } from 'lodash'
 
 import _ from './intl'
-import autoControlledInput from './auto-controlled-input'
+import Button from './button'
 import Component from './base-component'
-import propTypes from './prop-types'
+import Icon from './icon'
+import propTypes from './prop-types-decorator'
 import renderXoItem from './render-xo-item'
+import store from './store'
+import Tooltip from './tooltip'
+import uncontrollableInput from 'uncontrollable-input'
 import { Select } from './form'
 import {
   createCollectionWrapper,
@@ -42,7 +42,6 @@ import {
 import {
   addSubscriptions,
   connectStore,
-  mapPlus,
   resolveResourceSets
 } from './utils'
 import {
@@ -135,37 +134,6 @@ const options = props => ({
   ]).isRequired
 })
 export class GenericSelect extends Component {
-  componentDidUpdate (prevProps) {
-    const { onChange, xoObjects } = this.props
-
-    if (!onChange || prevProps.xoObjects === xoObjects) {
-      return
-    }
-
-    const ids = this._getSelectValue()
-    const objectsById = this._getObjectsById()
-
-    if (!isArray(ids)) {
-      ids && !objectsById[ids] && onChange(undefined)
-    } else {
-      let shouldTriggerOnChange
-
-      const newValue = isArray(ids) && mapPlus(ids, (id, push) => {
-        const object = objectsById[id]
-
-        if (object) {
-          push(object)
-        } else {
-          shouldTriggerOnChange = true
-        }
-      })
-
-      if (shouldTriggerOnChange) {
-        this.props.onChange(newValue)
-      }
-    }
-  }
-
   _getObjectsById = createSelector(
     () => this.props.xoObjects,
     objects => keyBy(
@@ -180,22 +148,19 @@ export class GenericSelect extends Component {
     () => this.props.xoContainers,
     () => this.props.xoObjects,
     (containers, objects) => { // createCollectionWrapper with a depth?
-      const __DEV__ = process.env.NODE_ENV !== 'production'
       const { name } = this.constructor
 
+      let options = []
       if (!containers) {
         if (__DEV__ && !isArray(objects)) {
           throw new Error(`${name}: without xoContainers, xoObjects must be an array`)
         }
 
-        return map(objects, getOption)
-      }
-
-      if (__DEV__ && isArray(objects)) {
+        options = map(objects, getOption)
+      } else if (__DEV__ && isArray(objects)) {
         throw new Error(`${name}: with xoContainers, xoObjects must be an object`)
       }
 
-      const options = []
       forEach(containers, container => {
         options.push({
           disabled: true,
@@ -206,6 +171,30 @@ export class GenericSelect extends Component {
           options.push(getOption(object, container))
         })
       })
+
+      const values = this._getSelectValue()
+      const objectsById = this._getObjectsById()
+      const addIfMissing = val => {
+        if (val && !objectsById[val]) {
+          options.push({
+            disabled: true,
+            id: val,
+            label: val,
+            value: val,
+            xoItem: {
+              id: val,
+              removed: true
+            }
+          })
+        }
+      }
+
+      if (isArray(values)) {
+        forEach(values, addIfMissing)
+      } else {
+        addIfMissing(values)
+      }
+
       return options
     }
   )
@@ -289,7 +278,7 @@ export class GenericSelect extends Component {
       {select}
       <span className='input-group-btn'>
         <Tooltip content={_('selectAll')}>
-          <Button type='button' bsStyle='secondary' onClick={this._selectAll} style={ADDON_BUTTON_STYLE}>
+          <Button onClick={this._selectAll} style={ADDON_BUTTON_STYLE}>
             <Icon icon='add' />
           </Button>
         </Tooltip>
@@ -298,7 +287,7 @@ export class GenericSelect extends Component {
   }
 }
 
-const makeStoreSelect = (createSelectors, defaultProps) => autoControlledInput(options)(
+const makeStoreSelect = (createSelectors, defaultProps) => uncontrollableInput(options)(
   connectStore(createSelectors)(
     props =>
       <GenericSelect
@@ -308,7 +297,7 @@ const makeStoreSelect = (createSelectors, defaultProps) => autoControlledInput(o
   )
 )
 
-const makeSubscriptionSelect = (subscribe, props) => autoControlledInput(options)(
+const makeSubscriptionSelect = (subscribe, props) => uncontrollableInput(options)(
   class extends Component {
     constructor (props) {
       super(props)

src/common/selectors.js

@@ -1,18 +1,21 @@
+import add from 'lodash/add'
 import checkPermissions from 'xo-acl-resolver'
-import filter from 'lodash/filter'
-import find from 'lodash/find'
-import forEach from 'lodash/forEach'
-import groupBy from 'lodash/groupBy'
-import isArray from 'lodash/isArray'
-import isArrayLike from 'lodash/isArrayLike'
-import isFunction from 'lodash/isFunction'
-import keys from 'lodash/keys'
-import map from 'lodash/map'
-import orderBy from 'lodash/orderBy'
-import pickBy from 'lodash/pickBy'
-import size from 'lodash/size'
-import slice from 'lodash/slice'
 import { createSelector as create } from 'reselect'
+import {
+  filter,
+  find,
+  forEach,
+  groupBy,
+  isArray,
+  isArrayLike,
+  isFunction,
+  keys,
+  map,
+  orderBy,
+  pickBy,
+  size,
+  slice
+} from 'lodash'
 
 import invoke from './invoke'
 import shallowEqual from './shallow-equal'
@@ -126,9 +129,9 @@ export const createCounter = (collection, predicate) =>
 //
 // Should only be used with a reasonable number of properties.
 export const createPicker = (object, props) =>
-  _createCollectionWrapper(
-    _create2(
-      object, props,
+  _create2(
+    object, props,
+    _createCollectionWrapper(
       (object, props) => {
         const values = {}
         forEach(props, prop => {
@@ -191,6 +194,13 @@ export const createSort = (
   order = 'asc'
 ) => _create2(collection, getter, order, orderBy)
 
+export const createSumBy = (itemsSelector, iterateeSelector) =>
+  _create2(
+    itemsSelector,
+    iterateeSelector,
+    (items, iteratee) => map(items, iteratee).reduce(add, 0)
+  )
+
 export const createTop = (collection, iteratee, n) =>
   _create2(
     collection,
@@ -347,7 +357,7 @@ export const createSortForType = invoke(() => {
   return (type, collection) => createSort(
     collection,
     autoSelector(type, getIteratees),
-    autoSelector(type, getOrders),
+    autoSelector(type, getOrders)
   )
 })
 
@@ -448,6 +458,24 @@ export const createGetTags = collectionSelectors => {
   return _extendCollectionSelector(getTags, 'tag')
 }
 
+export const createGetVmLastShutdownTime = (getVmId = (_, {vm}) => vm != null ? vm.id : undefined) => create(
+  getVmId,
+  createGetObjectsOfType('message'),
+  (vmId, messages) => {
+    let max = null
+    forEach(messages, message => {
+      if (
+        message.$object === vmId &&
+        message.name === 'VM_SHUTDOWN' &&
+        (max === null || message.time > max)
+      ) {
+        max = message.time
+      }
+    })
+    return max
+  }
+)
+
 export const createGetObjectMessages = objectSelector =>
   createGetObjectsOfType('message').filter(
     create(
@@ -463,9 +491,10 @@ export const createGetObjectMessages = objectSelector =>
 export const getObject = createGetObject((_, id) => id)
 
 export const createDoesHostNeedRestart = hostSelector => {
-  // Returns the first patch of the host which requires it to be
-  // restarted.
-  const restartPoolPatch = createGetObjectsOfType('pool_patch').pick(
+  // XS < 7.1
+  const patchRequiresReboot = createGetObjectsOfType('pool_patch').pick(
+    // Returns the first patch of the host which requires it to be
+    // restarted.
     create(
       createGetObjectsOfType('host_patch').pick(
         (state, props) => {
@@ -485,7 +514,11 @@ export const createDoesHostNeedRestart = hostSelector => {
     action === 'restartHost' || action === 'restartXapi'
   ) ])
 
-  return (state, props) => restartPoolPatch(state, props) !== undefined
+  return create(
+    hostSelector,
+    (...args) => args,
+    (host, args) => host.rebootRequired || !!patchRequiresReboot(...args)
+  )
 }
 
 export const createGetHostMetrics = hostSelector =>
@@ -509,3 +542,17 @@ export const createGetHostMetrics = hostSelector =>
       }
     )
   )
+
+export const createGetVmDisks = vmSelector =>
+  createGetObjectsOfType('VDI').pick(
+    create(
+      createGetObjectsOfType('VBD').pick(
+        (state, props) => vmSelector(state, props).$VBDs
+      ),
+      _createCollectionWrapper(vbds => map(vbds, vbd =>
+        vbd.is_cd_drive
+          ? undefined
+          : vbd.VDI
+      ))
+    )
+  )

src/common/single-line-row.js

@@ -1,6 +1,6 @@
 import React, { cloneElement } from 'react'
 
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 const SINGLE_LINE_STYLE = { display: 'flex' }
 const COL_STYLE = { marginTop: 'auto', marginBottom: 'auto' }

src/common/sorted-table/index.css

@@ -10,3 +10,8 @@
 .clickableRow {
   cursor: pointer;
 }
+
+.highlight {
+  outline: 2px solid #366e98;
+  outline-offset: -2px;
+}

src/common/sorted-table/index.js

@@ -1,21 +1,36 @@
 import _ from 'intl'
-import ceil from 'lodash/ceil'
 import classNames from 'classnames'
-import debounce from 'lodash/debounce'
-import findIndex from 'lodash/findIndex'
-import isEmpty from 'lodash/isEmpty'
-import isFunction from 'lodash/isFunction'
-import map from 'lodash/map'
-import React from 'react'
-import { Dropdown, MenuItem, Pagination } from 'react-bootstrap-4/lib'
 import DropdownMenu from 'react-bootstrap-4/lib/DropdownMenu' // https://phabricator.babeljs.io/T6662 so Dropdown.Menu won't work like https://react-bootstrap.github.io/components.html#btn-dropdowns-custom
 import DropdownToggle from 'react-bootstrap-4/lib/DropdownToggle' // https://phabricator.babeljs.io/T6662 so Dropdown.Toggle won't work https://react-bootstrap.github.io/components.html#btn-dropdowns-custom
+import React from 'react'
+import Shortcuts from 'shortcuts'
 import { Portal } from 'react-overlays'
+import { routerShape } from 'react-router/lib/PropTypes'
+import { Set } from 'immutable'
+import {
+  Dropdown,
+  MenuItem,
+  Pagination
+} from 'react-bootstrap-4/lib'
+import {
+  ceil,
+  debounce,
+  findIndex,
+  forEach,
+  isEmpty,
+  isFunction,
+  map
+} from 'lodash'
 
+import ActionRowButton from '../action-row-button'
+import Button from '../button'
+import ButtonGroup from '../button-group'
 import Component from '../base-component'
+import defined from '../xo-defined'
 import Icon from '../icon'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import SingleLineRow from '../single-line-row'
+import Tooltip from '../tooltip'
 import { BlockLink } from '../link'
 import { Container, Col } from '../grid'
 import { create as createMatcher } from '../complex-matcher'
@@ -32,9 +47,8 @@ import styles from './index.css'
 // ===================================================================
 
 @propTypes({
+  defaultFilter: propTypes.string,
   filters: propTypes.object,
-  nFilteredItems: propTypes.number.isRequired,
-  nItems: propTypes.number.isRequired,
   onChange: propTypes.func.isRequired
 })
 class TableFilter extends Component {
@@ -56,10 +70,9 @@ class TableFilter extends Component {
 
     return (
       <div className='input-group'>
-        <span className='input-group-addon'>{props.nFilteredItems} / {props.nItems}</span>
         {isEmpty(props.filters)
           ? <span className='input-group-addon'><Icon icon='search' /></span>
-          : <div className='input-group-btn'>
+          : <span className='input-group-btn'>
             <Dropdown id='filter'>
               <DropdownToggle bsStyle='info'>
                 <Icon icon='search' />
@@ -72,18 +85,27 @@ class TableFilter extends Component {
                 )}
               </DropdownMenu>
             </Dropdown>
-          </div>}
+          </span>}
         <input
-          type='text'
-          ref='filter'
-          onChange={this._onChange}
           className='form-control'
+          defaultValue={props.defaultFilter}
+          onChange={this._onChange}
+          ref='filter'
         />
-        <div className='input-group-btn'>
-          <button className='btn btn-secondary' onClick={this._cleanFilter}>
+        <Tooltip content={_('filterSyntaxLinkTooltip')}>
+          <a
+            className='input-group-addon'
+            href='https://xen-orchestra.com/docs/search.html#filter-syntax'
+            target='_blank'
+          >
+            <Icon icon='info' />
+          </a>
+        </Tooltip>
+        <span className='input-group-btn'>
+          <Button onClick={this._cleanFilter}>
             <Icon icon='clear-search' />
-          </button>
-        </div>
+          </Button>
+        </span>
       </div>
     )
   }
@@ -93,7 +115,7 @@ class TableFilter extends Component {
 
 @propTypes({
   columnId: propTypes.number.isRequired,
-  name: propTypes.any.isRequired,
+  name: propTypes.node,
   sort: propTypes.func,
   sortIcon: propTypes.string
 })
@@ -104,10 +126,10 @@ class ColumnHead extends Component {
   }
 
   render () {
-    const { name, sortIcon } = this.props
+    const { name, sortIcon, textAlign } = this.props
 
     if (!this.props.sort) {
-      return <th>{name}</th>
+      return <th className={textAlign && `text-xs-${textAlign}`}>{name}</th>
     }
 
     const isSelected = sortIcon === 'asc' || sortIcon === 'desc'
@@ -115,6 +137,7 @@ class ColumnHead extends Component {
     return (
       <th
         className={classNames(
+          textAlign && `text-xs-${textAlign}`,
           styles.clickableColumn,
           isSelected && classNames('text-white', 'bg-info')
         )}
@@ -131,26 +154,65 @@ class ColumnHead extends Component {
 
 // ===================================================================
 
-const DEFAULT_ITEMS_PER_PAGE = 10
+@propTypes({
+  indeterminate: propTypes.bool.isRequired
+})
+class Checkbox extends Component {
+  componentDidUpdate () {
+    const { props: { indeterminate }, ref } = this
+    if (ref !== null) {
+      ref.indeterminate = indeterminate
+    }
+  }
+
+  _ref = ref => {
+    this.ref = ref
+    this.componentDidUpdate()
+  }
+
+  render () {
+    const { indeterminate, ...props } = this.props
+    props.ref = this._ref
+    props.type = 'checkbox'
+    return <input {...props} />
+  }
+}
+
+// ===================================================================
+
+const actionsShape = propTypes.arrayOf(propTypes.shape({
+  // groupedActions: the function will be called with an array of the selected items` ids in parameters
+  // individualActions: the function will be called with the related item's id in parameters
+  handler: propTypes.func.isRequired,
+  icon: propTypes.string.isRequired,
+  label: propTypes.node.isRequired,
+  level: propTypes.oneOf([ 'warning', 'danger' ])
+}))
 
 @propTypes({
   defaultColumn: propTypes.number,
+  defaultFilter: propTypes.string,
   collection: propTypes.oneOfType([
     propTypes.array,
     propTypes.object
   ]).isRequired,
   columns: propTypes.arrayOf(propTypes.shape({
+    component: propTypes.func,
     default: propTypes.bool,
-    name: propTypes.node.isRequired,
-    itemRenderer: propTypes.func.isRequired,
+    name: propTypes.node,
+    itemRenderer: propTypes.func,
     sortCriteria: propTypes.oneOfType([
       propTypes.func,
       propTypes.string
     ]),
-    sortOrder: propTypes.string
+    sortOrder: propTypes.string,
+    textAlign: propTypes.string
   })).isRequired,
   filterContainer: propTypes.func,
+  filterUrlParam: propTypes.string,
   filters: propTypes.object,
+  groupedActions: actionsShape,
+  individualActions: actionsShape,
   itemsPerPage: propTypes.number,
   paginationContainer: propTypes.func,
   rowAction: propTypes.func,
@@ -158,11 +220,20 @@ const DEFAULT_ITEMS_PER_PAGE = 10
     propTypes.func,
     propTypes.string
   ]),
+  // DOM node selector like body or .my-class
+  // The shortcuts will be enabled when the node is focused
+  shortcutsTarget: propTypes.string,
   userData: propTypes.any
+}, {
+  router: routerShape
 })
 export default class SortedTable extends Component {
-  constructor (props) {
-    super(props)
+  static defaultProps = {
+    itemsPerPage: 10
+  }
+
+  constructor (props, context) {
+    super(props, context)
 
     let selectedColumn = props.defaultColumn
     if (selectedColumn == null) {
@@ -174,8 +245,15 @@ export default class SortedTable extends Component {
     }
 
     this.state = {
+      all: false, // whether all items are selected (accross pages)
+      filter: defined(
+        () => context.router.location.query[props.filterUrlParam],
+        () => props.filters[props.defaultFilter]
+      ),
       selectedColumn,
-      itemsPerPage: props.itemsPerPage || DEFAULT_ITEMS_PER_PAGE
+      sortOrder: props.columns[selectedColumn].sortOrder === 'desc'
+        ? 'desc'
+        : 'asc'
     }
 
     this._getSelectedColumn = () =>
@@ -185,11 +263,11 @@ export default class SortedTable extends Component {
       () => this.props.collection
     )
 
-    this._getAllItems = createSort(
+    this._getItems = createSort(
       createFilter(
         () => this.props.collection,
         createSelector(
-          () => this.state.filter || '',
+          () => this.state.filter,
           createMatcher
         )
       ),
@@ -207,16 +285,67 @@ export default class SortedTable extends Component {
     this.state.activePage = 1
 
     this._getVisibleItems = createPager(
-      this._getAllItems,
+      this._getItems,
       () => this.state.activePage,
-      this.state.itemsPerPage
+      this.props.itemsPerPage
     )
-  }
 
-  componentWillMount () {
-    this.setState({
-      sortOrder: this.props.columns[this.state.selectedColumn].sortOrder === 'desc' ? 'desc' : 'asc'
-    })
+    this.state.selectedItemsIds = new Set()
+
+    this._hasGroupedActions = createSelector(
+      () => this.props.groupedActions,
+      actions => !isEmpty(actions)
+    )
+
+    this._getShortcutsHandler = createSelector(
+      this._getVisibleItems,
+      this._hasGroupedActions,
+      () => this.state.highlighted,
+      () => this.props.rowLink,
+      () => this.props.rowAction,
+      () => this.props.userData,
+      (visibleItems, hasGroupedActions, itemIndex, rowLink, rowAction, userData) => (command, event) => {
+        event.preventDefault()
+        const item = itemIndex !== undefined ? visibleItems[itemIndex] : undefined
+
+        switch (command) {
+          case 'SEARCH':
+            this.refs.filterInput.refs.filter.focus()
+            break
+          case 'NAV_DOWN':
+            if (hasGroupedActions || rowAction !== undefined || rowLink !== undefined) {
+              this.setState({
+                highlighted: (itemIndex + visibleItems.length + 1) % visibleItems.length || 0
+              })
+            }
+            break
+          case 'NAV_UP':
+            if (hasGroupedActions || rowAction !== undefined || rowLink !== undefined) {
+              this.setState({
+                highlighted: (itemIndex + visibleItems.length - 1) % visibleItems.length || 0
+              })
+            }
+            break
+          case 'SELECT':
+            if (itemIndex !== undefined && hasGroupedActions) {
+              this._selectItem(itemIndex)
+            }
+            break
+          case 'ROW_ACTION':
+            if (item !== undefined) {
+              if (rowLink !== undefined) {
+                this.context.router.push(isFunction(rowLink)
+                  ? rowLink(item, userData)
+                  : rowLink
+                )
+              } else if (rowAction !== undefined) {
+                rowAction(item, userData)
+              }
+            }
+            break
+        }
+      }
+    )
   }
 
   componentDidMount () {
@@ -247,31 +376,238 @@ export default class SortedTable extends Component {
     })
   }
 
+  componentDidUpdate () {
+    const { selectedItemsIds } = this.state
+
+    // Unselect items that are no longer visible
+    if ((this._visibleItemsRecomputations || 0) < (this._visibleItemsRecomputations = this._getVisibleItems.recomputations())) {
+      const newSelectedItems = selectedItemsIds.intersect(map(this._getVisibleItems(), 'id'))
+      if (newSelectedItems.size < selectedItemsIds.size) {
+        this.setState({ selectedItemsIds: newSelectedItems })
+      }
+    }
+  }
+
   _onPageSelection = (_, event) => this.setState({
-    activePage: event.eventKey
+    activePage: event.eventKey,
+    highlighted: undefined
   })
 
-  _onFilterChange = debounce(filter => {
+  _selectAllVisibleItems = event => {
     this.setState({
+      all: false,
+      selectedItemsIds: event.target.checked
+        ? this.state.selectedItemsIds.union(map(this._getVisibleItems(), 'id'))
+        : this.state.selectedItemsIds.clear()
+    })
+  }
+
+  // TODO: figure out why it's necessary
+  _toggleNestedCheckboxGuard = false
+
+  _toggleNestedCheckbox = event => {
+    const child = event.target.firstElementChild
+    if (child != null && child.tagName === 'INPUT') {
+      if (this._toggleNestedCheckboxGuard) {
+        return
+      }
+      this._toggleNestedCheckboxGuard = true
+      child.dispatchEvent(
+        new window.MouseEvent('click', event.nativeEvent)
+      )
+      this._toggleNestedCheckboxGuard = false
+    }
+  }
+
+  _selectAll = () => this.setState({ all: true })
+
+  _selectItem (current, selected, range = false) {
+    const { all, selectedItemsIds } = this.state
+    const visibleItems = this._getVisibleItems()
+    const item = visibleItems[current]
+
+    if (all) {
+      return this.setState({
+        all: false,
+        selectedItemsIds: new Set().withMutations(selectedItemsIds => {
+          forEach(visibleItems, item => {
+            selectedItemsIds.add(item.id)
+          })
+          selectedItemsIds.delete(item.id)
+        })
+      })
+    }
+
+    let method = (
+      selected === undefined ? !selectedItemsIds.has(item.id) : selected
+    ) ? 'add' : 'delete'
+
+    let previous
+    this.setState({ selectedItemsIds:
+      (
+        range &&
+        (previous = this._previous) !== undefined
+      ) ? selectedItemsIds.withMutations(selectedItemsIds => {
+        let i = previous
+        let end = current
+        if (previous > current) {
+          i = current
+          end = previous
+        }
+        for (; i <= end; ++i) {
+          selectedItemsIds[method](visibleItems[i].id)
+        }
+      })
+        : selectedItemsIds[method](item.id)
+    })
+
+    this._previous = current
+  }
+
+  _onSelectItemCheckbox = event => {
+    const { target } = event
+    this._selectItem(+target.name, target.checked, event.nativeEvent.shiftKey)
+  }
+
+  _onFilterChange = debounce(filter => {
+    const { filterUrlParam } = this.props
+    if (filterUrlParam !== undefined) {
+      const { router } = this.context
+      const { location } = router
+      router.replace({
+        ...location,
+        query: {
+          ...location.query,
+          [filterUrlParam]: filter
+        }
+      })
+    }
+    this.setState({
+      activePage: 1,
       filter,
-      activePage: 1
+      highlighted: undefined
     })
   }, 500)
 
+  _executeGroupedAction = handler => {
+    const { state } = this
+    return handler(
+      state.all
+        ? map(this._getItems(), 'id')
+        : state.selectedItemsIds.toArray()
+    )
+  }
+
+  _executeRowAction = event => {
+    const { props } = this
+    const item = this._getVisibleItems()[event.currentTarget.dataset.index]
+    props.rowAction(item, props.userData)
+  }
+
+  _renderItem = (item, i) => {
+    const { props, state } = this
+
+    const { individualActions, rowAction, rowLink, userData } = props
+
+    const hasGroupedActions = this._hasGroupedActions()
+    const hasIndividualActions = !isEmpty(individualActions)
+
+    const columns = map(props.columns, ({
+      component: Component,
+      itemRenderer,
+      textAlign
+    }, key) =>
+      <td
+        className={textAlign && `text-xs-${textAlign}`}
+        key={key}
+      >
+        {Component !== undefined
+          ? <Component item={item} userData={userData} />
+          : itemRenderer(item, userData)
+        }
+      </td>
+    )
+
+    const { id = i } = item
+
+    const selectionColumn = hasGroupedActions && <td
+      className='text-xs-center'
+      onClick={this._toggleNestedCheckbox}
+    >
+      <input
+        checked={state.all || state.selectedItemsIds.has(id)}
+        name={i} // position in visible items
+        onChange={this._selectItem}
+        type='checkbox'
+      />
+    </td>
+    const actionsColumn = hasIndividualActions && <td><div className='pull-right'>
+      <ButtonGroup>
+        {map(individualActions, ({ icon, label, level, handler }, key) => <ActionRowButton
+          btnStyle={level}
+          handler={handler}
+          handlerParam={id}
+          icon={icon}
+          key={key}
+          tooltip={label}
+        />)}
+      </ButtonGroup>
+    </div></td>
+
+    return rowLink != null
+        ? <BlockLink
+          className={state.highlighted === i ? styles.highlight : undefined}
+          key={id}
+          tagName='tr'
+          to={isFunction(rowLink) ? rowLink(item, userData) : rowLink}
+        >
+          {selectionColumn}
+          {columns}
+          {actionsColumn}
+        </BlockLink>
+        : <tr
+          className={classNames(
+            rowAction && styles.clickableRow,
+            state.highlighted === i && styles.highlight
+          )}
+          key={id}
+          onClick={rowAction && (() => rowAction(item, userData))}
+        >
+          {selectionColumn}
+          {columns}
+          {actionsColumn}
+        </tr>
+  }
+
   render () {
     const { props, state } = this
     const {
-      paginationContainer,
       filterContainer,
-      filters,
-      rowAction,
-      rowLink,
-      userData
+      groupedActions,
+      itemsPerPage,
+      paginationContainer,
+      shortcutsTarget
     } = props
+    const { all } = state
 
-    const nFilteredItems = this._getAllItems().length
+    const nAllItems = this._getTotalNumberOfItems()
+    const nItems = this._getItems().length
+    const nSelectedItems = state.selectedItemsIds.size
+    const nVisibleItems = this._getVisibleItems().length
 
-    const paginationInstance = (
+    const hasGroupedActions = this._hasGroupedActions()
+    const hasIndividualActions = !isEmpty(props.individualActions)
+
+    const nColumns = props.columns.length + (hasIndividualActions ? 2 : 1)
+
+    const displayPagination =
+      paginationContainer === undefined &&
+      itemsPerPage < nAllItems
+    const displayFilter =
+      filterContainer === undefined &&
+      nAllItems !== 0
+
+    const paginationInstance = displayPagination && (
       <Pagination
         first
         last
@@ -280,84 +616,133 @@ export default class SortedTable extends Component {
         ellipsis
         boundaryLinks
         maxButtons={10}
-        items={ceil(nFilteredItems / state.itemsPerPage)}
-        activePage={this.state.activePage}
+        items={ceil(nItems / itemsPerPage)}
+        activePage={state.activePage}
         onSelect={this._onPageSelection}
       />
     )
 
-    const filterInstance = (
+    const filterInstance = displayFilter && (
       <TableFilter
-        filters={filters}
-        nFilteredItems={nFilteredItems}
-        nItems={this._getTotalNumberOfItems()}
+        defaultFilter={state.filter}
+        filters={props.filters}
         onChange={this._onFilterChange}
+        ref='filterInput'
       />
     )
 
     return (
       <div>
+        {shortcutsTarget !== undefined && <Shortcuts
+          handler={this._getShortcutsHandler()}
+          name='SortedTable'
+          stopPropagation
+          targetNodeSelector={shortcutsTarget}
+        />}
         <table className='table'>
           <thead className='thead-default'>
             <tr>
+              <th colSpan={nColumns}>
+                {nItems === nAllItems
+                  ? _('sortedTableNumberOfItems', { nTotal: nItems })
+                  : _('sortedTableNumberOfFilteredItems', {
+                    nFiltered: nItems,
+                    nTotal: nAllItems
+                  })
+                }
+                {all
+                  ? <span>
+                    {' '}-{' '}
+                    <span className='text-danger'>
+                      {_('sortedTableAllItemsSelected')}
+                    </span>
+                  </span>
+                  : nSelectedItems !== 0 && <span>
+                    {' '}-{' '}
+                    {_('sortedTableNumberOfSelectedItems', {
+                      nSelected: nSelectedItems
+                    })}
+                    {nSelectedItems === nVisibleItems && nSelectedItems < nItems &&
+                      <Button
+                        btnStyle='info'
+                        className='ml-1'
+                        onClick={this._selectAll}
+                        size='small'
+                      >
+                        {_('sortedTableSelectAllItems')}
+                      </Button>
+                    }
+                  </span>
+                }
+                {nSelectedItems !== 0 && <div className='pull-right'>
+                  <ButtonGroup>
+                    {map(groupedActions, ({ icon, label, level, handler }, key) => <ActionRowButton
+                      btnStyle={level}
+                      handler={this._executeGroupedAction}
+                      handlerParam={handler}
+                      icon={icon}
+                      key={key}
+                      tooltip={label}
+                    />)}
+                  </ButtonGroup>
+                </div>}
+              </th>
+            </tr>
+            <tr>
+              {hasGroupedActions && <th
+                className='text-xs-center'
+                onClick={this._toggleNestedCheckbox}
+              >
+                <Checkbox
+                  onChange={this._selectAllVisibleItems}
+                  checked={all || nSelectedItems !== 0}
+                  indeterminate={!all && nSelectedItems !== 0 && nSelectedItems !== nVisibleItems}
+                />
+              </th>}
               {map(props.columns, (column, key) => (
                 <ColumnHead
+                  textAlign={column.textAlign}
                   columnId={key}
+
                   key={key}
                   name={column.name}
                   sort={column.sortCriteria && this._sort}
                   sortIcon={state.selectedColumn === key ? state.sortOrder : 'sort'}
                />
               ))}
+              {hasIndividualActions && <th />}
             </tr>
           </thead>
           <tbody>
-            {map(this._getVisibleItems(), (item, i) => {
-              const columns = map(props.columns, (column, key) => (
-                <td key={key}>
-                  {column.itemRenderer(item, userData)}
-                </td>
-              ))
-
-              const { id = i } = item
-
-              return rowLink
-                ? <BlockLink
-                  key={id}
-                  tagName='tr'
-                  to={isFunction(rowLink) ? rowLink(item, userData) : rowLink}
-                >{columns}</BlockLink>
-                : <tr
-                  className={rowAction && styles.clickableRow}
-                  key={id}
-                  onClick={rowAction && (() => rowAction(item, userData))}
-                >
-                  {columns}
-                </tr>
-            })}
+            {nVisibleItems !== 0
+              ? map(this._getVisibleItems(), this._renderItem)
+              : <tr><td className='text-info text-xs-center' colSpan={nColumns}>
+                {_('sortedTableNoItems')}
+              </td></tr>
+            }
           </tbody>
         </table>
-        {(!paginationContainer || !filterContainer) && (
+        {(displayFilter || displayPagination) && (
           <Container>
             <SingleLineRow>
               <Col mediumSize={8}>
-                {paginationContainer
-                  ? (
+                {displayPagination && (
+                  paginationContainer !== undefined
                     // Rebuild container function to refresh Portal component.
-                    <Portal container={() => paginationContainer()}>
+                    ? <Portal container={() => paginationContainer()}>
                       {paginationInstance}
                     </Portal>
-                  ) : paginationInstance
-                }
+                    : paginationInstance
+                )}
               </Col>
               <Col mediumSize={4}>
-                {filterContainer
-                  ? (
-                    <Portal container={() => filterContainer()}>
+                {displayFilter && (
+                  filterContainer
+                    ? <Portal container={() => filterContainer()}>
                       {filterInstance}
                     </Portal>
-                  ) : filterInstance
-                }
+                    : filterInstance
+                )}
               </Col>
             </SingleLineRow>
           </Container>

src/common/state-button.js

@@ -0,0 +1,45 @@
+import React from 'react'
+import styled from 'styled-components'
+import {
+  omit
+} from 'lodash'
+
+import ActionButton from './action-button'
+import propTypes from './prop-types-decorator'
+
+// do not forward `state` to ActionButton
+const Button = styled(p => <ActionButton {...omit(p, 'state')} />)`
+  background-color: ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateBg`]};
+  border: 2px solid ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateColor`]};
+  color: ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateColor`]};
+`
+
+const StateButton = ({
+  disabledHandler,
+  disabledHandlerParam,
+  disabledLabel,
+  disabledTooltip,
+
+  enabledLabel,
+  enabledTooltip,
+  enabledHandler,
+  enabledHandlerParam,
+
+  state,
+  ...props
+}) =>
+  <Button
+    handler={state ? enabledHandler : disabledHandler}
+    handlerParam={state ? enabledHandlerParam : disabledHandlerParam}
+    tooltip={state ? enabledTooltip : disabledTooltip}
+    {...props}
+    icon={state ? 'running' : 'halted'}
+    size='small'
+    state={state}
+  >
+    {state ? enabledLabel : disabledLabel}
+  </Button>
+
+export default propTypes({
+  state: propTypes.bool.isRequired
+})(StateButton)

src/common/store/actions.js

@@ -1,33 +1,22 @@
-import isFunction from 'lodash/isFunction'
-
-// ===================================================================
-
 const createAction = (() => {
   const { defineProperty } = Object
-  const noop = function () {
-    if (arguments.length) {
-      throw new Error('this action expects no payload!')
-    }
-  }
 
-  return (type, payloadCreator = noop) => {
-    const createActionObject = payload => {
-      // Thunks
-      if (isFunction(payload)) {
-        return payload
-      }
+  return (type, payloadCreator) => defineProperty(
+    payloadCreator
+      ? (...args) => ({
+        type,
+        payload: payloadCreator(...args)
+      })
+      : (action => function () {
+        if (arguments.length) {
+          throw new Error('this action expects no payload!')
+        }
 
-      return payload === undefined
-        ? { type }
-        : { type, payload }
-    }
-
-    return defineProperty(
-      (...args) => createActionObject(payloadCreator(...args)),
-      'toString',
-      { value: () => type }
-    )
-  }
+        return action
+      })({ type }),
+    'toString',
+    { value: () => type }
+  )
 })()
 
 // ===================================================================

src/common/store/reducer.js

@@ -102,16 +102,20 @@ export default {
 
       for (const id in updates) {
         const object = updates[id]
+        const previous = all[id]
 
         if (object) {
+          const { type } = object
+
           all[id] = object
-          get(object.type)[id] = object
-        } else {
-          const previous = all[id]
-          if (previous) {
-            delete all[id]
+          get(type)[id] = object
+
+          if (previous && previous.type !== type) {
             delete get(previous.type)[id]
           }
+        } else if (previous) {
+          delete all[id]
+          delete get(previous.type)[id]
         }
       }
 

src/common/tab-button.js

@@ -18,7 +18,9 @@ const TabButton = ({
     {...props}
     size='large'
     style={STYLE}
-  ><span className='hidden-md-down'>{_(labelId)}</span></ActionButton>
+  >
+    {labelId !== undefined && <span className='hidden-md-down'>{_(labelId)}</span>}
+  </ActionButton>
 )
 export { TabButton as default }
 

src/common/tags.js

@@ -5,7 +5,7 @@ import React from 'react'
 
 import Component from './base-component'
 import Icon from './icon'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 
 const INPUT_STYLE = {
   margin: '2px',

src/common/themes/base.js

@@ -0,0 +1,6 @@
+export default {
+  disabledStateBg: '#fff',
+  disabledStateColor: '#c0392b',
+  enabledStateBg: '#fff',
+  enabledStateColor: '#27ae60'
+}

src/common/timezone-picker.js

@@ -5,7 +5,7 @@ import React from 'react'
 
 import _ from './intl'
 import Component from './base-component'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import { getXoServerTimezone } from './xo'
 import { Select } from './form'
 
@@ -56,7 +56,7 @@ export default class TimezonePicker extends Component {
     }
 
     this.setState({
-      timezone: option && option.value || SERVER_TIMEZONE_TAG
+      timezone: (option != null && option.value) || SERVER_TIMEZONE_TAG
     }, () =>
       this.props.onChange(this.state.timezone === SERVER_TIMEZONE_TAG ? null : this.state.timezone)
     )
@@ -81,7 +81,6 @@ export default class TimezonePicker extends Component {
         />
         <div className='pull-right'>
           <ActionButton
-            btnStyle='secondary'
             handler={this._useLocalTime}
             icon='time'
           >

src/common/tooltip/get-position.js

@@ -280,8 +280,8 @@ const getParent = (currentTarget) => {
     currentParent = currentParent.parentElement
   }
 
-  const parentTop = currentParent && currentParent.getBoundingClientRect().top || 0
-  const parentLeft = currentParent && currentParent.getBoundingClientRect().left || 0
+  const parentTop = currentParent && currentParent.getBoundingClientRect().top
+  const parentLeft = currentParent && currentParent.getBoundingClientRect().left
 
   return {parentTop, parentLeft}
 }

src/common/tooltip/index.js

@@ -5,7 +5,7 @@ import ReactDOM from 'react-dom'
 
 import Component from '../base-component'
 import getPosition from './get-position'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 
 import styles from './index.css'
 

src/common/utils.js

@@ -1,21 +1,26 @@
-import escapeRegExp from 'lodash/escapeRegExp'
-import every from 'lodash/every'
-import forEach from 'lodash/forEach'
 import getStream from 'get-stream'
 import humanFormat from 'human-format'
-import isArray from 'lodash/isArray'
-import isEmpty from 'lodash/isEmpty'
-import isFunction from 'lodash/isFunction'
-import isPlainObject from 'lodash/isPlainObject'
-import isString from 'lodash/isString'
-import join from 'lodash/join'
-import keys from 'lodash/keys'
-import map from 'lodash/map'
-import mapValues from 'lodash/mapValues'
 import React from 'react'
 import ReadableStream from 'readable-stream'
-import replace from 'lodash/replace'
 import { connect } from 'react-redux'
+import {
+  clone,
+  escapeRegExp,
+  every,
+  forEach,
+  isArray,
+  isEmpty,
+  isFunction,
+  isPlainObject,
+  isString,
+  join,
+  keys,
+  map,
+  mapValues,
+  replace,
+  sample,
+  startsWith
+} from 'lodash'
 
 import _ from './intl'
 import * as actions from './store/actions'
@@ -62,14 +67,27 @@ export const addSubscriptions = subscriptions => Component => {
     }
 
     componentWillMount () {
-      this._unsubscribes = map(isFunction(subscriptions) ? subscriptions() : subscriptions, (subscribe, prop) =>
-        subscribe(value => this.setState({ [prop]: value }))
+      this._unsubscribes = map(
+        isFunction(subscriptions)
+          ? subscriptions(this.props)
+          : subscriptions,
+        (subscribe, prop) =>
+          subscribe(value => this._setState({ [prop]: value }))
       )
     }
 
+    componentDidMount () {
+      this._setState = this.setState
+    }
+
     componentWillUnmount () {
       forEach(this._unsubscribes, unsubscribe => unsubscribe())
       this._unsubscribes = null
+      delete this._setState
+    }
+
+    _setState (nextState) {
+      this.state = { ...this.state, nextState }
     }
 
     render () {
@@ -180,19 +198,6 @@ export { default as Debug } from './debug'
 
 // -------------------------------------------------------------------
 
-// Returns the first defined (non-null, non-undefined) value.
-export const firstDefined = function () {
-  const n = arguments.length
-  for (let i = 0; i < n; ++i) {
-    const arg = arguments[i]
-    if (arg !== undefined) {
-      return arg
-    }
-  }
-}
-
-// -------------------------------------------------------------------
-
 // Returns the current XOA Plan or the Plan name if number given
 export const getXoaPlan = plan => {
   switch (plan || +process.env.XOA_PLAN) {
@@ -258,6 +263,11 @@ export const formatSize = bytes => humanFormat(bytes, { scale: 'binary', unit: '
 
 export const formatSizeRaw = bytes => humanFormat.raw(bytes, { scale: 'binary', unit: 'B' })
 
+export const formatSpeed = (bytes, milliseconds) => humanFormat(
+  bytes * 1e3 / milliseconds,
+  { scale: 'binary', unit: 'B/s' }
+)
+
 export const parseSize = size => {
   let bytes = humanFormat.parse.raw(size, { scale: 'binary' })
   if (bytes.unit && bytes.unit !== 'B') {
@@ -349,20 +359,6 @@ export const throwFn = error => () => {
   )
 }
 
-// -------------------------------------------------------------------
-
-export function tap (cb) {
-  return this.then(value =>
-    Promise.resolve(cb(value)).then(() => value)
-  )
-}
-
-export function rethrow (cb) {
-  return this.catch(error =>
-    Promise.resolve(cb(error)).then(() => { throw error })
-  )
-}
-
 // ===================================================================
 
 export const resolveResourceSet = resourceSet => {
@@ -482,7 +478,35 @@ export const resolveIds = params => {
 
 // ===================================================================
 
-export const compareVersions = (v1, v2) => {
+const OPs = {
+  '<': a => a < 0,
+  '<=': a => a <= 0,
+  '===': a => a === 0,
+  '>': a => a > 0,
+  '>=': a => a >= 0
+}
+
+const makeNiceCompare = compare => function () {
+  const { length } = arguments
+  if (length === 2) {
+    return compare(arguments[0], arguments[1])
+  }
+
+  let i = 1
+  let v1 = arguments[0]
+  let op, v2
+  while (i < length) {
+    op = arguments[i++]
+    v2 = arguments[i++]
+    if (!OPs[op](compare(v1, v2))) {
+      return false
+    }
+    v1 = v2
+  }
+  return true
+}
+
+export const compareVersions = makeNiceCompare((v1, v2) => {
   v1 = v1.split('.')
   v2 = v2.split('.')
 
@@ -495,4 +519,65 @@ export const compareVersions = (v1, v2) => {
   }
 
   return 0
+})
+
+export const isXosanPack = ({ name }) =>
+  startsWith(name, 'XOSAN')
+
+// ===================================================================
+
+export const getCoresPerSocketPossibilities = (maxCoresPerSocket, vCPUs) => {
+  // According to : https://www.citrix.com/blogs/2014/03/11/citrix-xenserver-setting-more-than-one-vcpu-per-vm-to-improve-application-performance-and-server-consolidation-e-g-for-cad3-d-graphical-applications/
+  const maxVCPUs = 16
+
+  const options = []
+  if (maxCoresPerSocket !== undefined && vCPUs !== '') {
+    const ratio = vCPUs / maxVCPUs
+
+    for (let coresPerSocket = maxCoresPerSocket; coresPerSocket >= ratio; coresPerSocket--) {
+      if (vCPUs % coresPerSocket === 0) options.push(coresPerSocket)
+    }
+  }
+
+  return options
 }
+
+// Generates a random human-readable string of length `length`
+// Useful to generate random default names intended for the UI user
+export const generateReadableRandomString = (() => {
+  const CONSONANTS = 'bdfgklmnprtvz'.split('')
+  const VOWELS = 'aeiou'.split('')
+  return (length = 8) => {
+    const result = new Array(length)
+    for (let i = 0; i < length; ++i) {
+      result[i] = sample((i & 1) === 0 ? VOWELS : CONSONANTS)
+    }
+    return result.join('')
+  }
+})()
+
+export const cowSet = (object, path, value, depth = 0) => {
+  if (depth >= path.length) {
+    return value
+  }
+
+  object = object != null ? clone(object) : {}
+  const prop = path[depth]
+  object[prop] = cowSet(object[prop], path, value, depth + 1)
+  return object
+}
+
+// Generates a function that returns a value between 0 and 1
+// This function returns an estimated progress value between 0 and 1
+// based on the elapsed time since the createFakeProgress call and
+// the given estimated duration d
+export const createFakeProgress = (() => {
+  const S = 0.95 // Progress value after d seconds
+  return d => {
+    const startTime = Date.now() / 1e3
+    return () => {
+      const x = Date.now() / 1e3 - startTime
+      return -Math.exp((x * Math.log(1 - S)) / d) + 1
+    }
+  }
+})()

src/common/wizard/index.js

@@ -1,18 +1,22 @@
 import classNames from 'classnames'
 import every from 'lodash/every'
-import map from 'lodash/map'
 import React, { Component, cloneElement } from 'react'
 
 import _ from '../intl'
 import Icon from '../icon'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 
 import styles from './index.css'
 
 const Wizard = ({ children }) => {
-  const allDone = every(React.Children.toArray(children), (child) => child.props.done || child.props.summary)
+  const allDone = every(React.Children.toArray(children), child =>
+    child.props.done || child.props.summary
+  )
+
   return <ul className={styles.wizard}>
-    {map(React.Children.toArray(children), (child, key) => cloneElement(child, { allDone, key }))}
+    {React.Children.map(children, (child, key) =>
+      child && cloneElement(child, { allDone, key })
+    )}
   </ul>
 }
 export { Wizard as default }

src/common/xo-defined.js

@@ -0,0 +1,63 @@
+// Usage:
+//
+// ```js
+// const httpProxy = defined(
+//   process.env.HTTP_PROXY,
+//   process.env.http_proxy
+// )
+//
+// const httpProxy = defined([
+//   process.env.HTTP_PROXY,
+//   process.env.http_proxy
+// ])
+// ```
+export default function defined () {
+  let args = arguments
+  let n = args.length
+  if (n === 1) {
+    args = arguments[0]
+    n = args.length
+  }
+
+  for (let i = 0; i < n; ++i) {
+    let arg = arguments[i]
+    if (typeof arg === 'function') {
+      arg = get(arg)
+    }
+    if (arg !== undefined) {
+      return arg
+    }
+  }
+}
+
+// Usage:
+//
+// ```js
+// const friendName = get(() => props.user.friends[0].name)
+//
+// // this form can be used to avoid recreating functions:
+// const getFriendName = _ => _.friends[0].name
+// const friendName = get(getFriendName, props.user)
+// ```
+export const get = (accessor, arg) => {
+  try {
+    return accessor(arg)
+  } catch (error) {
+    if (!(error instanceof TypeError)) { // avoid hiding other errors
+      throw error
+    }
+  }
+}
+
+// Usage:
+//
+// ```js
+// const httpAgent = ifDef(
+//   process.env.HTTP_PROXY,
+//   _ => new ProxyAgent(_)
+// )
+// ```
+export const ifDef = (value, thenFn) =>
+  value !== undefined
+    ? thenFn(value)
+    : value

src/common/xo-json-schema-input/xo-abstract-input.js

@@ -1,20 +1,21 @@
 import map from 'lodash/map'
-import AbstractInput from '../json-schema-input/abstract-input'
+import { PureComponent } from 'react'
+
+import getEventValue from '../get-event-value'
 
 // ===================================================================
 
-export default class XoAbstractInput extends AbstractInput {
-  get value () {
-    const value = this.refs.input.value
+const getId = value => (value != null && value.id) || value
 
-    if (this.props.schema.type === 'array') {
-      return map(value, object => object.id || object)
-    }
+export default class XoAbstractInput extends PureComponent {
+  _onChange = event => {
+    const value = getEventValue(event)
+    const { props } = this
 
-    return value.id || value
-  }
-
-  set value (value) {
-    this.refs.input.value = value
+    return props.onChange(
+      props.schema.type === 'array'
+        ? map(value, getId)
+        : getId(value)
+    )
   }
 }

src/common/xo-json-schema-input/xo-highlevel-object-input.js

@@ -16,10 +16,10 @@ export default class HighLevelObjectInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-host-input.js

@@ -16,10 +16,10 @@ export default class HostInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-pool-input.js

@@ -16,10 +16,10 @@ export default class PoolInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-remote-input.js

@@ -16,10 +16,10 @@ export default class RemoteInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-role-input.js

@@ -16,10 +16,10 @@ export default class RoleInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-sr-input.js

@@ -16,10 +16,10 @@ export default class SrInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-subject-input.js

@@ -16,10 +16,10 @@ export default class SubjectInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-tag-input.js

@@ -16,10 +16,10 @@ export default class TagInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-json-schema-input/xo-vm-input.js

@@ -16,10 +16,10 @@ export default class VmInput extends XoAbstractInput {
           disabled={props.disabled}
           hasSelectAll
           multi={props.multi}
-          onChange={props.onChange}
+          onChange={this._onChange}
           ref='input'
           required={props.required}
-          defaultValue={props.defaultValue}
+          value={props.value}
         />
       </PrimitiveInputWrapper>
     )

src/common/xo-line-chart/index.js

@@ -15,7 +15,7 @@ import {
   values
 } from 'lodash'
 
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import { computeArraysSum } from '../xo-stats'
 import { formatSize } from '../utils'
 

src/common/xo-parallel-chart.js

@@ -6,7 +6,7 @@ import map from 'lodash/map'
 import times from 'lodash/times'
 
 import Component from './base-component'
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import { setStyles } from './d3-utils'
 
 // ===================================================================

src/common/xo-sparklines.js

@@ -4,7 +4,7 @@ import {
   SparklinesLine
 } from 'react-sparklines'
 
-import propTypes from './prop-types'
+import propTypes from './prop-types-decorator'
 import {
   computeArraysAvg,
   computeObjectsAvg

src/common/xo-week-charts/index.js

@@ -5,7 +5,7 @@ import map from 'lodash/map'
 
 import Component from '../base-component'
 import _ from '../intl'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import { Toggle } from '../form'
 import { setStyles } from '../d3-utils'
 import {
@@ -381,7 +381,7 @@ export default class XoWeekCharts extends Component {
           <p className='mt-1'>
             {_('weeklyChartsScaleInfo')}
             {' '}
-            <Toggle iconSize={1} icon='scale' className='btn btn-secondary' onChange={this._updateScale} />
+            <Toggle iconSize={1} icon='scale' onChange={this._updateScale} />
           </p>
         </div>
         <div

src/common/xo-week-heatmap/index.js

@@ -13,7 +13,7 @@ import { FormattedTime } from 'react-intl'
 
 import _ from '../intl'
 import Component from '../base-component'
-import propTypes from '../prop-types'
+import propTypes from '../prop-types-decorator'
 import Tooltip from '../tooltip'
 
 import styles from './index.css'

src/common/xo/add-host-modal/index.js

@@ -1,12 +1,16 @@
 import _ from 'intl'
 import BaseComponent from 'base-component'
+import Icon from 'icon'
 import React from 'react'
 import SingleLineRow from 'single-line-row'
 import { Col } from 'grid'
 import { connectStore } from 'utils'
-import { createCollectionWrapper, createGetObjectsOfType, createSelector } from 'selectors'
-import { forEach } from 'lodash'
+import { createCollectionWrapper, createGetObjectsOfType, createSelector, createGetObject } from 'selectors'
 import { SelectHost } from 'select-objects'
+import {
+  differenceBy,
+  forEach
+} from 'lodash'
 
 @connectStore(() => ({
   singleHosts: createSelector(
@@ -30,10 +34,20 @@ import { SelectHost } from 'select-objects'
       })
       return singleHosts
     })
+  ),
+  poolMasterPatches: createSelector(
+    createGetObject(
+      (_, props) => props.pool.master
+    ),
+    ({ patches }) => patches
   )
 }), { withRef: true })
 export default class AddHostModal extends BaseComponent {
   get value () {
+    if (process.env.XOA_PLAN < 2 && this.state.nMissingPatches) {
+      return {}
+    }
+
     return this.state
   }
 
@@ -42,18 +56,40 @@ export default class AddHostModal extends BaseComponent {
     singleHosts => host => singleHosts[host.id]
   )
 
+  _onChangeHost = host => {
+    this.setState({
+      host,
+      nMissingPatches: host
+       ? differenceBy(this.props.poolMasterPatches, host.patches, 'name').length
+       : undefined
+    })
+  }
+
   render () {
+    const { nMissingPatches } = this.state
+
     return <div>
       <SingleLineRow>
         <Col size={6}>{_('addHostSelectHost')}</Col>
         <Col size={6}>
           <SelectHost
-            onChange={this.linkState('host')}
+            onChange={this._onChangeHost}
             predicate={this._getHostPredicate()}
             value={this.state.host}
           />
         </Col>
       </SingleLineRow>
+      <br />
+      {nMissingPatches > 0 && <SingleLineRow>
+        <Col>
+          <span className='text-danger'>
+            <Icon icon='error' /> {process.env.XOA_PLAN > 1
+              ? _('hostNeedsPatchUpdate', { patches: nMissingPatches })
+              : _('hostNeedsPatchUpdateNoInstall')
+            }
+          </span>
+        </Col>
+      </SingleLineRow>}
     </div>
   }
 }

src/common/xo/add-user-filter-modal/index.js

@@ -5,7 +5,7 @@ import * as FormGrid from '../../form-grid'
 import _ from '../../intl'
 import Combobox from '../../combobox'
 import Component from '../../base-component'
-import propTypes from '../../prop-types'
+import propTypes from '../../prop-types-decorator'
 import { createSelector } from '../../selectors'
 
 @propTypes({

src/common/xo/choose-sr-for-each-vdis-modal/index.js

@@ -0,0 +1,139 @@
+import Collapse from 'collapse'
+import Component from 'base-component'
+import React from 'react'
+import { every, forEach, map } from 'lodash'
+
+import _ from '../../intl'
+import propTypes from '../../prop-types-decorator'
+import SingleLineRow from '../../single-line-row'
+import { createSelector } from '../../selectors'
+import { SelectSr } from '../../select-objects'
+import { isSrWritable } from 'xo'
+import {
+  Container,
+  Col
+} from 'grid'
+
+// Can 2 SRs on the same pool have 2 VDIs used by the same VM
+const areSrsCompatible = (sr1, sr2) =>
+  sr1.shared || sr2.shared || sr1.$container === sr2.$container
+
+const Collapsible = ({collapsible, children, ...props}) => collapsible
+  ? <Collapse {...props}>{children}</Collapse>
+  : <div>
+    <span>{props.buttonText}</span>
+    <br />
+    {children}
+  </div>
+
+Collapsible.propTypes = {
+  collapsible: propTypes.bool.isRequired,
+  children: propTypes.node.isRequired
+}
+
+@propTypes({
+  vdis: propTypes.array.isRequired,
+  predicate: propTypes.func
+})
+export default class ChooseSrForEachVdisModal extends Component {
+  state = {
+    mapVdisSrs: {}
+  }
+
+  componentWillReceiveProps (newProps) {
+    if (
+      this.props.predicate !== undefined &&
+      newProps.predicate !== this.props.predicate
+    ) {
+      this.state = {
+        mainSr: undefined,
+        mapVdisSrs: {}
+      }
+    }
+  }
+
+  _onChange = props => {
+    this.setState(props)
+    this.props.onChange(props)
+  }
+
+  _onChangeMainSr = newSr => {
+    const oldSr = this.state.mainSr
+
+    if (oldSr == null || newSr == null || oldSr.$pool !== newSr.$pool) {
+      this.setState({
+        mapVdisSrs: {}
+      })
+    } else if (!newSr.shared) {
+      const mapVdisSrs = {...this.state.mapVdisSrs}
+      forEach(mapVdisSrs, (sr, vdi) => {
+        if (sr != null && newSr !== sr && sr.$container !== newSr.$container && !sr.shared) {
+          delete mapVdisSrs[vdi]
+        }
+      })
+      this._onChange({mapVdisSrs})
+    }
+
+    this._onChange({
+      mainSr: newSr
+    })
+  }
+
+  _getSrPredicate = createSelector(
+    () => this.state.mainSr,
+    () => this.state.mapVdisSrs,
+    (mainSr, mapVdisSrs) => sr =>
+      isSrWritable(sr) &&
+      mainSr.$pool === sr.$pool &&
+      areSrsCompatible(mainSr, sr) &&
+      every(mapVdisSrs, selectedSr => selectedSr == null || areSrsCompatible(selectedSr, sr))
+  )
+
+  render () {
+    const { props, state } = this
+    const { vdis } = props
+    const {
+      mainSr,
+      mapVdisSrs
+    } = state
+
+    const srPredicate = props.predicate || this._getSrPredicate()
+
+    return <div>
+      <SelectSr
+        onChange={mainSr => props.predicate !== undefined
+          ? this._onChange({mainSr})
+          : this._onChangeMainSr(mainSr)
+        }
+        predicate={props.predicate || isSrWritable}
+        placeholder={_('chooseSrForEachVdisModalMainSr')}
+        value={mainSr}
+      />
+      <br />
+      {vdis != null && mainSr != null &&
+        <Collapsible collapsible={vdis.length >= 3} buttonText={_('chooseSrForEachVdisModalSelectSr')}>
+          <br />
+          <Container>
+            <SingleLineRow>
+              <Col size={6}><strong>{_('chooseSrForEachVdisModalVdiLabel')}</strong></Col>
+              <Col size={6}><strong>{_('chooseSrForEachVdisModalSrLabel')}</strong></Col>
+            </SingleLineRow>
+            {map(vdis, vdi =>
+              <SingleLineRow key={vdi.uuid}>
+                <Col size={6}>{ vdi.name_label || vdi.name }</Col>
+                <Col size={6}>
+                  <SelectSr
+                    onChange={sr => this._onChange({ mapVdisSrs: { ...mapVdisSrs, [vdi.uuid]: sr } })}
+                    value={mapVdisSrs[vdi.uuid]}
+                    predicate={srPredicate}
+                  />
+                </Col>
+              </SingleLineRow>
+            )}
+            <i>{_('chooseSrForEachVdisModalOptionalEntry')}</i>
+          </Container>
+        </Collapsible>
+      }
+    </div>
+  }
+}