Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: gravsearch results don't appear after page refresh (DSP-1675) #542

Merged
merged 2 commits into from Sep 22, 2021
Merged

fix: gravsearch results don't appear after page refresh (DSP-1675) #542

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caa575b
fix: gravsearch results now appear after page refresh
mdelez Sep 21, 2021
7c491df
Merge branch 'main' into wip/DSP-1675-grav-search-refresh-fix
mdelez Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 2 additions & 20 deletions src/app/workspace/results/list-view/list-view.component.spec.ts
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
import { CountQueryResponse, IFulltextSearchParams, MockResource, ReadResourceSequence, SearchEndpointV2 } from '@dasch-swiss/dsp-js';
import { of } from 'rxjs';
import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
import { AdvancedSearchParams, AdvancedSearchParamsService } from '../../search/services/advanced-search-params.service';
import { ListViewComponent, SearchParams } from './list-view.component';

/**
Expand Down Expand Up @@ -80,7 +79,7 @@ class TestParentComponent implements OnInit {
};

this.gravsearch = {
query: 'fake query',
query: 'fake query OFFSET 0',
mode: 'gravsearch'
};
}
Expand All @@ -96,8 +95,6 @@ describe('ListViewComponent', () => {
let testHostComponent: TestParentComponent;
let testHostFixture: ComponentFixture<TestParentComponent>;

let searchParamsServiceSpy: jasmine.SpyObj<AdvancedSearchParamsService>;

beforeEach(waitForAsync(() => {

const searchSpyObj = {
Expand All @@ -106,8 +103,6 @@ describe('ListViewComponent', () => {
}
};

const searchParamsSpyObj = jasmine.createSpyObj('SearchParamsService', ['getSearchParams']);

TestBed.configureTestingModule({
declarations: [
ListViewComponent,
Expand All @@ -127,23 +122,13 @@ describe('ListViewComponent', () => {
provide: DspApiConnectionToken,
useValue: searchSpyObj
},
{
provide: AdvancedSearchParamsService,
useValue: searchParamsSpyObj
}
]
})
.compileComponents();
}));

beforeEach(() => {

searchParamsServiceSpy = TestBed.inject(AdvancedSearchParamsService) as jasmine.SpyObj<AdvancedSearchParamsService>;

const generateFakeQuery = (offset: number) => 'fake query OFFSET ' + offset;

searchParamsServiceSpy.getSearchParams.and.callFake((): AdvancedSearchParams => new AdvancedSearchParams(generateFakeQuery));

const searchSpy = TestBed.inject(DspApiConnectionToken);

(searchSpy.v2.search as jasmine.SpyObj<SearchEndpointV2>).doFulltextSearchCountQuery.and.callFake(
Expand Down Expand Up @@ -215,10 +200,7 @@ describe('ListViewComponent', () => {
const searchSpy = TestBed.inject(DspApiConnectionToken);

// do advanced search count query
expect(searchSpy.v2.search.doExtendedSearchCountQuery).toHaveBeenCalledWith('fake query');

// generate gravesearch query
expect(searchParamsServiceSpy.getSearchParams).toHaveBeenCalled();
expect(searchSpy.v2.search.doExtendedSearchCountQuery).toHaveBeenCalledWith('fake query OFFSET 0');

// do advanced search
expect(searchSpy.v2.search.doExtendedSearch).toHaveBeenCalledWith('fake query OFFSET 0');
Expand Down
10 changes: 5 additions & 5 deletions src/app/workspace/results/list-view/list-view.component.ts
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ import { ApiResponseError, CountQueryResponse, IFulltextSearchParams, KnoraApiCo
import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
import { ComponentCommunicationEventService, EmitEvent, Events } from 'src/app/main/services/component-communication-event.service';
import { NotificationService } from 'src/app/main/services/notification.service';
import { AdvancedSearchParamsService } from '../../search/services/advanced-search-params.service';

/**
* query: search query. It can be gravserch query or fulltext string query.
Expand Down Expand Up @@ -117,7 +116,6 @@ export class ListViewComponent implements OnChanges {

constructor(
@Inject(DspApiConnectionToken) private _dspApiConnection: KnoraApiConnection,
private _advancedSearchParamsService: AdvancedSearchParamsService,
private _notification: NotificationService,
private _componentCommsService: ComponentCommunicationEventService,
) { }
Expand Down Expand Up @@ -231,10 +229,12 @@ export class ListViewComponent implements OnChanges {
);
}

// perform advanced search
const gravsearch = this._advancedSearchParamsService.getSearchParams().generateGravsearch(this.pageEvent.pageIndex);
let gravsearch: string;

if (typeof gravsearch === 'string') {
if (this.search.query !== undefined) {
gravsearch = this.search.query;
gravsearch = gravsearch.substring(0, gravsearch.search('OFFSET'));
gravsearch = gravsearch + 'OFFSET ' + this.pageEvent.pageIndex;
this._dspApiConnection.v2.search.doExtendedSearch(gravsearch).subscribe(
(response: ReadResourceSequence) => {
// if the response does not contain any resources even the search count is greater than 0,
Expand Down