diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 0000000..37371cb
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,11 @@
+# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11
\ No newline at end of file
diff --git a/README.md b/README.md
index 96e55e9..b48bac9 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,39 @@
-# Angular Universal & Anguar-CLI minimal starter
+# Monitor
-> This demo is built following the [Angular-CLI Wiki guide](https://github.com/angular/angular-cli/wiki/stories-universal-rendering)
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14.
-We're utilizing packages from the [Angular Universal @nguniversal](https://github.com/angular/universal) repo, such as [ng-module-map-ngfactory-loader](https://github.com/angular/universal/tree/master/modules/module-map-ngfactory-loader) to enable Lazy Loading.
+## Install packages
----
+Run npm install (maybe needs sudo), a script that will delete unused files from library will be run.
-## Static or Dynamic
-This repo demonstrates the use of 2 different forms of Server Side Rendering.
+## Development server
-**Static** Also known as "prerendering"
-* Happens at build time
-* Renders your application and replaces the dist index.html with a version rendered at the route `/`.
+Run `npm start` for a dev server. Navigate to `http://localhost:4500/`. The app will automatically reload if you change any of the source files.
-**Dynamic**
-* Happens at runtime
-* Uses `ngExpressEngine` to render you application on the fly at the requested url.
+## Build - CSR
----
+Use the `npm run build-dev` for a development build.
+Use the `npm run build-beta` for a beta build.
+Use the `npm run build-prod` for a production build.
-## Installation
-* `npm install` or `yarn`
+## Build - SSR
----
+Use the `npm run build:ssr-dev` for a development build.
+Use the `npm run build:ssr-beta` for a beta build.
+Use the `npm run build:ssr-prod` for a production build.
-## Development (Client-side only rendering)
-* run `npm run start` which will start `ng serve` (project served at the standard: localhost:4200)
+## Run SSR
----
+`npm run serve:ssr` will run the last server build.
-## Production
+## Webpack Analyzer
-Depending on whether you're publishing dynamic or static prerendering, run the build command, and then serve up your dist folder assets.
+In order to analyze bundle size you can run `npm run webpack-bundle-analyzer`
-> **NOTE**: To deploy your **Static** site to a static hosting platform you will have to deploy the *`dist/browser`* folder, rather than the usual *`dist`*
+## Running unit tests
-ie: `npm run build:dynamic` or `npm run build:static`. All of the files that need to be served will be found within the `/dist` folder.
-
-
-
----
-
-## Testing Universal (dynamic or static) builds -Locally-
-
-**Dynamic** : **`npm run start:dynamic`**
-
-Compiles your application and spins up a Node Express to dynamically serve your Universal application on `http://localhost:4000`.
-
-**Static** : **`npm run start:static`**
-
-- Compiles your application and prerenders your applications files, spinning up a demo http-server so you can view it on `http://127.0.0.1:8080`
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+## Running end-to-end tests
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
diff --git a/angular.json b/angular.json
index bcc4d60..fe67e38 100644
--- a/angular.json
+++ b/angular.json
@@ -1,21 +1,46 @@
{
- "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+ "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
- "ng-universal-demo": {
+ "monitor": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
+ "prefix": "app",
+ "schematics": {
+ "@schematics/angular:class": {
+ "skipTests": true
+ },
+ "@schematics/angular:component": {
+ "skipTests": true
+ },
+ "@schematics/angular:directive": {
+ "skipTests": true
+ },
+ "@schematics/angular:guard": {
+ "skipTests": true
+ },
+ "@schematics/angular:module": {
+ "skipTests": true
+ },
+ "@schematics/angular:pipe": {
+ "skipTests": true
+ },
+ "@schematics/angular:service": {
+ "skipTests": true
+ }
+ },
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
- "outputPath": "dist/browser",
+ "aot": true,
+ "outputPath": "dist/monitor/browser",
"index": "src/index.html",
"main": "src/main.ts",
- "tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
+ "tsConfig": "src/tsconfig.app.json",
"assets": [
"src/assets",
"src/robots.txt",
@@ -33,45 +58,91 @@
]
},
"configurations": {
- "production": {
+ "development": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
- "extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
- "fileReplacements": [
+ "budgets": [
{
- "replace": "src/environments/environment.ts",
- "with": "src/environments/environment.prod.ts"
+ "type": "initial",
+ "maximumWarning": "2mb",
+ "maximumError": "5mb"
},
{
- "replace": "src/index.html",
- "with": "src/index.prod.html"
- },
- {
- "replace": "src/robots.txt",
- "with": "src/robots.prod.txt"
+ "type": "anyComponentStyle",
+ "maximumWarning": "6kb"
}
]
},
"beta": {
+ "fileReplacements": [
+ {
+ "replace": "src/environments/environment.ts",
+ "with": "src/environments/environment.beta.ts"
+ }
+ ],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
- "extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
+ "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "2mb",
+ "maximumError": "5mb"
+ },
+ {
+ "type": "anyComponentStyle",
+ "maximumWarning": "6kb"
+ }
+ ]
+ },
+ "production": {
+ "assets": [
+ "src/assets",
+ {
+ "input": "src/prod/",
+ "output": "/",
+ "glob": "*.txt"
+ },
+ "src/sitemap.xml"
+ ],
+ "index": {
+ "input": "src/prod/index.html",
+ "output": "index.html"
+ },
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
- "with": "src/environments/environment.beta.ts"
+ "with": "src/environments/environment.prod.ts"
+ }
+ ],
+ "optimization": true,
+ "outputHashing": "all",
+ "sourceMap": false,
+ "namedChunks": false,
+ "aot": true,
+ "extractLicenses": true,
+ "vendorChunk": false,
+ "buildOptimizer": true,
+ "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "2mb",
+ "maximumError": "5mb"
+ },
+ {
+ "type": "anyComponentStyle",
+ "maximumWarning": "6kb"
}
]
}
@@ -80,43 +151,33 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
- "browserTarget": "ng-universal-demo:build"
+ "browserTarget": "monitor:build"
},
"configurations": {
"production": {
- "browserTarget": "ng-universal-demo:build:production"
- },
- "beta": {
- "browserTarget": "ng-universal-demo:build:beta"
+ "browserTarget": "monitor:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
- "browserTarget": "ng-universal-demo:build"
+ "browserTarget": "monitor:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
- "karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
- "scripts": [
- "src/assets/common-assets/common/jquery.js",
- "src/assets/common-assets/common/uikit.min.js",
- "src/assets/common-assets/common/uikit-icons.min.js",
- "node_modules/jquery/dist/jquery.js"
- ],
+ "karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
+ "scripts": [],
"assets": [
- "src/assets",
- "src/robots.txt",
- "src/sitemap.xml"
+ "src/assets"
]
}
},
@@ -135,57 +196,89 @@
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
- "outputPath": "dist/server",
- "main": "src/main.server.ts",
+ "outputPath": "dist/monitor/server",
+ "main": "server.ts",
"tsConfig": "src/tsconfig.server.json"
},
"configurations": {
- "production": {
- "fileReplacements": [
- {
- "replace": "src/environments/environment.ts",
- "with": "src/environments/environment.prod.ts"
- },
- {
- "replace": "src/index.html",
- "with": "src/index.prod.html"
- },
- {
- "replace": "src/robots.txt",
- "with": "src/robots.prod.txt"
- }
- ]
+ "development": {
+ "outputHashing": "media",
+ "sourceMap": false,
+ "optimization": true
},
"beta": {
+ "outputHashing": "media",
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.beta.ts"
}
- ]
+ ],
+ "sourceMap": false,
+ "optimization": true
+ },
+ "production": {
+ "outputHashing": "media",
+ "fileReplacements": [
+ {
+ "replace": "src/environments/environment.ts",
+ "with": "src/environments/environment.prod.ts"
+ }
+ ],
+ "sourceMap": false,
+ "optimization": true
}
}
+ },
+ "serve-ssr": {
+ "builder": "@nguniversal/builders:ssr-dev-server",
+ "options": {
+ "browserTarget": "monitor:build",
+ "serverTarget": "monitor:server"
+ },
+ "configurations": {
+ "production": {
+ "browserTarget": "monitor:build:production",
+ "serverTarget": "monitor:server:production"
+ }
+ }
+ },
+ "prerender": {
+ "builder": "@nguniversal/builders:prerender",
+ "options": {
+ "browserTarget": "monitor:build:production",
+ "serverTarget": "monitor:server:production",
+ "routes": [
+ "/"
+ ]
+ },
+ "configurations": {
+ "production": {}
+ }
}
}
},
- "ng-universal-demo-e2e": {
- "root": "e2e",
- "sourceRoot": "e2e",
+ "monitor-e2e": {
+ "root": "e2e/",
"projectType": "application",
+ "prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
- "protractorConfig": "./protractor.conf.js",
- "devServerTarget": "ng-universal-demo:serve"
+ "protractorConfig": "e2e/protractor.conf.js",
+ "devServerTarget": "monitor:serve"
+ },
+ "configurations": {
+ "production": {
+ "devServerTarget": "monitor:serve:production"
+ }
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
- "tsConfig": [
- "e2e/tsconfig.e2e.json"
- ],
+ "tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
@@ -194,33 +287,5 @@
}
}
},
- "defaultProject": "ng-universal-demo",
- "schematics": {
- "@schematics/angular:class": {
- "spec": false
- },
- "@schematics/angular:component": {
- "spec": false,
- "inlineStyle": true,
- "inlineTemplate": true,
- "prefix": "app",
- "styleext": "css"
- },
- "@schematics/angular:directive": {
- "spec": false,
- "prefix": "app"
- },
- "@schematics/angular:guard": {
- "spec": false
- },
- "@schematics/angular:module": {
- "spec": false
- },
- "@schematics/angular:pipe": {
- "spec": false
- },
- "@schematics/angular:service": {
- "spec": false
- }
- }
+ "defaultProject": "monitor"
}
diff --git a/clean-library.sh b/clean-library.sh
new file mode 100644
index 0000000..8fae529
--- /dev/null
+++ b/clean-library.sh
@@ -0,0 +1,9 @@
+cd src/app/openaireLibrary
+# Exclude Dashboard files
+echo "Exclude Dashboard files"
+svn update --set-depth exclude ./dashboard
+# Exclude ck-editor usages
+echo "Exclude ck-editor usages"
+svn update --set-depth exclude ./sharedComponents/subscriber-invite
+cd ../../../
+echo "Done"
diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json
deleted file mode 100644
index 43b25a4..0000000
--- a/deploy/beta-properties.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "environment" : "beta",
- "enablePiwikTrack" : true,
- "useCache" : true,
- "showContent" : true,
- "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
- "framesAPIURL" : "https://beta.openaire.eu/stats3/",
- "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
- "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
- "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/",
- "useNewStatistisTool":true,
- "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
- "searchAPIURLLAst" : "https://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",
- "searchCrossrefAPIURL" : "https://api.crossref.org/works",
- "searchDataciteAPIURL" : "https://api.datacite.org/works",
- "searchOrcidURL" : "https://pub.orcid.org/v2.1/",
- "orcidURL" : "https://orcid.org/",
- "doiURL" : "https://dx.doi.org/",
- "cordisURL" : "http://cordis.europa.eu/projects/",
- "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
- "r3DataURL": "http://service.re3data.org/repository/",
- "zenodo" : "https://zenodo.org/",
- "zenodoCommunities" : "https://zenodo.org/api/communities/",
- "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
- "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
- "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
- "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
- "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
- "helpdesk" : "https://www.openaire.eu/support/helpdesk",
- "utilsService" : "https://demo.openaire.eu/utils-service",
-
- "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-
- "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
- "piwikSiteId" : "298",
- "loginUrl" :"https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
- "userInfoUrl" : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
-
- "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
-
- "cookieDomain" :".openaire.eu",
-
- "feedbackmail" :"openaire.test@gmail.com",
-
- "cacheUrl" :"https://demo.openaire.eu/cache/get?url=",
-
- "monitorServiceAPIURL" :"https://beta.services.openaire.eu/uoa-monitor-service/",
-
- "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools",
-
- "adminToolsCommunity" :"monitor",
- "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
- "contextsAPI":"https://beta.services.openaire.eu/openaire/context",
- "communityAPI": "https://beta.services.openaire.eu/openaire/community/",
- "communitiesAPI": "https://beta.services.openaire.eu/openaire/community/communities",
-
- "csvLimit": 2000,
- "pagingLimit": 20,
- "resultsPerPage": 10,
-
- "baseLink" : "",
- "domain" : "https://beta.monitor.openaire.eu",
- "searchLinkToPublication" : "/search/publication?articleId=",
- "searchLinkToProject" : "/search/project?projectId=",
- "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
- "searchLinkToDataset" : "/search/dataset?datasetId=",
- "searchLinkToSoftwareLanding" : "/search/software?softwareId=",
- "searchLinkToOrganization" : "/search/organization?organizationId=",
- "searchLinkToOrp" : "/search/other?orpId=",
-
- "searchLinkToCommunities" : "/search/find/communities",
- "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",
- "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
- "searchLinkToJournals" : "/search/journals",
- "searchLinkToJournalsTable" : "/search/journals-table",
-
- "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",
-
- "sendMailUrl": "https://beta.services.openaire.eu/uoa-admin-tools/sendMail/",
- "notifyForNewManagers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewManagers/",
- "notifyForNewSubscribers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewSubscribers/",
-
-
- "lastIndexInformationLink" : "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
- "showLastIndexInformationLink" : true,
-
- "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- "claimsInformationLink": "https://beta.openaire.eu/linking",
-
- "depositLearnHowPage": "/participate/deposit/learn-how",
- "depositSearchPage": "/participate/deposit/search",
- "shareInZenodoPage": "/participate/deposit/zenodo",
-
- "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-
- "admins" : ["argirok@di.uoa.gr"],
- "lastIndexUpdate": "2019-08-07",
- "indexInfoAPI": "https://beta.services.openaire.eu/openaire/info/"
-}
diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh
deleted file mode 100755
index 4238ff8..0000000
--- a/deploy/prepareDeploy.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#ATTENTION
-#DON'T run it in svn folder - it REMOVES files
-#Copy project in another location eg "deploy-folder"
-#go to "deploy-folder/deploy"
-#uncomment the proper commands
-#run the script
-
-# cp theproperties file according to the deploy environment!!!
-## uncommect one of the following -->
-# cp beta-properties.json ../src/assets/env-properties.json;
-# cp production-properties.json ../src/assets/env-properties.json;
-
-## uncommect from here-->
-# printf '\nCheck that you have the correct properties file';
-# echo -n "Press key:";
-# read -n1 ans
-# pico ../src/assets/env-properties.json;
-# printf '\nCheck the properties file version';
-# echo -n "Press key:";
-# read -n1 ans
-# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts;
-# echo 'For Production keep meta for bots';
-# printf '\n\nCheck index.html: For test and beta keep meta for noindex, for production remove noindex and keep meta for Search engines verification';
-# printf '\nUpdate css/ js files version!';
-# echo -n "Press key:";
-# read -n1 ans
-# echo -n "Pressed";
-# pico ../src/index.html;
-# echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!';
-# echo -n "Press key:";
-# read -n1 ans
-# pico ../src/robots.txt;
-# echo -n "Pressed";
-# rm -rf ../src/assets/common-assets/.svn/;
-# rm -rf ../src/app/openaireLibrary/.svn/;
-# cd ..; npm run build:ssr; cd deploy;
-#rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; ../dist/browser/assets/common-assets/.svn/; cd ../; rm -rf deploy;
-# echo 'Now copy to the server!'
-
-##<-- to here
-
-#Deploy instructions!
-#copy "deploy-folder" in beta.connect.openaire.eu or connect.openaire.eu
-#copies of previous deployments exist in "/home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD"
-#run "npm i"
-#become nodejs user to be able to copy the files: "sudo su nodejs -s /bin/bash"
-#check what is running "pm2 list"
-#portal files exist in "/srv/www/portal/connect"
-#copy deployment files to the portal folder "cp -r /home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD/* /srv/www/portal/connect"
-#restart portal to get the changes "pm2 restart connect"
-
-
- #rm -rf src node_modules .idea/ installOpenaireLib.sh dist/browser/stats.json dist/browser/assets/common-assets/.svn/ deploy;
diff --git a/deploy/production-properties.json b/deploy/production-properties.json
deleted file mode 100644
index 515bfbd..0000000
--- a/deploy/production-properties.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "environment" : "production",
- "enablePiwikTrack" : false,
- "useCache" : true,
- "showContent" : true,
- "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
- "framesAPIURL" : "https://www.openaire.eu/stats3/",
- "statisticsAPIURL" : "https://services.openaire.eu/stats-api/",
- "statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
- "statisticsFrameNewAPIURL": "",
- "useNewStatistisTool":false,
- "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
- "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/",
- "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources",
- "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",
- "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports",
- "searchCrossrefAPIURL" : "https://api.crossref.org/works",
- "searchDataciteAPIURL" : "https://api.datacite.org/works",
- "searchOrcidURL" : "https://pub.orcid.org/v2.1/",
- "orcidURL" : "https://orcid.org/",
- "doiURL" : "https://dx.doi.org/",
- "cordisURL" : "http://cordis.europa.eu/projects/",
- "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
- "r3DataURL": "http://service.re3data.org/repository/",
- "zenodo" : "https://zenodo.org/",
- "zenodoCommunities" : "https://zenodo.org/api/communities/",
- "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
- "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
- "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
- "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
- "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
- "helpdesk" : "https://www.openaire.eu/support/helpdesk",
- "utilsService" : "https://explore.openaire.eu/utils-service",
-
- "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
-
- "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
- "piwikSiteId" : "112",
- "loginUrl" :"https://services.openaire.eu/_UPDATE_/openid_connect_login",
-
- "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
-
- "cookieDomain" :".openaire.eu",
-
- "feedbackmail" :"feedback@openaire.eu",
-
- "cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
-
- "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/",
-
- "monitorServiceAPIURL" :"http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service",
-
- "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
-
- "adminToolsCommunity" :"monitor",
- "contextsAPI":"https://services.openaire.eu/openaire/context",
-
- "communityAPI": "https://services.openaire.eu/openaire/community/",
- "communitiesAPI": "https://services.openaire.eu/openaire/community/communities",
-
- "csvLimit": 2000,
- "pagingLimit": 20,
- "resultsPerPage": 10,
-
- "baseLink" : "",
- "domain" : : "https://monitor.openaire.eu",
-
- "searchLinkToPublication" : "/search/publication?articleId=",
- "searchLinkToProject" : "/search/project?projectId=",
- "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
- "searchLinkToDataset" : "/search/dataset?datasetId=",
- "searchLinkToSoftwareLanding" : "/search/software?softwareId=",
- "searchLinkToOrp" : "/search/other?orpId=",
- "searchLinkToOrganization" : "/search/organization?organizationId=",
-
- "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",
- "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
- "searchLinkToJournals" : "/search/journals",
- "searchLinkToJournalsTable" : "/search/journals-table",
-
- "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",
- "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
- "showLastIndexInformationLink" : true,
- "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
- "claimsInformationLink": "https://www.openaire.eu/linking",
- "depositLearnHowPage": "/participate/deposit/learn-how",
- "depositSearchPage": "/participate/deposit/search",
- "shareInZenodoPage": "/participate/deposit/zenodo",
- "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-
- "admins" : ["rcd-helpdesk@openaire.eu"],
- "lastIndexUpdate": "2019-07-24",
- "indexInfoAPI": "https://services.openaire.eu/openaire/info/"
-}
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
new file mode 100644
index 0000000..86776a3
--- /dev/null
+++ b/e2e/protractor.conf.js
@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+ allScriptsTimeout: 11000,
+ specs: [
+ './src/**/*.e2e-spec.ts'
+ ],
+ capabilities: {
+ 'browserName': 'chrome'
+ },
+ directConnect: true,
+ baseUrl: 'http://localhost:4200/',
+ framework: 'jasmine',
+ jasmineNodeOpts: {
+ showColors: true,
+ defaultTimeoutInterval: 30000,
+ print: function() {}
+ },
+ onPrepare() {
+ require('ts-node').register({
+ project: require('path').join(__dirname, './tsconfig.e2e.json')
+ });
+ jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+ }
+};
\ No newline at end of file
diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
new file mode 100644
index 0000000..511f5a6
--- /dev/null
+++ b/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,23 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+ let page: AppPage;
+
+ beforeEach(() => {
+ page = new AppPage();
+ });
+
+ it('should display welcome message', () => {
+ page.navigateTo();
+ expect(page.getTitleText()).toEqual('Welcome to monitor!');
+ });
+
+ afterEach(async () => {
+ // Assert that there are no errors emitted from the browser
+ const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+ expect(logs).not.toContain(jasmine.objectContaining({
+ level: logging.Level.SEVERE,
+ } as logging.Entry));
+ });
+});
diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
new file mode 100644
index 0000000..5776aa9
--- /dev/null
+++ b/e2e/src/app.po.ts
@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+ navigateTo() {
+ return browser.get(browser.baseUrl) as Promise;
+ }
+
+ getTitleText() {
+ return element(by.css('app-root h1')).getText() as Promise;
+ }
+}
diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
new file mode 100644
index 0000000..a6dd622
--- /dev/null
+++ b/e2e/tsconfig.e2e.json
@@ -0,0 +1,13 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/app",
+ "module": "commonjs",
+ "target": "es5",
+ "types": [
+ "jasmine",
+ "jasminewd2",
+ "node"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index f35f9ac..091a610 100644
--- a/package.json
+++ b/package.json
@@ -1,75 +1,71 @@
{
- "name": "openaire-monitor",
- "version": "1.0.0",
- "license": "Openaire",
- "contributors": [
- "Argiro Kokogiannaki ",
- "Konstantina Galouni "
- ],
+ "name": "monitor",
+ "version": "0.0.0",
"scripts": {
"ng": "ng",
"start": " ng serve --port 4500 --disable-host-check --host 0.0.0.0",
- "start:ssr": "npm run build:ssr && npm run serve:ssr",
- "start:prerender": "npm run build:prerender && npm run serve:prerender",
- "start:ssr-beta": "npm run build:ssr-beta && npm run serve:ssr",
- "start:prerender-beta": "npm run build:prerender-beta && npm run serve:prerender",
"build": "ng build",
- "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true && ng run ng-universal-demo:server:production",
- "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true && ng run ng-universal-demo:server:beta",
- "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
- "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
- "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",
- "build:ssr-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server",
- "generate:prerender": "cd dist && node prerender",
- "webpack:server": "webpack --config webpack.server.config.js --progress --colors",
- "serve:prerender": "cd dist/browser && http-server",
- "serve:ssr": "node dist/server",
- "after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
+ "build-dev": "ng build --configuration=development",
+ "build-beta": "ng build --configuration=beta",
+ "build-prod": "ng build --prod",
+ "webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/monitor/browser/stats-es2015.json --host 0.0.0.0",
+ "test": "ng test",
+ "e2e": "ng e2e",
+ "dev:ssr": "ng run monitor:serve-ssr",
+ "serve:ssr": "node dist/monitor/server/main.js",
+ "build:ssr-dev": "npm run build-dev && ng run monitor:server:development",
+ "build:ssr-beta": "npm run build-beta && ng run monitor:server:beta",
+ "build:ssr-prod": "npm run build-prod && ng run monitor:server:production",
+ "prerender": "ng run monitor:prerender",
+ "postinstall": "chmod +x clean-library.sh && ./clean-library.sh",
+ "after-build-clean": "rm -rf dist/monitor/browser/assets/common-assets/.svn/ src/app/openaireLibrary/.svn node_modules src/assets/common-assets/.svn/"
},
"private": true,
"dependencies": {
- "@angular/animations": "^7.2.14",
- "@angular/cdk": "^7.3.7",
- "@angular/common": "7.2.14",
- "@angular/compiler": "7.2.14",
- "@angular/core": "7.2.14",
- "@angular/forms": "7.2.14",
- "@angular/http": "7.2.14",
- "@angular/material": "^7.3.7",
- "@angular/platform-browser": "7.2.14",
- "@angular/platform-browser-dynamic": "7.2.14",
- "@angular/platform-server": "7.2.14",
- "@angular/router": "7.2.14",
- "@nguniversal/express-engine": "^6.0.0",
- "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
- "@types/express": "^4.16.1",
- "citation-js": "^0.3.4",
+ "@angular/animations": "~11.2.14",
+ "@angular/cdk": "^11.2.13",
+ "@angular/common": "~11.2.14",
+ "@angular/compiler": "~11.2.14",
+ "@angular/core": "~11.2.14",
+ "@angular/forms": "~11.2.14",
+ "@angular/localize": "^11.2.14",
+ "@angular/material": "^11.2.13",
+ "@angular/platform-browser": "~11.2.14",
+ "@angular/platform-browser-dynamic": "~11.2.14",
+ "@angular/platform-server": "~11.2.14",
+ "@angular/router": "~11.2.14",
+ "@nguniversal/express-engine": "^11.2.1",
"clipboard": "^1.5.16",
- "core-js": "^2.4.1",
+ "core-js": "^2.5.4",
+ "express": "^4.15.2",
"jquery": "^3.4.1",
- "ngx-json-ld": "0.1.6",
- "prom-client": "^11.3.0",
+ "ng-recaptcha": "^7.0.1",
+ "rxjs": "^6.5.1",
"ts-md5": "^1.2.0",
- "tslib": "^1.9.0",
- "wikidata-sdk": "^5.2.9",
- "zone.js": "^0.8.26",
- "ng-recaptcha": "^3.0.5",
- "ng2-ckeditor": "1.1.9"
+ "tslib": "^2.0.0",
+ "zone.js": "~0.10.2"
},
"devDependencies": {
- "@angular-devkit/build-angular": "~0.13.0",
- "@angular/cli": "^7.3.9",
- "@angular/compiler-cli": "7.2.14",
- "@angular/language-service": "7.2.14",
- "@types/jquery": "^3.3.29",
- "@types/node": "^8.0.30",
- "cpy-cli": "^1.0.1",
- "http-server": "^0.10.0",
- "reflect-metadata": "^0.1.10",
- "rxjs": "6.5.1",
- "rxjs-compat": "^6.5.1",
- "ts-loader": "^4.2.0",
- "typescript": "3.2.4",
- "webpack-cli": "^3.3.2"
+ "@angular-devkit/build-angular": "~0.1102.14",
+ "@angular/cli": "~11.2.14",
+ "@angular/compiler-cli": "~11.2.14",
+ "@angular/language-service": "~11.2.14",
+ "@nguniversal/builders": "^11.2.1",
+ "@types/express": "^4.17.0",
+ "@types/compression": "^1.7.0",
+ "@types/node": "^12.11.1",
+ "@types/jasmine": "~3.6.0",
+ "@types/jasminewd2": "~2.0.3",
+ "codelyzer": "^6.0.0",
+ "jasmine-core": "~3.8.0",
+ "jasmine-spec-reporter": "~5.0.0",
+ "karma": "~6.3.3",
+ "karma-chrome-launcher": "~3.1.0",
+ "karma-coverage-istanbul-reporter": "~3.0.2",
+ "karma-jasmine": "~4.0.0",
+ "karma-jasmine-html-reporter": "^1.6.0",
+ "protractor": "~7.0.0",
+ "ts-node": "~7.0.0",
+ "typescript": "~4.0.7"
}
}
diff --git a/prerender.ts b/prerender.ts
deleted file mode 100644
index c664006..0000000
--- a/prerender.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Load zone.js for the server.
-import 'zone.js/dist/zone-node';
-import 'reflect-metadata';
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
-import { join } from 'path';
-
-import { enableProdMode } from '@angular/core';
-// Faster server renders w/ Prod mode (dev mode never needed)
-enableProdMode();
-
-// Express Engine
-import { ngExpressEngine } from '@nguniversal/express-engine';
-// Import module map for lazy loading
-import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
-import { renderModuleFactory } from '@angular/platform-server';
-import { ROUTES } from './static.paths';
-
-// * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
-
-const BROWSER_FOLDER = join(process.cwd(), 'browser');
-
-// Load the index.html file containing referances to your application bundle.
-const index = readFileSync(join('browser', 'index.html'), 'utf8');
-
-let previousRender = Promise.resolve();
-
-// Iterate each route path
-ROUTES.forEach(route => {
- const fullPath = join(BROWSER_FOLDER, route);
-
- // Make sure the directory structure is there
- if(!existsSync(fullPath)){
- mkdirSync(fullPath);
- }
-
- // Writes rendered HTML to index.html, replacing the file if it already exists.
- previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, {
- document: index,
- url: route,
- extraProviders: [
- provideModuleMap(LAZY_MODULE_MAP)
- ]
- })).then(html => writeFileSync(join(fullPath, 'index.html'), html));
-});
diff --git a/server.ts b/server.ts
index cf64032..955a2dc 100644
--- a/server.ts
+++ b/server.ts
@@ -1,82 +1,77 @@
import 'zone.js/dist/zone-node';
-import 'reflect-metadata';
-import { renderModuleFactory } from '@angular/platform-server';
-import { enableProdMode } from '@angular/core';
+import { ngExpressEngine } from '@nguniversal/express-engine';
import * as express from 'express';
+import * as compression from 'compression';
import { join } from 'path';
-import { readFileSync } from 'fs';
-// Faster server renders w/ Prod mode (dev mode never needed)
-enableProdMode();
+import { AppServerModule } from './src/main.server';
+import { APP_BASE_HREF } from '@angular/common';
+import { existsSync } from 'fs';
+import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
-// Express server
-const app = express();
+// The Express app is exported so that it can be used by serverless Functions.
+export function app() {
+ const server = express();
+ server.use(compression());
+ const distFolder = join(process.cwd(), 'dist/monitor/browser');
+ const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
-const PORT = process.env.PORT || 3000;
-const DIST_FOLDER = join(process.cwd(), 'dist');
+ // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+ server.engine('html', ngExpressEngine({
+ bootstrap: AppServerModule,
+ }));
-// Our index.html we'll use as our template
-const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString();
+ server.set('view engine', 'html');
+ server.set('views', distFolder);
-// * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
+ // Example Express Rest API endpoints
+ // server.get('/api/**', (req, res) => { });
+ // Serve static files from /browser
+ server.get('*.*', express.static(distFolder, {
+ maxAge: '1y'
+ }));
-// Express Engine
-import {ngExpressEngine, RenderOptions} from '@nguniversal/express-engine';
-// Import module map for lazy loading
-import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
-import {REQUEST, RESPONSE} from "@nguniversal/express-engine/tokens";
-
-// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
-// app.engine('html', ngExpressEngine({
-// bootstrap: AppServerModuleNgFactory,
-// providers: [
-// { provide: 'request', useFactory: () => options.req, deps: [] },
-// provideModuleMap(LAZY_MODULE_MAP)
-// ]
-// }));
-
-// be able to get request and get domain from there
-app.engine('html', (_, options: any, callback) => {
- const opts = {
- document: template,
- url: options.req.url,
- extraProviders: [
- provideModuleMap(LAZY_MODULE_MAP),
- {
- provide: REQUEST,
- useValue: options.req
- },
- {
- provide: RESPONSE,
- useValue: options.req.res,
- },
- ]
- };
-
- renderModuleFactory(AppServerModuleNgFactory, opts)
- .then(html => callback(null, html)
+ // All regular routes use the Universal engine
+ server.get('*', (req, res) => {
+ res.render(indexHtml, {
+ req, providers: [
+ {
+ provide: APP_BASE_HREF,
+ useValue: req.baseUrl
+ },
+ {
+ provide: REQUEST, useValue: (req)
+ },
+ {
+ provide: RESPONSE, useValue: (res)
+ }
+ ]
+ }
);
-});
-app.set('view engine', 'html');
-app.set('views', join(DIST_FOLDER, 'browser'));
+ });
-/* - Example Express Rest API endpoints -
- app.get('/api/**', (req, res) => { });
-*/
+ return server;
+}
-// Server static files from /browser
-app.get('*.*', express.static(join(DIST_FOLDER, 'browser'), {
- maxAge: '1y'
-}));
+function run() {
+ const port = process.env.PORT || 4000;
-// ALl regular routes use the Universal engine
-app.get('*', (req, res) => {
- res.render('index', { req });
-});
+ // Start up the Node server
+ const server = app();
+ server.listen(port, () => {
+ console.log(`Node Express server listening on http://localhost:${port}`);
+ });
+}
-// Start up the Node server
-app.listen(PORT, () => {
- console.log(`Node Express server listening on http://localhost:${PORT}`);
-});
+// Webpack will replace 'require' with '__webpack_require__'
+// '__non_webpack_require__' is a proxy to Node 'require'
+// The below code is to ensure that the server is run only when not requiring the bundle.
+declare const __non_webpack_require__: NodeRequire;
+const mainModule = __non_webpack_require__.main;
+const moduleFilename = mainModule && mainModule.filename || '';
+if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
+ run();
+}
+
+export * from './src/main.server';
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 51aaa4e..c8351c9 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -3,30 +3,30 @@ import {RouterModule, Routes} from '@angular/router';
import {OpenaireErrorPageComponent} from './error/errorPage.component';
const routes: Routes = [
- {path: '', loadChildren: './home/home.module#HomeModule'},
+ {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
{
path: 'browse',
- loadChildren: './search-stakeholders/search-stakeholders.module#SearchStakeholdersModule'
+ loadChildren: () => import('./search-stakeholders/search-stakeholders.module').then(m => m.SearchStakeholdersModule)
},
{path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'},
{
path: 'about/learn-how',
- loadChildren: './learn-how/learn-how.module#LearnHowModule'
+ loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)
},
{
path: 'contact-us',
- loadChildren: './contact/contact.module#ContactModule'
+ loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule)
},
{
path: 'reload',
- loadChildren: './reload/libReload.module#LibReloadModule'
+ loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule)
},
{
path: 'user-info',
- loadChildren: './login/libUser.module#LibUserModule'
+ loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)
},
{path: 'error', component: OpenaireErrorPageComponent},
- {path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
+ {path: 'theme', loadChildren: () => import('./openaireLibrary/utils/theme/theme.module').then(m => m.ThemeModule)},
{
path: '**',
pathMatch: 'full',
@@ -35,7 +35,9 @@ const routes: Routes = [
];
@NgModule({
- imports: [RouterModule.forRoot(routes)],
+ imports: [RouterModule.forRoot(routes, {
+ onSameUrlNavigation: "reload"
+})],
exports: [RouterModule]
})
export class AppRoutingModule {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9f30556..48aef0c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -65,9 +65,7 @@ export class AppComponent {
private router: Router, private stakeholderService: StakeholderService, private smoothScroll: SmoothScroll,
private userManagementService: UserManagementService) {
this.subscriptions.push(router.events.forEach((event) => {
- if (event instanceof NavigationStart) {
- HelperFunctions.scroll();
- } else if (event instanceof NavigationEnd) {
+ if (event instanceof NavigationEnd) {
this.url = event.url;
let r = this.route;
while (r.firstChild) {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a47aed3..2150431 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -31,7 +31,7 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
BottomModule,
CookieLawModule,
BrowserTransferStateModule,
- BrowserModule.withServerTransition({appId: 'my-app'}),
+ BrowserModule.withServerTransition({ appId: 'monitor' }),
AppRoutingModule,
Schema2jsonldModule
],
diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts
index 79602ec..cc86a55 100644
--- a/src/app/app.server.module.ts
+++ b/src/app/app.server.module.ts
@@ -1,20 +1,15 @@
-import {NgModule} from '@angular/core';
-import {ServerModule} from '@angular/platform-server';
-import {ModuleMapLoaderModule} from '@nguniversal/module-map-ngfactory-loader';
+import { NgModule } from '@angular/core';
+import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
-import {AppModule} from './app.module';
-import {AppComponent} from './app.component';
+import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
@NgModule({
imports: [
- // The AppServerModule should import your AppModule followed
- // by the ServerModule from @angular/platform-server.
AppModule,
ServerModule,
- ModuleMapLoaderModule,
+ ServerTransferStateModule
],
- // Since the bootstrapped component is not inherited from your
- // imported AppModule, it needs to be repeated here.
bootstrap: [AppComponent],
})
export class AppServerModule {}
diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts
index ba6da35..7a87db9 100644
--- a/src/app/contact/contact.component.ts
+++ b/src/app/contact/contact.component.ts
@@ -33,10 +33,8 @@ export class ContactComponent implements OnInit {
'Research Infrastructure', 'Government',
'Non-profit', 'Industry', 'Other'
];
-
public contactForm: FormGroup;
@ViewChild('AlertModal') modal;
- @ViewChild('recaptcha') recaptcha;
constructor(private route: ActivatedRoute,
private _router: Router,
@@ -70,7 +68,6 @@ export class ContactComponent implements OnInit {
this.reset();
//this.getDivContents();
// this.getPageContents();
- HelperFunctions.scroll();
this.showLoading = false;
}
diff --git a/src/app/contact/contact.module.ts b/src/app/contact/contact.module.ts
index 95fec20..732b402 100644
--- a/src/app/contact/contact.module.ts
+++ b/src/app/contact/contact.module.ts
@@ -18,7 +18,7 @@ import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module";
@NgModule({
imports: [
ContactRoutingModule, CommonModule, RouterModule,
- AlertModalModule, RecaptchaModule.forRoot(), HelperModule,
+ AlertModalModule, RecaptchaModule, HelperModule,
Schema2jsonldModule, SEOServiceModule, ContactUsModule
],
declarations: [
diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts
index 5666758..850e92d 100644
--- a/src/app/search-stakeholders/search-stakeholders.component.ts
+++ b/src/app/search-stakeholders/search-stakeholders.component.ts
@@ -61,7 +61,7 @@ export class SearchStakeholdersComponent {
public keyword = "";
public searchLink;
properties: EnvProperties = properties;
- @ViewChild(NewSearchPageComponent) searchPage: NewSearchPageComponent;
+ @ViewChild(NewSearchPageComponent, { static: true }) searchPage: NewSearchPageComponent;
private user: User;
private userFilterLoaded: boolean = false;
@@ -140,7 +140,6 @@ export class SearchStakeholdersComponent {
this.handleError('Error getting stakeholders', err);
this.searchUtils.status = this.errorMessages.getErrorCode(err.status);
this.disableForms = false;
- HelperFunctions.scroll();
}
));
}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index f0ce0d2..a5d38d7 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -37,7 +37,7 @@ const COMPONENTS = [
]
})
export class SharedModule {
- static forRoot(): ModuleWithProviders {
+ static forRoot(): ModuleWithProviders {
return {
ngModule: SharedModule,
};
diff --git a/src/karma.conf.js b/src/karma.conf.js
new file mode 100644
index 0000000..1c643c4
--- /dev/null
+++ b/src/karma.conf.js
@@ -0,0 +1,32 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+ config.set({
+ basePath: '',
+ frameworks: ['jasmine', '@angular-devkit/build-angular'],
+ plugins: [
+ require('karma-jasmine'),
+ require('karma-chrome-launcher'),
+ require('karma-jasmine-html-reporter'),
+ require('karma-coverage-istanbul-reporter'),
+ require('@angular-devkit/build-angular/plugins/karma')
+ ],
+ client: {
+ clearContext: false // leave Jasmine Spec Runner output visible in browser
+ },
+ coverageIstanbulReporter: {
+ dir: require('path').join(__dirname, '../coverage/monitor'),
+ reports: ['html', 'lcovonly', 'text-summary'],
+ fixWebpackSourcePaths: true
+ },
+ reporters: ['progress', 'kjhtml'],
+ port: 9876,
+ colors: true,
+ logLevel: config.LOG_INFO,
+ autoWatch: true,
+ browsers: ['Chrome'],
+ singleRun: false,
+ restartOnFileChange: true
+ });
+};
diff --git a/src/main.server.ts b/src/main.server.ts
index d7c01cd..0c79b87 100644
--- a/src/main.server.ts
+++ b/src/main.server.ts
@@ -1 +1,15 @@
-export { AppServerModule } from './app/app.server.module';
+/***************************************************************************************************
+ * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
+ */
+import '@angular/localize/init';
+
+import {enableProdMode} from '@angular/core';
+
+import {properties} from './environments/environment';
+
+if (properties.environment !== "development") {
+ enableProdMode();
+}
+
+export {AppServerModule} from './app/app.server.module';
+export {renderModule, renderModuleFactory} from '@angular/platform-server';
diff --git a/src/main.ts b/src/main.ts
index d8a282e..82a0683 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,5 +9,6 @@ if (properties.environment !== "development") {
}
document.addEventListener('DOMContentLoaded', () => {
- platformBrowserDynamic().bootstrapModule(AppModule);
+ platformBrowserDynamic().bootstrapModule(AppModule)
+ .catch(err => console.error(err));
});
diff --git a/src/polyfills.ts b/src/polyfills.ts
index 4e77c07..7c9e495 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -1,3 +1,7 @@
+/***************************************************************************************************
+ * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
+ */
+import '@angular/localize/init';
/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
@@ -11,61 +15,53 @@
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
*
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
*/
/***************************************************************************************************
* BROWSER POLYFILLS
*/
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-import 'core-js/es6/symbol';
-import 'core-js/es6/object';
-import 'core-js/es6/function';
-import 'core-js/es6/parse-int';
-import 'core-js/es6/parse-float';
-import 'core-js/es6/number';
-import 'core-js/es6/math';
-import 'core-js/es6/string';
-import 'core-js/es6/date';
-import 'core-js/es6/array';
-import 'core-js/es6/regexp';
-import 'core-js/es6/map';
-import 'core-js/es6/weak-map';
-import 'core-js/es6/set';
-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
-/** Evergreen browsers require these. **/
-import 'core-js/es6/reflect';
-
-
/**
- * Required to support Web Animations `@angular/animation`.
- * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
- **/
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
-
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ * with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ * (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
/***************************************************************************************************
- * Zone JS is required by Angular itself.
+ * Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
-
/***************************************************************************************************
* APPLICATION IMPORTS
*/
-
-/**
- * Date, currency, decimal and percent pipes.
- * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
- */
-// import 'intl'; // Run `npm install --save intl`.
-/**
- * Need to import at least one locale-data with intl.
- */
-// import 'intl/locale-data/jsonp/en';
diff --git a/src/index.prod.html b/src/prod/index.html
similarity index 100%
rename from src/index.prod.html
rename to src/prod/index.html
diff --git a/src/robots.prod.txt b/src/prod/robots.txt
similarity index 100%
rename from src/robots.prod.txt
rename to src/prod/robots.txt
diff --git a/src/styles.css b/src/styles.css
index c73d3af..31fdeab 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,5 +1,4 @@
/* You can add global styles to this file, and also import other style files */
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
@import "assets/common-assets/common/theme.css";
@import "assets/common-assets/common/custom.css";
@import "assets/common-assets/library.css";
diff --git a/src/test.ts b/src/test.ts
new file mode 100644
index 0000000..1631789
--- /dev/null
+++ b/src/test.ts
@@ -0,0 +1,20 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 16b7847..f3a1b80 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -2,14 +2,13 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
- "baseUrl": "./",
- "module": "es2015",
- "types": [
- "node"
- ]
+ "types": []
},
- "exclude": [
- "test.ts",
- "**/*.spec.ts"
+ "files": [
+ "main.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "src/**/*.d.ts"
]
}
diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json
index 7e55994..39f85aa 100644
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@@ -1,21 +1,17 @@
{
- "extends": "../tsconfig.json",
+ "extends": "./tsconfig.app.json",
"compilerOptions": {
- "outDir": "../out-tsc/app",
- "baseUrl": "./",
- // Set the module format to "commonjs":
- "module": "commonjs",
+ "outDir": "../out-tsc/app-server",
+ "target": "es2016",
"types": [
"node"
]
},
- "exclude": [
- "test.ts",
- "**/*.spec.ts"
+ "files": [
+ "main.server.ts",
+ "../server.ts"
],
- // Add "angularCompilerOptions" with the AppServerModule you wrote
- // set as the "entryModule".
"angularCompilerOptions": {
- "entryModule": "app/app.server.module#AppServerModule"
+ "entryModule": "./app/app.server.module#AppServerModule"
}
}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
new file mode 100644
index 0000000..de77336
--- /dev/null
+++ b/src/tsconfig.spec.json
@@ -0,0 +1,18 @@
+{
+ "extends": "../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../out-tsc/spec",
+ "types": [
+ "jasmine",
+ "node"
+ ]
+ },
+ "files": [
+ "test.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "**/*.spec.ts",
+ "**/*.d.ts"
+ ]
+}
diff --git a/static.paths.ts b/static.paths.ts
deleted file mode 100644
index be309ca..0000000
--- a/static.paths.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const ROUTES = [
- '/',
- '/lazy',
- '/home',
- '/search/publication','/search/other','/search/project','/search/dataset','/search/dataprovider','/search/organization',
- '/search/find',
- '/search/person','/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization',
- '/search/find/people','/search/find/publications','/search/find/other','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations',
- '/search/advanced/people','/search/advanced/publications','/search/advanced/other','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations',
- '/participate/deposit-publications','/participate/deposit-datasets','/participate/deposit-publications-result','/participate/deposit-datasets-result','/participate/deposit-subject-result',
- '/search/content-providers','/search/content-providers-table','/search/entity-registries','/search/entity-registries-table','/search/journals','/search/journals-table',
- '/project-report','/claims','/myclaims','/participate/claim','/participate/direct-claim','/claims-project-manager',
- '/test','/user-info',
- '/error', '/*path'
-];
diff --git a/tsconfig.json b/tsconfig.json
index 8cd9a30..8c693a2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,22 +1,23 @@
{
"compileOnSave": false,
"compilerOptions": {
- "importHelpers": true,
+ "baseUrl": "./",
+ "downlevelIteration": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
+ "module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "target": "es5",
+ "importHelpers": true,
+ "target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
- "es2017",
+ "es2018",
"dom"
- ],
- "module": "es2015",
- "baseUrl": "./"
+ ]
}
-}
\ No newline at end of file
+}
diff --git a/webpack.server.config.js b/webpack.server.config.js
deleted file mode 100644
index 4d2b44f..0000000
--- a/webpack.server.config.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Work around for https://github.com/angular/angular-cli/issues/7200
-
-const path = require('path');
-const webpack = require('webpack');
-
-module.exports = {
- //mode: 'none',
- entry: {
- // This is our Express server for Dynamic universal
- server: './server.ts',
- // This is an example of Static prerendering (generative)
- prerender: './prerender.ts'
- },
- target: 'node',
- resolve: { extensions: ['.ts', '.js'] },
- // Make sure we include all node_modules etc
- externals: [/(node_modules|main\..*\.js)/,],
- optimization: {
- minimize: false
- },
- output: {
- // Puts the output at the root of the dist folder
- path: path.join(__dirname, 'dist'),
- filename: '[name].js'
- },
- module: {
- rules: [
- { test: /\.ts$/, loader: 'ts-loader' }
- ,{
- // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
- // Removing this will cause deprecation warnings to appear.
- test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
- parser: { system: true },
- },
- ]
- },
- plugins: [
- new webpack.ContextReplacementPlugin(
- // fixes WARNING Critical dependency: the request of a dependency is an expression
- /(.+)?angular(\\|\/)core(.+)?/,
- path.join(__dirname, 'src'), // location of your src
- {} // a map of your routes
- ),
- new webpack.ContextReplacementPlugin(
- // fixes WARNING Critical dependency: the request of a dependency is an expression
- /(.+)?express(\\|\/)(.+)?/,
- path.join(__dirname, 'src'),
- {}
- )
- ]
-}