@openmrs/esm-form-entry-app 11.3.1-pre.9637 → 11.3.1-pre.9641

package/dist/openmrs-esm-form-entry-app.js.buildmanifest.json

@@ -11644,12 +11644,12 @@
       ],
       "files": [
         "main.c9fedbf76d90aec0.css",
-        "main.4fe416d153a1af95.js"
+        "main.9dec6586faceb3d4.js"
       ],
       "auxiliaryFiles": [
-        "main.4fe416d153a1af95.js.map"
+        "main.9dec6586faceb3d4.js.map"
       ],
-      "hash": "6f7e3a38ca3f152b",
+      "hash": "efb1b8777777bb4a",
       "childrenByOrder": {}
     },
     {
@@ -15024,7 +15024,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-form-entry-app.js.map"
       ],
-      "hash": "ecce7d49aa42f315",
+      "hash": "da3cb6338fc8aefd",
       "childrenByOrder": {}
     },
     {
@@ -27367,9 +27367,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 6078284,
+      "size": 6078801,
       "sizes": {
-        "javascript": 6078284
+        "javascript": 6078801
       },
       "names": [
         "bootstrap"
@@ -27380,12 +27380,12 @@
         "main"
       ],
       "files": [
-        "89284.d15c283f899702d9.js"
+        "89284.5a048e2e15df1801.js"
       ],
       "auxiliaryFiles": [
-        "89284.d15c283f899702d9.js.map"
+        "89284.5a048e2e15df1801.js.map"
       ],
-      "hash": "f5687c0b08d45774",
+      "hash": "c626c407e8880337",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"11.3.1-pre.9637"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","o3forms":"*"},"extensions":[{"name":"form-widget","component":"formWidget","slot":"form-widget-slot","online":true,"offline":true}],"version":"11.3.1-pre.9641"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-entry-app",
-  "version": "11.3.1-pre.9637",
+  "version": "11.3.1-pre.9641",
   "license": "MPL-2.0",
   "description": "Angular form engine for O3",
   "browser": "dist/openmrs-esm-form-entry-app.js",

package/src/app/form-data-source/form-data-source.service.spec.ts

@@ -36,18 +36,59 @@ describe('Service: FormDataSourceService', () => {
     expect(service).toBeTruthy();
   });
 
-  it('should find for provider by search text', (done) => {
+  it('should find providers by search text after 300ms delay', fakeAsync(() => {
     const service: FormDataSourceService = TestBed.get(FormDataSourceService);
-    const result = service.findProvider('text');
+    let actualResults: any[];
 
-    result.subscribe((results) => {
-      expect(results).toBeTruthy();
-      expect(results.length).toBeGreaterThan(0);
-      expect(results[0].value).toEqual('uuid');
+    service.findProvider('text').subscribe((results) => {
+      actualResults = results;
+    });
+
+    tick(300); // advance past the timer delay
+
+    expect(actualResults).toBeTruthy();
+    expect(actualResults.length).toBeGreaterThan(0);
+    expect(actualResults[0].value).toEqual('uuid');
+  }));
+
+  it('should return empty array for empty or whitespace search text', (done) => {
+    const service: FormDataSourceService = TestBed.get(FormDataSourceService);
+
+    service.findProvider('').subscribe((results) => {
+      expect(results).toEqual([]);
       done();
     });
   });
 
+  it('should return independent observables for each search', fakeAsync(() => {
+    const service: FormDataSourceService = TestBed.get(FormDataSourceService);
+    const providerResourceService = TestBed.get(ProviderResourceService);
+    const searchSpy = spyOn(providerResourceService, 'searchProvider').and.callThrough();
+
+    let firstResults: any[];
+    let secondResults: any[];
+
+    // Two independent searches - each gets its own observable
+    service.findProvider('first').subscribe((results) => {
+      firstResults = results;
+    });
+
+    service.findProvider('second').subscribe((results) => {
+      secondResults = results;
+    });
+
+    tick(300);
+
+    // Each call triggers its own API request (isolation maintained)
+    expect(searchSpy).toHaveBeenCalledTimes(2);
+    expect(searchSpy).toHaveBeenCalledWith('first');
+    expect(searchSpy).toHaveBeenCalledWith('second');
+
+    // Both should have results
+    expect(firstResults).toBeTruthy();
+    expect(secondResults).toBeTruthy();
+  }));
+
   it(
     'should find provider when getProviderByProviderUuid is called' + ' with a provider uuid',
     inject(

package/src/app/form-data-source/form-data-source.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
-import { take, map, tap } from 'rxjs/operators';
-import { Observable, Subject } from 'rxjs';
+import { take, map, tap, switchMap } from 'rxjs/operators';
+import { Observable, Subject, of, timer } from 'rxjs';
 
 import { FetchResponse, fhirBaseUrl, FHIRResource, openmrsFetch } from '@openmrs/esm-framework';
 
@@ -136,10 +136,23 @@ export class FormDataSourceService {
     }
   }
 
-  public findProvider(searchText): Observable<any[]> {
-    return this.providerResourceService.searchProvider(searchText).pipe(
-      map((providers) => providers.filter((p) => !!p.person).map(this.mapProvider)),
-      tap((result) => this.setCachedProviderSearchResults(result)),
+  public findProvider(searchText: string): Observable<any[]> {
+    const trimmedSearchText = searchText?.trim() ?? '';
+
+    if (!trimmedSearchText) {
+      return of([]);
+    }
+
+    // Return a cold observable with 300ms delay
+    // Each call gets its own independent observable
+    // The component's switchMap cancels previous subscriptions for true debouncing
+    return timer(300).pipe(
+      switchMap(() =>
+        this.providerResourceService.searchProvider(trimmedSearchText).pipe(
+          map((providers) => providers.filter((provider) => !!provider.person).map(this.mapProvider)),
+          tap((result) => this.setCachedProviderSearchResults(result)),
+        ),
+      ),
     );
   }
 

package/src/app/openmrs-api/provider-resource.service.spec.ts

@@ -45,24 +45,27 @@ describe('Service : ProviderResourceService Unit Tests', () => {
     const results = {
       results: [
         {
-          uuid: 'uuid',
-          display: 'test',
+          uuid: 'uuid-1',
+          display: 'test provider',
         },
         {
-          uuid: 'uuid',
-          display: 'other',
+          uuid: 'uuid-2',
+          display: 'another test provider',
         },
       ],
     };
 
     providerResourceService.searchProvider(searchText).subscribe((providers) => {
-      for (const provider of providers) {
-        expect(provider.display).toContain('test');
-      }
+      expect(providers.length).toBe(2);
+      expect(providers[0].display).toBe('test provider');
+      expect(providers[1].display).toBe('another test provider');
       done();
     });
 
-    const req = httpMock.expectOne(providerResourceService.getUrl());
+    const req = httpMock.expectOne((request) => {
+      return request.url.includes('provider') && request.params.get('q') === searchText;
+    });
+    expect(req.request.method).toBe('GET');
     req.flush(results);
   });
 });

package/src/app/openmrs-api/provider-resource.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpParams, HttpClient } from '@angular/common/http';
 
-import { Observable, ReplaySubject, of } from 'rxjs';
-import { take, map, catchError } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
 
 import { PersonResourceService } from './person-resource.service';
 import { WindowRef } from '../window-ref';
@@ -19,11 +19,10 @@ export class ProviderResourceService {
   ) {}
 
   public searchProvider(searchText: string): Observable<Array<Provider>> {
-    return this.getAllProviders().pipe(
-      map((providers) =>
-        providers.filter((provider) => provider.display.toLowerCase().includes(searchText.toLowerCase())),
-      ),
-    );
+    const params = new HttpParams().set('q', searchText);
+    const url = this.windowRef.openmrsRestBase + 'provider?v=' + ProviderResourceService.v;
+
+    return this.http.get<ListResult<Provider>>(url, { params }).pipe(map((r) => r.results));
   }
 
   public getProviderByUuid(uuid: string): Observable<Provider | undefined> {
@@ -36,13 +35,13 @@ export class ProviderResourceService {
   }
 
   private getAllProviders(): Observable<Array<Provider>> {
-    const url = this.windowRef.openmrsRestBase + 'provider?q=&v=' + ProviderResourceService.v;
+    const url = this.windowRef.openmrsRestBase + 'provider?v=' + ProviderResourceService.v;
     return this.http.get<ListResult<Provider>>(url).pipe(map((r) => r.results));
   }
 
   public getUrl(uuid?: string) {
     return uuid
       ? this.windowRef.openmrsRestBase + 'provider/' + uuid + '?v=' + ProviderResourceService.v
-      : this.windowRef.openmrsRestBase + 'provider?q=&v=' + ProviderResourceService.v;
+      : this.windowRef.openmrsRestBase + 'provider?v=' + ProviderResourceService.v;
   }
 }