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
2 changed files with 291 additions and 40 deletions
Showing only changes of commit 106cb5dcf8 - Show all commits

View File

@ -1,3 +1,4 @@
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"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc";
@ -14,16 +15,15 @@ export interface EnvProperties {
showAddThis?: boolean; showAddThis?: boolean;
showContent?: boolean; showContent?: boolean;
enableEoscDataTransfer?:boolean; enableEoscDataTransfer?:boolean;
framesAPIURL?: string; statisticsFrameAPIURL?: string; //delete?
statisticsFrameAPIURL?: string;
statisticsFrameNewAPIURL?: string; statisticsFrameNewAPIURL?: string;
bipFrameAPIURL?: string; bipFrameAPIURL?: string;
useNewStatistisTool?: boolean; useNewStatistisTool?: boolean; //delete?
useOldStatisticsSchema?: boolean; useOldStatisticsSchema?: boolean;
monitorStatsFrameUrl?:string; monitorStatsFrameUrl?:string;
disableFrameLoad?:boolean disableFrameLoad?:boolean
statisticsAPIURL?: string; statisticsAPIURL?: string;
impactFactorsAPIURL?: string; impactFactorsAPIURL?: string; //???
enermapsURL?: string; enermapsURL?: string;
claimsAPIURL?: string; claimsAPIURL?: string;
searchAPIURLLAst?: string; searchAPIURLLAst?: string;
@ -51,11 +51,6 @@ export interface EnvProperties {
sherpaURLSuffix?: string; sherpaURLSuffix?: string;
zenodo?: string; zenodo?: string;
zenodoCommunities?: string; zenodoCommunities?: string;
openAccess?: string;
openAccessRepo?: string;
fp7Guidlines?: string;
h2020Guidlines?: string;
ercGuidlines?: string;
helpdesk?: string; helpdesk?: string;
helpdeskEmail?: string; helpdeskEmail?: string;
utilsService?: string; utilsService?: string;
@ -66,6 +61,7 @@ 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;
@ -135,10 +131,10 @@ export interface EnvProperties {
reCaptchaSiteKey?: string; reCaptchaSiteKey?: string;
// contact us recipients // contact us recipients
admins?: string[]; admins?: string[];
lastIndexUpdate?: string; lastIndexUpdate?: string; //delete?
indexInfoAPI?: string; indexInfoAPI?: string;
altMetricsAPIURL?: string; altMetricsAPIURL?: string;
b2noteAPIURL?: string; b2noteAPIURL?: string; //delete?
adminPortalURL?: string; adminPortalURL?: string;
sushiliteURL?: string; sushiliteURL?: string;
notificationsAPIURL?: string; notificationsAPIURL?: string;
@ -151,3 +147,29 @@ export interface EnvProperties {
eoscDataTransferDestinations?; eoscDataTransferDestinations?;
hasMachineCache?: boolean; hasMachineCache?: boolean;
} }
export function checkPropertyValues(properties:EnvProperties){
let keys = Object.keys(properties);
let Warn = 0;
// console.debug( "Environment: " +properties.environment )
for(let attribute of keys){
// console.debug(attribute + ": " +properties[attribute] + " " )
if (properties.environment == "production" && typeof properties[attribute] == 'string' && (properties[attribute].indexOf("beta.") != -1 || properties[attribute].indexOf("uoa.di.gr") != -1)) {
console.warn("shouldn't be prod? " + attribute + ": " + properties[attribute]);
Warn++;
}
if (properties.environment != "production" && typeof properties[attribute] == 'string' && properties[attribute].indexOf("https://services.") != -1) {
console.warn("should be prod? " + attribute + ": " + properties[attribute]);
Warn++;
}
if (properties.environment != "development" && typeof properties[attribute] == 'string' && properties[attribute].indexOf("uoa.di.gr") != -1) {
console.warn("should be in dev? " + attribute + ": " + properties[attribute]);
Warn++;
}
}
/*if(Warn > 0){
alert("check properties: " + Warn)
}*/
}

View File

@ -1,45 +1,274 @@
import {EnvProperties} from "../env-properties"; import {EnvProperties} from "../env-properties";
export let common: EnvProperties = { export let common: EnvProperties = {
bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
useNewStatistisTool: true,
openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
searchCrossrefAPIURL: "https://api.crossref.org/works",
searchDataciteAPIURL: "https://api.datacite.org/works",
searchOrcidURL: "https://pub.orcid.org/v2.1/",
orcidURL: "https://orcid.org/",
orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/",
orcidTokenURL : "https://orcid.org/oauth/authorize?",
orcidClientId: "APP-IN0O56SBVVTB7NN4",
doiURL: "https://doi.org/",
pmcURL: "http://europepmc.org/articles/",
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
handleURL: "http://hdl.handle.net/",
cordisURL: "http://cordis.europa.eu/projects/",
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
r3DataURL: "http://service.re3data.org/repository/",
swhURL: "https://archive.softwareheritage.org/", swhURL: "https://archive.softwareheritage.org/",
// searchCrossrefAPIURL: "https://api.crossref.org/works", fairSharingURL: "https://fairsharing.org/",
// searchDataciteAPIURL: "https://api.datacite.org/works", eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
// searchOrcidURL: "https://pub.orcid.org/v2.1/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
// orcidURL: "https://orcid.org/", sherpaURLSuffix: "/",
// doiURL: "https://doi.org/", zenodo: "https://zenodo.org/",
// pmcURL: "http://europepmc.org/articles/", helpdesk: "https://www.openaire.eu/support/helpdesk",
// pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", helpdeskEmail: "helpdesk@openaire.eu",
// handleURL: "http://hdl.handle.net/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
// cordisURL: "http://cordis.europa.eu/projects/", cookieDomain: ".openaire.eu",
// openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", feedbackmail: "feedback@openaire.eu",
// r3DataURL: "http://service.re3data.org/repository/", csvLimit: 2000,
// fairSharingURL: "https://fairsharing.org/", pagingLimit: 20,
// sherpaURL: "http://sherpa.ac.uk/romeo/issn/", resultsPerPage: 10,
// sherpaURLSuffix: "/", baseLink : "",
// zenodo: "https://zenodo.org/", searchLinkToResult: "/search/result?id=",
// openAccess: "https://www.openaire.eu/support/faq#article-id-234", searchLinkToPublication: "/search/publication?articleId=",
// openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", searchLinkToProject: "/search/project?projectId=",
// fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
// h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", searchLinkToDataset: "/search/dataset?datasetId=",
// ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", searchLinkToSoftwareLanding: "/search/software?softwareId=",
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
searchLinkToAll: "/search/find/",
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToProjects: "/search/find/projects",
searchLinkToDatasets: "/search/find/datasets",
searchLinkToSoftware: "/search/find/software",
searchLinkToOrps: "/search/find/other",
searchLinkToOrganizations: "/search/find/organizations",
searchLinkToCompatibleDataProviders: "/search/content-providers",
searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
searchLinkToJournals: "/search/journals",
searchLinkToResults: "/search/find/research-outcomes",
searchLinkToAdvancedPublications: "/search/advanced/publications",
searchLinkToAdvancedProjects: "/search/advanced/projects",
searchLinkToAdvancedDatasets: "/search/advanced/datasets",
searchLinkToAdvancedSoftware: "/search/advanced/software",
searchLinkToAdvancedOrps: "/search/advanced/other",
searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
errorLink: '/error',
showLastIndexInformationLink: true,
lastIndexUpdate: "2020-06-15",
depositLearnHowPage: "/participate/deposit/learn-how",
depositSearchPage: "/participate/deposit/search",
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
admins: ['feedback@openaire.eu'],
b2noteAPIURL: 'https://b2note.eudat.eu/',
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",
//connect
enermapsURL:"https://lab.idiap.ch/enermaps",
zenodoCommunities: 'https://zenodo.org/api/communities/',
shareInZenodoPage: '/participate/deposit/zenodo',
afterLoginRedirectLink: '/myCommunities',
searchLinkToCommunities: '/search/find/communities',
} }
export let commonDev: EnvProperties = { export let commonDev: EnvProperties = {
// searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", environment: "development",
// searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/",
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
claimsAPIURL: "http://scoobydoo.di.uoa.gr:8880/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/",
orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?",
orcidClientId: "APP-A5M3KTX6NCN67L91",
utilsService: "http://dl170.madgik.di.uoa.gr:8000",
vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
cookieDomain: ".di.uoa.gr",
feedbackmail: "kostis30fylloy@gmail.com",
cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/",
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/",
contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
claimsInformationLink: "https://www.openaire.eu/linking-beta",
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
admins: ['kostis30fylloy@gmail.com', 'alexandros.martzios@athenarc.gr', 'kgalouni@di.uoa.gr'],
adminPortalURL: "https://beta.admin.connect.openaire.eu",
//connect
communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities',
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
//admin
miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining',
feedbackmailForMissingEntities: 'feedback@openaire.eu',
connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200',
} }
export let commonTest: EnvProperties = { export let commonTest: EnvProperties = {
// searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/", environment: "test",
// searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
claimsAPIURL: "https://services.openaire.eu/claims-new/rest/claimsService/",
searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/",
searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources",
csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
utilsService: "https://explore.openaire.eu/utils-service",
vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
loginUrl: " https://services.openaire.eu/login-service/openid_connect_login",
userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
cacheUrl: "https://explore.openaire.eu/cache/get?url=",
datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/",
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
contextsAPI: "https://services.openaire.eu/openaire/context",
communityAPI: "https://services.openaire.eu/openaire/community/",
lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
claimsInformationLink: "https://www.openaire.eu/linking",
indexInfoAPI: "https://services.openaire.eu/openaire/info/",
adminPortalURL: "https://admin.connect.openaire.eu",
baseOpenaireLink: 'https://explore.openaire.eu',
} }
export let commonBeta: EnvProperties = { export let commonBeta: EnvProperties = {
// searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", environment: "beta",
// searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/",
searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
utilsService: "https://demo.openaire.eu/utils-service",
vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
cacheUrl: "https://demo.openaire.eu/cache/get?url=",
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/",
monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service",
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
contextsAPI: "https://beta.services.openaire.eu/openaire/context",
communityAPI: "https://beta.services.openaire.eu/openaire/community/",
lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
claimsInformationLink: "https://beta.openaire.eu/linking",
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
adminPortalURL: "https://beta.admin.connect.openaire.eu",
baseOpenaireLink: 'https://beta.explore.openaire.eu',
//connect
communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities",
registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
//admin
miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining',
feedbackmailForMissingEntities: 'feedback@openaire.eu',
deleteCacheUrl: 'https://demo.openaire.eu/cache/clear',
deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache',
connectPortalUrl: 'https://beta.connect.openaire.eu',
} }
export let commonProd: EnvProperties = { export let commonProd: EnvProperties = {
// searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", environment: "production",
// searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
} statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
claimsAPIURL: "https://services.openaire.eu/claims-new/rest/claimsService/",
searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
utilsService: "https://explore.openaire.eu/utils-service",
vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
loginUrl: " https://services.openaire.eu/login-service/openid_connect_login",
userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
cacheUrl: "https://explore.openaire.eu/cache/get?url=",
datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/",
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
contextsAPI: "https://services.openaire.eu/openaire/context",
communityAPI: "https://services.openaire.eu/openaire/community/",
lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
claimsInformationLink: "https://www.openaire.eu/linking",
indexInfoAPI: "https://services.openaire.eu/openaire/info/",
adminPortalURL: "https://admin.connect.openaire.eu",
baseOpenaireLink: 'https://explore.openaire.eu',
//connect
communitiesAPI: "https://services.openaire.eu/openaire/community/communities",
//admin
registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining',
feedbackmailForMissingEntities: 'feedback@openaire.eu',
deleteCacheUrl: 'https://explore.openaire.eu/cache/clear',
deleteBrowserCacheUrl: 'https://services.openaire.eu/uoa-admin-tools/cache',
connectPortalUrl: 'https://connect.openaire.eu',
}
/*
*
Properties to check
* not in explore
* isDashboard
showContent
enableEoscDataTransfer
developersApiUrl?: string,
useHelpTexts?:boolean;
searchLinkToStakeholders?: string;
searchLinkToAdvancedServices?: string;
sushiliteURL?: string;
notificationsAPIURL?: string;
egiNotebookLink?: string;
eoscDataTransferAPI?;
eoscDataTransferLoginUrl?;
eoscDataTransferDestinations?;
* */