Possible fix for user card display crashing

Reviewed-on: #201

.gitea/workflows/deploy-dev.yaml

@@ -92,7 +92,8 @@ jobs:
       - name: Run Database Migrations
         run: |
           cd /var/www/html/milsim-site-v4/api
-          sudo -u nginx npx db-migrate up -e prod
+          npx db-migrate up -e prod
+          chown -R nginx:nginx .
 
       - name: Reset File Permissions
         run: |

.gitea/workflows/deploy-prod.yaml

@@ -92,7 +92,8 @@ jobs:
       - name: Run Database Migrations
         run: |
           cd /var/www/html/milsim-site-v4/api
-          sudo -u nginx npx db-migrate up -e prod
+          npx db-migrate up -e prod
+          chown -R nginx:nginx .
 
       - name: Reset File Permissions
         run: |

api/src/index.ts

@@ -18,7 +18,8 @@ app.use(morgan((tokens: morgan.TokenIndexer, req: express.Request, res: express.
   }
 
   const payload: LogPayload = {
-    message: 'HTTP request completed',
+    message: `${tokens.method(req, res)} ${tokens.url(req, res)}`,
+    // message: 'HTTP request completed',
     data: {
       method: tokens.method(req, res),
       path: tokens.url(req, res),
@@ -102,7 +103,7 @@ import { roles, memberRoles } from './routes/roles';
 import { courseRouter, eventRouter } from './routes/course';
 import { calendarRouter } from './routes/calendar';
 import { docsRouter } from './routes/docs';
-import { units } from './routes/units';
+import { memberUnits, units } from './routes/units';
 
 app.use('/application', applicationRouter);
 app.use('/ranks', ranks);
@@ -117,6 +118,7 @@ app.use('/course', courseRouter)
 app.use('/courseEvent', eventRouter)
 app.use('/calendar', calendarRouter)
 app.use('/units', units)
+app.use('/memberUnits', memberUnits);
 app.use('/docs', docsRouter)
 app.use('/', authRouter)
 

api/src/routes/loa.ts

@@ -189,7 +189,50 @@ router.post('/adminCancel/:id', [requireRole(['17th Administrator', '17th HQ', '
 })
 
 // extend LOA
-router.post('/extend/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
+router.post('/extend/:id', async (req: Request, res: Response) => {
+    const to: Date = req.body.to;
+
+    const member = req.user.id;
+
+    let LOA = await getLOAbyID(Number(req.params.id));
+    if (!LOA) {
+        return res.status(404).send("LOA not found");
+    }
+
+    if (LOA.member_id !== member) {
+        return res.status(403).send("You do not have permission to extend this LOA");
+    }
+
+    if (LOA.extended_till !== null) {
+        return res.status(409).send("You must contact the administration team to extend your LOA again");
+    }
+
+    if (!to) {
+        return res.status(400).send("Extension length is required");
+    }
+
+    try {
+        await setLOAExtension(Number(req.params.id), to);
+
+        audit.leaveOfAbsence('extended', { actorId: req.user.id, targetId: Number(req.params.id) });
+        logger.info('app', 'LOA Extended', { extended_by: req.user.id, LOA: req.params.id })
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error(
+            'app',
+            'Failed to extend LOA',
+            {
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : undefined,
+            }
+        );
+        res.status(500).json(error);
+    }
+})
+
+// admin extend LOA
+router.post('/extendAdmin/:id', [requireRole(['17th Administrator', '17th HQ', '17th Command'])], async (req: Request, res: Response) => {
     const to: Date = req.body.to;
 
     if (!to) {

api/src/routes/members.ts

@@ -6,7 +6,7 @@ import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { getUserActiveLOA } from '../services/db/loaService';
 import { getAllMembersLite, getMemberSettings, getMembersFull, getMembersLite, getUserData, getUserState, setUserSettings, getFilteredMembers, setUserState, getLastNonSuspendedState } from '../services/db/memberService';
-import { getUserRoles } from '../services/db/rolesService';
+import { getUserRoles, stripUserRoles } from '../services/db/rolesService';
 import { memberSettings, MemberState, myData } from '@app/shared/types/member';
 import { Discharge } from '@app/shared/schemas/dischargeSchema';
 
@@ -249,6 +249,7 @@ router.post('/discharge', [requireLogin, requireMemberState(MemberState.Member),
 
         var data: Discharge = req.body;
         setUserState(data.userID, MemberState.Discharged, "Member Discharged", author, con, data.reason);
+        stripUserRoles(data.userID, con);
         cancelLatestRank(data.userID, con);
         cancelLatestUnit(data.userID, con);
         con.commit();

api/src/routes/units.ts

@@ -1,10 +1,17 @@
 import express = require('express');
 const unitsRouter = express.Router();
+const memberUnitsRouter = express.Router();
+
+import { Request, Response } from 'express';
 
 import pool from '../db';
-import { requireLogin } from '../middleware/auth';
+import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
 import { logger } from '../services/logging/logger';
 import { Unit } from '@app/shared/types/units';
+import { MemberState } from '@app/shared/types/member';
+import { assignNewUnit } from '../services/db/unitService';
+import { audit } from '../services/logging/auditLog';
+import { forceInsertMemberRank, insertMemberRank } from '../services/db/rankService';
 
 unitsRouter.use(requireLogin);
 
@@ -26,4 +33,41 @@ unitsRouter.get('/', async (req, res) => {
     }
 });
 
+memberUnitsRouter.post('/admin', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req: Request, res: Response) => {
+    const memberId = Number(req.query.memberId);
+    const unitId = Number(req.query.unitId);
+    const rankId = Number(req.query.rankId);
+    const reason = req.query.reason as string;
+
+    try {
+
+        if (!memberId || !unitId) {
+            return res.status(400).json({ error: 'memberId and unitId query parameters are required' });
+        }
+
+        await assignNewUnit(memberId, unitId, req.user.id, req.user.id, reason);
+        await forceInsertMemberRank(memberId, rankId, req.user.id, req.user.id, reason);
+        logger.info('app', 'Member force assigned unit', {
+            member: memberId,
+            unit: unitId,
+            rank: rankId,
+            caller: req.user.id,
+        });
+        audit.member('update_unit', { actorId: req.user.id, targetId: memberId }, { unit: unitId, rank: rankId, reason: reason });
+
+        res.sendStatus(200);
+    } catch (error) {
+        logger.error('app', 'Failed to force assign unit', {
+            member: memberId,
+            unit: unitId,
+            caller: req.user.id,
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        })
+
+        res.sendStatus(500);
+    }
+});
+
 export const units = unitsRouter;
+export const memberUnits = memberUnitsRouter;

api/src/services/db/memberService.ts

@@ -219,7 +219,10 @@ export async function getMembersFull(ids: number[]): Promise<MemberCardDetails[]
             loa_until: row.loa_until ? new Date(row.loa_until) : undefined,
         };
         // roles comes as array of strings; parse each one
-        const roles: Role[] = row.roles;
+        const roles: Role[] =
+            typeof row.roles === "string"
+                ? JSON.parse(row.roles)
+                : row.roles;
 
         return { member, roles };
     });

api/src/services/db/rankService.ts

@@ -36,6 +36,16 @@ export async function insertMemberRank(member_id: number, rank_id: number, date?
     await pool.query(sql, params);
 }
 
+export async function forceInsertMemberRank(member_id: number, rank_id: number, authorized: number, creator: number, reason: string) {
+    const sql = `CALL sp_update_member_rank(?, ?, ?, ?, ?, NOW())`;
+
+    const result = await pool.query(sql, [member_id, rank_id, authorized, creator, reason]);
+
+    if (!result || result.affectedRows === 0) {
+        throw new Error("Failed to update member rank");
+    }
+}
+
 
 export async function batchInsertMemberRank(promos: BatchPromotionMember[], author: number, approver: number) {
     try {

api/src/services/db/rolesService.ts

@@ -3,6 +3,7 @@ import pool from '../../db';
 import { Role, RoleSummary } from '@app/shared/types/roles'
 import { logger } from '../logging/logger';
 import { memberCache } from '../../routes/auth';
+import * as mariadb from 'mariadb';
 
 export async function assignUserGroup(userID: number, roleID: number) {
     try {
@@ -63,3 +64,15 @@ export async function getUsersWithRole(roleId: number): Promise<MemberLight[]> {
 
     return out as MemberLight[]
 }
+
+export async function stripUserRoles(userID: number, con: mariadb.Pool | mariadb.Connection = pool) {
+    try {
+        const out = await con.query(`DELETE FROM members_roles WHERE member_id = ?;`, [userID]);
+        return { success: true, affectedRows: out.affectedRows };
+    } catch (error) {
+        logger.error('app', 'Failed to strip user roles', error);
+        throw error;
+    } finally {
+        memberCache.Invalidate(userID);
+    }
+}

api/src/services/db/unitService.ts

@@ -11,3 +11,12 @@ export async function cancelLatestUnit(userID: number, con: mariadb.Pool | maria
         throw error;
     }
 }
+
+export async function assignNewUnit(memberID: number, unitID: number, authorizedID: number, creatorID: number, reason: string) {
+    let sql = `CALL sp_update_member_unit(?, ?, ?, ?, ?, NOW())`;
+
+    const result = await pool.query(sql, [memberID, unitID, authorizedID, creatorID, reason]);
+    if (!result || result.affectedRows === 0) {
+        throw new Error('Record was not updated');
+    }
+}

api/src/services/logging/auditLog.ts

@@ -33,7 +33,7 @@ class AuditLogger {
         }
     }
     
-    member(action: 'update_rank' | 'suspension_added' | 'suspension_removed' | 'discharged', context: AuditContext, data: any = {}) {
+    member(action: 'update_rank'| 'update_unit' | 'suspension_added' | 'suspension_removed' | 'discharged', context: AuditContext, data: any = {}) {
         return this.record('member', action, context, data);
     }
 

ui/src/api/loa.ts

@@ -175,3 +175,20 @@ export async function extendLOA(id: number, to: Date) {
         throw new Error("Could not extend LOA");
     }
 }
+
+export async function adminExtendLOA(id: number, to: Date) {
+    const res = await fetch(`${addr}/loa/extendAdmin/${id}`, {
+        method: "POST",
+        credentials: 'include',
+        body: JSON.stringify({ to }),
+        headers: {
+            "Content-Type": "application/json",
+        }
+    });
+
+    if (res.ok) {
+        return
+    } else {
+        throw new Error("Could not extend LOA");
+    }
+}

ui/src/api/units.ts

@@ -13,3 +13,14 @@ export async function getUnits(): Promise<Unit[]> {
     }
     return response.json();
 }
+
+export async function adminAssignUnit(member: number, unit: number, rank: number, reason: string) {
+    const response = await fetch(`${addr}/memberUnits/admin?memberId=${member}&unitId=${unit}&rankId=${rank}&reason=${encodeURIComponent(reason)}`, {
+        method: 'POST',
+        credentials: 'include'
+    });
+    if (!response.ok) {
+        throw new Error("Failed to assign unit");
+    }
+    return;
+}

ui/src/components/loa/loaList.vue

@@ -16,7 +16,7 @@ import {
         DropdownMenuTrigger,
     } from "@/components/ui/dropdown-menu"
     import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
-import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
+    import { adminExtendLOA, cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
     import { onMounted, ref, computed } from "vue";
     import { LOARequest } from "@shared/types/loa";
     import Dialog from "../ui/dialog/Dialog.vue";
@@ -101,7 +101,6 @@ const targetLOA = ref<LOARequest | null>(null);
     const extendTo = ref<CalendarDate | null>(null);
 
     const targetEnd = computed(() => { return targetLOA.value.extended_till ? targetLOA.value.extended_till : targetLOA.value.end_date })
-
     function toCalendarDate(date: Date): CalendarDate {
         if (typeof date === 'string')
             date = new Date(date);
@@ -109,7 +108,11 @@ function toCalendarDate(date: Date): CalendarDate {
     }
 
     async function commitExtend() {
+        if (props.adminMode) {
+            await adminExtendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        } else {
             await extendLOA(targetLOA.value.id, extendTo.value.toDate(getLocalTimeZone()));
+        }
         isExtending.value = false;
         await loadLOAs();
     }
@@ -145,7 +148,7 @@ function setPage(pagenum: number) {
                 <div class="flex gap-5">
                     <Calendar v-model="extendTo" class="rounded-md border shadow-sm w-min" layout="month-and-year"
                         :min-value="toCalendarDate(targetEnd)"
-                        :max-value="toCalendarDate(targetEnd).add({ years: 1 })" />
+                        :max-value="props.adminMode ? toCalendarDate(targetEnd).add({ years: 1 }) : toCalendarDate(targetEnd).add({ months: 1 })" />
                     <div class="flex flex-col w-full gap-3 px-2">
                         <p>Quick Options</p>
                         <Button variant="outline" @click="extendTo = toCalendarDate(targetEnd).add({ days: 7 })">1
@@ -205,9 +208,10 @@ function setPage(pagenum: number) {
                                         </Button>
                                     </DropdownMenuTrigger>
                                     <DropdownMenuContent>
-                                        <DropdownMenuItem v-if="!post.closed && props.adminMode"
+                                        <DropdownMenuItem v-if="!post.closed"
+                                            :disabled="post.extended_till !== null && !props.adminMode"
                                             @click="isExtending = true; targetLOA = post">
-                                            Extend
+                                             {{ (post.extended_till !== null && !props.adminMode) ? 'Extend (Already Extended)' : 'Extend' }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
                                             @click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?

ui/src/components/members/DischargeMember.vue

@@ -26,7 +26,10 @@ const props = defineProps<{
     member: Member | null
 }>()
 
-const emit = defineEmits(['update:open', 'discharged'])
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    'discharged': [value: { data: Discharge }]
+}>()
 
 const formSchema = toTypedSchema(dischargeSchema);
 

ui/src/components/members/TransferMember.vue

@@ -0,0 +1,250 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+
+import { adminAssignUnit, getUnits } from '@/api/units'
+import { getAllRanks } from '@/api/rank'
+import { Button } from '@/components/ui/button'
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogTitle,
+} from '@/components/ui/dialog'
+import { Field, FieldError, FieldLabel } from '@/components/ui/field'
+import { Input } from '@/components/ui/input'
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/components/ui/select'
+import MemberCard from './MemberCard.vue'
+import type { Member } from '@shared/types/member'
+import type { Rank } from '@shared/types/rank'
+import type { Unit } from '@shared/types/units'
+
+const props = defineProps<{
+    open: boolean
+    member: Member | null
+}>()
+
+const emit = defineEmits<{
+    'update:open': [value: boolean]
+    transferred: [value: { memberId: number; unitId: number; rankId: number; reason: string }]
+}>()
+
+const units = ref<Unit[]>([])
+const ranks = ref<Rank[]>([])
+const loadingUnits = ref(false)
+const loadingRanks = ref(false)
+const submitting = ref(false)
+const formError = ref('')
+
+const selectedUnitId = ref('')
+const selectedRankId = ref('')
+const selectedReason = ref('transfer_request')
+const customReason = ref('')
+
+const reasonOptions = [
+    { label: 'Transfer Request', value: 'transfer_request' },
+    { label: 'Leadership Vote', value: 'leadership_vote' },
+    { label: 'Appointment', value: 'appointment' },
+    { label: 'Step Down', value: 'step_down' },
+    { label: 'Custom', value: 'custom' },
+]
+
+const resolvedReason = computed(() => {
+    if (selectedReason.value === 'custom') {
+        return customReason.value.trim()
+    }
+    return selectedReason.value
+})
+
+const canSubmit = computed(() => {
+    return !!props.member && !!selectedUnitId.value && !!selectedRankId.value && !!resolvedReason.value
+})
+
+function resolveDefaultRankId(member: Member | null): string {
+    if (!member || !member.rank) {
+        return ''
+    }
+
+    const normalizedMemberRank = member.rank.trim().toLowerCase()
+    const matchedRank = ranks.value.find((rank) => {
+        return rank.name.trim().toLowerCase() === normalizedMemberRank
+            || rank.short_name.trim().toLowerCase() === normalizedMemberRank
+    })
+
+    return matchedRank ? String(matchedRank.id) : ''
+}
+
+function resetForm() {
+    selectedUnitId.value = ''
+    selectedRankId.value = ''
+    selectedReason.value = 'transfer_request'
+    customReason.value = ''
+    formError.value = ''
+}
+
+async function loadUnits() {
+    loadingUnits.value = true
+    formError.value = ''
+    try {
+        units.value = await getUnits()
+    } catch {
+        formError.value = 'Failed to load units. Please try again.'
+    } finally {
+        loadingUnits.value = false
+    }
+}
+
+async function loadRanks() {
+    loadingRanks.value = true
+    formError.value = ''
+    try {
+        ranks.value = await getAllRanks()
+        selectedRankId.value = resolveDefaultRankId(props.member)
+    } catch {
+        formError.value = 'Failed to load ranks. Please try again.'
+    } finally {
+        loadingRanks.value = false
+    }
+}
+
+watch(
+    () => props.open,
+    (isOpen) => {
+        if (isOpen) {
+            resetForm()
+            loadUnits()
+            loadRanks()
+        }
+    },
+)
+
+async function onSubmit() {
+    if (!props.member) {
+        return
+    }
+
+    if (!selectedUnitId.value) {
+        formError.value = 'Please select a target unit.'
+        return
+    }
+
+    if (!selectedRankId.value) {
+        formError.value = 'Please select a target rank.'
+        return
+    }
+
+    if (!resolvedReason.value) {
+        formError.value = 'Please select a reason or enter a custom reason.'
+        return
+    }
+
+    submitting.value = true
+    formError.value = ''
+    try {
+        const unitId = Number(selectedUnitId.value)
+        const rankId = Number(selectedRankId.value)
+        await adminAssignUnit(props.member.member_id, unitId, rankId, resolvedReason.value)
+
+        emit('transferred', {
+            memberId: props.member.member_id,
+            unitId,
+            rankId,
+            reason: resolvedReason.value,
+        })
+        emit('update:open', false)
+    } catch {
+        formError.value = 'Failed to transfer member. Please try again.'
+    } finally {
+        submitting.value = false
+    }
+}
+</script>
+
+<template>
+    <Dialog :open="open" @update:open="emit('update:open', $event)">
+        <DialogContent class="sm:max-w-[425px]">
+            <DialogHeader>
+                <DialogTitle>Transfer Member</DialogTitle>
+                <DialogDescription>
+                    Select a new unit assignment for
+                    <MemberCard v-if="member" :member-id="member.member_id" />
+                </DialogDescription>
+            </DialogHeader>
+
+            <form id="transferForm" @submit.prevent="onSubmit" class="space-y-4 py-2">
+                <Field>
+                    <FieldLabel>Target Unit</FieldLabel>
+                    <Select v-model="selectedUnitId" :disabled="loadingUnits || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select unit" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="unit in units" :key="unit.id" :value="String(unit.id)">
+                                {{ unit.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Target Rank</FieldLabel>
+                    <Select v-model="selectedRankId" :disabled="loadingRanks || submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select rank" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem v-for="rank in ranks" :key="rank.id" :value="String(rank.id)">
+                                {{ rank.name }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field>
+                    <FieldLabel>Reason</FieldLabel>
+                    <Select v-model="selectedReason" :disabled="submitting">
+                        <SelectTrigger>
+                            <SelectValue placeholder="Select reason" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectItem
+                                v-for="reason in reasonOptions"
+                                :key="reason.value"
+                                :value="reason.value"
+                            >
+                                {{ reason.label }}
+                            </SelectItem>
+                        </SelectContent>
+                    </Select>
+                </Field>
+
+                <Field v-if="selectedReason === 'custom'">
+                    <FieldLabel>Custom Reason</FieldLabel>
+                    <Input
+                        v-model="customReason"
+                        :disabled="submitting"
+                        placeholder="Enter custom transfer reason"
+                    />
+                </Field>
+
+                <FieldError v-if="formError" :errors="[formError]" />
+            </form>
+
+            <DialogFooter class="gap-2">
+                <Button variant="ghost" @click="emit('update:open', false)">
+                    Cancel
+                </Button>
+                <Button type="submit" form="transferForm" :disabled="!canSubmit || loadingUnits || loadingRanks || submitting">
+                    {{ submitting ? 'Transferring...' : 'Transfer Member' }}
+                </Button>
+            </DialogFooter>
+        </DialogContent>
+    </Dialog>
+</template>

ui/src/pages/memberList.vue

@@ -32,6 +32,9 @@
     import Spinner from "@/components/ui/spinner/Spinner.vue";
     import DischargeMember from "@/components/members/DischargeMember.vue";
     import MemberCard from "@/components/members/MemberCard.vue";
+    import { useMemberDirectory } from "@/stores/memberDirectory";
+    import { Discharge } from "@shared/schemas/dischargeSchema";
+    import TransferMember from "@/components/members/TransferMember.vue";
 
     // --- State ---
     const router = useRouter();
@@ -139,25 +142,41 @@
 
     //discharge form logic
     const isDischargeOpen = ref(false)
-    const targetMember = ref(null)
+    const isTransferOpen = ref(false)
+    const targetMember = ref<Member | null>(null)
 
     function openDischargeModal(member: Member) {
         targetMember.value = member
         isDischargeOpen.value = true
     }
 
+    function openTransferModal(member: Member) {
+        targetMember.value = member
+        isTransferOpen.value = true
+    }
+
     async function onSuspend(member: Member) {
         await suspendMember(member.member_id);
         await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
     }
 
     async function onUnsuspend(member: Member) {
         await unsuspendMember(member.member_id);
         await fetchMembers();
+        memberCache.invalidateMember(member.member_id);
     }
 
-    function handleDischargeSuccess(data) {
+    const memberCache = useMemberDirectory();
+
+    function handleDischargeSuccess(value: { data: Discharge }) {
         fetchMembers();
+        memberCache.invalidateMember(value.data.userID);
+    }
+
+    function handleTransferSuccess(value: { memberId: number; unitId: number; rankId: number; reason: string }) {
+        fetchMembers();
+        memberCache.invalidateMember(value.memberId);
     }
 </script>
 
@@ -165,6 +184,8 @@
     <div>
         <DischargeMember v-model:open="isDischargeOpen" :member="targetMember" @discharged="handleDischargeSuccess">
         </DischargeMember>
+        <TransferMember v-model:open="isTransferOpen" :member="targetMember" @transferred="handleTransferSuccess">
+        </TransferMember>
         <div class="mx-auto max-w-7xl w-full py-10 px-4">
             <div class="flex flex-col gap-2">
                 <div class="flex flex-col md:flex-row md:items-center justify-between gap-4">
@@ -245,7 +266,8 @@
                                 <TableCell>{{ member.rank }}</TableCell>
                                 <TableCell>{{ member.unit }}</TableCell>
                                 <TableCell>
-                                    <Badge variant="outline" class="capitalize font-normal">{{ MemberState[member.member_state] }}</Badge>
+                                    <Badge variant="outline" class="capitalize font-normal">{{
+                                        MemberState[member.member_state] }}</Badge>
                                 </TableCell>
                                 <TableCell>
                                     <Badge v-if="member.loa_until" variant="secondary"
@@ -262,11 +284,17 @@
                                             <!-- <DropdownMenuItem @click="navigateToMember(member.member_id)">
                                                 View Profile
                                             </DropdownMenuItem> -->
-                                            <DropdownMenuItem @click="openDischargeModal(member)"
+                                            <DropdownMenuItem v-if="member.member_state === MemberState.Member"
+                                                @click="openTransferModal(member)">
+                                                Transfer Member
+                                            </DropdownMenuItem>
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Discharged"
+                                                @click="openDischargeModal(member)"
                                                 class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
                                                 Discharge Member
                                             </DropdownMenuItem>
-                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended" @click="onSuspend(member)"
+                                            <DropdownMenuItem v-if="member.member_state !== MemberState.Suspended"
+                                                @click="onSuspend(member)"
                                                 class="text-destructive focus:bg-destructive focus:text-destructive-foreground font-medium">
                                                 Suspend Member
                                             </DropdownMenuItem>