2023-12-14 17:14:57 +01:00
import { ChangeDetectorRef , Component , EventEmitter , Input , Output , ViewChild } from '@angular/core' ;
2020-02-11 15:56:20 +01:00
import { ActivatedRoute } from '@angular/router' ;
2020-10-20 16:47:54 +02:00
import { AdvancedField , Filter } from './searchUtils/searchHelperClasses.class' ;
2020-02-11 15:56:20 +01:00
import { SearchDataprovidersService } from '../services/searchDataproviders.service' ;
import { ErrorCodes } from '../utils/properties/errorCodes' ;
import { ErrorMessagesComponent } from '../utils/errorMessages.component' ;
2022-05-05 19:35:08 +02:00
import { OpenaireEntities , SearchFields } from '../utils/properties/searchFields' ;
2020-02-11 15:56:20 +01:00
import { SearchCustomFilter , SearchUtilsClass } from './searchUtils/searchUtils.class' ;
import { EnvProperties } from '../utils/properties/env-properties' ;
2022-04-15 14:38:41 +02:00
import { NewSearchPageComponent , SearchForm } from "./searchUtils/newSearchPage.component" ;
2020-02-25 16:40:56 +01:00
import { DatasourcesHelperClass } from "./searchUtils/datasourcesHelper.class" ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
import { properties } from "../../../environments/environment" ;
2023-12-14 16:30:29 +01:00
import { RefineResultsUtils } from "../services/servicesUtils/refineResults.class" ;
import { RefineFieldResultsService } from "../services/refineFieldResults.service" ;
2024-05-30 15:33:43 +02:00
import { zip } from "rxjs" ;
2020-02-11 15:56:20 +01:00
@Component ( {
selector : 'search-dataproviders' ,
template : `
< new - search - page
2020-08-19 12:16:43 +02:00
pageTitle = "{{(simpleView?'':'Advanced ')}} Find research {{ pageTitle }}"
2022-05-13 14:57:31 +02:00
[ entityType ] = entityType
[ type ] = "typeName"
2020-02-19 16:35:48 +01:00
[ results ] = "results"
[ searchUtils ] = "searchUtils"
2021-08-13 11:42:50 +02:00
[ sortedByChanged ] = "searchUtils.sortBy"
2020-02-19 16:35:48 +01:00
[ fieldIds ] = "fieldIds" [ fieldIdsMap ] = "fieldIdsMap" [ selectedFields ] = "selectedFields"
2023-12-14 16:30:29 +01:00
[ staticFields ] = "staticFields" [ staticFilters ] = "staticFilters"
[ staticFieldValues ] = "staticFieldValues"
2022-05-13 14:57:31 +02:00
[ csvParams ] = "csvParams" [ csvPath ] = "csvPath"
2020-02-11 15:56:20 +01:00
[ simpleSearchLink ] = "simpleSearchLink" [ advancedSearchLink ] = "advancedSearchLink"
[ disableForms ] = "disableForms"
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
[ disableRefineForms ] = "disableRefineForms"
2020-02-11 15:56:20 +01:00
[ loadPaging ] = "loadPaging"
[ oldTotalResults ] = "oldTotalResults"
2020-02-19 16:35:48 +01:00
[ openaireLink ] = openaireLink
2023-07-12 14:05:25 +02:00
[ includeOnlyResultsAndFilter ] = "includeOnlyResultsAndFilter" [ hasPrefix ] = "hasPrefix"
2022-04-15 14:38:41 +02:00
[ searchForm ] = "searchForm"
2023-05-08 16:10:51 +02:00
[ entitiesSelection ] = "false" [ showSwitchSearchLink ] = "showSwitchSearchLink"
2020-02-19 16:35:48 +01:00
[ filters ] = "filters"
2020-03-26 13:18:18 +01:00
[ simpleView ] = "simpleView" formPlaceholderText = "Search by name, description, subject..."
2022-02-16 17:43:20 +01:00
[ showResultCount ] = "true" [ showIndexInfo ] = "type!='deposit'"
2020-05-05 10:46:10 +02:00
[ tableViewLink ] = "tableViewLink"
2023-12-14 17:14:57 +01:00
[ sort ] = "false" [ showBreadcrumb ] = "showBreadcrumb" [ basicMetaDescription ] = "metaDescription"
( filterRequestAll ) = "filterRequestedAll($event)" >
2020-08-13 13:15:10 +02:00
2020-02-11 15:56:20 +01:00
< / n e w - s e a r c h - p a g e >
`
} )
export class SearchDataProvidersComponent {
private errorCodes : ErrorCodes ;
private errorMessages : ErrorMessagesComponent ;
2023-11-13 12:46:42 +01:00
@Input ( ) customFilters : SearchCustomFilter [ ] = null ;
@Input ( )
set customFilter ( customFilter : SearchCustomFilter | SearchCustomFilter [ ] ) {
if ( ! Array . isArray ( customFilter ) ) {
2024-02-14 09:28:54 +01:00
this . customFilters = customFilter ? [ customFilter ] : null ;
2023-11-13 12:46:42 +01:00
} else {
this . customFilters = customFilter ;
}
} @Input ( ) tableViewLink ;
2022-04-15 14:38:41 +02:00
@Input ( ) searchForm : SearchForm = { class : 'search-form' , dark : true } ;
2020-02-11 15:56:20 +01:00
public results = [ ] ;
public filters = [ ] ;
public searchUtils :SearchUtilsClass = new SearchUtilsClass ( ) ;
public searchFields :SearchFields = new SearchFields ( ) ;
public fieldIds : string [ ] = this . searchFields . DATASOURCE_ADVANCED_FIELDS ;
public fieldIdsMap = this . searchFields . DATASOURCE_FIELDS ;
public selectedFields :AdvancedField [ ] = [ ] ;
public resourcesQuery = "(oaftype exact datasource)" ;
public csvParams : string ;
public disableForms : boolean = false ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
public disableRefineForms : boolean = false ;
2020-02-11 15:56:20 +01:00
public loadPaging : boolean = true ;
public oldTotalResults : number = 0 ;
public pagingLimit : number = 0 ;
2024-07-02 12:51:15 +02:00
properties :EnvProperties = properties ;
2022-05-05 19:35:08 +02:00
public openaireEntities = OpenaireEntities ;
2022-05-13 14:57:31 +02:00
@Input ( ) type : "all" | "registries" | "journals" | "compatible" | "deposit" | "services" = "all" ;
@Input ( ) entityType : "dataprovider" | "service" = "dataprovider" ;
@Input ( ) typeName = OpenaireEntities . DATASOURCES ;
2020-03-12 18:03:35 +01:00
public refineFields : string [ ] ;
pageTitle ;
2021-07-14 13:19:57 +02:00
@ViewChild ( NewSearchPageComponent , { static : true } ) searchPage : NewSearchPageComponent ;
2020-02-11 15:56:20 +01:00
@Input ( ) simpleView : boolean = true ;
2020-02-19 16:35:48 +01:00
@Input ( ) simpleSearchLink : string = "" ;
2020-02-11 15:56:20 +01:00
advancedSearchLink : string = "" ;
2022-05-13 14:57:31 +02:00
csvPath : string = "" ;
2020-02-11 15:56:20 +01:00
@Input ( ) hasPrefix : boolean = true ;
2022-08-08 16:45:31 +02:00
@Input ( ) openaireLink : string = null ;
2020-02-19 16:35:48 +01:00
@Input ( ) includeOnlyResultsAndFilter : boolean = false ;
@Output ( ) searchPageUpdates = new EventEmitter ( ) ;
2020-08-13 13:15:10 +02:00
@Input ( ) showSwitchSearchLink :boolean ;
@Input ( ) showBreadcrumb : boolean = false ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
subs : any [ ] = [ ] ;
2020-10-20 16:47:54 +02:00
searchResultsSub : any ;
searchFiltersSub : any ;
2020-08-19 12:16:43 +02:00
metaDescription = [ ] ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
2023-12-14 16:30:29 +01:00
public staticFields : string [ ] = [ ] ;
public staticFieldValues = this . searchFields . DATASOURCE_STATIC_FIELD_VALUES ;
public staticFilters = [ ] ;
private refineQuery : string = "" ;
constructor ( private route : ActivatedRoute , private _searchDataProvidersService : SearchDataprovidersService ,
private _refineFieldsResultsService : RefineFieldResultsService ,
private cdr : ChangeDetectorRef ) {
2020-02-11 15:56:20 +01:00
this . results = [ ] ;
this . errorCodes = new ErrorCodes ( ) ;
this . errorMessages = new ErrorMessagesComponent ( ) ;
this . searchUtils . status = this . errorCodes . LOADING ;
2022-06-23 16:30:45 +02:00
this . searchFields . sortFieldsByName ( this . fieldIds , this . fieldIdsMap ) ;
2020-02-11 15:56:20 +01:00
}
ngOnInit() {
2020-03-12 18:03:35 +01:00
this . refineFields = DatasourcesHelperClass . getrefineFields ( this . type ) ;
2023-12-14 16:30:29 +01:00
this . staticFields = this . entityType == "service" ? this . searchFields . DATASOURCE_STATIC_FIELDS : [ ] ;
this . staticFilters = RefineResultsUtils . parse ( this . staticFieldValues , this . staticFields , this . entityType , "search" , true ) ;
2020-03-12 18:03:35 +01:00
this . pageTitle = DatasourcesHelperClass . getTitle ( this . type ) ;
2020-08-19 12:16:43 +02:00
this . metaDescription = DatasourcesHelperClass . getDescription ( this . type )
2020-08-13 13:15:10 +02:00
if ( this . showSwitchSearchLink == null ) {
2022-05-13 14:57:31 +02:00
this . showSwitchSearchLink = ( this . type == "all" || this . type == "services" ) ;
2020-06-29 13:10:32 +02:00
}
2022-05-13 14:57:31 +02:00
this . csvPath = this . entityType == "service" ? OpenaireEntities.SERVICES_FILE : OpenaireEntities.DATASOURCES_FILE ;
2020-11-11 15:43:13 +01:00
if ( ! this . simpleSearchLink ) {
2022-05-13 14:57:31 +02:00
this . simpleSearchLink = this . entityType == "service" ? this . properties.searchLinkToServices : this.properties.searchLinkToDataProviders ;
}
this . advancedSearchLink = this . entityType == "service" ? this . properties.searchLinkToAdvancedServices : this.properties.searchLinkToAdvancedDataProviders ;
2020-11-11 15:43:13 +01:00
this . searchUtils . baseUrl = ( this . simpleView ) ? this . simpleSearchLink :this.advancedSearchLink ;
2023-07-12 14:05:25 +02:00
this . pagingLimit = properties . pagingLimit ;
2020-02-25 16:40:56 +01:00
let firstLoad = true ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
this . subs . push ( this . route . queryParams . subscribe ( params = > {
2020-02-11 15:56:20 +01:00
this . loadPaging = true ;
if ( params [ 'page' ] && this . searchUtils . page != params [ 'page' ] ) {
this . loadPaging = false ;
this . oldTotalResults = this . searchUtils . totalResults ;
}
var refine = true ;
2021-05-12 16:22:08 +02:00
if ( this . searchPage . searchUtils . refineStatus == this . errorCodes . DONE ) {
if ( params [ 'page' ] != undefined && this . filters && ! firstLoad && this . searchUtils . page != + params [ 'page' ] ) {
refine = false ;
}
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
2021-05-12 16:22:08 +02:00
if ( params [ 'size' ] != undefined && this . filters && ! firstLoad && this . searchUtils . size != params [ 'size' ] ) {
refine = false ;
}
2020-07-24 13:21:22 +02:00
}
2020-02-11 15:56:20 +01:00
2020-07-24 13:21:22 +02:00
let page = ( params [ 'page' ] === undefined ) ? 0 : + params [ 'page' ] ;
this . searchUtils . page = ( page < 1 ) ? 1 : page ;
2020-02-11 15:56:20 +01:00
2021-08-13 11:42:50 +02:00
this . searchUtils . validateSize ( params [ 'size' ] ) ;
2020-07-24 13:21:22 +02:00
this . searchPage . fieldIds = this . fieldIds ;
this . selectedFields = [ ] ;
if ( this . type == "deposit" ) {
this . searchPage . keywordFields = this . searchFields . DEPOSIT_DATASOURCE_KEYWORD_FIELDS ;
this . searchPage . usedBy = "deposit" ;
}
2023-12-15 15:46:43 +01:00
this . searchPage . prepareSearchPage ( this . fieldIds , this . selectedFields , this . refineFields , [ ] , this . staticFields , this . fieldIdsMap , this . customFilters , params , this . entityType ) ;
2022-02-21 15:29:03 +01:00
if ( refine ) {
2022-05-13 14:57:31 +02:00
this . _getFilters ( this . searchPage . getSearchAPIQueryForAdvancedSearhFields ( params ) , this . searchUtils . page , 0 , true , this . searchPage . getSearchAPIQueryForRefineFields ( params , firstLoad ) ) ;
2020-07-24 13:21:22 +02:00
} else {
this . searchUtils . refineStatus = this . errorCodes . DONE ;
}
2022-05-13 14:57:31 +02:00
this . getResults ( this . searchPage . getSearchAPIQueryForAdvancedSearhFields ( params ) , this . searchUtils . page , this . searchUtils . size , refine , this . searchPage . getSearchAPIQueryForRefineFields ( params , firstLoad ) ) ;
2020-07-24 13:21:22 +02:00
firstLoad = false ;
2023-12-14 17:14:57 +01:00
this . refineQuery = this . searchPage . getSearchAPIQueryForRangeFields ( params ) + this . searchPage . getSearchAPIQueryForRefineFields ( params , firstLoad ) ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
} ) ) ;
2020-02-11 15:56:20 +01:00
}
ngOnDestroy() {
2020-10-20 16:47:54 +02:00
if ( this . searchResultsSub ) {
this . searchResultsSub . unsubscribe ( ) ;
}
if ( this . searchFiltersSub ) {
this . searchFiltersSub . unsubscribe ( ) ;
}
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
for ( let sub of this . subs ) {
sub . unsubscribe ( ) ;
}
}
public _getFilters ( parameters :string , page : number , size : number , refine : boolean , refineFieldsFilterQuery = null ) {
if ( page <= this . pagingLimit || this . searchUtils . refineStatus == this . errorCodes . LOADING ) {
this . searchUtils . refineStatus = this . errorCodes . LOADING ;
this . disableRefineForms = true ;
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } ) ;
let datasourceQueryPrefix = DatasourcesHelperClass . getQueryPrefix ( this . type ) ;
2024-02-01 18:46:34 +01:00
let isDeposit : boolean = ( this . type == "deposit" ) ;
let parametersFull ;
let refineQueryFull ;
if ( isDeposit ) {
parametersFull = datasourceQueryPrefix + ( datasourceQueryPrefix . length > 0 && parameters . length > 0 ? ' and (' : '' ) + parameters + ( datasourceQueryPrefix . length > 0 && parameters . length > 0 ? ' ) ' : '' ) ;
refineQueryFull = refineFieldsFilterQuery ;
} else {
parametersFull = parameters ;
refineQueryFull = refineFieldsFilterQuery + ( refineFieldsFilterQuery . length > 0 && datasourceQueryPrefix . length > 0 ? "&" : "" ) + ( datasourceQueryPrefix . length > 0 ? "fq=" : "" ) + datasourceQueryPrefix ;
}
2024-05-30 15:33:43 +02:00
let filterQueries ;
let filterIds = [ ] ;
let fields = this . searchPage . getFields ( ) ;
for ( let filter of this . searchPage . URLCreatedFilters ) {
filterIds . push ( filter . filterId ) ;
fields = fields . filter ( field = > field != filter . filterId ) ;
}
if ( filterIds . length > 0 ) {
filterQueries = zip ( this . _searchDataProvidersService . advancedSearchDataproviders ( parametersFull , page , size , this . properties , ( refine ) ? this . searchPage . getRefineFieldsQuery ( filterIds ) : null , filterIds , refineQueryFull , isDeposit , false ) ,
this . _searchDataProvidersService . advancedSearchDataproviders ( parametersFull , page , size , this . properties , ( refine ) ? this . searchPage . getRefineFieldsQuery ( fields ) : null , fields , refineQueryFull , isDeposit , true )
) ;
} else {
filterQueries = this . _searchDataProvidersService . advancedSearchDataproviders ( parametersFull , page , size , this . properties , ( refine ) ? this . searchPage . getRefineFieldsQuery ( fields ) : null , fields , refineQueryFull , isDeposit , true )
}
this . searchFiltersSub = filterQueries . subscribe (
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
data = > {
2024-05-30 15:33:43 +02:00
let totalResults = filterIds . length > 0 ? data [ 0 ] [ 0 ] : data [ 0 ] ;
let filters = filterIds . length > 0 ? data [ 0 ] [ 2 ] . concat ( data [ 1 ] [ 2 ] ) : data [ 2 ] ;
2020-10-20 16:47:54 +02:00
this . filtersReturned ( refine , filters , totalResults , page ) ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
} ,
err = > {
2021-05-12 16:22:08 +02:00
this . filters = this . searchPage . prepareFiltersToShow ( [ ] , 0 ) ;
2023-12-14 16:30:29 +01:00
this . staticFilters = this . searchPage . prepareStaticFiltersToShow ( ) ;
2021-05-12 16:22:08 +02:00
[Monitor Dashboard & Library | new-theme]: Renaming entity types using OpenaireEntities.
Files updated: develop.component.ts, methodology.component.ts, claimEntitiesSelection.component.ts, directLinking.component.ts, linkingGeneric.component.html, linkingGeneric.component.ts, approved.component.ts, searchDataprovidersToDeposit.component.ts, errorPage.component.ts, dataProvider.component.html, dataProvider.component.ts, dataProvider.service.ts, relatedDatasourcesTab.component.ts, project.component.ts, myOrcidLinks.component.ts, searchMyOrcidResults.component.html, searchMyOrcidResults.component.ts, searchAll.component.html, searchAll.component.ts, advancedSearchForm.component.html, advancedSearchForm.component.ts, searchDataProviders.component.ts, searchResearchResults.service.ts, numbers.component.ts, other-portals.component.html, other-portals.component.ts, fetchDataproviders.class.ts, fetchResearchResults.class.ts, searchFields.ts, result-preview.component.ts
2022-05-09 12:13:44 +02:00
this . handleError ( "Error getting refine filters for " + OpenaireEntities . DATASOURCES + ": " , err ) ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
this . searchUtils . refineStatus = this . errorMessages . getErrorCode ( err . status ) ;
this . disableRefineForms = false ;
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } )
}
2020-10-20 16:47:54 +02:00
) ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
}
2020-02-11 15:56:20 +01:00
}
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
2020-10-20 16:47:54 +02:00
public filtersReturned ( refine : boolean , filters : Filter [ ] , totalResults , page : number ) {
if ( refine ) {
this . filters = this . searchPage . prepareFiltersToShow ( filters , totalResults ) ;
2023-12-14 16:30:29 +01:00
this . staticFilters = this . searchPage . prepareStaticFiltersToShow ( ) ;
2020-10-20 16:47:54 +02:00
}
this . searchUtils . refineStatus = this . errorCodes . DONE ;
if ( totalResults == 0 ) {
this . searchUtils . refineStatus = this . errorCodes . NONE ;
}
if ( this . searchUtils . refineStatus == this . errorCodes . DONE ) {
// Page out of limit!!!
let totalPages : any = totalResults / ( this . searchUtils . size ) ;
if ( ! ( Number . isInteger ( totalPages ) ) ) {
totalPages = ( parseInt ( totalPages , 10 ) + 1 ) ;
}
if ( totalPages < page ) {
this . searchUtils . refineStatus = this . errorCodes . OUT_OF_BOUND ;
}
}
if ( this . searchUtils . refineStatus != this . errorCodes . DONE && this . searchUtils . status != this . searchUtils . refineStatus ) {
if ( this . searchResultsSub ) {
this . searchResultsSub . unsubscribe ( ) ;
}
this . resultsReturned ( refine , [ ] , totalResults , page ) ;
}
this . disableRefineForms = false ;
2020-12-15 13:45:02 +01:00
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } )
2020-10-20 16:47:54 +02:00
}
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
2020-02-11 15:56:20 +01:00
public getResults ( parameters :string , page : number , size : number , refine : boolean , refineFieldsFilterQuery = null ) {
if ( page > this . pagingLimit ) {
size = 0 ;
}
if ( page <= this . pagingLimit || this . searchUtils . status == this . errorCodes . LOADING ) {
2022-02-21 15:29:03 +01:00
2020-02-24 14:45:22 +01:00
this . csvParams = ( parameters ? ( "&fq=(" + parameters ) : "" ) + ( parameters ? ")" : "" ) ;
this . csvParams += ( refineFieldsFilterQuery ? refineFieldsFilterQuery : "" ) ;
2020-02-11 15:56:20 +01:00
this . searchUtils . status = this . errorCodes . LOADING ;
this . disableForms = true ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } ) ;
2020-02-19 16:35:48 +01:00
2020-02-11 15:56:20 +01:00
this . results = [ ] ;
this . searchUtils . totalResults = 0 ;
2020-02-25 16:40:56 +01:00
let datasourceQueryPrefix = DatasourcesHelperClass . getQueryPrefix ( this . type ) ;
2024-02-01 18:46:34 +01:00
let isDeposit : boolean = ( this . type == "deposit" ) ;
let parametersFull ;
let refineQueryFull ;
if ( isDeposit ) {
parametersFull = datasourceQueryPrefix + ( datasourceQueryPrefix . length > 0 && parameters . length > 0 ? ' and (' : '' ) + parameters + ( datasourceQueryPrefix . length > 0 && parameters . length > 0 ? ' ) ' : '' ) ;
refineQueryFull = refineFieldsFilterQuery ;
} else {
parametersFull = parameters ;
refineQueryFull = refineFieldsFilterQuery + ( refineFieldsFilterQuery . length > 0 && datasourceQueryPrefix . length > 0 ? "&" : "" ) + ( datasourceQueryPrefix . length > 0 ? "fq=" : "" ) + datasourceQueryPrefix ;
}
this . searchResultsSub = this . _searchDataProvidersService . advancedSearchDataproviders ( parametersFull , page , size , this . properties , null , this . searchPage . getFields ( ) , refineQueryFull , isDeposit ) . subscribe (
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
data = > {
2020-10-20 16:47:54 +02:00
let totalResults = data [ 0 ] ;
let results = data [ 1 ] ;
this . resultsReturned ( refine , results , totalResults , page ) ;
2020-02-11 15:56:20 +01:00
} ,
err = > {
//console.log(err);
[Monitor Dashboard & Library | new-theme]: Renaming entity types using OpenaireEntities.
Files updated: develop.component.ts, methodology.component.ts, claimEntitiesSelection.component.ts, directLinking.component.ts, linkingGeneric.component.html, linkingGeneric.component.ts, approved.component.ts, searchDataprovidersToDeposit.component.ts, errorPage.component.ts, dataProvider.component.html, dataProvider.component.ts, dataProvider.service.ts, relatedDatasourcesTab.component.ts, project.component.ts, myOrcidLinks.component.ts, searchMyOrcidResults.component.html, searchMyOrcidResults.component.ts, searchAll.component.html, searchAll.component.ts, advancedSearchForm.component.html, advancedSearchForm.component.ts, searchDataProviders.component.ts, searchResearchResults.service.ts, numbers.component.ts, other-portals.component.html, other-portals.component.ts, fetchDataproviders.class.ts, fetchResearchResults.class.ts, searchFields.ts, result-preview.component.ts
2022-05-09 12:13:44 +02:00
this . handleError ( "Error getting " + OpenaireEntities . DATASOURCES , err ) ;
2020-02-11 15:56:20 +01:00
this . searchUtils . status = this . errorMessages . getErrorCode ( err . status ) ;
//TODO check erros (service not available, bad request)
// if( ){
// this.searchUtils.status = errorCodes.ERROR;
// }
//var errorCodes:ErrorCodes = new ErrorCodes();
//this.searchUtils.status = errorCodes.NOT_AVAILABLE;
/ * i f ( e r r . s t a t u s = = ' 4 0 4 ' ) {
this . searchUtils . status = this . errorCodes . NOT_FOUND ;
} else if ( err . status == '500' ) {
this . searchUtils . status = this . errorCodes . ERROR ;
} else {
this . searchUtils . status = this . errorCodes . NOT_AVAILABLE ;
} * /
//this.searchPage.closeLoading();
this . disableForms = false ;
[Trunk | Library]:
1. searchUtils.class.ts: In SearchUtilsClass added field "refineStatus:number = 1;" for refine queries.
2. searchResultsPerPage.component.ts & searchSorting.component.ts: [Bug fix] In EventEmitter (value change), emit raw value, not object with field "value".
3. searchDataProviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts:
a. Add subscriptions in array to unsubscribe in ngOnDestroy.
b. Get properties from environment (no service needed).
c. Separate queries for refine and results.
d. Do not call refine query when page, results per page, sortBy change (there is still a bug here).
e. For refine query, added field "disableRefineForms" default set to false - passed in <new-search-page>.
4. newSearchPage.component.html:
a. Disable forms when "disableForms" or "disableRefineForms" is true.
b. Do not show filters, until results query returns, but show results while refine is loading.
c. Deleted old, unused code.
5. newSearchPage.component.ts:
a. Added fields "@Input() disableRefineForms: boolean = false;", "@Input() sortedByChanged: string = "";", "@Input() resultsPerPageChanged: number;"
b. When results per page or sortBy change, do not upadate immediately searchUtils values - do not query for refine when these change (there is still a bug here).
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59155 d315682c-612b-4755-9ff5-7f18f6832af3
2020-07-21 15:48:55 +02:00
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } ) ;
2020-07-24 13:21:22 +02:00
this . searchPage . hideFilters = false ;
2020-02-11 15:56:20 +01:00
}
2020-10-20 16:47:54 +02:00
) ;
2020-02-11 15:56:20 +01:00
}
}
2020-10-20 16:47:54 +02:00
public resultsReturned ( refine : boolean , results : any , totalResults , page : number ) {
this . searchUtils . totalResults = totalResults ;
this . results = results ;
if ( ! refine ) {
2023-12-14 16:30:29 +01:00
this . searchPage . buildPageURLParameters ( this . filters , [ ] , this . staticFilters , false ) ;
2020-10-20 16:47:54 +02:00
}
this . searchPage . hideFilters = false ;
this . searchUtils . status = this . errorCodes . DONE ;
if ( this . searchUtils . totalResults == 0 ) {
this . searchUtils . status = this . errorCodes . NONE ;
}
if ( this . searchUtils . status == this . errorCodes . DONE ) {
// Page out of limit!!!
let totalPages : any = this . searchUtils . totalResults / ( this . searchUtils . size ) ;
if ( ! ( Number . isInteger ( totalPages ) ) ) {
totalPages = ( parseInt ( totalPages , 10 ) + 1 ) ;
}
if ( totalPages < page ) {
this . searchUtils . totalResults = 0 ;
this . searchUtils . status = this . errorCodes . OUT_OF_BOUND ;
}
}
if ( this . searchUtils . status != this . errorCodes . DONE && this . searchUtils . refineStatus != this . searchUtils . status ) {
if ( this . searchFiltersSub ) {
this . searchFiltersSub . unsubscribe ( ) ;
}
this . filtersReturned ( refine , [ ] , totalResults , page ) ;
}
this . disableForms = false ;
2020-12-15 13:45:02 +01:00
this . searchPageUpdates . emit ( { disableForms : this.disableForms , disableRefineForms : this.disableRefineForms , searchUtils : this.searchUtils } ) ;
2020-10-20 16:47:54 +02:00
}
2020-02-11 15:56:20 +01:00
private handleError ( message : string , error ) {
[Monitor Dashboard & Library | new-theme]: Renaming entity types using OpenaireEntities.
Files updated: develop.component.ts, methodology.component.ts, claimEntitiesSelection.component.ts, directLinking.component.ts, linkingGeneric.component.html, linkingGeneric.component.ts, approved.component.ts, searchDataprovidersToDeposit.component.ts, errorPage.component.ts, dataProvider.component.html, dataProvider.component.ts, dataProvider.service.ts, relatedDatasourcesTab.component.ts, project.component.ts, myOrcidLinks.component.ts, searchMyOrcidResults.component.html, searchMyOrcidResults.component.ts, searchAll.component.html, searchAll.component.ts, advancedSearchForm.component.html, advancedSearchForm.component.ts, searchDataProviders.component.ts, searchResearchResults.service.ts, numbers.component.ts, other-portals.component.html, other-portals.component.ts, fetchDataproviders.class.ts, fetchResearchResults.class.ts, searchFields.ts, result-preview.component.ts
2022-05-09 12:13:44 +02:00
console . error ( OpenaireEntities . DATASOURCES + " advanced Search Page: " + message , error ) ;
2020-02-11 15:56:20 +01:00
}
2023-12-14 17:14:57 +01:00
public filterRequestedAll ( oldFilter : Filter ) {
let fieldsStr : string = "&fields=" + oldFilter . filterId + "&refine=true" ;
this . searchFiltersSub = this . _searchDataProvidersService . advancedSearchDataproviders ( this . searchPage . getSearchAPIQueryForAdvancedSearhFields ( ) , 1 , 0 , properties , fieldsStr , [ oldFilter . filterId ] , this . refineQuery ) . subscribe (
// this.searchFiltersSub = this._refineFieldsResultsService.getAllRefineFieldResultsByFieldName(oldFilter.filterId, this.entityType, this.properties, this.refineQuery).subscribe(
res = > {
2024-02-27 00:42:15 +01:00
let filter : Filter = res [ 2 ] [ 0 ] ;
2023-12-14 17:14:57 +01:00
if ( filter . values . length == 0 ) {
filter = oldFilter ;
filter . countAllValues = 0 ;
} else {
filter . countAllValues = filter . values . length ;
// console.log(filter);
for ( let value of filter . values ) {
for ( let oldValue of oldFilter . values ) {
if ( oldValue . id == value . id && oldValue . selected ) {
value . selected = true ;
break ;
}
}
}
}
let index : number = this . filters . findIndex ( ( fltr : Filter ) = > fltr . filterId == filter . filterId ) ;
2023-12-20 23:06:32 +01:00
filter . isViewAllOpen = true ;
2023-12-14 17:14:57 +01:00
this . filters [ index ] = filter ;
this . cdr . detectChanges ( ) ;
} ,
error = > {
let index : number = this . filters . findIndex ( ( fltr : Filter ) = > fltr . filterId == oldFilter . filterId ) ;
oldFilter . countAllValues = 0 ;
this . filters [ index ] = oldFilter ;
this . cdr . detectChanges ( ) ;
}
)
}
2020-02-11 15:56:20 +01:00
}