Search solr suggestions

Author: strawburster

src/app/core/submission/vocabularies/models/vocabulary-options.model.ts

@@ -16,7 +16,7 @@ export class VocabularyOptions {
   /**
    * The type of the vocabulary (source): xml, authority, suggest
    */
-  type: string;
+  type?: string;
 
   constructor(name: string,
     closed: boolean = false, type: string = 'xml') {

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.spec.ts

@@ -15,10 +15,12 @@ import { Item } from '@dspace/core/shared/item.model';
 import { MetadataValue } from '@dspace/core/shared/metadata.models';
 import { Vocabulary } from '@dspace/core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyService } from '@dspace/core/submission/vocabularies/vocabulary.service';
+import { SearchServiceStub } from '@dspace/core/testing/search-service.stub';
 import { createPaginatedList } from '@dspace/core/testing/utils.test';
 import { VocabularyServiceStub } from '@dspace/core/testing/vocabulary-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
+import { SearchService } from 'src/app/shared/search/search.service';
 
 import { RegistryService } from '../../../../admin/admin-registries/registry/registry.service';
 import { DynamicOneboxModel } from '../../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
@@ -32,6 +34,7 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
   let fixture: ComponentFixture<DsoEditMetadataAuthorityFieldComponent>;
 
   let vocabularyService: any;
+  let searchService: any;
   let itemService: ItemDataService;
   let registryService: RegistryService;
   let notificationsService: NotificationsService;
@@ -112,6 +115,7 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
       findByHref: createSuccessfulRemoteDataObject$(item),
     });
     vocabularyService = new VocabularyServiceStub();
+    searchService = new SearchServiceStub();
     registryService = jasmine.createSpyObj('registryService', {
       queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
     });
