From b11c22de0bb46f9c8d00a203bbb5f9ae57ff0ec4 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 5 Jul 2017 13:41:50 +0100
Subject: [PATCH 1/5] Remove global action from policy

---
 .../admin/vue-components/AccountingView.vue   |  7 +--
 frontend/toolkit/DataTable.vue                | 51 +++++++++----------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue
index 18b12b2f6..372567fba 100644
--- a/frontend/admin/vue-components/AccountingView.vue
+++ b/frontend/admin/vue-components/AccountingView.vue
@@ -1,5 +1,7 @@
 <template>
   <adminlte-box :title="'Accounting for user ' + $route.params.id">
+    <button slot="tools" class="btn btn-primary" @click="newAccountingDialog.visible = true">Create New Policy</button>
+
     <div class="alert alert-danger" v-if="communicationError">
       <strong>Error:</strong> {{communicationError}}
     </div>
@@ -7,7 +9,6 @@
     <data-table
     :headers.once="table.headers"
     :rows="table.rows"
-    :globalActions="table.globalActions"
     :rowActions="table.rowActions">
     </data-table>
 
@@ -47,10 +48,6 @@
             "ID", "Image", "Workspace", "Vol. source", "Vol. target", "Readonly"
           ],
           rows: [],
-          globalActions: [{
-            label: "Create New Entry",
-            callback: () => {this.newAccountingDialog.visible = true;}
-          }],
           rowActions: [{
             label: "Remove",
             callback: this.removeAction
diff --git a/frontend/toolkit/DataTable.vue b/frontend/toolkit/DataTable.vue
index c8941d2fe..ab305e0fc 100644
--- a/frontend/toolkit/DataTable.vue
+++ b/frontend/toolkit/DataTable.vue
@@ -1,32 +1,27 @@
 <template>
-  <div class="column-container">
-    <div class="align-right">
-      <button v-for="action in globalActions" class="btn btn-primary" @click="action.callback">{{action.label}}</button>
-    </div>
-    <div class="table-responsive">
-      <table class="table table-hover no-margin">
-        <thead>
-          <tr>
-            <th v-for="header in headers">{{header}}</th>
-            <th v-if="rowActions.length > 0">Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr v-for="(row, row_index) in rows">
-            <template v-for="(value, col_index) in row">
-              <td v-if="isBoolean(value)"><i class="fa fa-check" v-if="value"></i></td>
-              <td v-else>{{value}}</td>
-            </template>
-            <td>
-              <button v-for="action in rowActions"
-              :class="buttonClassFromType(action.type)"
-              style="margin-right: 10px"
-              @click="action.callback(row)">{{action.label}}</button>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+  <div class="table-responsive">
+    <table class="table table-hover no-margin">
+      <thead>
+        <tr>
+          <th v-for="header in headers">{{header}}</th>
+          <th v-if="rowActions.length > 0">Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(row, row_index) in rows">
+          <template v-for="(value, col_index) in row">
+            <td v-if="isBoolean(value)"><i class="fa fa-check" v-if="value"></i></td>
+            <td v-else>{{value}}</td>
+          </template>
+          <td>
+            <button v-for="action in rowActions"
+            :class="buttonClassFromType(action.type)"
+            style="margin-right: 10px"
+            @click="action.callback(row)">{{action.label}}</button>
+          </td>
+        </tr>
+      </tbody>
+    </table>
   </div>
 </template>
 

From e626b4ade8bfe57f33a8e838436dfce8af9be4d1 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 5 Jul 2017 13:46:20 +0100
Subject: [PATCH 2/5] Change other views

---
 frontend/admin/vue-components/ApplicationsView.vue | 7 ++-----
 frontend/admin/vue-components/ContainersView.vue   | 1 -
 frontend/admin/vue-components/UsersView.vue        | 7 ++-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/admin/vue-components/ApplicationsView.vue b/frontend/admin/vue-components/ApplicationsView.vue
index 0ea68d17f..98dd3caf1 100644
--- a/frontend/admin/vue-components/ApplicationsView.vue
+++ b/frontend/admin/vue-components/ApplicationsView.vue
@@ -1,5 +1,7 @@
 <template>
   <adminlte-box title="Applications">
+    <button slot="tools" class="btn btn-primary" @click="newApplicationDialog.visible = true">Add New Application</button>
+
     <div class="alert alert-danger" v-if="communicationError">
       <strong>Error:</strong> {{communicationError}}
     </div>
@@ -7,7 +9,6 @@
     <data-table
     :headers.once="table.headers"
     :rows="table.rows"
-    :globalActions="table.globalActions"
     :rowActions="table.rowActions">
     </data-table>
 
@@ -43,10 +44,6 @@
         table: {
           headers: ["ID", "Image"],
           rows: [],
-          globalActions: [{
-            label: "Create New Entry",
-            callback: () => {this.newApplicationDialog.visible = true;}
-          }],
           rowActions: [{
             label: "Remove",
             callback: this.removeAction
diff --git a/frontend/admin/vue-components/ContainersView.vue b/frontend/admin/vue-components/ContainersView.vue
index acd8b406b..a250b70f4 100644
--- a/frontend/admin/vue-components/ContainersView.vue
+++ b/frontend/admin/vue-components/ContainersView.vue
@@ -6,7 +6,6 @@
     <data-table
     :headers.once="table.headers"
     :rows="table.rows"
-    :globalActions="table.globalActions"
     :rowActions="table.rowActions">
     </data-table>
     <confirm-dialog
diff --git a/frontend/admin/vue-components/UsersView.vue b/frontend/admin/vue-components/UsersView.vue
index 4661d784c..7e89213a6 100644
--- a/frontend/admin/vue-components/UsersView.vue
+++ b/frontend/admin/vue-components/UsersView.vue
@@ -1,5 +1,7 @@
 <template>
   <adminlte-box title="Users">
+    <button slot="tools" class="btn btn-primary" @click="newUserDialog.visible = true">Create New User</button>
+
     <div class="alert alert-danger" v-if="communicationError">
       <strong>Error:</strong> {{communicationError}}
     </div>
@@ -7,7 +9,6 @@
     <data-table
     :headers.once="table.headers"
     :rows="table.rows"
-    :globalActions="table.globalActions"
     :rowActions="table.rowActions">
     </data-table>
     <new-user-dialog
@@ -39,10 +40,6 @@
         table: {
           headers: ["ID", "Username"],
           rows: [],
-          globalActions: [{
-            label: "Create New Entry",
-            callback: () => {this.newUserDialog.visible = true;}
-          }],
           rowActions: [{
             label: "Policies",
             callback: this.showPolicyAction,

From 60171961db270e7f44ca82c736176c2c4e324164 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 5 Jul 2017 13:52:51 +0100
Subject: [PATCH 3/5] Remove remaining code for global actions

---
 frontend/toolkit/DataTable.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frontend/toolkit/DataTable.vue b/frontend/toolkit/DataTable.vue
index ab305e0fc..0428715ae 100644
--- a/frontend/toolkit/DataTable.vue
+++ b/frontend/toolkit/DataTable.vue
@@ -28,7 +28,7 @@
 <script>
   module.exports = {
     props: [
-      "headers", "rows", "globalActions", "rowActions"
+      "headers", "rows", "rowActions"
     ],
     methods: {
       isBoolean: function(value) {
@@ -42,14 +42,3 @@
     }
   };
 </script>
-
-<style scoped>
-  .column-container {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .align-right {
-    align-self: flex-end;
-  }
-</style>

From 441f08c3c7ea35eccdd41d3f82768978892df036 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 5 Jul 2017 13:54:06 +0100
Subject: [PATCH 4/5] Fix test

---
 frontend/tests/tests/vue/components/test_DataTable.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/tests/tests/vue/components/test_DataTable.js b/frontend/tests/tests/vue/components/test_DataTable.js
index 760769649..157f8847e 100644
--- a/frontend/tests/tests/vue/components/test_DataTable.js
+++ b/frontend/tests/tests/vue/components/test_DataTable.js
@@ -6,13 +6,9 @@ QUnit.test("rendering", function (assert) {
   assert.equal(helpers.getRenderedText(DataTable, {
     headers: ["foo", "bar"],
     rows: [[1,2], [3,4]],
-    globalActions: [{
-      label: "New",
-      callback: function() {}
-    }],
     rowActions: [{
       label: "Remove",
       callback: function() {}
     }]
-  }), "New foobar Actions 12 Remove34 Remove");
+  }), "foobar Actions 12 Remove34 Remove");
 });

From 11e2ee658833458dade6483630c402936c773e88 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 5 Jul 2017 14:17:04 +0100
Subject: [PATCH 5/5] Fix selenium tests

---
 selenium_tests/test_user_accounting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/selenium_tests/test_user_accounting.py b/selenium_tests/test_user_accounting.py
index a024f5999..aa8fd33ce 100644
--- a/selenium_tests/test_user_accounting.py
+++ b/selenium_tests/test_user_accounting.py
@@ -7,13 +7,13 @@ class TestUserAccounting(AdminDriverTest):
     def test_create_new_entry_button(self):
         self.click_first_element_located(By.LINK_TEXT, "Users")
 
-        self.click_first_button("Create New Entry")
+        self.click_first_button("Create New User")
         self.click_modal_footer_button("Cancel")
 
     def test_create_and_remove_user(self):
         self.click_first_element_located(By.LINK_TEXT, "Users")
 
-        self.click_first_button("Create New Entry")
+        self.click_first_button("Create New User")
         self.type_text_in_element_located(By.CSS_SELECTOR, ".modal-body > form > div > input", "mrenou")
         self.click_modal_footer_button("Submit")