Merge remote-tracking branch 'origin/develop'

Reviewed-on: #3

angular.json

@@ -34,6 +34,12 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "fileReplacements": [
+              {
+                "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                "with": "src/app/shared/searchFields.aggregator.ts"
+              }
+            ],
             "outputPath": "dist/aggregator/browser",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -61,6 +67,12 @@
           },
           "configurations": {
             "development": {
+              "fileReplacements": [
+                {
+                  "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                  "with": "src/app/shared/searchFields.aggregator.ts"
+                }
+              ],
               "optimization": {
                 "scripts": true,
                 "styles": {
@@ -104,6 +116,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.beta.ts"
+                },
+                {
+                  "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                  "with": "src/app/shared/searchFields.aggregator.ts"
                 }
               ],
               "optimization": {
@@ -149,6 +165,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
+                },
+                {
+                  "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                  "with": "src/app/shared/searchFields.aggregator.ts"
                 }
               ],
               "optimization": {
@@ -237,6 +257,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.beta.ts"
+                },
+                {
+                  "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                  "with": "src/app/shared/searchFields.aggregator.ts"
                 }
               ],
               "sourceMap": false,
@@ -249,6 +273,10 @@
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
+                },
+                {
+                  "replace": "src/app/openaireLibrary/utils/properties/searchFields.ts",
+                  "with": "src/app/shared/searchFields.aggregator.ts"
                 }
               ],
               "sourceMap": false,

package.json

@@ -43,7 +43,7 @@
     "rxjs": "^6.5.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
-    "uikit": "3.16.14",
+    "uikit": "3.16.24",
     "zone.js": "~0.13.1"
   },
   "devDependencies": {

src/app/app-routing.module.ts

@@ -73,10 +73,6 @@ const routes: Routes = [
     path: 'search/advanced/projects',
     loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule)
   },
-  {
-    path: 'project-report',
-    loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
-  },
   {
     path: 'reload',
     loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule),

src/app/app.component.ts

@@ -102,7 +102,9 @@ export class AppComponent {
       this.userMenuItems = [];
       if (this.user) {
         this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], [], {}));
-        this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {}));
+        if(this.properties.environment != "beta") {
+          this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {}));
+        }
         // this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
       }
     }));

src/app/claims/myClaims/myClaims.component.ts

@@ -1,27 +1,15 @@
 import {Component} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {Subscriber} from "rxjs";
 import {properties} from "../../../environments/environment";
 
 
 @Component({
     selector: 'openaire-my-claims',
-    template: `<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL"></my-claims>`
+    template: `<my-claims *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL"></my-claims>`
 })
  export class OpenaireMyClaimsComponent {
   claimsInfoURL:string;
-  userInfoURL: string;
-  sub;
 
-  constructor (private route: ActivatedRoute) {
-  }
-  ngOnDestroy() {
-    if (this.sub instanceof Subscriber) {
-      this.sub.unsubscribe();
-    }
-  }
    public ngOnInit() {
      this.claimsInfoURL = properties.claimsInformationLink;
-     this.userInfoURL = properties.userInfoUrl;
    }
 }

src/app/develop/develop.component.ts

@@ -25,12 +25,12 @@ import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields
 							</div>
 							<h3>For {{openaireEntities.RESULTS | lowercase}}</h3>
 							<div class="uk-margin-bottom">
-								For {{openaireEntities.RESULTS | lowercase}} ({{openaireEntities.PUBLICATIONS | lowercase}}, {{openaireEntities.DATASETS | lowercase}}, {{openaireEntities.SOFTWARE | lowercase}} and {{openaireEntities.OTHER | lowercase}}) you can use the Selective Access APIs by adding the community parameter.
+								For {{openaireEntities.RESULTS | lowercase}} ({{openaireEntities.PUBLICATIONS | lowercase}}, {{openaireEntities.DATASETS | lowercase}}, {{openaireEntities.SOFTWARE | lowercase}} and {{openaireEntities.OTHER | lowercase}}) you can use the Graph API by adding the community parameter.
 							</div>
 							<a class="uk-display-inline-block uk-button uk-button-text"
