Skip to content

Commit d56a0ab

Browse files
committed
Fix user table issue caused by API change
1 parent eae5cdf commit d56a0ab

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

webapp/src/components/UserTable.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<select
3434
v-model="user.role"
3535
class="dropdown"
36-
@change="confirmUpdateUserRole(user._id.$oid, $event.target.value)"
36+
@change="confirmUpdateUserRole(user.immutable_id, $event.target.value)"
3737
>
3838
<option value="user">User</option>
3939
<option value="admin">Admin</option>
@@ -44,21 +44,21 @@
4444
<button
4545
v-if="user.account_status === 'active'"
4646
class="btn btn-outline-danger btn-sm text-uppercase text-monospace"
47-
@click="confirmUpdateUserStatus(user._id.$oid, 'deactivated')"
47+
@click="confirmUpdateUserStatus(user.immutable_id, 'deactivated')"
4848
>
4949
Deactivate
5050
</button>
5151
<button
5252
v-else-if="user.account_status === 'unverified'"
5353
class="btn btn-outline-success btn-sm text-uppercase text-monospace"
54-
@click="confirmUpdateUserStatus(user._id.$oid, 'active')"
54+
@click="confirmUpdateUserStatus(user.immutable_id, 'active')"
5555
>
5656
Activate
5757
</button>
5858
<button
5959
v-else-if="user.account_status === 'deactivated'"
6060
class="btn btn-outline-success btn-sm text-uppercase text-monospace"
61-
@click="confirmUpdateUserStatus(user._id.$oid, 'active')"
61+
@click="confirmUpdateUserStatus(user.immutable_id, 'active')"
6262
>
6363
Activate
6464
</button>
@@ -91,11 +91,11 @@ export default {
9191
}
9292
},
9393
async confirmUpdateUserRole(user_id, new_role) {
94-
const originalCurrentUser = this.original_users.find((user) => user._id.$oid === user_id);
94+
const originalCurrentUser = this.original_users.find((user) => user.immutable_id.$oid === user_id);
9595
9696
if (originalCurrentUser.role === "admin") {
9797
window.alert("You can't change an admin's role.");
98-
this.users.find((user) => user._id.$oid === user_id).role = originalCurrentUser.role;
98+
this.users.find((user) => user.immutable_id.$oid === user_id).role = originalCurrentUser.role;
9999
return;
100100
}
101101
@@ -106,21 +106,21 @@ export default {
106106
) {
107107
await this.updateUserRole(user_id, new_role);
108108
} else {
109-
this.users.find((user) => user._id.$oid === user_id).role = originalCurrentUser.role;
109+
this.users.find((user) => user.immutable_id.$oid === user_id).role = originalCurrentUser.role;
110110
}
111111
},
112112
async confirmUpdateUserStatus(user_id, new_status) {
113-
const originalCurrentUser = this.original_users.find((user) => user._id.$oid === user_id);
113+
const originalCurrentUser = this.original_users.find((user) => user.immutable_id.$oid === user_id);
114114
115115
if (
116116
window.confirm(
117117
`Are you sure you want to change ${originalCurrentUser.display_name}'s status from "${originalCurrentUser.account_status}" to "${new_status}" ?`,
118118
)
119119
) {
120-
this.users.find((user) => user._id.$oid == user_id).account_status = new_status;
120+
this.users.find((user) => user.immutable_id == user_id).account_status = new_status;
121121
await this.updateUserStatus(user_id, new_status);
122122
} else {
123-
this.users.find((user) => user._id.$oid === user_id).account_status =
123+
this.users.find((user) => user.immutable_id === user_id).account_status =
124124
originalCurrentUser.account_status;
125125
}
126126
},

0 commit comments

Comments
 (0)