@sunbird-cb/cbp-ai 0.1.50 → 0.1.52

package/fesm2022/sunbird-cb-cbp-ai.mjs

@@ -1200,7 +1200,7 @@ class ApprovalRequestFormComponent {
             request_name: ['', [
                     Validators.required,
                     Validators.maxLength(100),
-                    Validators.pattern(/^(?!\s*$)[A-Za-z0-9]+$/)
+                    Validators.pattern(/^(?!\s*$)[A-Za-z0-9 ]+$/)
                 ]],
             searchmdo: [''],
         });
@@ -1997,8 +1997,10 @@ class EditCbpPlanComponent {
                 }));
                 // total count may be present in different keys depending on API version.
                 // Prefer 'result.result.totalcount' (legacy lower-case) then data.totalCount, then totalCount
-                const total = _.get(res, 'result.result.totalcount', _.get(res, 'result.result.data.totalCount', _.get(res, 'result.result.totalCount', 0)));
-                this.defaultSearchDesignationCount = total;
+                // const total = _.get(res, 'result.result.totalcount', _.get(res, 'result.result.data.totalCount', _.get(res, 'result.result.totalCount', 0)))
+                // this.defaultSearchDesignationCount = total
+                const total = _.get(res, 'result.result.totalCount', 0);
+                this.defaultSearchDesignationCount = Number(total) || 0;
                 // If offset is zero (first page) replace backup, otherwise append + dedupe
                 if (!this.masterData['designationBackup'] || reqOffset === 0) {
                     this.masterData['designationBackup'] = mapped;
@@ -2016,7 +2018,13 @@ class EditCbpPlanComponent {
                     this.noMoreLegacyDesignations = true;
                 }
                 // Ensure visible list matches the requested display count
-                this.masterData['designation'] = (this.masterData['designationBackup'] || []).slice(0, this.designationListLoadCount);
+                this.masterData = {
+                    ...this.masterData,
+                    designation: [
+                        ...(this.masterData['designationBackup'] || [])
+                            .slice(0, this.designationListLoadCount)
+                    ]
+                };
                 // loading flag cleared in finalize()
                 this.ensureSelectedDesignationExists();
                 this.checkCurrentDesignationPresent();
@@ -2136,45 +2144,50 @@ class EditCbpPlanComponent {
         }, 300);
     }
     onDesignationSelectScroll(event) {
-        const panel = event.target;
-        const scrollPosition = panel.scrollTop + panel.clientHeight;
-        const scrollThreshold = panel.scrollHeight - 50;
-        // only trigger near bottom
-        if (scrollPosition < scrollThreshold) {
-            return;
-        }
-        // prevent duplicate api calls
-        if (this.isLoadingMoreDesignations) {
+        const element = event.target;
+        const atBottom = element.scrollHeight - element.scrollTop <=
+            element.clientHeight + 10;
+        if (!atBottom || this.isLoadingMoreDesignations) {
             return;
         }
-        const loadedCount = this.masterData?.designationBackup?.length || 0;
-        const visibleCount = this.masterData?.designation?.length || 0;
-        console.log('loadedCount', loadedCount, 'visibleCount', visibleCount, 'total', this.defaultSearchDesignationCount);
+        const loaded = this.masterData?.designationBackup?.length || 0;
+        const visible = this.masterData?.designation?.length || 0;
+        console.log({
+            loaded,
+            visible,
+            total: this.defaultSearchDesignationCount
+        });
         /**
          * STEP 1
-         * show more from local cache
+         * SHOW MORE FROM LOCAL CACHE
          */
-        if (loadedCount > visibleCount) {
-            this.isLoadingMoreDesignations = true;
+        if (visible < loaded) {
+            this.designationListLoadCount +=
+                this.designationDefaultLoadCount;
+            // IMPORTANT
+            // create NEW ARRAY reference
+            this.masterData = {
+                ...this.masterData,
+                designation: [
+                    ...this.masterData.designationBackup.slice(0, this.designationListLoadCount)
+                ]
+            };
+            // FORCE UI UPDATE
+            this.cdRef.detectChanges();
+            // restore scroll position
             setTimeout(() => {
-                this.designationListLoadCount +=
-                    this.designationDefaultLoadCount;
-                this.masterData.designation =
-                    this.masterData.designationBackup.slice(0, this.designationListLoadCount);
-                this.isLoadingMoreDesignations = false;
-            }, 200);
+                element.scrollTop = element.scrollTop - 20;
+            });
             return;
         }
         /**
          * STEP 2
-         * fetch next page from api
+         * FETCH NEXT PAGE
          */
-        if (!this.noMoreLegacyDesignations &&
-            loadedCount < this.defaultSearchDesignationCount) {
-            this.isLoadingMoreDesignations = true;
+        if (loaded < this.defaultSearchDesignationCount &&
+            !this.noMoreLegacyDesignations) {
             this.designationOffset +=
                 this.designationDefaultLoadCount;
-            console.log('calling next api page', this.designationOffset);
             this.getDesignation(this.designationSearchText || undefined, this.designationOffset);
         }
     }