Merge pull request #356 from stustapay/milo/fix-user-to-role-create

fix(admin): correct user list in user to role create
stustapay · May 20, 2024 · cc2d532 · cc2d532
2 parents 9f9c557 + 84f3a03
commit cc2d532
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/web/apps/administration/src/app/routes/cashiers/CashierCloseOut.tsx b/web/apps/administration/src/app/routes/cashiers/CashierCloseOut.tsx
@@ -239,8 +239,7 @@ export const CashierCloseOut: React.FC = () => {
                   label={t("closeOut.closingOutUser")}
                   value={formik.values.closingOutUserId}
                   onBlur={formik.handleBlur}
-                  // TODO: readd filter once roles are again propagated with users
-                  // filterRole="finanzorga"
+                  filterPrivilege="node_administration"
                   onChange={(val) => formik.setFieldValue("closingOutUserId", val)}
                   error={formik.touched.closingOutUserId && !!formik.errors.closingOutUserId}
                   helperText={(formik.touched.closingOutUserId && formik.errors.closingOutUserId) as string}

diff --git a/web/apps/administration/src/app/routes/users/user-to-role/UserToRoleList.tsx b/web/apps/administration/src/app/routes/users/user-to-role/UserToRoleList.tsx
@@ -85,6 +85,9 @@ export const UserToRoleList: React.FC = () => {
       return "";
     }
     const roles = ids.map((id) => selectUserRoleById(userRoles, id));
+    roles.sort((lhs, rhs) =>
+      lhs !== undefined && rhs && undefined ? lhs.name.toLowerCase().localeCompare(rhs.name.toLowerCase()) : -1
+    );
 
     return (
       <Box sx={{ display: "grid", gap: 1, gridAutoFlow: "column" }}>

diff --git a/web/apps/administration/src/components/features/UserSelect.tsx b/web/apps/administration/src/components/features/UserSelect.tsx
@@ -1,4 +1,4 @@
-import { User, selectUserAll, useListUsersQuery } from "@/api";
+import { Privilege, User, selectUserAll, useListUsersQuery } from "@/api";
 import { useCurrentNode } from "@/hooks";
 import { Select, SelectProps } from "@stustapay/components";
 import { getUserName } from "@stustapay/models";
@@ -7,12 +7,13 @@ import * as React from "react";
 export type UserSelectProps = {
   value: number;
   onChange: (userId: number) => void;
+  filterPrivilege?: Privilege;
 } & Omit<SelectProps<User, false>, "options" | "formatOption" | "multiple" | "value" | "onChange">;
 
-export const UserSelect: React.FC<UserSelectProps> = ({ value, onChange, ...props }) => {
+export const UserSelect: React.FC<UserSelectProps> = ({ value, onChange, filterPrivilege, ...props }) => {
   const { currentNode } = useCurrentNode();
   const { users } = useListUsersQuery(
-    { nodeId: currentNode.id, filterPrivilege: "node_administration" },
+    { nodeId: currentNode.id, filterPrivilege },
     {
       selectFromResult: ({ data, ...rest }) => ({
         ...rest,