From 1b66d19bdebe49f723d7824ba3a22f94d401759c Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 25 Oct 2023 13:01:09 +0300 Subject: [PATCH] rename frontend external reference to fetcher external reference --- .../external-reference/external-reference.ts | 5 +--- .../external-sources.service.ts | 6 ++--- .../form-field/form-field.component.ts | 24 +++++++++---------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dmp-frontend/src/app/core/model/external-reference/external-reference.ts b/dmp-frontend/src/app/core/model/external-reference/external-reference.ts index 031e03161..82d264c65 100644 --- a/dmp-frontend/src/app/core/model/external-reference/external-reference.ts +++ b/dmp-frontend/src/app/core/model/external-reference/external-reference.ts @@ -1,10 +1,7 @@ -export interface ExternalReference { +export interface FetcherExternalReference { id: string; name: string; - abbreviation: string; pid: string; - originalId: string; - key: string; pidTypeField: string; uri: string; description: string; diff --git a/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts b/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts index d8c82574d..e3b42585b 100644 --- a/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts +++ b/dmp-frontend/src/app/core/services/external-sources/external-sources.service.ts @@ -14,7 +14,7 @@ import { BaseHttpService } from '../http/base-http.service'; import { ConfigurationService } from '../configuration/configuration.service'; import { LicenseCriteria } from '@app/core/query/license/license-criteria'; import {PublicationCriteria} from "@app/core/query/publication/publication-criteria"; -import { ExternalReference } from '@app/core/model/external-reference/external-reference'; +import { FetcherExternalReference } from '@app/core/model/external-reference/external-reference'; import { ExternalReferencesType } from '@app/core/common/enum/external-references-type'; @Injectable() export class ExternalSourcesService { @@ -59,11 +59,11 @@ export class ExternalSourcesService { return this.http.get(this.actionUrl + 'licenses' + '?query=' + requestItem.criteria.like + '&type=' + requestItem.criteria.type, { headers: this.headers }); } - public listExternal(externalType: ExternalReferencesType, query: string, type: string): Observable { + public listExternal(externalType: ExternalReferencesType, query: string, type: string): Observable { const url = this.configurationService.server + `external-references/search/${externalType}`; const options = { params: { query: query, type: type } }; - return this.http.get(url, options); + return this.http.get(url, options); } public searchDatasetTags(requestItem: RequestItem): Observable { diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts index f147d095e..222299821 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts @@ -48,7 +48,7 @@ import {MatDialog} from "@angular/material/dialog"; import {HttpError} from "@common/modules/errors/error-handling/http-error-handling.service"; import {HttpErrorResponse} from "@angular/common/http"; import * as FileSaver from "file-saver"; -import { ExternalReference } from '@app/core/model/external-reference/external-reference'; +import { FetcherExternalReference } from '@app/core/model/external-reference/external-reference'; import { ExternalReferencesType } from '@app/core/common/enum/external-references-type'; @Component({ @@ -464,7 +464,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { } } - searchDatasetExternalDatasets(query: string): Observable { + searchDatasetExternalDatasets(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new ExternalDatasetCriteria(); requestItem.criteria.like = query; @@ -473,42 +473,42 @@ export class FormFieldComponent extends BaseComponent implements OnInit { return this.externalSourcesService.listExternal(ExternalReferencesType.Datasets, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalDataRepositories(query: string): Observable { + searchDatasetExternalDataRepositories(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new DataRepositoryCriteria(); requestItem.criteria.like = query; requestItem.criteria.type = ''; return this.externalSourcesService.listExternal(ExternalReferencesType.DataRepositories, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalPubRepositories(query: string): Observable { + searchDatasetExternalPubRepositories(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new DataRepositoryCriteria(); requestItem.criteria.like = query; requestItem.criteria.type = ''; return this.externalSourcesService.listExternal(ExternalReferencesType.PubRepositories, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalJournalRepositories(query: string): Observable { + searchDatasetExternalJournalRepositories(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new DataRepositoryCriteria(); requestItem.criteria.like = query; requestItem.criteria.type = ''; return this.externalSourcesService.listExternal(ExternalReferencesType.Journals, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalTaxonomies(query: string): Observable { + searchDatasetExternalTaxonomies(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new TaxonomyCriteria(); requestItem.criteria.like = query; requestItem.criteria.type = ''; return this.externalSourcesService.listExternal(ExternalReferencesType.Taxonomies, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalLicences(query: string): Observable { + searchDatasetExternalLicences(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new LicenseCriteria(); requestItem.criteria.like = query; requestItem.criteria.type = ''; return this.externalSourcesService.listExternal(ExternalReferencesType.Licenses, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalPublications(query: string): Observable { + searchDatasetExternalPublications(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new PublicationCriteria(); requestItem.criteria.like = query; @@ -516,7 +516,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { return this.externalSourcesService.listExternal(ExternalReferencesType.Publications, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalRegistries(query: string): Observable { + searchDatasetExternalRegistries(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new RegistryCriteria(); requestItem.criteria.like = query; @@ -524,7 +524,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit { return this.externalSourcesService.listExternal(ExternalReferencesType.Registries, requestItem.criteria.like, requestItem.criteria.type); } - searchDatasetExternalServices(query: string): Observable { + searchDatasetExternalServices(query: string): Observable { const requestItem: RequestItem = new RequestItem(); requestItem.criteria = new ServiceCriteria(); requestItem.criteria.like = query; @@ -591,12 +591,12 @@ export class FormFieldComponent extends BaseComponent implements OnInit { } } - filterOrganisations(value: string): Observable { + filterOrganisations(value: string): Observable { //return this.externalSourcesService.searchDMPOrganizations(value); return this.externalSourcesService.listExternal(ExternalReferencesType.Organizations, value, ''); } - filterResearchers(value: string): Observable { + filterResearchers(value: string): Observable { //return this.externalSourcesService.searchDMPResearchers({ criteria: { name: value, like: null } }); return this.externalSourcesService.listExternal(ExternalReferencesType.Researcher, value, ''); }