Limited most member search inputs to only display active members

api/src/routes/members.ts

@@ -158,7 +158,9 @@ router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
 
 router.get('/lite', [requireLogin], async (req: Request, res: Response) => {
     try {
-        let out = await getAllMembersLite();
+        let activeOnly = Boolean(req.query.active);
+        console.log(activeOnly);
+        let out = await getAllMembersLite(activeOnly);
         res.status(200).json(out);
     } catch (error) {
         logger.error(

api/src/services/db/memberService.ts

@@ -170,14 +170,16 @@ export async function getMembersLite(ids: number[]): Promise<MemberLight[]> {
     return res;
 }
 
-export async function getAllMembersLite(): Promise<MemberLight[]> {
+export async function getAllMembersLite(activeOnly: boolean): Promise<MemberLight[]> {
+
+    const filter = activeOnly ? `\nWHERE member_state = ${MemberState.Member}` : ''
     const sql = `SELECT m.member_id AS id,
                   m.member_name AS username,
                   m.displayName,
                   u.color
               FROM view_member_rank_unit_status_latest m
-                  LEFT JOIN units u ON u.name = m.unit;`;
-
+                  LEFT JOIN units u ON u.name = m.unit ${filter};`;
+    console.log(sql);
     const res: MemberLight[] = await pool.query(sql);
     return res;
 }

ui/src/api/member.ts

@@ -66,8 +66,8 @@ export async function setMemberSettings(settings: memberSettings) {
     return;
 }
 
-export async function getAllLightMembers(): Promise<MemberLight[]> {
-    const response = await fetch(`${addr}/members/lite`, {
+export async function getAllLightMembers(activeOnly: boolean = true): Promise<MemberLight[]> {
+    const response = await fetch(`${addr}/members/lite${activeOnly ? '?active=true' : '?active=false'}`, {
         credentials: 'include',
         headers: {
             "Content-Type": "application/json",