Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/app/core/model/sdr/repo/abstract-sdr-repo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ export abstract class AbstractSdrRepo<R extends SdrResource> implements SdrRepo<
if (request.query.defaultField && request.query.defaultField.length > 0) {
parameters.push(`df=${request.query.defaultField}`);
}
if (request.query.fields && request.query.fields.length > 0) {
parameters.push(`fl=${request.query.fields}`);
}
}

if (request.highlight && request.highlight.fields.length > 0) {
Expand Down
1 change: 1 addition & 0 deletions src/app/core/model/view/collection-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export interface CollectionView extends View {
readonly templates: any;
templateFunctions?: any;
readonly styles: string[];
readonly fields: string[];
readonly facets: Facet[];
readonly filters: Filter[];
readonly boosts: Boost[];
Expand Down
1 change: 1 addition & 0 deletions src/app/shared/result-view/result-view.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ describe('ResultViewComponent', () => {
default: (resource: any) => component.view.templates.default,
},
styles: [],
fields: [],
facets: [],
filters: [],
boosts: [],
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/search-box/search-box.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ng-template #helpLinks>
<small class="d-block text-muted text-right">
<a [routerLink]="getDiscoveryRouterLink()" [queryParams]="getDiscoveryQueryParams()" queryParamsHandling="merge">{{ 'SHARED.SEARCH_BOX.DISCOVERY' | translate }}</a>
<a [routerLink]="getDiscoveryRouterLink()" [queryParams]="getDiscoveryQueryParams()">{{ 'SHARED.SEARCH_BOX.DISCOVERY' | translate }}</a>
<span> | </span>
<!-- <a [routerLink]="['/about']" fragment="searchTips">{{ 'SHARED.SEARCH_BOX.SEARCH_TIPS' | translate }}</a> -->
<a href="https://scholars.library.tamu.edu/about_scholars/#searchTips">{{ 'SHARED.SEARCH_BOX.SEARCH_TIPS' | translate }}</a>
Expand Down
3 changes: 3 additions & 0 deletions src/app/shared/utilities/discovery.utility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ const buildQuery = (queryParams: Params): Queryable => {
if (queryParams.df && queryParams.df.length > 0) {
query.defaultField = queryParams.df;
}
if (queryParams.fl && queryParams.fl.length > 0) {
query.fields = queryParams.fl;
}
return query as Queryable;
};

Expand Down
17 changes: 14 additions & 3 deletions src/app/shared/utilities/view.utility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,23 @@ import { Direction } from '../../core/model/request';

const addFacetsToQueryParams = (queryParams: Params, collectionView: CollectionView): void => {
if (collectionView.facets && collectionView.facets.length > 0) {
let facets = '';
queryParams.facets = '';
collectionView.facets.forEach((facet: Facet) => {
facets += facets.length > 0 ? `,${facet.field}` : facet.field;
queryParams.facets += queryParams.facets.length > 0 ? `,${facet.field}` : facet.field;
['type', 'pageSize', 'pageNumber'].forEach((key: string) => {
queryParams[`${facet.field}.${key}`] = facet[key];
});
queryParams[`${facet.field}.sort`] = `${facet.sort},${facet.direction}`;
});
queryParams.facets = facets;
}
};

const addFieldsToQueryParams = (queryParams: Params, collectionView: CollectionView): void => {
if (collectionView.fields && collectionView.fields.length > 0) {
queryParams.fl = '';
collectionView.fields.forEach((field: string) => {
queryParams.fl += queryParams.fl.length > 0 ? `,${field}` : field;
});
}
};

Expand Down Expand Up @@ -70,15 +78,18 @@ const addHighlightsToQueryParams = (queryParams: Params, discoveryView: Discover
const addExportToQueryParams = (queryParams: Params, collectionView: CollectionView): void => {
if (collectionView.export && collectionView.export.length > 0) {
queryParams.export = [];
queryParams.fl = '';
collectionView.export.forEach((exp: Export) => {
queryParams.export.push(`${exp.valuePath},${exp.columnHeader}`);
queryParams.fl += queryParams.fl.length > 0 ? `,${exp.valuePath}` : exp.valuePath;
});
}
};

const getQueryParams = (collectionView: CollectionView): Params => {
const queryParams: Params = {};
queryParams.collection = 'individual';
addFieldsToQueryParams(queryParams, collectionView);
addFacetsToQueryParams(queryParams, collectionView);
addFiltersToQueryParams(queryParams, collectionView);
addBoostToQueryParams(queryParams, collectionView);
Expand Down