update filter team for invoice and expense

src/app/api/projectExpenses/index.ts

@@ -8,6 +8,7 @@ export type ProjectExpensesResult = {
     expenseNo?: string
     projectCode: string
     projectName: string
+    teamId: number
     teamCode: string
     teamName: string
     amount: number

src/components/ExpenseSearch/ExpenseSearchWrapper.tsx

@@ -22,12 +22,17 @@ const ExpenseSearchWrapper: React.FC & SubComponents = async () => {
     fetchProjectExpenses(),
     fetchProjects(),
   ]);
-  // const userStaff = await fetchUserStaff()
-  // const teamId = userStaff?.teamId
-  // const _projects = projects
+  const userStaff = await fetchUserStaff()
+  const teamId = userStaff?.teamId
 
-  console.log(expenses)
-  const _expenses = expenses.map((e) => {
+  let filteredExpenses = expenses
+  if (teamId) {
+    filteredExpenses = expenses.filter(e => e.teamId === teamId)
+  } else {
+    filteredExpenses = []
+  }
+
+  const _expenses = filteredExpenses.map((e) => {
     const issueDate = e.issueDate;
     const receiptDate = e.receiptDate;
     const formattedIssueDate = dayjs([issueDate[0], issueDate[1], issueDate[2]].join()).format(OUTPUT_DATE_FORMAT)

src/components/InvoiceSearch/InvoiceSearchWrapper.tsx

@@ -19,18 +19,19 @@ interface SubComponents {
 // }
 
 const InvoiceSearchWrapper: React.FC & SubComponents = async () => {
-  // const userStaff = await fetchUserStaff()
-  // const teamId = userStaff?.teamId
+  const userStaff = await fetchUserStaff()
+  const teamId = userStaff?.teamId
   const invoices = await fetchInvoicesV3()
   const projects = await fetchProjects()
-  // const filteredProjects = projects.filter(project => project.teamId === teamId)
 
-  // let filteredInvoice = invoices
-  // if (teamId) {
-  //   filteredInvoice = invoices.filter(invoice => invoice.teamId === teamId)
-  // }
+  let filteredInvoice = invoices
+  if (teamId) {
+    filteredInvoice = invoices.filter(i => i.teamId === teamId)
+  } else {
+    filteredInvoice = []
+  }
 
-  const convertedInvoices = invoices.map((invoice)=>{
+  const convertedInvoices = filteredInvoice.map((invoice)=>{
     return{
       id: invoice.id,
       invoiceNo: invoice.invoiceNo,