From dd3b6676d3f1f74c2463fda8cac6c4f41856dc2d Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 23 Oct 2018 10:40:28 -0400 Subject: [PATCH 01/18] Fix __repr__ on workspace user model --- atst/models/workspace_user.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/atst/models/workspace_user.py b/atst/models/workspace_user.py index 216b07aa..aae7b88a 100644 --- a/atst/models/workspace_user.py +++ b/atst/models/workspace_user.py @@ -67,8 +67,5 @@ class WorkspaceUser(object): def __repr__(self): return "".format( - self.user.full_name, - self.role, - self.workspace.name, - self.num_environment_roles, + self.user_name, self.role, self.workspace.name, self.num_environment_roles ) From 3de1e5544035ca764e5fc749953a046c66220869 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 24 Oct 2018 15:10:16 -0400 Subject: [PATCH 02/18] Basic Vue function for search --- atst/routes/workspaces.py | 11 ++++++++-- js/components/forms/members_list.js | 29 +++++++++++++++++++++++++ js/index.js | 2 ++ templates/workspaces/members/index.html | 11 ++++++++-- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 js/components/forms/members_list.js diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index b0c751a6..324153dd 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -1,4 +1,4 @@ -import re +import re, json from datetime import date, timedelta from flask import ( @@ -102,9 +102,16 @@ def workspace_members(workspace_id): new_member = next( filter(lambda m: m.user_name == new_member_name, workspace.members), None ) + members_list = [ + {"name": k.user_name, "role": k.role, "num_env": k.num_environment_roles} + for k in workspace.members + ] return render_template( - "workspaces/members/index.html", workspace=workspace, new_member=new_member + "workspaces/members/index.html", + workspace=workspace, + members=members_list, + new_member=new_member, ) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js new file mode 100644 index 00000000..983c98ce --- /dev/null +++ b/js/components/forms/members_list.js @@ -0,0 +1,29 @@ + +export default { + name: 'members-list', + + template: '#search-template', + + props: { + members: Array, + }, + + data: function () { + return { + searchValue: '', + searchedList: [], + } + }, + + mounted: function () { + // console.log(this.members) + }, + + methods: { + search: function () { + console.log(this.members) + this.searchedList = this.members.filter(member => member.name.includes(this.searchValue)) + console.log(this.searchedList) + }, + }, +} diff --git a/js/index.js b/js/index.js index a91f06c2..ac1f7c79 100644 --- a/js/index.js +++ b/js/index.js @@ -20,6 +20,7 @@ import selector from './components/selector' import BudgetChart from './components/charts/budget_chart' import SpendTable from './components/tables/spend_table' import CcpoApproval from './components/forms/ccpo_approval' +import MembersList from './components/forms/members_list' import LocalDatetime from './components/local_datetime' Vue.use(VTooltip) @@ -41,6 +42,7 @@ const app = new Vue({ BudgetChart, SpendTable, CcpoApproval, + MembersList, LocalDatetime, EditEnvironmentRole, EditProjectRoles, diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 90b650f5..329143cd 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -45,11 +45,16 @@ ) }} {% endif %} + + + + +
- -
@@ -103,6 +108,8 @@
+ + {% endif %} From 256ae73c9206d4463160439701e03af02bcefe07 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 10:01:15 -0400 Subject: [PATCH 03/18] Clean up Vue --- js/components/forms/members_list.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index 983c98ce..71234478 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -16,14 +16,15 @@ export default { }, mounted: function () { - // console.log(this.members) + this.searchedList = this.members }, methods: { search: function () { - console.log(this.members) - this.searchedList = this.members.filter(member => member.name.includes(this.searchValue)) - console.log(this.searchedList) + this.searchedList = this.members.filter( + member => member.name.toLowerCase() + .includes(this.searchValue.toLowerCase()) + ) }, }, } From c5856c539d1dce5d1692c349f7ccacff8f5de8e7 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 10:56:23 -0400 Subject: [PATCH 04/18] Use Vue for template rendering --- atst/routes/workspaces.py | 8 +++++++- templates/workspaces/members/index.html | 26 ++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 324153dd..8547f9bc 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -103,7 +103,13 @@ def workspace_members(workspace_id): filter(lambda m: m.user_name == new_member_name, workspace.members), None ) members_list = [ - {"name": k.user_name, "role": k.role, "num_env": k.num_environment_roles} + { + "name": k.user_name, + "status": k.status, + "id": k.user_id, + "role": k.role, + "num_env": k.num_environment_roles, + } for k in workspace.members ] diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 329143cd..8bde5d24 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -80,7 +80,6 @@ -
@@ -91,20 +90,21 @@ + - {% for m in workspace.members %} - {% set num_environment_roles = m.num_environment_roles %} - - - {% if num_environment_roles %} - - {% else %} - - {% endif %} - - + + + + + + - {% endfor %}
Workspace Role
{{ m.user_name }}{{ num_environment_roles }}No Environment Access{{ m.status }}{{ m.role_displayname }}
+ + + + + No Environment Access +
From 8c767b75352a4c1ea4ea9ed85780198eec1ef49a Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 11:40:41 -0400 Subject: [PATCH 05/18] Search if form is submitted --- templates/workspaces/members/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 8bde5d24..fb76c7bd 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -50,7 +50,7 @@
-
+
From d3726d4ecc874edff9072afed06e4f7acdc5f6f4 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 11:45:12 -0400 Subject: [PATCH 06/18] Display nice role names --- atst/routes/workspaces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 8547f9bc..e05f6412 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -107,7 +107,7 @@ def workspace_members(workspace_id): "name": k.user_name, "status": k.status, "id": k.user_id, - "role": k.role, + "role": k.role_displayname, "num_env": k.num_environment_roles, } for k in workspace.members From 45d29977e13a6fbc3ddd2862649fe88ad260bdd7 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 13:16:38 -0400 Subject: [PATCH 07/18] Delete unused module --- atst/routes/workspaces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index e05f6412..216b71e2 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -1,4 +1,4 @@ -import re, json +import re from datetime import date, timedelta from flask import ( From 9d2a48bd5d9317ca95a82634e4476c2d6a2f4ed5 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 26 Oct 2018 09:35:38 -0400 Subject: [PATCH 08/18] Use inline-template --- js/components/forms/members_list.js | 2 -- templates/workspaces/members/index.html | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index 71234478..f4be92d8 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -2,8 +2,6 @@ export default { name: 'members-list', - template: '#search-template', - props: { members: Array, }, diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index fb76c7bd..b4e0dfe0 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -46,9 +46,7 @@ {% endif %} - - - +
From 6ab4867d3cb4730b8302f4cc611654bd1a9b9a80 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 26 Oct 2018 12:01:49 -0400 Subject: [PATCH 09/18] Display message when search returns no members --- templates/workspaces/members/index.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index b4e0dfe0..21220cde 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -79,7 +79,7 @@
- +
@@ -105,6 +105,15 @@
Name
+
+ {{ EmptyState( + 'No members found.', + action_label=None, + action_href=None, + sub_message='Please try a different search.', + icon=None + ) }} +
From 1d1b5495311f1009f1853c253a5adb546be6117a Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 14:46:24 -0400 Subject: [PATCH 10/18] Basic status and role filtering, not reactive --- js/components/forms/members_list.js | 14 ++++++++++++++ templates/workspaces/members/index.html | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index f4be92d8..3c35730a 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -9,6 +9,8 @@ export default { data: function () { return { searchValue: '', + status: '', + role: '', searchedList: [], } }, @@ -23,6 +25,18 @@ export default { member => member.name.toLowerCase() .includes(this.searchValue.toLowerCase()) ) + + if (this.status) { + this.searchedList = this.searchedList.filter( + member => member.status === this.status + ) + } + + if (this.role) { + this.searchedList = this.searchedList.filter( + member => member.role.toLowerCase() === this.role + ) + } }, }, } diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 21220cde..1e34f0a5 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -59,21 +59,21 @@
- - - - + + +
- - - - + + +
From 421d5db291ce893f34294d93eed03ef8f2f58582 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 26 Oct 2018 09:38:02 -0400 Subject: [PATCH 11/18] computed searchedList with commented watch option --- js/components/forms/members_list.js | 46 ++++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index 3c35730a..6d442cd8 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -11,32 +11,42 @@ export default { searchValue: '', status: '', role: '', - searchedList: [], } }, mounted: function () { - this.searchedList = this.members + // this.searchedList = this.members }, + computed: { + searchedList: function () { + return this.members.filter( + member => this.status ? member.status === this.status : true + ).filter( + member => this.role ? member.role.toLowerCase() === this.role : true + ).filter( + member => this.searchValue ? member.name.toLowerCase() + .includes(this.searchValue.toLowerCase()) : true + ) + } + }, + + // watch: { + // status: function (status) { + // this.searchedList = this.searchedList.filter( + // member => member.status === status + // ) + // }, + // role: function (role) { + // this.searchedList = this.searchedList.filter( + // member => member.role.toLowerCase() === role + // ) + // } + // }, + methods: { search: function () { - this.searchedList = this.members.filter( - member => member.name.toLowerCase() - .includes(this.searchValue.toLowerCase()) - ) - - if (this.status) { - this.searchedList = this.searchedList.filter( - member => member.status === this.status - ) - } - - if (this.role) { - this.searchedList = this.searchedList.filter( - member => member.role.toLowerCase() === this.role - ) - } + console.log("search") }, }, } From 39281f65586aab641db14309597395120847a72c Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 30 Oct 2018 10:55:46 -0400 Subject: [PATCH 12/18] Make search and filters clear-able --- templates/workspaces/members/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 1e34f0a5..9f07ea0d 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -52,7 +52,7 @@
-
@@ -60,7 +60,7 @@
- + From 922a929ce2822c88add07b307b348f76866136f2 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 09:15:24 -0400 Subject: [PATCH 13/18] Clear filters --- js/components/forms/members_list.js | 31 +++++-------------------- templates/workspaces/members/index.html | 10 ++++---- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index 6d442cd8..5c6249db 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -14,39 +14,20 @@ export default { } }, - mounted: function () { - // this.searchedList = this.members - }, - computed: { searchedList: function () { return this.members.filter( - member => this.status ? member.status === this.status : true + member => this.status ? + member.status === this.status | this.status === 'all' + : true ).filter( - member => this.role ? member.role.toLowerCase() === this.role : true + member => this.role ? + member.role.toLowerCase() === this.role | this.role === 'all' + : true ).filter( member => this.searchValue ? member.name.toLowerCase() .includes(this.searchValue.toLowerCase()) : true ) } }, - - // watch: { - // status: function (status) { - // this.searchedList = this.searchedList.filter( - // member => member.status === status - // ) - // }, - // role: function (role) { - // this.searchedList = this.searchedList.filter( - // member => member.role.toLowerCase() === role - // ) - // } - // }, - - methods: { - search: function () { - console.log("search") - }, - }, } diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 9f07ea0d..ceb5ee1c 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -52,15 +52,14 @@
- +
- + + From 23172c7506b2036c778c5672abb688cb4568f4d2 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 11:18:07 -0400 Subject: [PATCH 14/18] Fix search button error --- templates/workspaces/members/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index ceb5ee1c..16541446 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -48,7 +48,7 @@
-
+
From 3e1c813ceb6fe510eefea188f24da9f3cf0715da Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 11:31:58 -0400 Subject: [PATCH 15/18] Iterate over workspace roles to display available role filters --- atst/routes/workspaces.py | 7 ++++++- templates/workspaces/members/index.html | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 216b71e2..e572d8d2 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -21,7 +21,11 @@ from atst.forms.project import NewProjectForm, ProjectForm from atst.forms.new_member import NewMemberForm from atst.forms.edit_member import EditMemberForm from atst.forms.workspace import WorkspaceForm -from atst.forms.data import ENVIRONMENT_ROLES, ENV_ROLE_MODAL_DESCRIPTION +from atst.forms.data import ( + ENVIRONMENT_ROLES, + ENV_ROLE_MODAL_DESCRIPTION, + WORKSPACE_ROLE_DEFINITIONS, +) from atst.domain.authz import Authorization from atst.models.permissions import Permissions from atst.domain.invitations import Invitations @@ -116,6 +120,7 @@ def workspace_members(workspace_id): return render_template( "workspaces/members/index.html", workspace=workspace, + choices=WORKSPACE_ROLE_DEFINITIONS, members=members_list, new_member=new_member, ) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 16541446..6314327f 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -71,9 +71,9 @@
From 471d98e650e70fe2128baec029bbe2515b21f46f Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 13:45:00 -0400 Subject: [PATCH 16/18] Filter with new implementation of roles list --- js/components/forms/members_list.js | 11 +++++++++-- templates/workspaces/members/index.html | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index 5c6249db..a092ab28 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -4,6 +4,7 @@ export default { props: { members: Array, + choices: Array, }, data: function () { @@ -21,8 +22,8 @@ export default { member.status === this.status | this.status === 'all' : true ).filter( - member => this.role ? - member.role.toLowerCase() === this.role | this.role === 'all' + member => this.role ? ( + this.getRoleFromDisplayName(member.role) === this.role | this.role === 'all') : true ).filter( member => this.searchValue ? member.name.toLowerCase() @@ -30,4 +31,10 @@ export default { ) } }, + + methods: { + getRoleFromDisplayName: function (role) { + return this.choices.find(choice => choice.display_name === role).name + }, + }, } diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 6314327f..b07aa070 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -46,7 +46,7 @@ {% endif %} - +
From b051e2a9559c470ee932be6faf7bdb2a144c5937 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 14:01:18 -0400 Subject: [PATCH 17/18] Use url_for for redirect link --- atst/routes/workspaces.py | 1 + templates/workspaces/members/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index e572d8d2..ddf743ad 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -113,6 +113,7 @@ def workspace_members(workspace_id): "id": k.user_id, "role": k.role_displayname, "num_env": k.num_environment_roles, + "edit_link": url_for("workspaces.view_member", workspace_id=workspace.id, member_id=k.user_id) } for k in workspace.members ] diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index b07aa070..82086696 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -92,7 +92,7 @@ - + From 64861d94c2b74905eb0ada17d248dc4a36aed124 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 31 Oct 2018 14:11:20 -0400 Subject: [PATCH 18/18] Formatting --- atst/routes/workspaces.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index ddf743ad..726e1bac 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -113,7 +113,9 @@ def workspace_members(workspace_id): "id": k.user_id, "role": k.role_displayname, "num_env": k.num_environment_roles, - "edit_link": url_for("workspaces.view_member", workspace_id=workspace.id, member_id=k.user_id) + "edit_link": url_for( + "workspaces.view_member", workspace_id=workspace.id, member_id=k.user_id + ), } for k in workspace.members ]