fix: createdby change to dropdown

bigcommerce · Mar 17, 2023 · 8d02166 · 8d02166
1 parent 179a018
commit 8d02166
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 54 deletions.
diff --git a/apps/storefront/src/pages/order/Order.tsx b/apps/storefront/src/pages/order/Order.tsx
@@ -29,6 +29,7 @@ import {
   getBCAllOrders,
   getOrderStatusType,
   getBcOrderStatusType,
+  getOrdersCreatedByUser,
 } from '@/shared/service/b2b'
 
 import {
@@ -115,6 +116,10 @@ const Order = ({
       isB2BUser,
       isAgenting,
       role,
+      companyInfo: {
+        id: companyB2BId,
+      },
+      salesRepCompanyId,
     },
   } = useContext(GlobaledContext)
 
@@ -132,11 +137,15 @@ const Order = ({
     const search = getInitFilter(isCompanyOrder, isB2BUser)
     setFilterData(search)
     const initFilter = async () => {
+      const companyId = companyB2BId || salesRepCompanyId
+      let createdByUsers: CustomFieldItems = {}
+      if (isB2BUser && isCompanyOrder) createdByUsers = await getOrdersCreatedByUser(+companyId, 0)
+
       const fn = isB2BUser ? getOrderStatusType : getBcOrderStatusType
       const orderStatusesName = isB2BUser ? 'orderStatuses' : 'bcOrderStatuses'
       const orderStatuses: CustomFieldItems = await fn()
 
-      const filterInfo = getFilterMoreData(isB2BUser, role, isCompanyOrder, isAgenting, orderStatuses[orderStatusesName])
+      const filterInfo = getFilterMoreData(isB2BUser, role, isCompanyOrder, isAgenting, createdByUsers, orderStatuses[orderStatusesName])
       setOrderStatuses(orderStatuses[orderStatusesName])
       setFilterInfo(filterInfo)
     }

diff --git a/apps/storefront/src/pages/order/config.ts b/apps/storefront/src/pages/order/config.ts
@@ -47,8 +47,11 @@ const bcFilterSearch = {
   q: '',
 }
 
-export const getFilterMoreData = (isB2BUser:boolean, role: string | number, isCompanyOrder: boolean, isAgenting: boolean, orderStatuses = []) => {
+export const getFilterMoreData = (isB2BUser:boolean, role: string | number, isCompanyOrder: boolean, isAgenting: boolean, createdByUsers: any, orderStatuses = []) => {
   const newOrderStatuses = orderStatuses.filter((item: CustomFieldStringItems) => item.statusCode !== '0' && item.statusCode !== '1')
+  const newCreatedByUsers = createdByUsers?.createdByUser?.results.map((item: any) => ({
+    createdBy: `${item.firstName} ${item.lastName}`,
+  })) || {}
   const filterMoreList = [
     {
       name: 'company',
@@ -80,7 +83,12 @@ export const getFilterMoreData = (isB2BUser:boolean, role: string | number, isCo
       label: 'Placed by',
       required: false,
       default: '',
-      fieldType: 'text',
+      fieldType: 'dropdown',
+      options: newCreatedByUsers,
+      replaceOptions: {
+        label: 'createdBy',
+        value: 'createdBy',
+      },
       xs: 12,
       variant: 'filled',
       size: 'small',

diff --git a/apps/storefront/src/pages/quote/QuotesList.tsx b/apps/storefront/src/pages/quote/QuotesList.tsx
@@ -1,5 +1,6 @@
 import {
   useContext,
+  useEffect,
   useState,
 } from 'react'
 import {
@@ -30,6 +31,7 @@ import {
 import {
   getB2BQuotesList,
   getBCQuotesList,
+  getShoppingListsCreatedByUser,
 } from '@/shared/service/b2b'
 
 import {
@@ -130,53 +132,63 @@ const quotesStatuses = [
     statusCode: 5,
   },
 ]
-const filterMoreList = [
-  {
-    name: 'status',
-    label: 'Order status',
-    required: false,
-    default: '',
-    fieldType: 'dropdown',
-    options: quotesStatuses,
-    replaceOptions: {
-      label: 'customLabel',
-      value: 'statusCode',
+
+const getFilterMoreList = (isB2BUser: boolean, createdByUsers: any, createdBySalesReps: any) => {
+  const filterMoreList = [
+    {
+      name: 'status',
+      label: 'Quote status',
+      required: false,
+      default: '',
+      fieldType: 'dropdown',
+      options: quotesStatuses,
+      replaceOptions: {
+        label: 'customLabel',
+        value: 'statusCode',
+      },
+      xs: 12,
+      variant: 'filled',
+      size: 'small',
     },
-    xs: 12,
-    variant: 'filled',
-    size: 'small',
-  },
-  {
-    name: 'createdBy',
-    label: 'Created by',
-    required: false,
-    default: '',
-    fieldType: 'text',
-    xs: 12,
-    variant: 'filled',
-    size: 'small',
-  },
-  {
-    name: 'salesRep',
-    label: 'Sales rep',
-    required: false,
-    default: '',
-    fieldType: 'text',
-    xs: 12,
-    variant: 'filled',
-    size: 'small',
-  },
-  // {
-  //   name: 'dateCreatedBeginAt',
-  //   label: 'Date created',
-  //   required: false,
-  //   default: '',
-  //   fieldType: 'date',
-  //   xs: 12,
-  //   variant: 'filled',
-  //   size: 'small',
-  // },
-]
+    {
+      name: 'createdBy',
+      label: 'Created by',
+      required: false,
+      default: '',
+      fieldType: 'dropdown',
+      options: createdByUsers,
+      replaceOptions: {
+        label: 'createdBy',
+        value: 'createdBy',
+      },
+      xs: 12,
+      variant: 'filled',
+      size: 'small',
+    },
+    {
+      name: 'salesRep',
+      label: 'Sales rep',
+      required: false,
+      default: '',
+      fieldType: 'dropdown',
+      options: createdBySalesReps,
+      replaceOptions: {
+        label: 'salesRep',
+        value: 'salesRep',
+      },
+      xs: 12,
+      variant: 'filled',
+      size: 'small',
+    },
+  ]
+
+  const filterCurrentMoreList = filterMoreList.filter((item) => {
+    if (!isB2BUser && (item.name === 'createdBy' || item.name === 'salesRep')) return false
+    return true
+  })
+
+  return filterCurrentMoreList
+}
 
 const QuotesList = () => {
   const initSearch = {
@@ -192,6 +204,8 @@ const QuotesList = () => {
 
   const [isRequestLoading, setIsRequestLoading] = useState(false)
 
+  const [filterMoreInfo, setFilterMoreInfo] = useState<Array<any>>([])
+
   const navigate = useNavigate()
 
   const [isMobile] = useMobile()
@@ -200,9 +214,33 @@ const QuotesList = () => {
     state: {
       isB2BUser,
       customer,
+      companyInfo: {
+        id: companyB2BId,
+      },
+      salesRepCompanyId,
     },
   } = useContext(GlobaledContext)
 
+  useEffect(() => {
+    const initFilter = async () => {
+      const companyId = companyB2BId || salesRepCompanyId
+      let createdByUsers: CustomFieldItems = {}
+      if (isB2BUser) createdByUsers = await getShoppingListsCreatedByUser(+companyId, 2)
+
+      const newCreatedByUsers = createdByUsers?.createdByUser?.results?.createdBy.map((item: any) => ({
+        createdBy: `${item}`,
+      })) || {}
+      const newCreatedBySalesReps = createdByUsers?.createdByUser?.results?.salesRep.map((item: any) => ({
+        salesRep: `${item.salesRep || item.salesRepEmail}`,
+      })) || {}
+
+      const filterInfos = getFilterMoreList(isB2BUser, newCreatedByUsers, newCreatedBySalesReps)
+      setFilterMoreInfo(filterInfos)
+    }
+
+    initFilter()
+  }, [])
+
   const goToDetail = (item: ListItem, status: number) => {
     if (+status === 0) {
       navigate('/quoteDraft')
@@ -308,6 +346,7 @@ const QuotesList = () => {
       render: (item: ListItem) => (<QuoteStatus code={item.status} />),
     },
   ]
+
   const handleChange = (key:string, value: string) => {
     if (key === 'search') {
       setFilterData({
@@ -351,7 +390,7 @@ const QuotesList = () => {
         >
           <B3Filter
             sortByConfig={sortByConfigData}
-            fiterMoreInfo={filterMoreList}
+            fiterMoreInfo={filterMoreInfo}
             startPicker={{
               isEnabled: true,
               label: 'From',

diff --git a/apps/storefront/src/pages/shoppingLists/ShoppingLists.tsx b/apps/storefront/src/pages/shoppingLists/ShoppingLists.tsx
@@ -2,6 +2,7 @@ import {
   useState,
   useContext,
   useRef,
+  useEffect,
 } from 'react'
 
 import {
@@ -16,6 +17,7 @@ import {
   getBcShoppingList,
   deleteB2BShoppingList,
   deleteBcShoppingList,
+  getShoppingListsCreatedByUser,
 } from '@/shared/service/b2b'
 
 import {
@@ -60,16 +62,35 @@ const shoppingLists = () => {
 
   const [deleteItem, setDeleteItem] = useState<null | ShoppingListsItemsProps>(null)
 
+  const [fiterMoreInfo, setFiterMoreinfo] = useState<Array<any>>([])
+
   const [isMobile] = useMobile()
 
   const {
     state: {
       role,
       isB2BUser,
       currentChannelId,
+      companyInfo: {
+        id: companyB2BId,
+      },
+      salesRepCompanyId,
     },
   } = useContext(GlobaledContext)
 
+  useEffect(() => {
+    const initFilter = async () => {
+      const companyId = companyB2BId || salesRepCompanyId
+      let createdByUsers: CustomFieldItems = {}
+      if (isB2BUser) createdByUsers = await getShoppingListsCreatedByUser(+companyId, 1)
+
+      const filterInfo = getFilterMoreList(createdByUsers, role)
+      setFiterMoreinfo(filterInfo)
+    }
+
+    initFilter()
+  }, [])
+
   const isExtraLarge = useCardListColumn()
 
   const isEnableBtnPermissions = true
@@ -102,8 +123,6 @@ const shoppingLists = () => {
     })
   }
 
-  const fiterMoreInfo = getFilterMoreList(role)
-
   const handleChange = (key:string, value: string) => {
     if (key === 'search') {
       const search = {

diff --git a/apps/storefront/src/pages/shoppingLists/config.ts b/apps/storefront/src/pages/shoppingLists/config.ts
@@ -76,14 +76,22 @@ export const getFilterShoppingListStatus = (role?: number | string): Array<Shopp
   return getShoppingListStatus
 }
 
-export const getFilterMoreList = (role: number | string): GetFilterMoreListProps[] => {
+export const getFilterMoreList = (createdByUsers: any, role: number | string): GetFilterMoreListProps[] => {
+  const newCreatedByUsers = createdByUsers?.createdByUser?.results.map((item: any) => ({
+    createdBy: `${item.firstName} ${item.lastName}`,
+  })) || {}
   const filterMoreList = [
     {
       name: 'createdBy',
       label: 'Created by',
       required: false,
       default: '',
-      fieldType: 'text',
+      fieldType: 'dropdown',
+      options: newCreatedByUsers,
+      replaceOptions: {
+        label: 'createdBy',
+        value: 'createdBy',
+      },
       xs: 12,
       variant: 'filled',
       size: 'small',

diff --git a/apps/storefront/src/shared/service/b2b/graphql/orders.ts b/apps/storefront/src/shared/service/b2b/graphql/orders.ts
@@ -184,6 +184,15 @@ const getOrderStatusTypeQl = (fn: string) => `{
   }
 }`
 
+const getCreatedByUser = (companyId: number, module: number, fn: string) => `{
+  ${fn}(
+    companyId: ${companyId},
+    module: ${module},
+  ){
+    results,
+  }
+}`
+
 export const getB2BAllOrders = (data: CustomFieldItems): CustomFieldItems => B3Request.graphqlB2B({
   query: allOrders(data, 'allOrders'),
 })
@@ -207,3 +216,7 @@ export const getOrderStatusType = (): CustomFieldItems => B3Request.graphqlB2B({
 export const getBcOrderStatusType = (): CustomFieldItems => B3Request.graphqlProxyBC({
   query: getOrderStatusTypeQl('bcOrderStatuses'),
 })
+
+export const getOrdersCreatedByUser = (companyId: number, module: number) => B3Request.graphqlB2B({
+  query: getCreatedByUser(companyId, module, 'createdByUser'),
+})
diff --git a/apps/storefront/src/shared/service/b2b/graphql/quote.ts b/apps/storefront/src/shared/service/b2b/graphql/quote.ts
@@ -335,6 +335,15 @@ const quoteAttachFileDelete = (data: CustomFieldItems) => `mutation{
   }
 }`
 
+const getCreatedByUser = (companyId: number, module: number, fn: string) => `{
+  ${fn}(
+    companyId: ${companyId},
+    module: ${module},
+  ){
+    results,
+  }
+}`
+
 export const getBCCustomerAddresses = (): CustomFieldItems => B3Request.graphqlProxyBC({
   query: getCustomerAddresses(),
 })
@@ -398,3 +407,7 @@ export const quoteDetailAttachFileCreate = (data: CustomFieldItems): CustomField
 export const quoteDetailAttachFileDelete = (data: CustomFieldItems): CustomFieldItems => B3Request.graphqlProxyBC({
   query: quoteAttachFileDelete(data),
 })
+
+export const getQuoteCreatedByUsers = (companyId: number, module: number) => B3Request.graphqlB2B({
+  query: getCreatedByUser(companyId, module, 'createdByUser'),
+})