Merge remote-tracking branch 'origin/master'

ui/src/pages/ProductPricing.vue

@@ -315,7 +315,7 @@ import { useProductPricingStore } from 'src/stores/ProductPricingStore'
 
 const store = useProductPricingStore()
 const FETCH_LIMIT = 500
-const currentOffset = ref(0)
+const nextCursor = ref('')
 const loadingMore = ref(false)
 
 const usdToTry = 38.25
@@ -852,14 +852,14 @@ function clearAllCurrencies () {
 }
 
 async function fetchChunk ({ reset = false } = {}) {
-  const offset = reset ? 0 : currentOffset.value
+  const afterProductCode = reset ? '' : nextCursor.value
   const result = await store.fetchRows({
     limit: FETCH_LIMIT,
-    offset,
+    afterProductCode,
     append: !reset
   })
   const fetched = Number(result?.fetched) || 0
-  currentOffset.value = offset + fetched
+  nextCursor.value = String(result?.nextCursor || '')
   return fetched
 }
 
@@ -894,7 +894,7 @@ async function reloadData () {
   console.info('[product-pricing][ui] reload:start', {
     at: new Date(startedAt).toISOString()
   })
-  currentOffset.value = 0
+  nextCursor.value = ''
   await fetchChunk({ reset: true })
   await ensureEnoughVisibleRows(120, 6)
   console.info('[product-pricing][ui] reload:done', {

ui/src/stores/ProductPricingStore.js

@@ -10,9 +10,9 @@ function toNumber (value) {
   return Number.isFinite(n) ? Number(n.toFixed(2)) : 0
 }
 
-function mapRow (raw, index, offset = 0) {
+function mapRow (raw, index, baseIndex = 0) {
   return {
-    id: offset + index + 1,
+    id: baseIndex + index + 1,
     productCode: toText(raw?.ProductCode),
     stockQty: toNumber(raw?.StockQty),
     stockEntryDate: toText(raw?.StockEntryDate),
@@ -64,27 +64,31 @@ export const useProductPricingStore = defineStore('product-pricing-store', {
       this.loading = true
       this.error = ''
       const limit = Number(options?.limit) > 0 ? Number(options.limit) : 500
-      const offset = Number(options?.offset) >= 0 ? Number(options.offset) : 0
+      const afterProductCode = toText(options?.afterProductCode)
       const append = Boolean(options?.append)
+      const baseIndex = append ? this.rows.length : 0
       const startedAt = Date.now()
       console.info('[product-pricing][frontend] request:start', {
         at: new Date(startedAt).toISOString(),
         timeout_ms: 180000,
         limit,
-        offset,
+        after_product_code: afterProductCode || null,
         append
       })
       try {
+        const params = { limit }
+        if (afterProductCode) params.after_product_code = afterProductCode
         const res = await api.request({
           method: 'GET',
           url: '/pricing/products',
-          params: { limit, offset },
+          params,
           timeout: 180000
         })
         const traceId = res?.headers?.['x-trace-id'] || null
         const hasMoreHeader = String(res?.headers?.['x-has-more'] || '').toLowerCase()
+        const nextCursorHeader = toText(res?.headers?.['x-next-cursor'])
         const data = Array.isArray(res?.data) ? res.data : []
-        const mapped = data.map((x, i) => mapRow(x, i, offset))
+        const mapped = data.map((x, i) => mapRow(x, i, baseIndex))
         if (append) {
           const merged = [...this.rows]
           const seen = new Set(this.rows.map((x) => x?.productCode))
@@ -104,12 +108,14 @@ export const useProductPricingStore = defineStore('product-pricing-store', {
           duration_ms: Date.now() - startedAt,
           row_count: this.rows.length,
           fetched_count: mapped.length,
-          has_more: this.hasMore
+          has_more: this.hasMore,
+          next_cursor: nextCursorHeader || null
         })
         return {
           traceId,
           fetched: mapped.length,
-          hasMore: this.hasMore
+          hasMore: this.hasMore,
+          nextCursor: nextCursorHeader
         }
       } catch (err) {
         if (!append) this.rows = []