-									href="https://graph.openaire.eu/develop/api.html" target="_blank">
+									href="https://graph.openaire.eu/docs/apis/search-api/research-products" target="_blank">
 								<span class="uk-flex uk-flex-middle">
-									<span>Selective Access APIs</span>
+									<span>Graph API</span>
 								</span>
 							</a>
 						</div>

src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts

@@ -1,15 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-
-@NgModule({
- imports: [
-  RouterModule.forChild([
-    { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]}
-  ])
-]
-})
-export class HtmlProjectReportRoutingModule { }

src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts

@@ -1,9 +0,0 @@
-import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
-
-@Component({
-    selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport></htmlProjectReport>`,
- })
-export class OpenaireHtmlProjectReportComponent{
-}

src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts

@@ -1,14 +0,0 @@
-import {NgModule} from '@angular/core';
-import {HtmlProjectReportModule} from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
-import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component';
-import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
-
-@NgModule({
-  imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
-  declarations:[OpenaireHtmlProjectReportComponent],
-  providers:[FreeGuard, PreviousRouteRecorder],
-  exports:[OpenaireHtmlProjectReportComponent]
-})
-export class LibHtmlProjectReportModule { }

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 5184ffad194e23864411f989f9403cd984afb4a3
+Subproject commit fe09fbfdcb6087e1f7e8373b654a29214adab65d

src/app/shared/searchFields.aggregator.ts

@@ -0,0 +1,67 @@
+import {SearchFieldsBase} from "src/app/openaireLibrary/utils/properties/searchFields.base";
+import {properties} from "src/environments/environment";
+
+export class SearchFields extends SearchFieldsBase {
+  ORGANIZATION_REFINE_FIELDS: string[] = [];
+  ORGANIZATION_ADVANCED_FIELDS: string[] = ["q", "organizationlegalname", "organizationlegalshortname", "pid"];
+
+  public static getParameterOrder(fieldId: string, params): number {
+    let fields = [];
+    let searchFields = new SearchFields();
+    if (searchFields.RESULT_REFINE_FIELDS.indexOf(fieldId) != -1) {
+      fields = searchFields.RESULT_REFINE_FIELDS;
+    } else if (searchFields.PROJECT_REFINE_FIELDS.indexOf(fieldId) != -1) {
+      fields = searchFields.PROJECT_REFINE_FIELDS
+    } else if (searchFields.ORGANIZATION_REFINE_FIELDS.indexOf(fieldId) != -1) {
+      fields = searchFields.ORGANIZATION_REFINE_FIELDS;
+    } else if (searchFields.DATASOURCE_REFINE_FIELDS.indexOf(fieldId) != -1) {
+      fields = searchFields.DATASOURCE_REFINE_FIELDS;
+    }
+    let index = fields.indexOf(fieldId);
+    let paramIndex = 0;
+    if (index != -1) {
+      for (let keyValue of params) {
+        if (fields.indexOf(keyValue[0]) > index) {
+          break;
+        }
+        paramIndex++
+      }
+    }
+    return paramIndex;
+  }
+}
+
+export enum OpenaireEntities {
+  RESULTS = "Research products",
+  PUBLICATIONS = "Publications",
+  DATASETS = "Research data",
+  SOFTWARE = "Research software",
+  OTHER = "Other research products",
+  PROJECTS = "Projects",
+  ORGANIZATIONS = "Organizations",
+  DATASOURCES = "Data sources",
+  SERVICES = "Services",
+  COMMUNITIES = "Research communities",
+
+  RESULT = "Research product",
+  PUBLICATION = "Publication",
+  DATASET = "Research data",
+  SOFTWARE_SINGULAR = "Research software",
+  OTHER_SINGULAR = "Other research product",
+  PROJECT = "Project",
+  ORGANIZATION = "Organization",
+  DATASOURCE = "Data source",
+  SERVICE = "Service",
+  COMMUNITY = "Research community",
+
+  RESULTS_FILE = "research-products",
+  PUBLICATIONS_FILE = "publications",
+  DATASETS_FILE = "research-data",
+  SOFTWARE_FILE = "research-software",
+  OTHER_FILE = "other-research-products",
+  PROJECTS_FILE = "projects",
+  ORGANIZATIONS_FILE = "organizations",
+  DATASOURCES_FILE = "data-sources",
+  SERVICES_FILE = "services",
+}
+

src/app/utils/aggregators.ts

@@ -97,7 +97,7 @@ export class PortalAggregators {
     let filter:SearchCustomFilter = null;
     if(agg && agg.fieldName) {
       filter = new SearchCustomFilter(agg.fieldName, agg.queryFieldName, agg.valueId, agg.valueName);
-      filter.promptToAddFilter = false;
+      // filter.promptToAddFilter = false;
       filter.isHiddenFilter = true;
     }
     return filter;

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860
+Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6
+Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298

src/environments/environment.beta.ts

@@ -9,7 +9,6 @@ let props: EnvProperties = {
   useCache: false,
   useLongCache: true,
   showAddThis: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
@@ -40,11 +39,6 @@ let props: EnvProperties = {
   sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
   sherpaURLSuffix: "/",
   zenodo: "https://zenodo.org/",
-  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",
   helpdeskEmail: "helpdesk@openaire.eu",
   utilsService: "https://demo.openaire.eu/utils-service",
@@ -53,10 +47,6 @@ let props: EnvProperties = {
 
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "553",
-  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",
-
   cookieDomain: ".openaire.eu",
 
   feedbackmail: "feedback@openaire.eu",
@@ -131,4 +121,4 @@ let props: EnvProperties = {
 
 export let properties: EnvProperties = {
   ...props,  ...common, ...commonBeta
-}
+}

src/environments/environment.prod.ts

@@ -9,12 +9,11 @@ let props: EnvProperties = {
   useCache: false,
   useLongCache: true,
   showAddThis: true,
-  framesAPIURL: "https://www.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
   useNewStatistisTool: true,
-  claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/",
+  claimsAPIURL: "https://services.openaire.eu/claims-new/rest/claimsService/",
   bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
   searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
   searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
@@ -40,11 +39,6 @@ let props: EnvProperties = {
   sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
   sherpaURLSuffix: "/",
   zenodo: "https://zenodo.org/",
-  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",
   helpdeskEmail: "helpdesk@openaire.eu",
   utilsService: "https://explore.openaire.eu/utils-service",
@@ -53,10 +47,6 @@ let props: EnvProperties = {
 
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "553",
-
-  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",
   cookieDomain: ".openaire.eu",
 
   feedbackmail: "feedback@openaire.eu",
@@ -133,4 +123,4 @@ let props: EnvProperties = {
 
 export let properties: EnvProperties = {
   ...props,  ...common, ...commonProd
-}
+}

src/environments/environment.ts

@@ -15,7 +15,6 @@ let props: EnvProperties = {
   useLongCache: false,
   showAddThis: true,
   enableEoscDataTransfer: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
@@ -46,11 +45,6 @@ let props: EnvProperties = {
   sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
   sherpaURLSuffix: "/",
   zenodo: "https://zenodo.org/",
-  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",
   helpdeskEmail: "helpdesk@openaire.eu",
   utilsService: "http://dl170.madgik.di.uoa.gr:8000",
@@ -59,9 +53,6 @@ let props: EnvProperties = {
   
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "6",
-  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",
   
@@ -135,4 +126,4 @@ let props: EnvProperties = {
 
 export let properties: EnvProperties = {
   ...props,  ...common, ...commonDev
-}
+}

src/prod/index.html

@@ -9,7 +9,7 @@
       <meta name="description"
             content="openAIRE aggregator portal, open access, publications, research results, European commission, search"/>
 
-      <meta property="og:description" content="openAIRE explore, open access, publications, research results, European commission, search"/>
+      <meta property="og:description" content="openAIRE aggregator portal, open access, publications, research results, European commission, search"/>
       <meta property="og:title" content="OpenAIRE"/>
       <meta property="og:type" content="website"/>
       <meta property="og:url" content="https://canada.explore.openaire.eu"/>