@@ -150,6 +154,7 @@ describe('DsoEditMetadataAuthorityFieldComponent', () => {
       ],
       providers: [
         { provide: VocabularyService, useValue: vocabularyService },
+        { provide: SearchService, useValue: searchService },
         { provide: ItemDataService, useValue: itemService },
         { provide: RegistryService, useValue: registryService },
         { provide: NotificationsService, useValue: notificationsService },

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

@@ -1,79 +1,83 @@
-<ng-template #suggestrt let-listEntry="result" let-t="term">
-  <ng-container
-    [ngTemplateOutlet]="suggestrte"
-    [ngTemplateOutletContext]="{entry: listEntry}">
-  </ng-container>
-</ng-template>
-
-<ng-template #suggestrte let-entry="entry">
-  <ul class="list-unstyled mb=0">
+<ng-template #rt let-listEntry="result" let-t="term">
+  <ul class="list-unstyled mb-0">
+    @if (listEntry.display) {
     <li
       class="list-item text-truncate text-primary"
-      [innerHTML]="(entry.term + ' (' + entry.weight + ')')">
+      [innerHtml]="listEntry.display">
     </li>
-  </ul>
-</ng-template>
-
-<ng-template #rt let-listEntry="result" let-t="term">
-  <ng-container
-    [ngTemplateOutlet]="(listEntry.hasOtherInformation()) ? hasInfo : noInfo"
-    [ngTemplateOutletContext]="{entry: listEntry}">
-  </ng-container>
-</ng-template>
-
-<ng-template #hasInfo let-entry="entry">
-  <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
-
-    @for (item of entry.otherInformation | dsObjNgFor; track item) {
+    } @else {
+    <li class="list-item text-truncate text-primary fw-bold">
+      {{listEntry.value}}
+    </li>
+    }
 
-      <li class="list-item text-truncate text-secondary" >
-        {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
-      </li>
+    @if (listEntry.hasOtherInformation()) {
+    @for (item of listEntry.otherInformation | dsObjNgFor; track item.key) {
 
-    }
-  </ul>
-</ng-template>
+    <li class="list-item text-truncate text-secondary" >
+      {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
+    </li>
 
-<ng-template #noInfo let-entry="entry">
-  <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
+    }}
   </ul>
 </ng-template>
 
-@if (!(isHierarchicalVocabulary() | async)) {
-
 <div class="position-relative right-addon">
 
-  @if (searching || loadingInitialValue) {
+  @if ((vocabulary$ | async)?.hierarchical) {
 
-  <i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+  <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
+    aria-hidden="true"></i>
+  <input class="form-control"
+    [attr.aria-labelledby]="'label_' + model.id"
+    [attr.autoComplete]="model.autoComplete"
+    [attr.aria-label]="model.label | translate"
+    [class.is-invalid]="showErrorMessages"
+    [class.tree-input]="!model.readOnly"
+    [id]="id"
+    [name]="model.name"
+    [placeholder]="model.placeholder"
+    [readonly]="true"
+    [disabled]="model.readOnly"
+    [type]="model.inputType"
+    [value]="currentValue?.display"
+    (focus)="onFocus($event)"
+    (change)="onChange($event)"
+    (click)="openTree($event)"
+    (keydown)="$event.preventDefault()"
+    (keypress)="$event.preventDefault()"
+    (keyup)="$event.preventDefault()">
 
   } @else {
 
+  @if (loading) {
+  <i
+    class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0"
+    aria-hidden="true">
+  </i>
+  } @else {
   <i
     dsAuthorityConfidenceState
     class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
     aria-hidden="true"
     [authorityValue]="currentValue"
-    (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
-
+    (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)">
+  </i>
   }
 
-  <input #instance="ngbTypeahead"
+  <input #typeahead="ngbTypeahead"
     class="form-control"
     [attr.aria-labelledby]="'label_' + model.id"
     [attr.autoComplete]="model.autoComplete"
     [attr.aria-label]="model.label | translate"
     [class.is-invalid]="showErrorMessages"
     [id]="model.id"
-    [inputFormatter]="formatter"
     [name]="model.name"
     [ngbTypeahead]="search"
     [placeholder]="model.placeholder"
     [readonly]="model.readOnly"
     [disabled]="model.readOnly"
-    [resultTemplate]="isSolrSuggest ? suggestrt : rt"
+    [resultTemplate]="rt"
     [type]="model.inputType"
     [(ngModel)]="currentValue"
     (blur)="onBlur($event)"
@@ -83,37 +87,8 @@
     (selectItem)="onSelectItem($event)">
 
   @if (searchFailed) {
-
   <div class="invalid-feedback">Sorry, suggestions could not be loaded.</div>
-
   }
 
+  }
 </div>
-
-} @else {
-
-<div class="position-relative right-addon">
-  <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
-    aria-hidden="true"></i>
-  <input class="form-control"
-    [attr.aria-labelledby]="'label_' + model.id"
-    [attr.autoComplete]="model.autoComplete"
-    [attr.aria-label]="model.label | translate"
-    [class.is-invalid]="showErrorMessages"
-    [class.tree-input]="!model.readOnly"
-    [id]="id"
-    [name]="model.name"
-    [placeholder]="model.placeholder"
-    [readonly]="true"
-    [disabled]="model.readOnly"
-    [type]="model.inputType"
-    [value]="currentValue?.display"
-    (focus)="onFocus($event)"
-    (change)="onChange($event)"
-    (click)="openTree($event)"
-    (keydown)="$event.preventDefault()"
-    (keypress)="$event.preventDefault()"
-    (keyup)="$event.preventDefault()">
-</div>
-
-}

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts

@@ -28,6 +28,7 @@ import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
 } from '@dspace/core/testing/dynamic-form-mock-services';
+import { SearchServiceStub } from '@dspace/core/testing/search-service.stub';
 import { createTestComponent } from '@dspace/core/testing/utils.test';
 import { VocabularyServiceStub } from '@dspace/core/testing/vocabulary-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '@dspace/core/utilities/remote-data.utils';
@@ -44,6 +45,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+import { SearchService } from 'src/app/shared/search/search.service';
 
 import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
@@ -97,6 +99,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
   let testFixture: ComponentFixture<TestComponent>;
   let oneboxCompFixture: ComponentFixture<DsDynamicOneboxComponent>;
   let vocabularyServiceStub: any;
+  let searchServiceStub: any;
   let modalService: any;
   let html;
   let modal;
@@ -137,6 +140,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
   // waitForAsync beforeEach
   beforeEach(() => {
     vocabularyServiceStub = new VocabularyServiceStub();
+    searchServiceStub = new SearchServiceStub();
 
     modal = jasmine.createSpyObj('modal',
       {
@@ -164,6 +168,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         ChangeDetectorRef,
         DsDynamicOneboxComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: SearchService, useValue: searchServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
         { provide: NgbModal, useValue: modal },
@@ -259,14 +264,14 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
       it('should emit blur Event onBlur when popup is closed', () => {
         spyOn(oneboxComponent.blur, 'emit');
-        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        spyOn(oneboxComponent.typeahead, 'isPopupOpen').and.returnValue(false);
         oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
 
       it('should not emit blur Event onBlur when popup is opened', () => {
         spyOn(oneboxComponent.blur, 'emit');
-        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(true);
+        spyOn(oneboxComponent.typeahead, 'isPopupOpen').and.returnValue(true);
         const input = oneboxCompFixture.debugElement.query(By.css('input'));
 
         input.nativeElement.blur();
@@ -278,7 +283,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         oneboxCompFixture.detectChanges();
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
-        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        spyOn(oneboxComponent.typeahead, 'isPopupOpen').and.returnValue(false);
         oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
@@ -291,7 +296,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         oneboxCompFixture.detectChanges();
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
-        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        spyOn(oneboxComponent.typeahead, 'isPopupOpen').and.returnValue(false);
         oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
@@ -304,7 +309,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         oneboxCompFixture.detectChanges();
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
-        spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
+        spyOn(oneboxComponent.typeahead, 'isPopupOpen').and.returnValue(false);
         oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();