+
diff --git a/webroot/js/grouper-groups-view.js b/webroot/js/grouper-groups-view.js
index e2a508d..7d75678 100644
--- a/webroot/js/grouper-groups-view.js
+++ b/webroot/js/grouper-groups-view.js
@@ -25,6 +25,10 @@ export default {
{
path: `/groupowner/co:${this.api.co}/glid:${this.api.glid}`,
label: this.txt.tabs.owner
+ },
+ {
+ path: `/usermanager/co:${this.api.co}/glid:${this.api.glid}`,
+ label: this.txt.tabs.manager
}
]
}
diff --git a/webroot/js/groups-table.js b/webroot/js/groups-table.js
index 49fe26a..89ba9fd 100644
--- a/webroot/js/groups-table.js
+++ b/webroot/js/groups-table.js
@@ -6,7 +6,10 @@ export default {
Table
],
data() {},
- computed: {
+ methods: {
+ groupStatus(status) {
+ return status === 'T' ? 'Enabled' : 'Disabled'
+ }
},
created() {},
template: /*html*/`
@@ -25,9 +28,10 @@ export default {
— |
{{ group.description || txt.descrZeroState }} |
-
{{ group.enabled && group.enabled === 'T' ? 'Enabled' : 'Disabled' }} |
+
{{ groupStatus(group?.enabled) }} |
+
+
-
+
+
+
+
{{ txt.grouper }}
link
diff --git a/webroot/js/members.js b/webroot/js/members.js
index 2fa0a09..9c3edac 100644
--- a/webroot/js/members.js
+++ b/webroot/js/members.js
@@ -116,7 +116,7 @@ export default {
const formData = new FormData();
formData.append("userId", id);
formData.append("group", name);
- const resp = await fetch(`${this.api.add}?group=${name}&userId=${id}`, {
+ const resp = await fetch(`${this.api.add}`, {
method: "POST",
headers: {
"Accept": "application/json",
@@ -163,7 +163,7 @@ export default {
diff --git a/webroot/js/page/GroupMember.js b/webroot/js/page/GroupMember.js
index a6f781b..09da695 100644
--- a/webroot/js/page/GroupMember.js
+++ b/webroot/js/page/GroupMember.js
@@ -23,6 +23,7 @@ export default {
},
methods: {
showSubscribers(group) {
+ // Create and show the modal
this.$refs.members.show(group);
},
},
@@ -31,11 +32,6 @@ export default {
setQueryParam('view', newValue);
}
},
- computed: {
- routePath() {
- return `/groupmember/co:${this.api.co}/glid:${this.api.glid}`;
- }
- },
mounted() {
let view = hasQueryParam('view') ? getQueryParam('view') : 'adhoc';
if (view !== 'working' && view !== 'adhoc') {
diff --git a/webroot/js/page/UserManager.js b/webroot/js/page/UserManager.js
new file mode 100644
index 0000000..256f868
--- /dev/null
+++ b/webroot/js/page/UserManager.js
@@ -0,0 +1,104 @@
+import PageCount from '../pagecount.js';
+import Pagination from '../pagination.js';
+import GroupsTable from '../groups-table.js';
+import Members from '../members.js';
+import Autocomplete from '../autocomplete.js';
+import Loader from '../loader.js';
+
+export default {
+ components: {
+ PageCount,
+ Pagination,
+ GroupsTable,
+ Members,
+ Autocomplete,
+ Loader
+ },
+ data() {
+ return {
+ loading: false,
+ results: [],
+ user: {},
+ rowLoading: false,
+ searched: false
+ }
+ },
+ inject: ['api', 'txt'],
+ methods: {
+ reset() {
+ this.searched = false
+ // If you are in the middle of a row action we do not want to clear
+ // the results because we are breaking the user experience
+ if(!this.rowLoading) {
+ this.results = []
+ }
+ },
+ async removeUser(group) {
+ const {name, displayExtension} = group;
+ const { identifier: id, label: username, email } = this.user;
+ // This will trigger the inline loader
+ group.loading = true;
+ this.rowLoading = true;
+ const resp = await fetch(`${this.api.remove}?group=${(name)}&userId=${id}`, {
+ method: "DELETE",
+ headers: {
+ "Accept": "application/json"
+ }
+ });
+ if (resp.ok) {
+ this.subscribers = [];
+ await this.findGroupsForManagedUser(this.user);
+ generateFlash(`${username ?? email} ${this.txt.removeSubscriberSuccess} ${(displayExtension)}`, 'success');
+ } else {
+ this.disabled = [ ...this.disabled, id ];
+ generateFlash(this.txt.removeSubscriberError, 'error');
+ let errorResponse = await resp.json();
+ generateFlash(`${errorResponse.message}`, 'error');
+ }
+ },
+ async findGroupsForManagedUser(user) {
+ this.user = user
+ // Reset
+ this.reset()
+ const { identifier: id } = user;
+ this.loading = !this.rowLoading && true;
+ const resp = await fetch(`${this.api.managing}?memberid=${id}`, {
+ headers: {
+ "Accept": "application/json",
+ },
+ method: "GET"
+ });
+ if (resp.ok) {
+ this.results = await resp.json();
+ generateFlash(`${id} has ${this.results.length} ${this.txt.memberships}`, 'success');
+ } else {
+ let errorResponse = await resp.json();
+ generateFlash(`${errorResponse.message}`, 'error');
+ }
+
+ this.searched = true;
+ this.loading = false;
+ }
+ },
+ template: /*html*/`
+
+
+
+
+
+
+
+
+
+ `
+}
\ No newline at end of file
diff --git a/webroot/js/pagecount.js b/webroot/js/pagecount.js
index 1b41421..5f9c83e 100644
--- a/webroot/js/pagecount.js
+++ b/webroot/js/pagecount.js
@@ -11,12 +11,16 @@ export default {
total: {
type: Number,
default: 100
+ },
+ searched: {
+ type: Boolean,
+ default: true
}
},
inject: ['txt'],
template: /*html*/`
- |