Use tuple return values in users and groups model

This commit is contained in:
Johannes Zellner
2025-02-11 15:31:47 +01:00
parent 7322006455
commit dde6e0859b
4 changed files with 18 additions and 18 deletions
+7 -2
View File
@@ -47,8 +47,13 @@ watch(accessRestriction, (value) => {
});
onMounted(async () => {
users.value = await usersModel.list();
groups.value = await groupsModel.list();
let [error, result] = await usersModel.list();
if (error) return console.error(error);
users.value = result;
[error, result] = await groupsModel.list();
if (error) return console.error(error);
groups.value = result;
});
</script>
+7 -2
View File
@@ -89,8 +89,13 @@ export default {
this.accessRestriction = applink && applink.accessRestriction ? applink.accessRestriction : { users: [], groups: [] };
// fetch users and groups
this.users = await usersModel.list();
this.groups = await groupsModel.list();
let [error, result] = await usersModel.list();
if (error) return console.error(error);
this.users = result;
[error, result] = await groupsModel.list();
if (error) return console.error(error);
this.groups = result;
this.$refs.applinkDialog.open();
},
+2 -7
View File
@@ -6,7 +6,6 @@ function create() {
const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
return {
name: 'GroupsModel',
async list() {
let error, result;
try {
@@ -15,12 +14,8 @@ function create() {
error = e;
}
if (error || result.status !== 200) {
console.error('Failed to list groups.', error || result.status);
return [];
}
return result.body.groups;
if (error || result.status !== 200) return [error || result];
return [null, result.body.groups];
},
};
}
+2 -7
View File
@@ -6,7 +6,6 @@ function create() {
const origin = import.meta.env.VITE_API_ORIGIN || window.location.origin;
return {
name: 'UsersModel',
async list() {
const perPage = 5000;
@@ -21,11 +20,7 @@ function create() {
error = e;
}
if (error || result.status !== 200) {
console.error('Failed to list users.', error || result.status);
users = [];
break;
}
if (error || result.status !== 200) return [error || result];
users = users.concat(result.body.users);
@@ -34,7 +29,7 @@ function create() {
page++;
}
return users;
return [null, users];
},
};
}