Merge Angular 16 Irish Monitor to develop #33

Merged
k.triantafyllou merged 151 commits from angular-16-irish-monitor into develop 2024-02-13 09:32:41 +01:00
6 changed files with 34 additions and 34 deletions
Showing only changes of commit 552f1ed43a - Show all commits

View File

@ -394,8 +394,8 @@ export class DataProviderComponent {
this.updateUrl(this.canonicalUrl); this.updateUrl(this.canonicalUrl);
this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink + this._router.url); this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink + this._router.url);
if (typeof document !== 'undefined') { if (typeof document !== 'undefined') {
this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId); // this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId);
// this.getCollectedFulltexts(); this.getCollectedFulltexts();
this.countResultsWithFundingInfo(); this.countResultsWithFundingInfo();
} else { } else {
this.aggregationStatusIsInitialized = true; this.aggregationStatusIsInitialized = true;
@ -454,34 +454,34 @@ export class DataProviderComponent {
} }
} }
private getDataProviderAggregationStatus(originalId: string) { // private getDataProviderAggregationStatus(originalId: string) {
this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe( // this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe(
data => { // data => {
this.dataProviderInfo.aggregationStatus = data; // this.dataProviderInfo.aggregationStatus = data;
this.aggregationStatusIsInitialized = true;
},
err => {
//console.log(err);
this.aggregationStatusIsInitialized = true;
this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err);
}
));
}
// private getCollectedFulltexts() {
// this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe(
// (data: string) => {
// this.dataProviderInfo.aggregationStatus = {"fulltexts": data};
// this.aggregationStatusIsInitialized = true; // this.aggregationStatusIsInitialized = true;
// }, // },
// err => { // err => {
// //console.log(err); // //console.log(err);
// this.aggregationStatusIsInitialized = true; // this.aggregationStatusIsInitialized = true;
// this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err); // this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err);
// } // }
// )); // ));
// } // }
private getCollectedFulltexts() {
this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe(
(data: string) => {
this.dataProviderInfo.aggregationStatus = {"fulltexts": data};
this.aggregationStatusIsInitialized = true;
},
err => {
//console.log(err);
this.aggregationStatusIsInitialized = true;
this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err);
}
));
}
private countResultsWithFundingInfo() { private countResultsWithFundingInfo() {
this.subscriptions.push(this._searchResearchResultsService.countCollectedResultsWithFundingInfo(this.datasourceId).subscribe( this.subscriptions.push(this._searchResearchResultsService.countCollectedResultsWithFundingInfo(this.datasourceId).subscribe(
fundedContent => { fundedContent => {

View File

@ -83,10 +83,10 @@ export class DataProviderService {
.pipe(map(res => this.parseDataproviderAggregationStatus(res))); .pipe(map(res => this.parseDataproviderAggregationStatus(res)));
} }
// getCollectedFulltexts(datasourceId: string) { getCollectedFulltexts(datasourceId: string) {
// return this.http.get(properties.pdfStatisticsAPIURL+"/api/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId) return this.http.get(properties.pdfStatisticsAPIURL+"/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId)
// .pipe(map(res => res)) .pipe(map(res => res))
// } }
private handleError (error: HttpErrorResponse) { private handleError (error: HttpErrorResponse) {
// in a real world app, we may send the error to some remote logging infrastructure // in a real world app, we may send the error to some remote logging infrastructure

View File

@ -40,7 +40,7 @@ export class EntitiesSelectionComponent {
/** TODO change conditions base on PortalType instead of customFilter */ /** TODO change conditions base on PortalType instead of customFilter */
ngOnInit() { ngOnInit() {
if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'irish'].includes(this.properties.adminToolsPortalType))) { if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'irish', 'faircore4eosc'].includes(this.properties.adminToolsPortalType))) {
this.subscriptions.push(this.config.portalAsObservable.subscribe(data => { this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
if (data) { if (data) {
let showEntity = {}; let showEntity = {};

View File

@ -65,8 +65,6 @@ export interface ControlConfiguration {
declare var UIkit; declare var UIkit;
/** /**
* WARNING! dashboard-input selector is @deprecated, use input instead
*
* Autocomplete soft allows values that are not listed in options list. In order to work as expected * Autocomplete soft allows values that are not listed in options list. In order to work as expected
* avoid providing options with different label and value. * avoid providing options with different label and value.
* *

View File

@ -1,4 +1,3 @@
export type Environment = "development" | "test" | "beta" | "production"; export type Environment = "development" | "test" | "beta" | "production";
export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc"; export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "irish"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "irish";
@ -15,6 +14,7 @@ export interface EnvProperties {
showAddThis?: boolean; showAddThis?: boolean;
showContent?: boolean; showContent?: boolean;
enableEoscDataTransfer?:boolean; enableEoscDataTransfer?:boolean;
pdfStatisticsAPIURL?: string;
statisticsFrameAPIURL?: string; //delete? statisticsFrameAPIURL?: string; //delete?
statisticsFrameNewAPIURL?: string; statisticsFrameNewAPIURL?: string;
bipFrameAPIURL?: string; bipFrameAPIURL?: string;
@ -61,7 +61,6 @@ export interface EnvProperties {
registryUrl?: string; registryUrl?: string;
logoutUrl?: string; logoutUrl?: string;
userInfoUrl?: string; userInfoUrl?: string;
clientManagementUrl?: string,
developersApiUrl?: string, developersApiUrl?: string,
cookieDomain?: string; cookieDomain?: string;
feedbackmail?: string; feedbackmail?: string;

View File

@ -38,7 +38,6 @@ export let common: EnvProperties = {
searchLinkToPublication: "/search/publication?articleId=", searchLinkToPublication: "/search/publication?articleId=",
searchLinkToProject: "/search/project?projectId=", searchLinkToProject: "/search/project?projectId=",
searchLinkToDataProvider: "/search/dataprovider?datasourceId=", searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
searchLinkToService: "/search/service?serviceId=",
searchLinkToDataset: "/search/dataset?datasetId=", searchLinkToDataset: "/search/dataset?datasetId=",
searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToSoftwareLanding: "/search/software?softwareId=",
searchLinkToOrp: "/search/other?orpId=", searchLinkToOrp: "/search/other?orpId=",
@ -46,7 +45,6 @@ export let common: EnvProperties = {
searchLinkToAll: "/search/find/", searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications", searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders", searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToServices: "/search/find/services",
searchLinkToProjects: "/search/find/projects", searchLinkToProjects: "/search/find/projects",
searchLinkToDatasets: "/search/find/datasets", searchLinkToDatasets: "/search/find/datasets",
searchLinkToSoftware: "/search/find/software", searchLinkToSoftware: "/search/find/software",
@ -62,7 +60,6 @@ export let common: EnvProperties = {
searchLinkToAdvancedSoftware: "/search/advanced/software", searchLinkToAdvancedSoftware: "/search/advanced/software",
searchLinkToAdvancedOrps: "/search/advanced/other", searchLinkToAdvancedOrps: "/search/advanced/other",
searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
searchLinkToAdvancedServices: "/search/advanced/services",
searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
searchLinkToAdvancedResults: "/search/advanced/research-outcomes", searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
errorLink: '/error', errorLink: '/error',
@ -75,6 +72,7 @@ export let common: EnvProperties = {
admins: ['feedback@openaire.eu'], admins: ['feedback@openaire.eu'],
b2noteAPIURL: 'https://b2note.eudat.eu/', b2noteAPIURL: 'https://b2note.eudat.eu/',
myOrcidLinksPage: "/my-orcid-links", myOrcidLinksPage: "/my-orcid-links",
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452",
//connect //connect
@ -90,6 +88,7 @@ export let common: EnvProperties = {
export let commonDev: EnvProperties = { export let commonDev: EnvProperties = {
environment: "development", environment: "development",
pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats",
statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/", statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/",
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
@ -133,6 +132,7 @@ export let commonDev: EnvProperties = {
export let commonTest: EnvProperties = { export let commonTest: EnvProperties = {
environment: "test", environment: "test",
pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
@ -159,11 +159,11 @@ export let commonTest: EnvProperties = {
baseOpenaireLink: 'https://explore.openaire.eu', baseOpenaireLink: 'https://explore.openaire.eu',
} }
export let commonBeta: EnvProperties = { export let commonBeta: EnvProperties = {
environment: "beta", environment: "beta",
pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
@ -186,6 +186,7 @@ export let commonBeta: EnvProperties = {
widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
claimsInformationLink: "https://beta.openaire.eu/linking", claimsInformationLink: "https://beta.openaire.eu/linking",
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
adminPortalURL: "https://beta.admin.connect.openaire.eu", adminPortalURL: "https://beta.admin.connect.openaire.eu",
baseOpenaireLink: 'https://beta.explore.openaire.eu', baseOpenaireLink: 'https://beta.explore.openaire.eu',
@ -203,6 +204,7 @@ export let commonBeta: EnvProperties = {
export let commonProd: EnvProperties = { export let commonProd: EnvProperties = {
environment: "production", environment: "production",
pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
@ -275,3 +277,4 @@ eoscDataTransferAPI?;
eoscDataTransferLoginUrl?; eoscDataTransferLoginUrl?;
eoscDataTransferDestinations?; eoscDataTransferDestinations?;
* */ * */