fix(overriderules): allows every user to be added to the override rules (#1333)

* fix: allows every user to be added to the override rules

* chore: code cleanup

* fix(overriderules): displaying more than ten users at a time

* fix(overriderules): pageSize unaffected by duplicate includeIds

Co-authored-by: Gauthier <mail@gauthierth.fr>

* fix: allows every user to be added to the override rules

* chore(overriderules): readding override rules after rebase

* chore(overriderules): removing empty file

* chore(overriderules): fixing bad merge

---------

Co-authored-by: Gauthier <mail@gauthierth.fr>
This commit is contained in:
RankWeis
2025-03-09 07:37:47 -07:00
committed by GitHub
parent dcc13080bc
commit af8d6b475c
4 changed files with 34 additions and 14 deletions

View File

@@ -578,7 +578,10 @@ export const UserSelector = ({
const users = defaultValue.split(',');
const res = await fetch(`/api/v1/user`);
const res = await fetch(
`/api/v1/user?includeIds=${encodeURIComponent(defaultValue)}`
);
if (!res.ok) {
throw new Error('Network response was not ok');
}

View File

@@ -127,18 +127,18 @@ const OverrideRuleTiles = ({
})
);
setKeywords(keywords);
const users = await Promise.all(
rules
.map((rule) => rule.users?.split(','))
.flat()
.filter((userId) => userId)
.map(async (userId) => {
const res = await fetch(`/api/v1/user/${userId}`);
if (!res.ok) throw new Error();
const user: User = await res.json();
return user;
})
);
const allUsersFromRules = rules
.map((rule) => rule.users)
.filter((users) => users)
.join(',');
if (allUsersFromRules) {
const res = await fetch(
`/api/v1/user?includeIds=${encodeURIComponent(allUsersFromRules)}`
);
if (!res.ok) throw new Error();
const users: User[] = (await res.json()).results;
setUsers(users);
}
setUsers(users);
})();
}, [rules]);