Merge pull request 'Merge develop into angular-16-irish-monitor branch' #26

argiro.kokogiannaki · 2023-12-15T15:09:00+01:00

argiro.kokogiannaki commented

2023-12-15 15:09:00 +01:00

No description provided.

argiro.kokogiannaki self-assigned this 2023-12-15 15:09:00 +01:00

argiro.kokogiannaki added 9 commits 2023-12-15 15:09:00 +01:00

84bf8cdebe [develop | DONE | FIXED] parsingFunctions.class.ts: Updated urls for eoscSubjects (eoscif guidelines).

01eabb74f3 [develop-filters | DONE | CHANGED]: searchFilter.component.ts: In method "_formatTitle()", remove number of filter values from filter name.

d587aaefe2 [develop-filters | DONE | CHANGED]: refineResults.class.ts: Removed check includeValue (for unidentified and Undetermined values) from "parse()" method | searchFilter.component.ts: In "ngOnChanges()" method updated check for filtering out filter values - check for unidentified, Undetermined, unknown (lowercase), not available (lowercase)

b0a67be290 [develop-filters | WIP | CHANGED]: Added static refine fields.

1. searchFields.base.ts: Added RESULT_STATIC_FIELDS/ DATASOURCE_STATIC_FIELDS and RESULT_STATIC_FIELD_VALUES/ DATASOURCE_STATIC_FIELD_VALUE and updated in RESULT_FIELDS type to static for resultbestaccessright, and added type and in DATASOURCE_FIELDS added eosctype.
2. staticAutoComplete.component.ts: Added @Input() public fieldValues; and added check not to query for values when static (fieldValues exists).
3. searchResearchResults.component.ts & searchProjects.component.ts & searchOrganizations.component.ts & searchDataProviders.component.ts: Added parameters for static fields in <new-search-page> and initialized them properly.
4. advancedSearchForm.component.html: Added parameter fieldValues to <static-autocomplete>.
5. advancedSearchForm.component.ts: Added method "public getFieldValuesForId(id: string)".
6. newSearchPage.component.html: Added parameter fieldValues to <advanced-search-form> and show static filters view case.
7. newSearchPage.component.ts: Added static filters - initialize them properly and make code for static filters more dynamic.

d15ce5522e [develop-filters | DONE | CHANGED]: refineFieldResults.service.ts: In method "getAllRefineFieldResultsByFieldName()", added size=0 in request url.

0768248bde [develop | DONE | CHANGED]: refineResults.class.ts: Missing change from pre-previous commit for static filters.

d9c7d35e57 [develop-filters | DONE | CHANGED]: Get 7 top values for each filter (minRef) and on view all click, query for top 100 for a specific filter.

1. searchResearchResults.service.ts & searchProjects.service.ts & searchOrganizations.service.ts & searchDataproviders.service.ts: In advanced search method added parameter minRef: boolean = false and if true, add in request url "&minRef=true" to query for top 7 values.
2. searchResearchResults.component.ts & searchProjects.component.ts & searchOrganizations.component.ts & searchDataProviders.component.ts: By default query filters with minRef=true | Added method "filterRequestedAll()" to be called on view all click of a filter.
3. searchHelperClasses.class.ts: Added in Filter public countAllValues?: number = -1; (-1: all filters not yet requested, 0: request failed) and public isOpen?: boolean = false; (checks if view all filter is clicked).
4. searchFilter.module.ts: Imported LoadingModule.
5. searchFilter.component.ts & searchFilter.component.html: Updated process on view all click.
6. newSearchPage.component.ts: Added method "filterToggled()".
7. newSearchPage.component.html: Bind filterToggled method to <search-filter> output.

afcbb07a24 [develop-filters | DONE | ADDED]: Added structures for grouping and ordering search filters.

1. searchFields.base.ts: Added RESULT_FIELDS_ORDERED and PROJECT_FIELDS_ORDERED.
2. searchResearchResults.component.ts: Set and initialize orderedFields and orderedFilters and pass them to <new-search-page>.
3. newSearchPage.component.html: If there are orderedFilters, show filters from this structure.

41adaa308d Merge pull request 'Merge develop-filters into develop branch' (#25 ) from develop-filters into develop

Reviewed-on: #25

argiro.kokogiannaki commented

2023-12-15 15:49:24 +01:00

Resolve conflicts in d804da4dd8

Resolve conflicts in https://code-repo.d4science.org/MaDgIK/openaire-library/commit/d804da4dd87403e9b01bb0bda688788ec6b76939

argiro.kokogiannaki closed this pull request

2023-12-15 15:49:24 +01:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

4 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: MaDgIK/openaire-library#26