[develop | DONE | ADDED] Added file searchFields.aggregator.ts to replace searchFields.ts (does not include "countrynojurisdiction" filter for organizations | angular.json: Added fileReplacements.

[develop | DONE | FIXED] aggregators.ts: filter.promptToAddFilter field no longer exists.
[develop | DONE | CHANGED] app.component.ts: Added check to add "My ORCID links" in the user menu only if environment is not beta.
2024-04-04 17:16:28 +03:00 · 2024-04-04 17:14:56 +03:00 · 2024-02-29 17:57:39 +02:00 · 2024-02-13 12:38:19 +02:00 · 2023-10-31 17:43:36 +02:00 · 2023-10-31 16:34:10 +02:00
54 changed files with 455 additions and 532 deletions
--- a/angular.json
+++ b/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": {
@ -220,13 +240,16 @@
            "main": "server.ts",
            "tsConfig": "src/tsconfig.server.json",
            "sourceMap": true,
-            "optimization": false
+            "optimization": false,
+            "buildOptimizer": false
          },
          "configurations": {
            "development": {
              "outputHashing": "media",
              "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "vendorChunk": true,
+              "buildOptimizer": true
            },
            "beta": {
              "outputHashing": "media",
@ -234,10 +257,15 @@
                {
                  "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,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
            },
            "production": {
              "outputHashing": "media",
@ -245,10 +273,15 @@
                {
                  "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,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
            }
          },
          "defaultConfiguration": ""
@ -301,7 +334,6 @@
      }
    }
  },
-  "defaultProject": "aggregator",
  "cli": {
    "analytics": false
  }
--- a/package.json
+++ b/package.json
@ -21,40 +21,40 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^14.2.3",
-    "@angular/cdk": "^14.2.2",
-    "@angular/common": "^14.2.3",
-    "@angular/compiler": "^14.2.3",
-    "@angular/core": "^14.2.3",
-    "@angular/forms": "^14.2.3",
-    "@angular/localize": "^14.2.3",
-    "@angular/material": "^14.2.2",
-    "@angular/platform-browser": "^14.2.3",
-    "@angular/platform-browser-dynamic": "^14.2.3",
-    "@angular/platform-server": "^14.2.3",
-    "@angular/router": "^14.2.3",
-    "@nguniversal/express-engine": "^14.2.0",
+    "@angular/animations": "^16.1.8",
+    "@angular/cdk": "^16.1.7",
+    "@angular/common": "^16.1.8",
+    "@angular/compiler": "^16.1.8",
+    "@angular/core": "^16.1.8",
+    "@angular/forms": "^16.1.8",
+    "@angular/localize": "^16.1.8",
+    "@angular/material": "^16.1.7",
+    "@angular/platform-browser": "^16.1.8",
+    "@angular/platform-browser-dynamic": "^16.1.8",
+    "@angular/platform-server": "^16.1.8",
+    "@angular/router": "^16.1.8",
+    "@nguniversal/express-engine": "^16.1.1",
    "clipboard": "^1.5.16",
    "core-js": "^2.5.4",
    "express": "^4.15.2",
    "jquery": "^3.4.1",
-    "ng-recaptcha": "^10.0.0",
+    "ng-recaptcha": "^12.0.2",
    "prom-client": "^11.3.0",
    "rxjs": "^6.5.1",
    "ts-md5": "^1.2.0",
    "tslib": "^2.0.0",
-    "uikit": "3.12.0",
-    "zone.js": "~0.11.4"
+    "uikit": "3.16.24",
+    "zone.js": "~0.13.1"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.3",
-    "@angular/cli": "^14.2.3",
-    "@angular/compiler-cli": "^14.2.3",
-    "@angular/language-service": "^14.2.3",
-    "@nguniversal/builders": "^14.2.0",
+    "@angular-devkit/build-angular": "^16.1.7",
+    "@angular/cli": "^16.1.7",
+    "@angular/compiler-cli": "^16.1.8",
+    "@angular/language-service": "^16.1.8",
+    "@nguniversal/builders": "^16.1.1",
    "@types/express": "^4.17.0",
    "@types/compression": "^1.7.0",
-    "@types/node": "^12.11.1",
+    "@types/node": "^16.18.50",
    "@types/jasmine": "~3.6.0",
    "@types/jasminewd2": "~2.0.3",
    "codelyzer": "^6.0.0",
@ -67,6 +67,6 @@
    "karma-jasmine-html-reporter": "^1.6.0",
    "protractor": "~7.0.0",
    "ts-node": "~7.0.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.9.5"
  }
 }
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -2,68 +2,56 @@ import {NgModule} from '@angular/core';
 import {Router, RouterModule, Routes} from '@angular/router';
 import {OpenaireErrorPageComponent} from './error/errorPage.component';
 import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
