[OGUI-402] Add horizontal scroll bar table (#386)

* [OGUI-402] Add horizontal scrollbar * [OGUI-402] Add horizontal scrollbar to envs table
AliceO2Group · Sep 30, 2019 · 5604f79 · 5604f79
1 parent b6e723d
commit 5604f79
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/Control/package-lock.json b/Control/package-lock.json
diff --git a/Control/package.json b/Control/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aliceo2/control",
   "description": "ALICE O2 Control GUI",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "main": "index.js",
   "scripts": {
     "start": "node index.js",

diff --git a/Control/public/common/showTableList.js b/Control/public/common/showTableList.js
@@ -29,12 +29,13 @@ export default (list, actions) => h('table.table', [
           item[columnName]
         )
     ),
-    actions && h('td.btn-group',
-      h('button.btn.btn-primary', {onclick: (event) => actions[0](event, item)}, 'Details'),
-      item.state !== 'RUNNING' && actions.length >= 2 && h('button.btn.btn-danger',
-        {
-          onclick: (event) => actions[1](event, item)
-        }, 'Shutdown'),
-    )
+    actions && h('td',
+      h('.btn-group',
+        h('button.btn.btn-primary', {onclick: (event) => actions[0](event, item)}, 'Details'),
+        item.state !== 'RUNNING' && actions.length >= 2 && h('button.btn.btn-danger',
+          {
+            onclick: (event) => actions[1](event, item)
+          }, 'Shutdown'),
+      ))
   ]))),
 ]);
diff --git a/Control/public/environment/environmentPage.js b/Control/public/environment/environmentPage.js
@@ -213,7 +213,7 @@ const controlButton = (buttonType, environment, item, label, type, stateToHide)
  * @param {Array<Actions>} actions
  * @return {vnode}
  */
-const displayTableOfTasks = (environment, list, actions) => h('', [
+const displayTableOfTasks = (environment, list, actions) => h('.scroll-auto', [
   h('table.table.table-sm', [
     h('thead', [
       h('tr',
@@ -237,7 +237,7 @@ const displayTableOfTasks = (environment, list, actions) => h('', [
             item[columnName]
           )
       ),
-      actions && h('td.btn-group',
+      actions && h('td',
         h('button.btn.btn-primary',
           {
             onclick: (event) => actions[0](event, item)

diff --git a/Control/public/environment/environmentsPage.js b/Control/public/environment/environmentsPage.js
@@ -44,10 +44,10 @@ export const content = (model) => h('.scroll-y.absolute-fill.text-center', [
  * @return {vnode}
  */
 const showContent = (model, list) => (list && Object.keys(list).length > 0)
-  ? showTableList(list, [
+  ? h('.scroll-auto', showTableList(list, [
     (event, item) => model.router.go(`?page=environment&id=${item.id}`),
     (event, item) =>
       confirm('Are you sure to delete this environment?' + item.id)
       && model.environment.destroyEnvironment({id: item.id})
-  ])
+  ]))
   : h('h3.m4', ['No environments found.']);