Merge branch 'etender' of https://git.zeptic.in/rohit/Procurelinc into dev

src/Services/BBPS/ApiUrls.tsx

@@ -78,8 +78,10 @@ const TENDER_LOGIN = `${BASE_URL}eproc/loginWithoutDecryption`
 const PROCEED_TO_BID = `${BASE_URL}tenderBidding/proceedToBid?tenderId=`
 const SUBMIT_ENVELOPE_A = `${BASE_URL}tenderBidding/getSaveEnvelopeAData`
 const SUBMIT_ENVELOPE_B = `${BASE_URL}tenderBidding/getSaveEnvelopeBData`
-const SUBMIT_ENVELOPE_FILE_A = `${BASE_URL}tenderBidding/addDocumentsEnvelopeA?requestDto=`
-const SUBMIT_ENVELOPE_FILE_B = `${BASE_URL}tenderBidding/addDocumentsEnvelopeB?requestDto=`
+const SUBMIT_ENVELOPE_FILE_A = `${BASE_URL}tenderBidding/addDocumentsEnvelopeA`
+const SUBMIT_ENVELOPE_FILE_B = `https://procurelinc.in/EProcurementSB/tenderBidding/addDocumentsEnvelopeB`
+const GET_ENVELOPE_C = `${BASE_URL}eTendering/getEnvelopeCTemplate/tenderId?tenderId=`
+const SUBMIT_ENVELOPE_C_UPLOAD = `${BASE_URL}tenderBidding/getSaveEnvelopeCData`
 
 
 
@@ -154,6 +156,8 @@ export {
   SUBMIT_ENVELOPE_A,
   SUBMIT_ENVELOPE_B,
   SUBMIT_ENVELOPE_FILE_A,
-  SUBMIT_ENVELOPE_FILE_B
+  SUBMIT_ENVELOPE_FILE_B,
+  GET_ENVELOPE_C,
+  SUBMIT_ENVELOPE_C_UPLOAD,
 };
 

src/Services/BBPS/Hooks.ts

@@ -25,17 +25,16 @@ export const useDashboard = () => {
 // Auction & Tender
 
 export const useFetchPurchaseTender = () => {
-  return useInfiniteQuery({
-    queryKey: ['fetchPurchaseTender'],
-    initialPageParam: 1,
-    queryFn: ({ pageParam }) =>
-      fetchPurchaseTender({
-        page: pageParam,
-        size: 10,
-      }),
-
-    getNextPageParam: (lastPage) => {
-      const { page, size, totalCount } = lastPage;
+    return useInfiniteQuery({
+        queryKey: ['fetchPurchaseTender'],
+        queryFn: ({ pageParam = 0 }) =>
+            fetchPurchaseTender({
+                page: pageParam,
+                size: 10,
+            }),
+        initialPageParam: 0,
+        getNextPageParam: (lastPage, allPages) => {
+            const { totalCount } = lastPage;
 
       const totalPages = Math.ceil(totalCount / size);
 
@@ -142,13 +141,12 @@ export const useOfflineTenderPurchase = () => {
 };
 
 export const useFetchTenderById = (tenderId: string) => {
-    return useQuery({
-        queryKey: ['fetchTenderById', tenderId],
-        queryFn: () => fetchTenderById(tenderId)
-        
-    });
+return useQuery({
+  queryKey: ['fetchTenderById', tenderId],
+  queryFn: () => fetchTenderById(tenderId),
+  enabled: !!tenderId, // prevents running with undefined id
+});
 }
-
 export const useProceedToBid = (tenderId?: string) => {
   return useQuery({
     queryKey: ['proceedToBid', tenderId],