mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-17 23:13:04 +00:00
Added link with the query quoted for search results if empty
If there is an error 400 or a search returns an empty result this commit will show a link with the query quoted. Also improved testing of search results component as the component has changed.
This commit is contained in:
@@ -92,7 +92,8 @@
|
||||
},
|
||||
"results": {
|
||||
"head": "Search Results",
|
||||
"no-results": "There were no results for this search"
|
||||
"no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
|
||||
"no-results-link": "quotes around it"
|
||||
},
|
||||
"sidebar": {
|
||||
"close": "Back to results",
|
||||
|
@@ -7,5 +7,12 @@
|
||||
[hideGear]="true">
|
||||
</ds-viewable-collection></div>
|
||||
<ds-loading *ngIf="!searchResults || searchResults?.isLoading" message="{{'loading.search-results' | translate}}"></ds-loading>
|
||||
<ds-error *ngIf="searchResults?.hasFailed" message="{{'error.search-results' | translate}}"></ds-error>
|
||||
<ds-error *ngIf="searchResults?.payload?.page.length == 0" message="{{'search.results.no-results' | translate}}"></ds-error>
|
||||
<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
|
||||
<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
|
||||
{{ 'search.results.no-results' | translate }}
|
||||
<a [routerLink]="['/search']"
|
||||
[queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
|
||||
queryParamsHandling="merge">
|
||||
{{"search.results.no-results-link" | translate}}
|
||||
</a>
|
||||
</div>
|
||||
|
@@ -1,5 +1,6 @@
|
||||
import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
import { ResourceType } from '../../core/shared/resource-type';
|
||||
import { Community } from '../../core/shared/community.model';
|
||||
@@ -9,11 +10,10 @@ import { SearchResultsComponent } from './search-results.component';
|
||||
describe('SearchResultsComponent', () => {
|
||||
let comp: SearchResultsComponent;
|
||||
let fixture: ComponentFixture<SearchResultsComponent>;
|
||||
let heading: DebugElement;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [TranslateModule.forRoot()],
|
||||
imports: [TranslateModule.forRoot(), NoopAnimationsModule],
|
||||
declarations: [SearchResultsComponent],
|
||||
schemas: [NO_ERRORS_SCHEMA]
|
||||
}).compileComponents();
|
||||
@@ -21,20 +21,39 @@ describe('SearchResultsComponent', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(SearchResultsComponent);
|
||||
comp = fixture.componentInstance; // SearchFormComponent test instance
|
||||
heading = fixture.debugElement.query(By.css('heading'));
|
||||
comp = fixture.componentInstance; // SearchResultsComponent test instance
|
||||
});
|
||||
|
||||
it('should display heading when results are not empty', fakeAsync(() => {
|
||||
(comp as any).searchResults = 'test';
|
||||
(comp as any).searchConfig = {pagination: ''};
|
||||
it('should display results when results are not empty', () => {
|
||||
(comp as any).searchResults = { hasSucceeded: true, isLoading: false, payload: { page: { length: 2 } } };
|
||||
(comp as any).searchConfig = {};
|
||||
fixture.detectChanges();
|
||||
tick();
|
||||
expect(heading).toBeDefined();
|
||||
}));
|
||||
expect(fixture.debugElement.query(By.css('ds-viewable-collection'))).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should not display heading when results is empty', () => {
|
||||
expect(heading).toBeNull();
|
||||
it('should not display link when results are not empty', () => {
|
||||
(comp as any).searchResults = { hasSucceeded: true, isLoading: false, payload: { page: { length: 2 } } };
|
||||
(comp as any).searchConfig = {};
|
||||
fixture.detectChanges();
|
||||
expect(fixture.debugElement.query(By.css('a'))).toBeNull();
|
||||
});
|
||||
|
||||
it('should display error message if error is != 400', () => {
|
||||
(comp as any).searchResults = { hasFailed: true, error: { statusCode: 500 } };
|
||||
fixture.detectChanges();
|
||||
expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should display link with new search where query is quoted if search return a error 400', () => {
|
||||
(comp as any).searchResults = { hasFailed: true, error: { statusCode: 400 } };
|
||||
fixture.detectChanges();
|
||||
expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should display link with new search where query is quoted if search result is empty', () => {
|
||||
(comp as any).searchResults = { payload: { page: { length: 0 } } };
|
||||
fixture.detectChanges();
|
||||
expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
|
@@ -6,6 +6,7 @@ import { SearchOptions } from '../search-options.model';
|
||||
import { SearchResult } from '../search-result.model';
|
||||
import { PaginatedList } from '../../core/data/paginated-list';
|
||||
import { ViewMode } from '../../core/shared/view-mode.model';
|
||||
import { isNotEmpty } from '../../shared/empty.util';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-search-results',
|
||||
@@ -35,4 +36,16 @@ export class SearchResultsComponent {
|
||||
*/
|
||||
@Input() viewMode: ViewMode;
|
||||
|
||||
/**
|
||||
* Method to change the given string by surrounding it by quotes if not already present.
|
||||
*/
|
||||
surroundStringWithQuotes(input: string): string {
|
||||
let result = input;
|
||||
|
||||
if (isNotEmpty(result) && !(result.startsWith('\"') && result.endsWith('\"'))) {
|
||||
result = `"${result}"`;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user