From 1eaf00605ec48753deafef181417610e6bd1c3b2 Mon Sep 17 00:00:00 2001
From: KinshukSS2 <kinshuk380@gmail.com>
Date: Fri, 17 Apr 2026 13:26:25 +0530
Subject: [PATCH] Fix datastream pagination nextLink normalization

---
 ui/server/datastream/read.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/server/datastream/read.ts b/ui/server/datastream/read.ts
index b4b2be40..9c348825 100644
--- a/ui/server/datastream/read.ts
+++ b/ui/server/datastream/read.ts
@@ -19,6 +19,7 @@ import { siteConfig } from '@/config/site'
 
 export async function getDatastreams(token: string) {
   const values: any[] = []
+  const apiBaseUrl = new URL(siteConfig.api_root)
 
   let url =
     `${siteConfig.api_root}` +
@@ -31,11 +32,15 @@ export async function getDatastreams(token: string) {
     values.push(...(data?.value ?? []))
 
     const nextLink: string | undefined = data?.['@iot.nextLink']
-    url = nextLink
-      ? nextLink.startsWith('http')
-        ? `${siteConfig.api_root}/${nextLink.split('/').at(-1)}`
-        : nextLink
-      : undefined
+    if (nextLink) {
+      const parsedNextLink = new URL(nextLink, apiBaseUrl)
+      url = new URL(
+        `${parsedNextLink.pathname}${parsedNextLink.search}`,
+        apiBaseUrl
+      ).toString()
+    } else {
+      url = undefined
+    }
   }
 
   return { datastreamData: values }