From d0ae11b9118418b304d889716258a628201eb931 Mon Sep 17 00:00:00 2001
From: gjulivan <grandjulivan@gmail.com>
Date: Thu, 11 Sep 2025 14:01:55 +0200
Subject: [PATCH 1/3] fix: combobox lazy load on initial load

---
 packages/pluggableWidgets/combobox-web/CHANGELOG.md        | 2 ++
 .../helpers/Database/DatabaseSingleSelectionSelector.ts    | 7 ++++---
 .../combobox-web/src/helpers/LazyLoadProvider.ts           | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/pluggableWidgets/combobox-web/CHANGELOG.md b/packages/pluggableWidgets/combobox-web/CHANGELOG.md
index da034edc54..17b451a97c 100644
--- a/packages/pluggableWidgets/combobox-web/CHANGELOG.md
+++ b/packages/pluggableWidgets/combobox-web/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - We fixed an issue where combobox failed to render a proper width on auto-fit container.
 
+- We fixed an issue where combobox lazy load is not working on initial load.
+
 ## [2.5.0] - 2025-08-12
 
 ### Added
diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
index d4f7d74fcb..f630fbd657 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
@@ -55,9 +55,6 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
             valueSourceAttribute
         } = extractDatabaseProps(props);
 
-        if (ds.status === "loading") {
-            return;
-        }
         this._attr = targetAttribute as R;
         this.readOnly = getReadonly(targetAttribute, props.customEditability, props.customEditabilityExpression);
         this.lazyLoader.updateProps(ds);
@@ -65,6 +62,10 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
             this.lazyLoader.getLimit(ds.limit, this.readOnly, targetAttribute?.status ?? ds.status, lazyLoading)
         );
 
+        if (ds.status === "loading") {
+            return;
+        }
+
         this.caption.updateProps({
             emptyOptionText: emptyOption,
             formattingAttributeOrExpression: captionProvider,
diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts b/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
index 219a8bef8b..02cfb019f7 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
@@ -18,7 +18,7 @@ export class LazyLoadProvider {
     getLimit(limit: number, readOnly: boolean, status: ValueStatus, lazyLoading: boolean): number | undefined {
         if (status !== "available" || readOnly === true) {
             if (status === "loading" && lazyLoading) {
-                return this.limit || 1;
+                return this.limit === Infinity || !this.limit ? 1 : this.limit;
             }
             return 0;
         }

From c1f4256bafef1c3d50cd0ff64a410338a3c843d7 Mon Sep 17 00:00:00 2001
From: gjulivan <grandjulivan@gmail.com>
Date: Wed, 17 Sep 2025 01:22:21 +0200
Subject: [PATCH 2/3] fix: fix regression when there is attribute value and
 lazy load

---
 .../helpers/BaseDatasourceOptionsProvider.ts  |  4 ++--
 .../DatabaseSingleSelectionSelector.ts        | 19 ++++++++++++++-----
 .../src/helpers/LazyLoadProvider.ts           |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/BaseDatasourceOptionsProvider.ts b/packages/pluggableWidgets/combobox-web/src/helpers/BaseDatasourceOptionsProvider.ts
index c817cf8edd..1fbd1ae76a 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/BaseDatasourceOptionsProvider.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/BaseDatasourceOptionsProvider.ts
@@ -86,9 +86,9 @@ export class BaseDatasourceOptionsProvider extends BaseOptionsProvider<ObjectIte
     }
 
     // used for initial load of selected value in case options are lazy loaded
-    loadSelectedValue(attributeValue: string): void {
+    loadSelectedValue(attributeValue: string, attrId?: ListAttributeValue["id"]): void {
         if (this.lazyLoading && this.ds && this.attributeId) {
-            const filterCondition = datasourceFilter("containsExact", attributeValue, this.attributeId);
+            const filterCondition = datasourceFilter("containsExact", attributeValue, attrId ?? this.attributeId);
             this.ds?.setFilter(filterCondition);
             this.ds.setLimit(1);
         }
diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
index f630fbd657..da0df2436e 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
@@ -55,6 +55,10 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
             valueSourceAttribute
         } = extractDatabaseProps(props);
 
+        if (ds.status === "loading" && (!lazyLoading || ds.limit !== Infinity)) {
+            return;
+        }
+
         this._attr = targetAttribute as R;
         this.readOnly = getReadonly(targetAttribute, props.customEditability, props.customEditabilityExpression);
         this.lazyLoader.updateProps(ds);
@@ -62,10 +66,6 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
             this.lazyLoader.getLimit(ds.limit, this.readOnly, targetAttribute?.status ?? ds.status, lazyLoading)
         );
 
-        if (ds.status === "loading") {
-            return;
-        }
-
         this.caption.updateProps({
             emptyOptionText: emptyOption,
             formattingAttributeOrExpression: captionProvider,
@@ -101,9 +101,18 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
                     });
                     if (obj) {
                         this.currentId = obj;
+                    } else {
+                        // NOTE: should not hit this scope normally
+                        // if the value is not in the options list, but there is a value from attribute
+                        // there is probably a mismatch between the value and the datasource
+                        // logical next step is to try to reload the attribute value
+                        // this.options.loadSelectedValue(targetAttribute.value?.toString(), valueSourceAttribute?.id);
                     }
                 } else {
-                    this.options.loadSelectedValue(targetAttribute.value?.toString());
+                    // should hit on initial condition whereas:
+                    // no options are loaded yet : (allOptions.length > 0)
+                    // but there is a value from target attribute : (!this.currentId)
+                    this.options.loadSelectedValue(targetAttribute.value?.toString(), valueSourceAttribute?.id);
                 }
             } else if (!targetAttribute.value && this.currentId) {
                 this.currentId = null;
diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts b/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
index 02cfb019f7..9b8c18d359 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/LazyLoadProvider.ts
@@ -18,7 +18,7 @@ export class LazyLoadProvider {
     getLimit(limit: number, readOnly: boolean, status: ValueStatus, lazyLoading: boolean): number | undefined {
         if (status !== "available" || readOnly === true) {
             if (status === "loading" && lazyLoading) {
-                return this.limit === Infinity || !this.limit ? 1 : this.limit;
+                return this.limit === Infinity || !this.limit ? 0 : this.limit;
             }
             return 0;
         }

From faf0dba81610c90844e6bab91f35a0118fb7c4ed Mon Sep 17 00:00:00 2001
From: gjulivan <grandjulivan@gmail.com>
Date: Wed, 17 Sep 2025 13:12:57 +0200
Subject: [PATCH 3/3] fix: reload content if not found

---
 .../src/helpers/Database/DatabaseSingleSelectionSelector.ts   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
index da0df2436e..d480133072 100644
--- a/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
+++ b/packages/pluggableWidgets/combobox-web/src/helpers/Database/DatabaseSingleSelectionSelector.ts
@@ -106,7 +106,9 @@ export class DatabaseSingleSelectionSelector<T extends string | Big, R extends E
                         // if the value is not in the options list, but there is a value from attribute
                         // there is probably a mismatch between the value and the datasource
                         // logical next step is to try to reload the attribute value
-                        // this.options.loadSelectedValue(targetAttribute.value?.toString(), valueSourceAttribute?.id);
+                        if (allOptions.length <= 1) {
+                            this.options.loadSelectedValue(targetAttribute.value?.toString(), valueSourceAttribute?.id);
+                        }
                     }
                 } else {
                     // should hit on initial condition whereas: