user default filter fix

added total to logistic
contextmachine · Oct 19, 2023 · fa43d30 · fa43d30
1 parent 3c3030f
commit fa43d30
Show file tree

Hide file tree

Showing 5 changed files with 2,802 additions and 2,870 deletions.
diff --git a/components/logistic/Logistic.tsx b/components/logistic/Logistic.tsx
@@ -46,6 +46,8 @@ const Logistic = () => {
 
             const groupByType = groupByOneKey(shippingList, x => x.contentType)
 
+            groupByType.set('ВСЕ ТИПЫ', shippingList)
+
             const tableData: LogisticDataType[] = [...groupByType.entries()].map(([type, shippings]) => {
                 const row: LogisticDataType = {
                     contentType: type,
@@ -75,9 +77,16 @@ const Logistic = () => {
                 return row
             })
 
-            console.log(tableData)
+            const sorted = tableData.sort((a, b) => a.contentType.localeCompare(b.contentType))
+
+            const x = sorted.findIndex(x => x.contentType === 'ВСЕ ТИПЫ')
+
+            const a = [
+                sorted[x],
+                ...sorted.slice(0, x),
+                ...sorted.slice(x + 1)]
 
-            setTableData(tableData.sort((a, b) => a.contentType.localeCompare(b.contentType)))
+            setTableData(a)
         }
     }, [data, dateRange])
 

diff --git a/components/shippingTable/ShippingTable.tsx b/components/shippingTable/ShippingTable.tsx
@@ -59,6 +59,7 @@ export default function ShippingTable(props: ShippintTableProps) {
 
 
     useEffect(() => {
+        console.log('data', filtered)
         setTableData(shippigDataToTableData(filtered))
     }, [filtered])
 

diff --git a/components/shippingTable/filters/Filters.tsx b/components/shippingTable/filters/Filters.tsx
@@ -32,6 +32,9 @@ export function TableFilters(props: TableFiltersProps) {
     const [searchId, setSearchId] = useState<number | undefined>(undefined)
     const [filters, setFilters] = useState<Filters>(new Map(initialColumns.map((x) => ([x.key! as string, undefined]))))
 
+
+    const [privateFiltered, setPrivateFiltered] = useState<Shipping[]>([])
+
     useEffect(() => {
         let filtered = shippings;
 
@@ -54,20 +57,22 @@ export function TableFilters(props: TableFiltersProps) {
                 })
             }
         })
-        setFiltered(filtered)
-    }, [shippings, filters, setFiltered, userFilters])
+
+        setPrivateFiltered(filtered)
+    }, [shippings, filters, setFiltered, userFilters, user])
 
 
     useEffect(() => {
-        let filtered = shippings;
+        let filtered = privateFiltered
 
         if (searchId) {
-            filtered = shippings.filter(shipping =>
+            filtered = filtered.filter(shipping =>
                 shipping.number.toString().startsWith(searchId.toString())
             )
         }
+
         setFiltered(filtered)
-    }, [searchId, setFiltered, shippings])
+    }, [privateFiltered, searchId, setFiltered, shippings])
 
 
     const clearColumnFilters = () => {
@@ -77,6 +82,7 @@ export function TableFilters(props: TableFiltersProps) {
 
     return <>
         {user.role !== 'admin' && <UserFilter
+            user={user}
             userFilters={userFilters}
             setUserFilters={setUserFilters}
         />}

diff --git a/components/shippingTable/filters/UserFilter.tsx b/components/shippingTable/filters/UserFilter.tsx
@@ -1,38 +1,47 @@
 import { Shipping } from "@/interfaces/Shipping"
+import { User } from "@/interfaces/UserInterface"
 import { UserFilterFunction, userFilterList, userFilterMap, UserFilterOption } from "@/utils/filterUtils"
 import { FilterFilled } from "@ant-design/icons"
 import { Select } from "antd"
-import { useState } from "react"
+import { useEffect, useMemo, useState } from "react"
 
 
 interface UserFilterProps {
+    user: User,
     userFilters: UserFilterFunction[],
     setUserFilters: (e: UserFilterFunction[]) => void
 }
 
 
 export function UserFilter(props: UserFilterProps) {
 
-    const { setUserFilters } = props
+    const { setUserFilters, user } = props
     const [state, setState] = useState('all')
 
-    const handleOnChangeFilter = (option: UserFilterOption) => {
-        setState(option.value)
-        setUserFilters([
-            (shipping: Shipping, userId: string) => {
-                return shipping.toId === userId || shipping.fromId === userId
-            },
-            userFilterMap.get(option.value)!
-        ])
+    useEffect(() => {
+        const defaultUserFilter = (shipping: Shipping, userId: string) => shipping.toId === userId || shipping.fromId === userId
 
-    }
+        const filters = []
+        if (user.role !== 'admin') {
+            console.log('def filter')
+            filters.push(defaultUserFilter)
+        }
+        filters.push(userFilterMap.get(state)!)
+        setUserFilters(filters)
+
+    }, [setUserFilters, state, user])
+
+
+
+
+
 
     return <>
         <Select
             suffixIcon={<FilterFilled />}
             defaultValue="all"
             style={{ width: 200 }}
-            onChange={(_, option) => handleOnChangeFilter(option as UserFilterOption)}
+            onChange={(_, option) => setState((option as UserFilterOption).value)}
             options={userFilterList}
             value={state}
         />