From 09b81699294c55ecfac81e2fdba4ce0b99a35e3f Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Mon, 12 Nov 2018 16:44:54 -0500 Subject: [PATCH 1/4] Rename test files to reflect recent code change --- tests/domain/{test_workspace_users.py => test_workspace_roles.py} | 0 tests/models/{test_workspace_user.py => test_workspace_role.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/domain/{test_workspace_users.py => test_workspace_roles.py} (100%) rename tests/models/{test_workspace_user.py => test_workspace_role.py} (100%) diff --git a/tests/domain/test_workspace_users.py b/tests/domain/test_workspace_roles.py similarity index 100% rename from tests/domain/test_workspace_users.py rename to tests/domain/test_workspace_roles.py diff --git a/tests/models/test_workspace_user.py b/tests/models/test_workspace_role.py similarity index 100% rename from tests/models/test_workspace_user.py rename to tests/models/test_workspace_role.py From 947106a5b1b153056f0d5905ca0e761055cc1813 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Mon, 12 Nov 2018 16:48:57 -0500 Subject: [PATCH 2/4] Rename "choices" var to "role_choices" for clarity --- atst/routes/workspaces.py | 2 +- js/components/forms/members_list.js | 4 ++-- templates/workspaces/members/index.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index a557473d..3ee2c2e6 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -123,7 +123,7 @@ def workspace_members(workspace_id): return render_template( "workspaces/members/index.html", workspace=workspace, - choices=WORKSPACE_ROLE_DEFINITIONS, + role_choices=WORKSPACE_ROLE_DEFINITIONS, members=members_list, new_member=new_member, ) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index e7e722e7..a887c089 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -51,7 +51,7 @@ export default { props: { members: Array, - choices: Array, + role_choices: Array, }, data: function () { @@ -91,7 +91,7 @@ export default { searchValue: '', status: '', role: '', - rolesByDisplayName: indexBy(prop('display_name'), this.choices), + rolesByDisplayName: indexBy(prop('display_name'), this.role_choices), sortInfo: { columnName: '', isAscending: true, diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index ef932607..3010b087 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -47,7 +47,7 @@ {% endif %} - +
@@ -72,7 +72,7 @@ From 990c24b802b218035bc267d8e9bee6c4cb65aceb Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Mon, 12 Nov 2018 17:11:45 -0500 Subject: [PATCH 3/4] Allow filtering by all member statuses in member list view --- atst/domain/workspace_roles.py | 10 ++++++++++ atst/models/workspace_role.py | 7 ++++--- atst/routes/workspaces.py | 3 ++- js/components/forms/members_list.js | 10 +++++++--- templates/workspaces/members/index.html | 13 +++++++++---- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/atst/domain/workspace_roles.py b/atst/domain/workspace_roles.py index e5002f0f..f6942e2f 100644 --- a/atst/domain/workspace_roles.py +++ b/atst/domain/workspace_roles.py @@ -9,6 +9,16 @@ from .users import Users from .exceptions import NotFoundError +MEMBER_STATUSES = [ + {"name": "active", "display_name": "Active"}, + {"name": "revoked", "display_name": "Revoked"}, + {"name": "expired", "display_name": "Invite expired"}, + {"name": "error", "display_name": "Error on invite"}, + {"name": "pending", "display_name": "Pending"}, + {"name": "unknown", "display_name": "Unknown errors"}, +] + + class WorkspaceRoles(object): @classmethod def get(cls, workspace_id, user_id): diff --git a/atst/models/workspace_role.py b/atst/models/workspace_role.py index 93a4a85b..ad223c5f 100644 --- a/atst/models/workspace_role.py +++ b/atst/models/workspace_role.py @@ -53,11 +53,12 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin): elif self.latest_invitation: if self.latest_invitation.is_revoked: return "Revoked" - elif self.latest_invitation.is_rejected_expired: - return "Invite expired" elif self.latest_invitation.is_rejected_wrong_user: return "Error on invite" - elif self.latest_invitation.is_expired: + elif ( + self.latest_invitation.is_rejected_expired + or self.latest_invitation.is_expired + ): return "Invite expired" else: return "Pending" diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 3ee2c2e6..bbe47803 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -14,7 +14,7 @@ from atst.domain.exceptions import UnauthorizedError, AlreadyExistsError from atst.domain.projects import Projects from atst.domain.reports import Reports from atst.domain.workspaces import Workspaces -from atst.domain.workspace_roles import WorkspaceRoles +from atst.domain.workspace_roles import WorkspaceRoles, MEMBER_STATUSES from atst.domain.environments import Environments from atst.domain.environment_roles import EnvironmentRoles from atst.forms.project import NewProjectForm, ProjectForm @@ -124,6 +124,7 @@ def workspace_members(workspace_id): "workspaces/members/index.html", workspace=workspace, role_choices=WORKSPACE_ROLE_DEFINITIONS, + status_choices=MEMBER_STATUSES, members=members_list, new_member=new_member, ) diff --git a/js/components/forms/members_list.js b/js/components/forms/members_list.js index a887c089..7de99020 100644 --- a/js/components/forms/members_list.js +++ b/js/components/forms/members_list.js @@ -11,12 +11,14 @@ const search = (query, members) => { } } -const filterByStatus = (status, members) => { +const filterByStatus = (status, statusesByDisplayName, members) => { + const getStatusFromDisplayName = (_status) => statusesByDisplayName[_status].name + if (status === '' || status === 'all') { return members } else { return members.filter( - (member) => member.status.toLowerCase() === status + (member) => getStatusFromDisplayName(member.status) === status ) } } @@ -52,6 +54,7 @@ export default { props: { members: Array, role_choices: Array, + status_choices: Array, }, data: function () { @@ -90,6 +93,7 @@ export default { return { searchValue: '', status: '', + statusesByDisplayName: indexBy(prop('display_name'), this.status_choices), role: '', rolesByDisplayName: indexBy(prop('display_name'), this.role_choices), sortInfo: { @@ -104,7 +108,7 @@ export default { searchedList: function () { return pipe( partial(search, [this.searchValue]), - partial(filterByStatus, [this.status]), + partial(filterByStatus, [this.status, this.statusesByDisplayName]), partial(filterByRole, [this.role, this.rolesByDisplayName]), partial(sort, [this.sortInfo]) )(this.members) diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 3010b087..83f4ba32 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -47,7 +47,12 @@ {% endif %} - +
@@ -61,9 +66,9 @@
From d72d018ba28c60ed251e1d6fb6b52c0898831766 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 13 Nov 2018 10:43:34 -0500 Subject: [PATCH 4/4] Fix alignment of filter inputs on member listing page --- styles/components/_search_bar.scss | 2 ++ templates/workspaces/members/index.html | 40 +++++++++++++------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/styles/components/_search_bar.scss b/styles/components/_search_bar.scss index 715c982c..28b536c5 100644 --- a/styles/components/_search_bar.scss +++ b/styles/components/_search_bar.scss @@ -27,6 +27,8 @@ flex-basis: 100%; .usa-input { + flex-basis: 100%; + @media (min-width:1000px) { margin-top: 0; } diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 83f4ba32..9b0e1e5f 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -61,26 +61,28 @@
-
- - -
+
+
+ + +
-
- - +
+ + +