Skip to content

Commit 4743ce6

Browse files
authored
Remove references to <item>._id.$oid in app code now they are handled by serializer (#1362)
1 parent 20f3391 commit 4743ce6

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## v0.6.4 (September 2025)
4+
5+
This patch release simply fixes a few UI bugs introduced in v0.6.3 (and earlier).
6+
It also signifies the adoption of the Contributor Covenant Code of Conduct (v2).
7+
8+
### What's Changed
9+
10+
* Broken admin dashboard UI for user management by @ml-evs in #1361
11+
* Inability to insert new items created via copying into a collection by @BenjaminCharmes in #1356
12+
* Long message dialog box formatting by @BenjaminCharmes in #1346
13+
14+
**Full Changelog**: https://github.com/datalab-org/datalab/compare/v0.6.3...v0.6.4
15+
316
## v0.6.3 (September 2025)
417

518
This patch release primarily improves block serialization performance and extensibility, as well as improving error handling for both developers and users.

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._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._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._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._id, 'active')"
6262
>
6363
Activate
6464
</button>
@@ -93,14 +93,14 @@ export default {
9393
}
9494
},
9595
async confirmUpdateUserRole(user_id, new_role) {
96-
const originalCurrentUser = this.original_users.find((user) => user._id.$oid === user_id);
96+
const originalCurrentUser = this.original_users.find((user) => user._id === user_id);
9797
9898
if (originalCurrentUser.role === "admin") {
9999
DialogService.error({
100100
title: "Role Change Error",
101101
message: "You can't change an admin's role.",
102102
});
103-
this.users.find((user) => user._id.$oid === user_id).role = originalCurrentUser.role;
103+
this.users.find((user) => user._id === user_id).role = originalCurrentUser.role;
104104
return;
105105
}
106106
@@ -112,22 +112,22 @@ export default {
112112
if (confirmed) {
113113
await this.updateUserRole(user_id, new_role);
114114
} else {
115-
this.users.find((user) => user._id.$oid === user_id).role = originalCurrentUser.role;
115+
this.users.find((user) => user._id === user_id).role = originalCurrentUser.role;
116116
}
117117
},
118118
async confirmUpdateUserStatus(user_id, new_status) {
119-
const originalCurrentUser = this.original_users.find((user) => user._id.$oid === user_id);
119+
const originalCurrentUser = this.original_users.find((user) => user._id === user_id);
120120
121121
const confirmed = await DialogService.confirm({
122122
title: "Change User Status",
123123
message: `Are you sure you want to change ${originalCurrentUser.display_name}'s status from "${originalCurrentUser.account_status}" to "${new_status}"?`,
124124
type: "warning",
125125
});
126126
if (confirmed) {
127-
this.users.find((user) => user._id.$oid == user_id).account_status = new_status;
127+
this.users.find((user) => user._id == user_id).account_status = new_status;
128128
await this.updateUserStatus(user_id, new_status);
129129
} else {
130-
this.users.find((user) => user._id.$oid === user_id).account_status =
130+
this.users.find((user) => user._id === user_id).account_status =
131131
originalCurrentUser.account_status;
132132
}
133133
},

webapp/src/file_upload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default function setupUppy(item_id, trigger_selector, reactive_file_list)
6868
file_id: response_body.file_id,
6969
file_info: {
7070
...response_body.file_information,
71-
immutable_id: response_body.file_information.immutable_id.$oid,
71+
immutable_id: response_body.file_information.immutable_id,
7272
},
7373
});
7474
}

0 commit comments

Comments
 (0)