+import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";

 const routes: Routes = [
  {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
  {
    path: 'search/result',
-    loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/publication',
-    loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/dataset',
-    loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/software',
-    loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/other',
-    loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/project',
-    loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/dataprovider',
-    loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/service',
-    loadChildren: () => import('./landingPages/service/libService.module').then(m => m.LibServiceModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/service/libService.module').then(m => m.LibServiceModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
  {
    path: 'search/organization',
-    loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), data: { showHeader: true}
+    loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule), data: { showHeader: true, hasMenuSearchBar: true}
  },
+  // Search Pages
  {
-    path: 'search/find',
-    loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
+    path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
  },
+  {path: 'search/find/publications', component: PageURLResolverComponent},
+  {path: 'search/find/datasets', component: PageURLResolverComponent},
+  {path: 'search/find/software', component: PageURLResolverComponent},
+  {path: 'search/find/other', component: PageURLResolverComponent},
  {
-    path: 'search/find/research-outcomes',
-    loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
-  },
-  {
-    path: 'search/find/projects',
-    loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)
-  },
-  {
-    path: 'search/find/dataproviders',
-    loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
-  },
-  {
-    path: 'search/find/services',
-    loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule)
-  },
-  {
-    path: 'search/find/organizations',
-    loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
+    path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
  },
  {
    path: 'search/advanced/research-outcomes',
@ -85,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),
@ -124,7 +108,7 @@ export class AppRoutingModule {
    }
  }
  constructor( private config: ConfigurationService, private router: Router){
-    this.subs.push(this.config.communityInformationState.subscribe(data => {
+    this.subs.push(this.config.portalAsObservable.subscribe(data => {
        if (data) {
          if (data['pages']) {
            for (var i = 0; i < data['pages'].length; i++) {
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -39,7 +39,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
                   ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
              </span></a>
      </cookie-law>
-      <bottom *ngIf="isClient && properties" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]" [darkBackground]="false" ></bottom>
+      <bottom *ngIf="isClient && properties" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]"></bottom>
    </div>
  `
 })
@ -64,7 +64,7 @@ export class AppComponent {
    this.id = ConnectHelper.getCommunityFromDomain(this.properties.domain);
    this.agg = PortalAggregators.getFilterInfoByMenuId(this.id);
    this.setStyles();
-    this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfoByMenuId(this.id));
+    this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfoByMenuId(this.id));
    this.showHeader = this.agg.showHeaderAlways;
  }

@ -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, [], [], {}));
      }
    }));
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,6 +1,6 @@
-import {NgModule} from '@angular/core';
+import {APP_ID, NgModule} from '@angular/core';
 import {SharedModule} from './shared/shared.module';
-import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
+import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
 import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
@ -27,14 +27,14 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
    NavigationBarModule, FeedbackModule, BottomModule,
    CookieLawModule,
    BrowserAnimationsModule,
-    BrowserTransferStateModule,
-    BrowserModule.withServerTransition({appId: 'aggregator'}),
+    BrowserModule,
    AppRoutingModule
  ],
  declarations: [AppComponent, OpenaireErrorPageComponent],
  exports: [AppComponent],
  providers: [
    ConfigurationService,
+    {provide: APP_ID, useValue: 'aggregator'},
    {
      provide: HTTP_INTERCEPTORS,
      useClass: HttpInterceptorService,
--- a/src/app/app.server.module.ts
+++ b/src/app/app.server.module.ts
@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
+import {ServerModule} from '@angular/platform-server';

 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@ -8,7 +8,6 @@ import { AppComponent } from './app.component';
  imports: [
    AppModule,
    ServerModule,
-    ServerTransferStateModule
  ],
  bootstrap: [AppComponent],
 })
--- a/src/app/claims/directLinking/directLinking.component.ts
+++ b/src/app/claims/directLinking/directLinking.component.ts
@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment";
@Component({
  selector: 'openaire-directLinking',
  template: `
-    <directLinking [piwikSiteId]="piwikSiteId"></directLinking>`
+    <directLinking></directLinking>`
 })
 export class OpenaireDirectLinkingComponent {
-  piwikSiteId = properties.piwikSiteId;
-
 }
--- a/src/app/claims/linking/linkingGeneric.component.ts
+++ b/src/app/claims/linking/linkingGeneric.component.ts
@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-linking-generic',
-    template: `<linking-generic pageTitle="Linking" [piwikSiteId]="piwikSiteId"></linking-generic>`
+    template: `<linking-generic pageTitle="Linking"></linking-generic>`

 })
 export class OpenaireLinkingComponent {
-    piwikSiteId = properties.piwikSiteId;
-
-
 }
--- a/src/app/claims/myClaims/myClaims.component.ts
+++ b/src/app/claims/myClaims/myClaims.component.ts
@ -1,34 +1,15 @@
 import {Component} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
-import {Subscriber} from "rxjs";
 import {properties} from "../../../environments/environment";


-
@Component({
    selector: 'openaire-my-claims',
-    template: `
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
-</my-claims>
-`
-
+    template: `<my-claims *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL"></my-claims>`
 })
 export class OpenaireMyClaimsComponent {
  claimsInfoURL:string;
-  userInfoURL: string;
-  sub;
-  piwikSiteId = properties.piwikSiteId;

-  constructor (private route: ActivatedRoute) {
-  }
-  ngOnDestroy() {
-    if (this.sub instanceof Subscriber) {
-      this.sub.unsubscribe();
-    }
-  }
   public ngOnInit() {
     this.claimsInfoURL = properties.claimsInformationLink;
-     this.userInfoURL = properties.userInfoUrl;
   }
 }
--- a/src/app/deposit/deposit.component.ts
+++ b/src/app/deposit/deposit.component.ts
@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";

@Component({
  selector: 'openaire-deposit',
  template: `    
-    <deposit-first-page [piwikSiteId]="piwikSiteId"></deposit-first-page>
+    <deposit-first-page></deposit-first-page>
    `
 })

 export class OpenaireDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-    constructor() {
-  }
-
-  public ngOnInit() {}
 }

--- a/src/app/deposit/deposit.module.ts
+++ b/src/app/deposit/deposit.module.ts
@ -12,7 +12,6 @@ import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPag

 import {ZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service";
 import {CommunityService} from "../openaireLibrary/connect/community/community.service";
-import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service";

@NgModule({
  imports: [
@ -26,6 +25,6 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC
    OpenaireDepositComponent,
  ],
  providers:    [PreviousRouteRecorder, IsRouteEnabled,
-    ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService]
+    ZenodoCommunitiesService, CommunityService]
 })
 export class LibDepositModule { }
--- a/src/app/deposit/searchDataprovidersToDeposit.component.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit.component.ts
@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";

@Component({
  selector: 'openaire-search-deposit',
  template: `
-    <deposit-search-dataproviders [piwikSiteId]="piwikSiteId"></deposit-search-dataproviders>
+    <deposit-search-dataproviders></deposit-search-dataproviders>
    `
 })

 export class OpenaireSearchDataprovidersToDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor() {}
-
-  public ngOnInit() {}
 }

--- a/src/app/deposit/searchDataprovidersToDeposit.module.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit.module.ts
@ -9,7 +9,6 @@ import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/sea
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
 import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
-import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';

 import {CommunityService} from '../openaireLibrary/connect/community/community.service';

@ -18,7 +17,7 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
    CommonModule, FormsModule,
    SearchDataprovidersToDepositModule,
    SearchDataprovidersToDepositRoutingModule,
-    ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule
+    ZenodoCommunitiesServiceModule
  ],
  declarations: [
    OpenaireSearchDataprovidersToDepositComponent
--- a/src/app/fos/fos.component.ts
+++ b/src/app/fos/fos.component.ts
@ -1,16 +1,10 @@
 import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";

@Component({
 	selector: 'aggregator-fos',
 	template: `
-		<fos [piwikSiteId]="piwikSiteId"></fos>
+		<fos></fos>
 	`
 })
 export class AggregatorFosComponent {
-	piwikSiteId = properties.piwikSiteId;
-
-	constructor() {
-
-	}
-}
+}
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@ -7,18 +7,25 @@
            Discover open linked research<span class="uk-text-primary">.</span>
          </h1>
 					<numbers #numbersComponent [defaultInit]="false"></numbers>
-          <div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-4@xl">
-						<advanced-search-input #advanced (searchEmitter)="goTo(true)">
-							<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
-																	(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
-																	[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>
-							<div class="uk-width-expand" input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
-						</advanced-search-input>
-						<div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
-							<div class="uk-padding-small">
-								<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
-							</div>
-						</div>
+          <div class="uk-margin-medium-top" style="max-width: 600px;" uk-scrollspy-class>
+            <div class="uk-flex uk-flex-right uk-text-small">
+              <a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
+                Advanced search
+              </a>
+            </div>
+            <div search-input [(value)]="keyword" [placeholder]="'Search'+(portalName ? (' in '+portalName) : '')" (searchEmitter)="goTo(true)"
+                 [searchInputClass]="'inner background'"></div>
+<!--						<advanced-search-input #advanced (searchEmitter)="goTo(true)">-->
+<!--							<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"-->
+<!--																	(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"-->
+<!--																	[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>-->
+<!--							<div class="uk-width-expand" input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>-->
+<!--						</advanced-search-input>-->
+<!--						<div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">-->
+<!--							<div class="uk-padding-small">-->
+<!--								<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>-->
+<!--							</div>-->
+<!--						</div>-->
          </div>
 					<div class="uk-padding-small uk-margin-small-top">
 						<div class="uk-text-meta">
@ -61,7 +68,7 @@
 					</div>
 				</div>
 				<div class="uk-position-relative">
-					<img class="uk-visible@m uk-height-1-1 uk-position-center-right" src="assets/common-assets/common/graph-nodes.svg" alt="OpenAIRE Research Graph" loading="lazy">
+					<img class="uk-visible@m uk-height-1-1 uk-position-center-right" src="assets/common-assets/common/graph-nodes.svg" alt="OpenAIRE Graph" loading="lazy">
 				</div>
 			</div>
 		</div>
@ -78,7 +85,7 @@
 								<div class="uk-margin-top uk-margin-bottom title">{{funder.name}}</div>
 								<div class="outcomes">
 									<h5 class="uk-margin-remove">{{funder.publications | number}}</h5>
-									<span>Research Outcomes Found</span>
+									<span class="uk-text-capitalize">{{entities.RESULTS}} Found</span>
 								</div>
 								<div class="uk-margin-top percentage">
 									<h5 class="uk-margin-remove">{{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%</h5>
@ -120,4 +127,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@ -23,18 +23,19 @@ import {Numbers, NumbersComponent} from "../openaireLibrary/sharedComponents/num
@Component({
  selector: 'home',
  templateUrl: 'home.component.html',
-	styleUrls: ['home.component.less']
+  styleUrls: ['home.component.less']
 })
 export class HomeComponent {
-  public keyword:string = "";
-  public searchFields:SearchFields = new SearchFields();
-  public errorCodes:ErrorCodes = new ErrorCodes();
-  public routerHelper:RouterHelper = new RouterHelper();
-	public numbers: Numbers = {};
+  public portalName: string = "";
+  public keyword: string = "";
+  public searchFields: SearchFields = new SearchFields();
+  public errorCodes: ErrorCodes = new ErrorCodes();
+  public routerHelper: RouterHelper = new RouterHelper();
+  public numbers: Numbers = {};
  properties: EnvProperties = properties;
-	public openaireEntities = OpenaireEntities;
+  public openaireEntities = OpenaireEntities;
  public readMore: boolean = false;
-	public funders = [];
+  public funders = [];
  subs: Subscription[] = [];
  resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
    filter: null,
@ -46,30 +47,40 @@ export class HomeComponent {
  disableSelect;
  selectedEntitySimpleUrl;
  selectedEntityAdvancedUrl;
-  resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
+  resultTypes: Filter = {
+    values: [],
+    filterId: "type",
+    countSelectedValues: 0,
+    filterType: 'checkbox',
+    originalFilterId: "",
+    valueIsExact: true,
+    title: "Result Types",
+    filterOperator: "or"
+  };
  public pageContents = null;
-  customFilter:SearchCustomFilter= null;
+  customFilter: SearchCustomFilter = null;
  aggregatorId;
-  aggregator:AggregatorInfo;
-  @ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent;
-  
-  constructor (
-    private _router: Router,
-    private _refineFieldResultsService:RefineFieldResultsService,
-    private _piwikService:PiwikService,
-    private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
-    private helper: HelperService,
-    private cdr: ChangeDetectorRef
+  aggregator: AggregatorInfo;
+  entities = OpenaireEntities;
+  @ViewChild('numbersComponent', {static: true}) numbersComponent: NumbersComponent;
+
+  constructor(
+      private _router: Router,
+      private _refineFieldResultsService: RefineFieldResultsService,
+      private _piwikService: PiwikService,
+      private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
+      private helper: HelperService,
+      private cdr: ChangeDetectorRef
  ) {
    this.aggregatorId = ConnectHelper.getCommunityFromDomain(properties.domain);
-    this.aggregator =  PortalAggregators.getFilterInfoByMenuId(this.aggregatorId);
+    this.aggregator = PortalAggregators.getFilterInfoByMenuId(this.aggregatorId);
    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(this.aggregator);
    let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
-    let title = "OpenAIRE - Explore | " +this.aggregator.title;
+    let title = "OpenAIRE - Explore | " + this.aggregator.title;
    this._title.setTitle(title);
-    this._meta.updateTag({content:description},"name='description'");
-    this._meta.updateTag({content:description},"property='og:description'");
-    this._meta.updateTag({content:title},"property='og:title'");
+    this._meta.updateTag({content: description}, "name='description'");
+    this._meta.updateTag({content: description}, "property='og:description'");
+    this._meta.updateTag({content: title}, "property='og:title'");
  }

  private getPageContents() {
@ -83,64 +94,88 @@ export class HomeComponent {
  }

  public ngOnInit() {
-    this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
+    this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url, false);
    this.getPageContents();
-    if(this.properties!=null){
-      var url = this.properties.domain + this.properties.baseLink+this._router.url;
-      this._meta.updateTag({content:url},"property='og:url'");
-      if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+    if (this.properties != null) {
+      var url = this.properties.domain + this.properties.baseLink + this._router.url;
+      this._meta.updateTag({content: url}, "property='og:url'");
+      if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
        this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
      }
-			if(this.numbersComponent) {
-				this.numbersComponent.showPublications = portalProperties.entities.publication.isEnabled;
-				this.numbersComponent.showDatasets = portalProperties.entities.dataset.isEnabled;
-				this.numbersComponent.showSoftware = portalProperties.entities.software.isEnabled;
-				this.numbersComponent.showOrp = portalProperties.entities.other.isEnabled;
-				this.numbersComponent.showOrganizations = portalProperties.entities.organization.isEnabled;
-				this.numbersComponent.showProjects = portalProperties.entities.project.isEnabled;
-				this.numbersComponent.showDataProviders = portalProperties.entities.datasource.isEnabled;
-			}
-      this.subs.push(this.config.communityInformationState.subscribe(data => {
-          if(data) {
-            var showEntity = {};
-            for (var i = 0; i < data['entities'].length; i++) {
-              showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
+      if (this.numbersComponent) {
+        this.numbersComponent.showPublications = portalProperties.entities.publication.isEnabled;
+        this.numbersComponent.showDatasets = portalProperties.entities.dataset.isEnabled;
+        this.numbersComponent.showSoftware = portalProperties.entities.software.isEnabled;
+        this.numbersComponent.showOrp = portalProperties.entities.other.isEnabled;
+        this.numbersComponent.showOrganizations = portalProperties.entities.organization.isEnabled;
+        this.numbersComponent.showProjects = portalProperties.entities.project.isEnabled;
+        this.numbersComponent.showDataProviders = portalProperties.entities.datasource.isEnabled;
+      }
+      this.subs.push(this.config.portalAsObservable.subscribe(data => {
+            if (data) {
+              if(data.name) {
+                this.portalName = data.name;
+              }
+              var showEntity = {};
+              for (var i = 0; i < data['entities'].length; i++) {
+                showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
+              }
+              if (this.numbersComponent) {
+                this.numbersComponent.showPublications = !!showEntity["publication"];
+                this.numbersComponent.showDatasets = !!showEntity["dataset"];
+                this.numbersComponent.showSoftware = !!showEntity["software"];
+                this.numbersComponent.showOrp = !!showEntity["orp"];
+                this.numbersComponent.showProjects = !!showEntity["project"];
+                this.numbersComponent.showDataProviders = !!showEntity["datasource"];
+                this.numbersComponent.showOrganizations = !!showEntity["organization"];
+              }
+              if (this.numbersComponent && this.numbersComponent.showPublications) {
+                this.resultTypes.values.push({
+                  name: this.openaireEntities.PUBLICATIONS,
+                  id: "publications",
+                  selected: false,
+                  number: 0
+                });
+              }
+              if (this.numbersComponent && this.numbersComponent.showDatasets) {
+                this.resultTypes.values.push({
+                  name: this.openaireEntities.DATASETS,
+                  id: "datasets",
+                  selected: false,
+                  number: 0
+                });
+              }
+              if (this.numbersComponent && this.numbersComponent.showSoftware) {
+                this.resultTypes.values.push({
+                  name: this.openaireEntities.SOFTWARE,
+                  id: "software",
+                  selected: false,
+                  number: 0
+                });
+              }
+              if (this.numbersComponent && this.numbersComponent.showOrp) {
+                this.resultTypes.values.push({
+                  name: this.openaireEntities.OTHER,
+                  id: "other",
+                  selected: false,
+                  number: 0
+                });
+              }
+              if (this.numbersComponent) {
+                this.numbersComponent.init(false, false, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations,
+                    this.customFilter ? StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
+              }
+              this.getFunders();
            }
-						if(this.numbersComponent) {
-							this.numbersComponent.showPublications = !!showEntity["publication"];
-							this.numbersComponent.showDatasets = !!showEntity["dataset"];
-							this.numbersComponent.showSoftware = !!showEntity["software"];
-							this.numbersComponent.showOrp = !!showEntity["orp"];
-							this.numbersComponent.showProjects = !!showEntity["project"];
-							this.numbersComponent.showDataProviders = !!showEntity["datasource"];
-							this.numbersComponent.showOrganizations = !!showEntity["organization"];
-						}
-            if(this.numbersComponent && this.numbersComponent.showPublications){
-              this.resultTypes.values.push({name: this.openaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0});
-            }
-            if(this.numbersComponent && this.numbersComponent.showDatasets){
-              this.resultTypes.values.push({name: this.openaireEntities.DATASETS , id:"datasets",selected:false, number:0});
-            }
-            if(this.numbersComponent && this.numbersComponent.showSoftware){
-              this.resultTypes.values.push({name: this.openaireEntities.SOFTWARE , id:"software",selected:false, number:0});
-            }
-            if(this.numbersComponent && this.numbersComponent.showOrp){
-              this.resultTypes.values.push({name: this.openaireEntities.OTHER , id:"other",selected:false, number:0});
-            }
-						if(this.numbersComponent) {
-							this.numbersComponent.init(false, false, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations,
-								this.customFilter ? StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
-						}
-						this.getFunders();
+          },
+          error => {
+            this.handleError("Error getting community information", error);
          }
-        },
-        error => {
-          this.handleError("Error getting community information", error);
-        }
      ));
    }

  }
+
  public ngOnDestroy() {
    for (let sub of this.subs) {
      sub.unsubscribe();
@ -148,47 +183,49 @@ export class HomeComponent {
  }

  private handleError(message: string, error) {
-    console.error("Home Page: "+message, error);
+    console.error("Home Page: " + message, error);
  }
-  entityChanged($event){
+
+  entityChanged($event) {
    this.selectedEntity = $event.entity;
    this.selectedEntitySimpleUrl = $event.simpleUrl;
    this.selectedEntityAdvancedUrl = $event.advancedUrl;
  }
-  goTo(simple:boolean){
-    let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl;
+
+  goTo(simple: boolean) {
+    let url = this.properties.searchLinkToAll;
    let parameterNames = [];
    let parameterValues = [];
-    if (this.selectedEntity == "result") {
-      if (this.resultTypes) {
-        let values = [];
-        for(let value of this.resultTypes.values){
-          if (value.selected) {
-            values.push(value.id);
-          }
-        }
-        if (values.length > 0 && values.length !=4) {
-          parameterNames.push("type");
-          parameterValues.push(values.join(","));
-        }
-        if (this.resultsQuickFilter) {
-          parameterNames.push("qf");
-          parameterValues.push("" + this.resultsQuickFilter.selected);
-        }
-      }
-    }else if(this.selectedEntity == "all"){
-      if (this.resultsQuickFilter) {
-        parameterNames.push("qf");
-        parameterValues.push("true");
-      }
-    }
-    if(this.keyword.length > 0) {
+    // if (this.selectedEntity == "result") {
+    //   if (this.resultTypes) {
+    //     let values = [];
+    //     for (let value of this.resultTypes.values) {
+    //       if (value.selected) {
+    //         values.push(value.id);
+    //       }
+    //     }
+    //     if (values.length > 0 && values.length != 4) {
+    //       parameterNames.push("type");
+    //       parameterValues.push(values.join(","));
+    //     }
+    //     if (this.resultsQuickFilter) {
+    //       parameterNames.push("qf");
+    //       parameterValues.push("" + this.resultsQuickFilter.selected);
+    //     }
+    //   }
+    // } else if (this.selectedEntity == "all") {
+    //   if (this.resultsQuickFilter) {
+    //     parameterNames.push("qf");
+    //     parameterValues.push("true");
+    //   }
+    // }
+    if (this.keyword.length > 0) {
      parameterNames.push("fv0");
      parameterValues.push(this.keyword);
      parameterNames.push("f0");
      parameterValues.push("q");
    }
-    if(this.customFilter){
+    if (this.customFilter) {
      parameterNames.push(this.customFilter.queryFieldName);
      parameterValues.push(this.customFilter.valueId);
      parameterNames.push("cf");
@ -196,77 +233,78 @@ export class HomeComponent {
    }
    this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
  }
-  getQueryParamsForAdvancedSearch(entity){
+
+  getQueryParamsForAdvancedSearch(entity) {
    let params = {};
    if (entity == "result") {
      if (this.resultsQuickFilter) {
        params["qf"] = "" + this.resultsQuickFilter.selected;
      }
    }
-    if(this.keyword.length > 0) {
+    if (this.keyword.length > 0) {
      params["fv0"] = "" + this.keyword;
      params["f0"] = "q";
    }
-    if(this.customFilter){
-			params = this.customFilter.getParameters(params);
+    if (this.customFilter) {
+      params = this.customFilter.getParameters(params);
    }
    return params;
  }

-	getFunders() {
-		let refineParams1 = '&fq=country%20exact%20%22CA%22';
-		let refineParams2 = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=country%20exact%20%22CA%22%20';
-		this.subs.push(zip(
-			this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams1),
-			this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams2)
-		).subscribe((data: any[]) => {
-			let queriedFunders1 = data[0][1][0].values;
-			queriedFunders1.forEach(queriedFunder => {
-				if(queriedFunder.id.includes('nserc')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/nserc_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				} else if(queriedFunder.id.includes('cihr')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/cihr_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				} else if(queriedFunder.id.includes('sshrc')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/sshrc_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				}
-			});
-			let queriedFunders2 = data[1][1][0].values;
-			queriedFunders2.forEach(queriedFunder => {
-				for(let funder of this.funders) {
-					if(queriedFunder.id == funder.id) {
-						funder.openAccessPublications = queriedFunder.number;
-					}
-				}
-			});
-		}));
-	}
+  getFunders() {
+    let refineParams1 = '&fq=country%20exact%20%22CA%22';
+    let refineParams2 = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=country%20exact%20%22CA%22%20';
+    this.subs.push(zip(
+        this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams1),
+        this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams2)
+    ).subscribe((data: any[]) => {
+      let queriedFunders1 = data[0][1][0].values;
+      queriedFunders1.forEach(queriedFunder => {
+        if (queriedFunder.id.includes('nserc')) {
+          this.funders.push({
+            "id": queriedFunder.id,
+            "name": queriedFunder.name,
+            "publications": queriedFunder.number,
+            "openAccessPublications": null,
+            "logo": 'assets/nserc_logo.png',
+            "params": {
+              relfunder: '"' + encodeURIComponent(queriedFunder.id) + '"'
+            }
+          });
+        } else if (queriedFunder.id.includes('cihr')) {
+          this.funders.push({
+            "id": queriedFunder.id,
+            "name": queriedFunder.name,
+            "publications": queriedFunder.number,
+            "openAccessPublications": null,
+            "logo": 'assets/cihr_logo.png',
+            "params": {
+              relfunder: '"' + encodeURIComponent(queriedFunder.id) + '"'
+            }
+          });
+        } else if (queriedFunder.id.includes('sshrc')) {
+          this.funders.push({
+            "id": queriedFunder.id,
+            "name": queriedFunder.name,
+            "publications": queriedFunder.number,
+            "openAccessPublications": null,
+            "logo": 'assets/sshrc_logo.png',
+            "params": {
+              relfunder: '"' + encodeURIComponent(queriedFunder.id) + '"'
+            }
+          });
+        }
+      });
+      let queriedFunders2 = data[1][1][0].values;
+      queriedFunders2.forEach(queriedFunder => {
+        for (let funder of this.funders) {
+          if (queriedFunder.id == funder.id) {
+            funder.openAccessPublications = queriedFunder.number;
+          }
+        }
+      });
+    }));
+  }

  isRouteAvailable(routeToCheck: string) {
    for (let i = 0; i < this._router.config.length; i++) {
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@ -28,6 +28,7 @@ import {book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
 import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module";
 import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module";
 import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
+import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";

@NgModule({
  imports: [
@ -40,7 +41,7 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul
    HomeRoutingModule,
    HelperModule,
    ErrorMessagesModule,
-    SEOServiceModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule
+    SEOServiceModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule
  ],
  declarations: [
    HomeComponent
--- a/src/app/landingPages/dataProvider/dataProvider.component.ts
+++ b/src/app/landingPages/dataProvider/dataProvider.component.ts
@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-dataprovider',
-    template: `<dataprovider [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider></dataprovider>`,
 })
 export class OpenaireDataProviderComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/dataset/dataset.component.ts
+++ b/src/app/landingPages/dataset/dataset.component.ts
@ -3,18 +3,7 @@ import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-dataset',
-    template: `<result-landing type="dataset" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="dataset"></result-landing>`,
 })
 export class OpenaireDatasetComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
+++ b/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 { }
--- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
+++ b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
@ -1,20 +0,0 @@
-import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
-
-@Component({
-    selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport [piwikSiteId]=""></htmlProjectReport>`,
- })
-export class OpenaireHtmlProjectReportComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
-}
--- a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
+++ b/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 { }
--- a/src/app/landingPages/organization/organization.component.ts
+++ b/src/app/landingPages/organization/organization.component.ts
@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-organization',
-    template: `<organization [piwikSiteId]="piwikSiteId"></organization>`,
+    template: `<organization></organization>`,
 })
 export class OpenaireOrganizationComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/orp/orp.component.ts
+++ b/src/app/landingPages/orp/orp.component.ts
@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-orp',
-    template: `<result-landing type="orp" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="orp"></result-landing>`,
 })
 export class OpenaireOrpComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/project/project.component.ts
+++ b/src/app/landingPages/project/project.component.ts
@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-project',
-    template: `<project [piwikSiteId]="piwikSiteId"></project>`,
+    template: `<project></project>`,
 })
 export class OpenaireProjectComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/publication/publication.component.ts
+++ b/src/app/landingPages/publication/publication.component.ts
@ -1,19 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
  selector: 'openaire-publication',
  template: `
-    <result-landing type="publication" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    <result-landing type="publication"></result-landing>`,
 })
-export class OpenairePublicationComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-
-  constructor() {}
-
-  ngOnInit() {
-  }
-
-
-}
+export class OpenairePublicationComponent {}
--- a/src/app/landingPages/result/result.component.ts
+++ b/src/app/landingPages/result/result.component.ts
@ -1,11 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-publication',
-    template: `<result-landing type="result" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="result"></result-landing>`,
 })
 export class OpenaireResultComponent{
-  piwikSiteId = properties.piwikSiteId;
-
 }
--- a/src/app/landingPages/service/service.component.ts
+++ b/src/app/landingPages/service/service.component.ts
@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-dataprovider',
-    template: `<dataprovider type="service" [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider type="service"></dataprovider>`,
 })
 export class OpenaireServiceComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/landingPages/software/software.component.ts
+++ b/src/app/landingPages/software/software.component.ts
@ -1,19 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";

@Component({
    selector: 'openaire-software',
-    template: `<result-landing type="software" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="software"></result-landing>`,
 })
 export class OpenaireSoftwareComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-  }
-
-  ngOnInit() {
-}
-
-
-
 }
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit 328198b6a56c3f3ecb38c7928073914a9609ddc0
+Subproject commit c351349f8ee3a130c56dc72b17159f07460c108e
--- a/src/app/sdg/sdg.component.ts
+++ b/src/app/sdg/sdg.component.ts
@ -7,11 +7,10 @@ import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
@Component({
 	selector: 'aggregator-sdg',
 	template: `
-		<sdg [piwikSiteId]="piwikSiteId" [customFilter]="customFilter"></sdg>
+		<sdg [customFilter]="customFilter"></sdg>
 	`
 })
 export class AggregatorSdgComponent {
-	piwikSiteId = properties.piwikSiteId;
 	aggregatorId;
 	aggregator: AggregatorInfo;
 	customFilter: SearchCustomFilter = null;
@ -23,4 +22,4 @@ export class AggregatorSdgComponent {
 	}

 	public ngOnInit() {}
-}
+}
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
  selector: 'openaire-advanced-search-dataprovider',
  template: `
    <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders':null"
-    [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+    [hasPrefix]="false" [searchForm]="searchForm">
    </search-dataproviders>

  `
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
  selector: 'openaire-advanced-search-organizations',
  template: `
    <search-organizations  [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations':null"
-                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                           [hasPrefix]="false" [searchForm]="searchForm">
    </search-organizations>

  `
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
    selector: 'openaire-advanced-search-projects',
    template: `
    <search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                     [hasPrefix]="false" [searchForm]="searchForm">
    </search-projects>

    `
--- a/src/app/searchPages/advanced/advancedSearchServices.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts
@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
  selector: 'openaire-advanced-search-service',
  template: `
    <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/services':null" 
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+                          [hasPrefix]="false"
                          type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                          [searchForm]="searchForm">
    </search-dataproviders>
--- a/src/app/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/searchPages/advanced/searchResearchResults.component.ts
@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
    selector: 'openaire-search-results',
    template: `
      <search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                               [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
    `

 })
--- a/src/app/searchPages/find/search.component.ts
+++ b/src/app/searchPages/find/search.component.ts
@ -8,22 +8,19 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
    selector: 'openaire-search-find',
    template: `
-    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter" [piwikSiteId]="piwikSiteId" 
-                [searchForm]="searchForm"></search-all>
+    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter"
+                [searchForm]="searchForm" [openAccess]="false"></search-all>
    `,
 })
 export class OpenaireSearchComponent{
  customFilter:SearchCustomFilter= null;
-  piwikSiteId = properties.piwikSiteId;
  public searchForm: SearchForm = {class: 'search-form', dark: true};
-  constructor ( ) {}
+
+
  ngOnInit() {
    let id = ConnectHelper.getCommunityFromDomain(properties.domain);
    let agg:AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);

 }
-
-
-
 }
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
  template: `

    <search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
    </search-dataproviders>

  `
--- a/src/app/searchPages/simple/searchOrganizations.component.ts
+++ b/src/app/searchPages/simple/searchOrganizations.component.ts
@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
    template: `

    <search-organizations [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
    </search-organizations>

    `
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
    template: `

    <search-projects [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                     [hasPrefix]="false" [searchForm]="searchForm">
    </search-projects>
     `

--- a/src/app/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/searchPages/simple/searchResearchResults.component.ts
@ -10,7 +10,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
    selector: 'openaire-search-results',
    template: `
      <search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                               [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
    `

 })
--- a/src/app/searchPages/simple/searchServices.component.ts
+++ b/src/app/searchPages/simple/searchServices.component.ts
@ -12,7 +12,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
  template: `

    <search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/services':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+                          [hasPrefix]="false"
                          type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                          [searchForm]="searchForm">
    </search-dataproviders>
--- a/src/app/shared/searchFields.aggregator.ts
+++ b/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",
+}
+
--- a/src/app/utils/aggregators.ts
+++ b/src/app/utils/aggregators.ts
@ -36,13 +36,13 @@ export class AggregatorInfo {

 export class PortalAggregators {
  static list: AggregatorInfo[] = [
-    new AggregatorInfo("canada", "Canadian Aggregator", "assets/canada-logo.png", "Country",
+    new AggregatorInfo("canada", "Canada Explore", "assets/canada-logo.png", "Country",
      "country", "CA", "Canada",
      "Portal to Canadian Research Outputs", `<span>
            Welcome to the Portal of Canadian Research Outputs. This has been developed as part of a collaboration between 
            Canadian Association of Research Libraries (CARL) and OpenAIRE. The portal presents research results collected 
            from Canadian institutional repositories compliant to <a
-              href="https://guidelines.openaire.eu/" target="_blank">OpenAIRE guidelines</a> and from the OpenAIRE Research Graph. 
+              href="https://guidelines.openaire.eu/" target="_blank">OpenAIRE guidelines</a> and from the OpenAIRE Graph. 
              It links them to three Canadian funders, Natural Sciences and Engineering Research Council of Canada, Canadian Institutes of Health Research and 
              Social Sciences and Humanities Research Council. For more information, visit the <a
              Social Sciences and Humanities Research Council. For more information, visit the <a
@ -70,8 +70,8 @@ export class PortalAggregators {
  
          }
          `),
-    new AggregatorInfo("italy", "Italian Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "IT", "Italy"),
-    new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece")
+    new AggregatorInfo("italy", "Italy Explore", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "IT", "Italy"),
+    new AggregatorInfo("greece", "Greece Explore", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece")
  ];
  static disabled = {
    "canada": {pages: ["/search/find/services"], entities: ["service"]},
@ -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;
@ -105,9 +105,9 @@ export class PortalAggregators {

  public static getCommunityInfoByMenuId(menuId: string): any {
    if(PortalAggregators.disabled[menuId]){
-      return Portal.getMockCommunityInfo(menuId, PortalAggregators.disabled[menuId].entities,PortalAggregators.disabled[menuId].pages);
+      return Portal.getMockCommunityInfo(menuId, PortalAggregators.getFilterInfoByMenuId(menuId).title, PortalAggregators.disabled[menuId].entities,PortalAggregators.disabled[menuId].pages);
    }
-    return Portal.getMockCommunityInfo(menuId, [],[]);
+    return Portal.getMockCommunityInfo(menuId, PortalAggregators.getFilterInfoByMenuId(menuId).title, [],[]);
  }
 }

--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@ -1 +1 @@
-Subproject commit 0c6b2ac12b4796e41bf4cc8de93c157efa866543
+Subproject commit 8d2f8348d8a601fad14844d920791fe7370bd4a2
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit 5c7af220c1de2c87d393e2636cdf18805a97e6a1
+Subproject commit 954a1fe8af0653740882c7db4b9bf92b8f9000f4
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@ -1,6 +1,7 @@
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
+let props: EnvProperties = {
  environment: "beta",
  adminToolsPortalType: "aggregator",
  dashboard: "aggregator",
@ -8,12 +9,12 @@ export let properties: 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/",
  useNewStatistisTool: true,
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
+  claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/",
+  bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
  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=",
@ -38,11 +39,6 @@ export let properties: 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",
@ -51,10 +47,6 @@ export let properties: 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",
@ -86,6 +78,7 @@ export let properties: EnvProperties = {
  searchLinkToOrp: "/search/other?orpId=",
  searchLinkToOrganization: "/search/organization?organizationId=",

+  searchLinkToAll: "/search/find/",
  searchLinkToPublications: "/search/find/publications",
  searchLinkToDataProviders: "/search/find/dataproviders",
  searchLinkToServices: "/search/find/services",
@ -125,3 +118,7 @@ export let properties: EnvProperties = {
  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"

 };
+
+export let properties: EnvProperties = {
+  ...props,  ...common, ...commonBeta
+}
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@ -1,6 +1,7 @@
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
+let props: EnvProperties = {
  environment: "production",
  adminToolsPortalType: "aggregator",
  dashboard: "aggregator",
@ -8,12 +9,12 @@ export let properties: 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://services.openaire.eu/claims/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",
  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
@ -38,11 +39,6 @@ export let properties: 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",
@ -51,10 +47,6 @@ export let properties: 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",
@ -101,6 +93,7 @@ export let properties: EnvProperties = {
  searchLinkToJournals: "/search/journals",
  searchLinkToResults: "/search/find/research-outcomes",

+  searchLinkToAll: "/search/find/",
  searchLinkToAdvancedPublications: "/search/advanced/publications",
  searchLinkToAdvancedProjects: "/search/advanced/projects",
  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
@ -127,3 +120,7 @@ export let properties: EnvProperties = {
  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"

 };
+
+export let properties: EnvProperties = {
+  ...props,  ...common, ...commonProd
+}
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -4,8 +4,9 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.

 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
+let props: EnvProperties = {
  environment: "development",
  adminToolsPortalType: "aggregator",
  dashboard: "aggregator",
@ -14,10 +15,10 @@ export let properties: 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/",
+  bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
  useNewStatistisTool: true,
  claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
  searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
@ -44,11 +45,6 @@ export let properties: 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",
@ -57,9 +53,6 @@ export let properties: 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",
  
@ -90,7 +83,8 @@ export let properties: EnvProperties = {
  searchLinkToSoftwareLanding: "/search/software?softwareId=",
  searchLinkToOrp: "/search/other?orpId=",
  searchLinkToOrganization: "/search/organization?organizationId=",
-  
+
+  searchLinkToAll: "/search/find/",
  searchLinkToPublications: "/search/find/publications",
  searchLinkToDataProviders: "/search/find/dataproviders",
  searchLinkToServices: "/search/find/services",
@ -129,3 +123,7 @@ export let properties: EnvProperties = {
  reCaptchaSiteKey: null,
  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
 };
+
+export let properties: EnvProperties = {
+  ...props,  ...common, ...commonDev
+}
--- a/src/main.server.ts
+++ b/src/main.server.ts
@ -12,4 +12,4 @@ if (properties.environment !== "development") {
 }

 export { AppServerModule } from './app/app.server.module';
-export { renderModule } from '@angular/platform-server';
+
--- a/src/prod/index.html
+++ b/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"/>
--- a/src/test.ts
+++ b/src/test.ts
@ -7,8 +7,6 @@ import {
  platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';

-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
  BrowserDynamicTestingModule,
@ -16,7 +14,3 @@ getTestBed().initTestEnvironment(
    teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@ -2,7 +2,6 @@
  "extends": "./tsconfig.app.json",
  "compilerOptions": {
    "outDir": "../out-tsc/app-server",
-    "target": "es2016",
    "types": [
      "node"
    ]
--- a/tsconfig.json
+++ b/tsconfig.json
@ -10,13 +10,14 @@
    "moduleResolution": "node",
    "experimentalDecorators": true,
    "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
    "typeRoots": [
      "node_modules/@types"
    ],
    "lib": [
      "es2018",
      "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
  }
 }
Author	SHA1	Message	Date
Konstantina Galouni	17ffe66631	[develop \| DONE \| ADDED] Added file searchFields.aggregator.ts to replace searchFields.ts (does not include "countrynojurisdiction" filter for organizations \| angular.json: Added fileReplacements.	2024-04-04 17:16:28 +03:00
Konstantina Galouni	815004724b	[develop \| DONE \| FIXED] aggregators.ts: filter.promptToAddFilter field no longer exists.	2024-04-04 17:14:56 +03:00
Konstantina Galouni	7ee9905433	[develop \| DONE \| CHANGED] app.component.ts: Added check to add "My ORCID links" in the user menu only if environment is not beta.	2024-02-29 17:57:39 +02:00
Konstantinos Triantafyllou	13034ee368	[develop]: Remove delete properties and their usage. Update uikit to 3.16.24	2024-02-13 12:38:19 +02:00
Konstantina Galouni	4a16c2f7c8	[develop \| DONE \| FIXED] environment.prod.ts: Set property claimsAPIURL to call prod API, not beta.	2023-10-31 17:43:36 +02:00
Konstantina Galouni	de7ec824c7	[develop \| DONE \| UPDATED] prod/index.html: Minor update on og:description meta tag.	2023-10-31 16:34:10 +02:00
Konstantina Galouni	054172cd77	Updating libraries	2023-10-31 11:58:54 +02:00
Konstantina Galouni	0e937add69	Merge pull request 'Update to Angular 16' (#2 ) from angular-16 into develop Reviewed-on: #2	2023-10-31 10:57:22 +01:00
Konstantina Galouni	d2f45442ab	Merge origin/develp into angular-16 branch - resolving conflicts in environments	2023-10-31 11:49:23 +02:00
Konstantina Galouni	15bcb1fabc	Updating libraries	2023-10-31 11:39:27 +02:00
Konstantina Galouni	a49f94a58a	[angular-16 \| DONE \| UPDATED] environment.prod.ts: Updated claimsAPIURL property to call new claims API.	2023-10-30 21:24:27 +02:00
Konstantina Galouni	655cbd069f	[angular-16 \| DONE \| FIXED] package.json: Downgraded version of uikit from 3.16.24 to 3.16.14 (parallax not working).	2023-10-30 19:15:08 +02:00
Konstantina Galouni	9410b61cc7	[angular-16 \| DONE \| UPDATED] environments/: Updated how properties are built - use common properties from library.	2023-10-30 19:14:03 +02:00
Konstantina Galouni	70e3447026	environment.beta.ts: Updated claimsAPI property to call new-claims	2023-10-20 12:01:26 +03:00
Konstantina Galouni	1b236d826d	remove unused imports to deleted searchZenodoCommunitiesService	2023-10-20 11:53:01 +03:00
Konstantina Galouni	2426e042ba	Updating openaireLibrary and openaire-theme	2023-10-20 10:24:31 +03:00
Konstantina Galouni	05083dc192	Updating openaireLibrary	2023-10-20 10:23:05 +03:00
Konstantinos Triantafyllou	8b9df4000a	Update types/node to version 16	2023-10-06 15:34:18 +03:00
Konstantina Galouni	ecda0f4adf	[Aggregator \| develop] Added property bipFrameAPIURL.	2023-08-30 16:46:25 +03:00
Konstantina Galouni	07c894a6a6	Updated libraries before release	2023-08-30 16:29:44 +03:00
Konstantinos Triantafyllou	91d4c0d24f	Update uikit to version 3.16.24	2023-08-23 18:18:18 +03:00
Konstantinos Triantafyllou	e6aa6cc8e5	DeleteTransferStateModule	2023-08-04 15:50:03 +03:00
Konstantinos Triantafyllou	39602cbd95	Update material to angular 16.	2023-08-04 14:17:32 +03:00
Konstantinos Triantafyllou	9f4fd02157	Update angular to angular 16.	2023-08-04 14:16:41 +03:00
Konstantinos Triantafyllou	d7e4383b7e	Update Zone to 0.13.1	2023-08-04 14:13:44 +03:00
Konstantinos Triantafyllou	5fd848575f	Update material to angular 15.	2023-08-04 14:13:13 +03:00
Konstantinos Triantafyllou	c0e2e3f315	Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version.	2023-08-04 14:10:52 +03:00
Konstantinos Triantafyllou	c72b81bf07	Update typescript to version 4.9.5	2023-08-04 14:09:47 +03:00
Konstantinos Triantafyllou	fb5f4064ca	Update libraries	2023-08-04 14:09:00 +03:00
Konstantina Galouni	d1543953a2	[Aggregator \| develop]: In search bars, set in placeholder the portal name according to the configuration name. 1. home.component: Get portalName by config.portalAsObservable>name and set placeholder to "Search "+portalName. 2. portal.ts: Added parameter "name: string" in method "getMockCommunityInfo()" and set communityInfo.name = name; 3. aggregators.ts: In method "getCommunityInfoByMenuId()", added "name" parameter in Portal.getMockCommunityInfo() \| Updated titles in PortalAggregators>AggregatorInfo.	2023-07-24 19:56:51 +03:00
Konstantinos Triantafyllou	4c2de1138e	Update library	2023-07-13 14:39:24 +03:00
Konstantinos Triantafyllou	d8d498474b	Change piwik base on the new dynamic piwik.	2023-07-13 13:44:40 +03:00
Konstantinos Triantafyllou	575ea1f996	Update libraries	2023-07-13 12:23:44 +03:00
Konstantina Galouni	b61f42c532	[Aggregator \| develop]: search.component.ts: Added in <search-all> input [openAccess]="false" \| searchAll.component.ts: Added @Input() openAccess: boolean = true; and add "resultbestaccessright" parameter in queries if this is true \| home.module.ts: Imported SearchInputModule \| home.component: In search bar, remove 2 steps, go to search all page and add advanced search link.	2023-07-11 15:11:37 +03:00
Konstantina Galouni	110f07f7e3	[Aggregator \| develop]: app-routing.module.ts: Set in landing routes data: {hasMenuSearchBar: true} to show search bar in menu & Rearrange routes for search pages - new redesign. \| environments/: Added property "searchLinkToAll".	2023-07-07 13:06:08 +03:00
Konstantinos Triantafyllou	c93523a178	Change OpenAIRE Research Graph to OpenAIRE Graph.	2023-06-28 14:40:11 +03:00
Konstantinos Triantafyllou	006671722c	Update UIkit to version 3.13.10	2023-06-28 14:28:43 +03:00
Konstantinos Triantafyllou	86350de14c	Update all libraries	2023-06-28 14:27:26 +03:00