commit libraries

# Conflicts:
#	src/environments/environment.beta.ts
#	src/environments/environment.prod.ts
#	src/environments/environment.ts

interactivemining-install.sh

@@ -1,7 +1,7 @@
 rm -f interactiveminingv3.tgz
 git clone https://code-repo.d4science.org/MaDgIK/interactive-mining.git
 cd interactive-mining/
-git checkout angular-14
+git checkout angular-16
 cd interactive-mining-angular-frontend/
 npm install
 npm run packagr

package.json

@@ -17,41 +17,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/router": "^14.2.3",
+    "@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/router": "^16.1.8",
     "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",
     "ng2-ckeditor": "1.3.7",
-    "ngx-color-picker": "^8.1.0",
+    "ngx-color-picker": "^14.0.0",
     "rxjs": "^6.5.1",
     "sass-loader": "7.3.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
-    "uikit": "3.13.10",
-    "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",
+    "@angular-devkit/build-angular": "^16.1.7",
+    "@angular/cli": "^16.1.7",
+    "@angular/compiler-cli": "^16.1.8",
+    "@angular/language-service": "^16.1.8",
+    "@types/ckeditor": "^4.9.10",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "@types/ckeditor": "^4.9.10",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -62,6 +61,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"
   }
 }

src/app/app.component.html

@@ -2,17 +2,15 @@
   <loading [full]="true"></loading>
 </div>
 <div *ngIf="loading == false">
-  <div class="sidebar_main_swipe" [class.sidebar_main_active]="open && hasSidebar" [class.sidebar_mini]="!open && hasSidebar"
+  <div id="modal-container"></div>
+  <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
+          [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
+  <div class="sidebar_main_swipe uk-flex" [class.sidebar_main_active]="open && (hasSidebar || hasInternalSidebar)" [class.sidebar_mini]="!open && (hasSidebar || hasInternalSidebar)"
        [class.sidebar_hover]="hover">
-    <div id="modal-container"></div>
-    <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
-            [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
-    <div>
-      <dashboard-sidebar *ngIf="hasSidebar" [items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
-      <main>
+      <dashboard-sidebar *ngIf="hasSidebar && !hasInternalSidebar" [items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
+      <main class="uk-width-1-1">
         <router-outlet></router-outlet>
       </main>
-    </div>
   </div>
 </div>
 

src/app/app.component.ts

@@ -28,6 +28,7 @@ export class AppComponent implements OnInit {
   params: BehaviorSubject<Params> = new BehaviorSubject<Params>(null);
   data: BehaviorSubject<Data> = new BehaviorSubject<Data>(null);
   hasSidebar: boolean = false;
+  hasInternalSidebar: boolean = false;
   hasHeader: boolean = true;
   hasAdminMenu: boolean = false;
   isFrontPage: boolean = false;
@@ -81,6 +82,10 @@ export class AppComponent implements OnInit {
       this.hasSidebar = hasSidebar;
       this.cdr.detectChanges();
     }));
+    this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => {
+      this.hasInternalSidebar = hasInternalSidebar;
+      this.cdr.detectChanges();
+    }));
     this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => {
       this.hasHeader = hasHeader;
       this.cdr.detectChanges();

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit c292215ada387fb0385cb77e67b3906104f4ee8a
+Subproject commit e30672043b03c607fb6c6c1c490d4fa34a772d3d

src/app/pages/affiliations/affiliations.component.ts

@@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
   deleteAffiliationOpen(index: number) {
     this.index = index;
     let affiliation: Affiliation = this.affiliations[index];
+    console.log(index, affiliation)
     this.removeAffiliationModal.alertTitle = 'Delete Organization';
     this.removeAffiliationModal.message = 'Do you want to remove <b>' +
       affiliation.name + '</b> from Organizations?';
@@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
   
   removeAffiliation() {
     this.loading = true;
-    this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations',
+    console.log(this.index, this.affiliations[this.index].id)
+    this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name,
       this.affiliations[this.index].id).subscribe((deleteOK) => {
         this.affiliations.splice(this.index, 1);
         if (this.currentPage.length === 0) {

src/app/pages/community-info/profile/edit-community/edit-community.component.ts

@@ -42,7 +42,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
         <div class="uk-width-1-1">
           <input #file id="photo" type="file" class="uk-hidden" (change)="fileChangeEvent($event)"/>
           <div *ngIf="!communityFb.get('isUpload').value" class="uk-grid uk-grid-column-large" uk-grid>
-            <div class="uk-margin-top uk-width-auto@l uk-width-1-1">
+            <div class="uk-margin-xsmall-top uk-width-auto@l uk-width-1-1">
               <div class="uk-grid uk-grid-column-large uk-flex-middle" uk-grid>
                 <div class="uk-width-auto@l uk-width-1-1 uk-flex uk-flex-center">
                   <button class="uk-button uk-button-primary uk-flex uk-flex-middle uk-flex-wrap"
@@ -77,11 +77,21 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
           <!-- Full width error message -->
           <div *ngIf="uploadError" class="uk-text-danger uk-margin-small-top uk-width-1-1">{{uploadError}}</div>
         </div>
-        <div class="uk-width-1-2@m">
+        <div class="uk-width-1-3@m">
           <div input [formInput]="communityFb.get('status')"
                placeholder="Visibility status for your community's profile."
                [options]="statuses" type="select"></div>
         </div>
+        <div class="uk-width-1-3@m">
+          <div input [formInput]="communityFb.get('claim')"
+               placeholder="Who can create links for your community"
+               [options]="claimOptions" type="select"></div>
+        </div>
+        <div class="uk-width-1-3@m">
+          <div input [formInput]="communityFb.get('membership')"
+               placeholder="Who can join"
+               [options]="membershipOptions" type="select"></div>
+        </div>
       </div>
     </form>
   `,
@@ -90,10 +100,22 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
 export class EditCommunityComponent {
   public communityFb: UntypedFormGroup;
   public statuses: Option[] = [
-    {label: 'Visible', value: 'all'},
-    {label: 'Visible to managers', value: 'manager'},
+    // {label: 'Visible', value: 'all'},
+    {label: 'Visible', value: 'PUBLIC'},
+    // {label: 'Visible to managers', value: 'manager'},
+    {label: 'Visible to managers', value: 'RESTRICTED'},
     {label: 'Hidden', value: 'hidden'}
   ]
+  public claimOptions: Option[] = [
+    {label: 'Logged in users', value: 'all'},
+    {label: 'Members only', value: 'membersOnly'},
+    {label: 'Managers only', value: 'managersOnly'}
+
+  ]
+  public membershipOptions: Option[] = [
+    {label: 'Anyone can join', value: 'open'},
+    {label: 'By invitation', value: 'byInvitation'}
+  ]
   public community: CommunityInfo;
   public isNew: boolean;
   public properties: EnvProperties = properties
@@ -133,6 +155,8 @@ export class EditCommunityComponent {
           shortName: this.fb.control(this.community.shortTitle, Validators.required),
           description: this.fb.control(this.community.description),
           status: this.fb.control(this.community.status),
+          claim: this.fb.control(this.community.claim),
+          membership: this.fb.control(this.community.membership),
           managers: this.fb.control(this.community.managers),
           isUpload: this.fb.control(this.community.isUpload),
           logoUrl: this.fb.control(this.community.logoUrl)

src/app/pages/community-routing.module.ts

@@ -31,7 +31,7 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR
     {
       path: 'customize-layout',
       loadChildren: () => import('./customization/customization.module').then(m => m.CustomizationModule),
-      data: {hasSidebar: true, hasHeader: false}
+      data: {hasInternalSidebar: true, hasHeader: false}
     },
     {
       path: 'user-info',

src/app/pages/content-providers/criteria-utils.ts

@@ -10,9 +10,11 @@ export class CriteriaUtils {
     {value: 'description', label: 'Description'},
     {value: 'subject', label: 'Subject'},
     {value: 'fos', label: 'Field of Science'},
-    {value: 'sdg', label: 'SDG'}
+    {value: 'sdg', label: 'SDG'},
+    {value: 'publisher', label: 'Publisher'},
+    {value: 'publicationyear', label: 'Publication Year'}
   ]
-  
+  public readonly numericFields: string[] = ['publicationyear'];
   public readonly verbs: Option[] = [
     {value: 'contains', label: 'contains'},
     {value: 'equals', label: 'equals'},
@@ -20,6 +22,11 @@ export class CriteriaUtils {
     {value: 'not_equals', label: 'not equals'},
     {value: 'starts_with', label: 'starts with'}
   ]
+  public readonly verbsForNumbers: Option[] = [
+    {value: 'equals', label: 'equals'},
+    {value: 'lesser_than', label: 'lesser than'},
+    {value: 'greater_than', label: 'greater than'}
+  ]
   
   public getFiltersAsText(criteria: Criteria[]): string {
     let text = criteria.slice(0, 3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
@@ -28,7 +35,7 @@ export class CriteriaUtils {
       if (!constraint.verb.includes('_caseinsensitive')) {
         matchCase = true;
       }
-      let verb = this.verbs.find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label;
+      let verb = [...this.verbs,...this.verbsForNumbers].find(verb => verb.value === constraint.verb.replace("_caseinsensitive", "")).label;
       let value = '"' + constraint.value + '"' + (matchCase ? " (Match case)" : "");
       return field + " " + verb + " " + value;
     }).join(" <b>and</b> "));

src/app/pages/content-providers/criteria/criteria.component.html

@@ -40,13 +40,17 @@
                         </button>
                       </div>
                       <div class="uk-width-1-1" input type="select" inputClass="border-bottom" [placeholder]="{static: true, label: 'Choose a field'}"
-                           [options]="criteriaUtils.fields" [formInput]="constraint.get('field')">
+                           [options]="criteriaUtils.fields" [formInput]="constraint.get('field')" (valueChange)="resetFieldWhenValueChange(constraint)">
                         <label class="uk-text-uppercase uk-text-bold uk-width-1-3 uk-text-truncate">Field:</label>
                       </div>
-                      <div class="uk-width-1-1" input type="select" inputClass="border-bottom"
+                      <div *ngIf="criteriaUtils.numericFields.indexOf(constraint.get('field').value) == -1" class="uk-width-1-1" input type="select" inputClass="border-bottom"
                            [options]="criteriaUtils.verbs" [formInput]="constraint.get('verb')">
                         <label class="uk-text-uppercase uk-text-bold uk-width-1-3 uk-text-truncate">Operator:</label>
                       </div>
+                      <div *ngIf="criteriaUtils.numericFields.indexOf(constraint.get('field').value) != -1" class="uk-width-1-1" input type="select" inputClass="border-bottom"
+                           [options]="criteriaUtils.verbsForNumbers" [formInput]="constraint.get('verb')">
+                        <label class="uk-text-uppercase uk-text-bold uk-width-1-3 uk-text-truncate">Operator:</label>
+                      </div>
                       <div class="uk-width-1-1" input [placeholder]="{static: true, label: 'Type a keyword'}"
                            [formInput]="constraint.get('value')">
                         <label class="uk-text-uppercase uk-text-bold uk-width-1-3 uk-text-truncate">Term:</label>
@@ -69,8 +73,10 @@
                     <div class="uk-flex uk-flex-middle uk-grid" uk-grid>
                       <div class="uk-width-1-4" input type="select" inputClass="border-bottom" [placeholder]="{static: true, label: 'Choose a field'}"
                            [options]="criteriaUtils.fields" [formInput]="constraint.get('field')"></div>
-                      <div class="uk-width-1-4" input type="select" inputClass="border-bottom"
+                      <div *ngIf="criteriaUtils.numericFields.indexOf(constraint.get('field').value) == -1" class="uk-width-1-4" input type="select" inputClass="border-bottom"
                            [options]="criteriaUtils.verbs" [formInput]="constraint.get('verb')"></div>
+                      <div *ngIf="criteriaUtils.numericFields.indexOf(constraint.get('field').value) != -1" class="uk-width-1-4" input type="select" inputClass="border-bottom"
+                           [options]="criteriaUtils.verbsForNumbers" [formInput]="constraint.get('verb')"></div>
                       <div *ngIf="constraint.get('field').value !== 'fos' && constraint.get('field').value !== 'sdg'" class="uk-width-1-4" inputClass="flat small" input [placeholder]="{static: true, label: 'Type a keyword'}"
                            [formInput]="constraint.get('value')"></div>
                       <div *ngIf="constraint.get('field').value === 'fos'" class="uk-width-1-4" inputClass="flat small" input [placeholder]="{static: true, label: 'Choose a FoS'}"

src/app/pages/content-providers/criteria/criteria.component.ts

@@ -225,4 +225,14 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
     })
     return selectionCriteria;
   }
+
+  resetFieldWhenValueChange(constraint){
+    // if field not numeric, but verb is numeric clear the verb
+    if(this.criteriaUtils.numericFields.indexOf(constraint.get('field').value) == -1 && this.criteriaUtils.verbs.indexOf(constraint.get('verb').value)){
+      constraint.get('verb').setValue(this.criteriaUtils.verbs[0].value);
+    }
+    if(this.criteriaUtils.numericFields.indexOf(constraint.get('field').value) != -1 && this.criteriaUtils.numericFields.indexOf(constraint.get('verb').value)){
+      constraint.get('verb').setValue(this.criteriaUtils.verbsForNumbers[0].value);
+    }
+  }
 }

src/app/pages/content-providers/remove-content-providers.component.ts

@@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit {
   }
   
   public confirmedDeleteContentProvider() {
-    this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe(
+    console.log(this.selectedCommunityContentProvider)
+    this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe(
       () => {
         let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider);
         this.communityContentProviders.splice(index, 1);

src/app/pages/customization/color.component.ts

@@ -21,14 +21,14 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust
   `,
   styles:[
     `
-    .color-input{
-        width:24px;
-        height:14px;
-        border-radius:3px;
-        border:0.1px solid #707070;
-        cursor: pointer;
-        
-    }`
+        .color-input{
+            width:24px;
+            height:14px;
+            border-radius:3px;
+            border:0.1px solid #707070;
+            cursor: pointer;
+            
+        }`
   ]
 })
 

src/app/pages/customization/customization.component.html

@@ -1,134 +1,135 @@
-<aside *ngIf="draftCustomizationOptions" id="sidebar_main">
-  <div id="sidebar_content">
-    <div class="back">
-      <a (click)="close()" class="uk-flex uk-flex-middle uk-flex-center">
-        <div class="uk-width-auto">
-          <icon *ngIf="menuSelected.id != 'home'" name="west" ratio="1.3"
-                [flex]="true"></icon>
-          <icon *ngIf="menuSelected.id == 'home'" name="close" ratio="1.3"
-                [flex]="true"></icon>
-        </div>
-        <span class="uk-width-expand uk-text-truncate uk-margin-left hide-on-close">{{menuSelected.name}}</span>
-      </a>
-    </div>
-    <div class="menu_section uk-margin-large-top uk-overflow-auto" style="max-height: 75vh">
-      <ul *ngIf="menuSelected.id == 'home'" class="uk-list uk-nav uk-nav-default" uk-nav>
-        <ng-template ngFor [ngForOf]="sidebarItems" let-item let-i="index">
-          <li class="uk-visible-toggle" [class.uk-active]="menuSelected.id == item.id">
-            <a (click)="changeMenu(item)"
-               [title]="item.name">
-              <div class="uk-flex uk-flex-middle uk-flex-center">
-                <div *ngIf="item.icon" class="uk-width-auto">
-                  <icon class="menu-icon" [name]="item.icon" [flex]="true"></icon>
-                </div>
-                <span class="uk-width-expand uk-text-truncate uk-margin-small-left hide-on-close">
+<div *ngIf="draftCustomizationOptions" class="uk-flex">
+  <aside id="sidebar_main" class="uk-sticky" uk-sticky="start: 0; end: .sidebar_main_swipe">
+    <div sidebar-content>
+      <div class="back">
+        <a (click)="close()" class="uk-flex uk-flex-middle uk-flex-center">
+          <div class="uk-width-auto">
+            <icon *ngIf="menuSelected.id != 'home'" name="west" ratio="1.3"
+                  [flex]="true"></icon>
+            <icon *ngIf="menuSelected.id == 'home'" name="close" ratio="1.3"
+                  [flex]="true"></icon>
+          </div>
+          <span class="uk-width-expand uk-text-truncate uk-margin-left hide-on-close">{{menuSelected.name}}</span>
+        </a>
+      </div>
+      <div class="menu_section uk-margin-large-top">
+        <ul *ngIf="menuSelected.id == 'home'" class="uk-list uk-nav uk-nav-default" uk-nav>
+          <ng-template ngFor [ngForOf]="sidebarItems" let-item let-i="index">
+            <li class="uk-visible-toggle" [class.uk-active]="menuSelected.id == item.id">
+              <a (click)="changeMenu(item)"
+                 [title]="item.name">
+                <div class="uk-flex uk-flex-middle uk-flex-center">
+                  <div *ngIf="item.icon" class="uk-width-auto">
+                    <icon class="menu-icon" [name]="item.icon" [flex]="true"></icon>
+                  </div>
+                  <span class="uk-width-expand uk-text-truncate uk-margin-small-left hide-on-close">
                   {{item.name}}
                 </span>
-                <span uk-icon="triangle-right"></span>
-              </div>
-            </a>
-          </li>
-        </ng-template>
-      </ul>
-      <ng-container *ngIf="menuSelected.id == 'identity'">
-        <ng-container
-            *ngTemplateOutlet="identityOptions ; context: { }"></ng-container>
-      </ng-container>
-      <ng-container *ngIf="menuSelected.id == 'backgrounds'">
-        <ng-container
-            *ngTemplateOutlet="backgroundOptions ; context: { }"></ng-container>
-      </ng-container>
-      <ng-container *ngIf="menuSelected.id == 'buttons'">
-        <ng-container
-            *ngTemplateOutlet="buttonOptions ; context: { }"></ng-container>
-      </ng-container>
+                  <span uk-icon="triangle-right"></span>
+                </div>
+              </a>
+            </li>
+          </ng-template>
+        </ul>
+        <ng-container *ngIf="menuSelected.id == 'identity'">
+          <ng-container
+                  *ngTemplateOutlet="identityOptions ; context: { }"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="menuSelected.id == 'backgrounds'">
+          <ng-container
+                  *ngTemplateOutlet="backgroundOptions ; context: { }"></ng-container>
+        </ng-container>
+        <ng-container *ngIf="menuSelected.id == 'buttons'">
+          <ng-container
+                  *ngTemplateOutlet="buttonOptions ; context: { }"></ng-container>
+        </ng-container>
+      </div>
     </div>
-
-  </div>
-</aside>
-<div *ngIf="draftCustomizationOptions" page-content>
-  <div actions>
-    <div class="uk-section-small">
-      <ng-container *ngTemplateOutlet="applyResetButtons;"></ng-container>
+  </aside>
+  <div page-content class="uk-width-1-1">
+    <div actions>
+      <div class="uk-section-small">
+        <ng-container *ngTemplateOutlet="applyResetButtons;"></ng-container>
+      </div>
     </div>
-  </div>
-  <div inner>
-    <div class="uk-section-small">
-      <div *ngIf="menuSelected.id == 'backgrounds'" class=" uk-padding-small ">
-        <div class="customizationMenuItems uk-margin-small">
-          <div class="uk-h4">Backgrounds</div>
-          <div>Note: Custom background style settings will override any identity settings that effect the
-            visualisation of a background.
-          </div>
+    <div inner>
+      <div class="uk-section-small">
+        <div *ngIf="menuSelected.id == 'backgrounds'" class=" uk-padding-small ">
+          <div class="customizationMenuItems uk-margin-small">
+            <div class="uk-h4">Backgrounds</div>
+            <div>Note: Custom background style settings will override any identity settings that effect the
+              visualisation of a background.
+            </div>
 
-          <div class="uk-margin-large-top uk-margin-small-bottom uk-h5"> Quick look
+            <div class="uk-margin-large-top uk-margin-small-bottom uk-h5"> Quick look
+
+            </div>
+            <quick-look-backgrounds [darkBackgroundColor]="draftCustomizationOptions.backgrounds.dark.color "
+                                    [lightBackgroundColor]="draftCustomizationOptions.backgrounds.light.color "
+                                    [formBackgroundColor]="draftCustomizationOptions.backgrounds.form.color"
+                                    [primaryColor]="draftCustomizationOptions.identity.mainColor"
+                                    [secondaryColor]="draftCustomizationOptions.identity.secondaryColor"
+                                    [buttonsOnDark]="draftCustomizationOptions.buttons.darkBackground"
+                                    [buttonsOnLight]="draftCustomizationOptions.buttons.lightBackground"
+            ></quick-look-backgrounds>
+
+          </div>
+        </div>
+        <div *ngIf="menuSelected.id == 'buttons'" class=" uk-padding-small ">
+          <div class="customizationMenuItems uk-margin-small">
+            <div class="uk-h4">Buttons</div>
+            <div>Note: Custom background style settings will override any identity settings that effect the
+              visualisation of a background.
+            </div>
+
+            <div class="uk-margin-large-top uk-margin-small-bottom uk-h5"> Quick look
+
+            </div>
+            <quick-look-backgrounds [darkBackgroundColor]="draftCustomizationOptions.backgrounds.dark.color "
+                                    [lightBackgroundColor]="draftCustomizationOptions.backgrounds.light.color "
+                                    [formBackgroundColor]="draftCustomizationOptions.backgrounds.form.color"
+                                    [primaryColor]="draftCustomizationOptions.identity.mainColor"
+                                    [secondaryColor]="draftCustomizationOptions.identity.secondaryColor"
+                                    [buttonsOnDark]="draftCustomizationOptions.buttons.darkBackground"
+                                    [buttonsOnLight]="draftCustomizationOptions.buttons.lightBackground"
+                                    [buttonView]="true"
+            ></quick-look-backgrounds>
 
           </div>
-          <quick-look-backgrounds [darkBackgroundColor]="draftCustomizationOptions.backgrounds.dark.color "
-                                  [lightBackgroundColor]="draftCustomizationOptions.backgrounds.light.color "
-                                  [formBackgroundColor]="draftCustomizationOptions.backgrounds.form.color"
-                                  [primaryColor]="draftCustomizationOptions.identity.mainColor"
-                                  [secondaryColor]="draftCustomizationOptions.identity.secondaryColor"
-                                  [buttonsOnDark]="draftCustomizationOptions.buttons.darkBackground"
-                                  [buttonsOnLight]="draftCustomizationOptions.buttons.lightBackground"
-          ></quick-look-backgrounds>
 
         </div>
-      </div>
-      <div *ngIf="menuSelected.id == 'buttons'" class=" uk-padding-small ">
-        <div class="customizationMenuItems uk-margin-small">
-          <div class="uk-h4">Buttons</div>
-          <div>Note: Custom background style settings will override any identity settings that effect the
-            visualisation of a background.
-          </div>
+        <div *ngIf="menuSelected.id == 'identity'" class=" uk-padding-small ">
+          <div class=" customizationMenuItems uk-margin-small">
 
-          <div class="uk-margin-large-top uk-margin-small-bottom uk-h5"> Quick look
+            <div class="uk-h4">Identity</div>
+            <div>Note: Custom identity style settings will effect the visualisation of the whole gateway. That
+              includes <span class="uk-text-bold">buttons, links, tabs, backgrounds, etc.</span></div>
 
           </div>
-          <quick-look-backgrounds [darkBackgroundColor]="draftCustomizationOptions.backgrounds.dark.color "
-                                  [lightBackgroundColor]="draftCustomizationOptions.backgrounds.light.color "
-                                  [formBackgroundColor]="draftCustomizationOptions.backgrounds.form.color"
-                                  [primaryColor]="draftCustomizationOptions.identity.mainColor"
-                                  [secondaryColor]="draftCustomizationOptions.identity.secondaryColor"
-                                  [buttonsOnDark]="draftCustomizationOptions.buttons.darkBackground"
-                                  [buttonsOnLight]="draftCustomizationOptions.buttons.lightBackground"
-                                  [buttonView]="true"
-          ></quick-look-backgrounds>
-
         </div>
-
-      </div>
-      <div *ngIf="menuSelected.id == 'identity'" class=" uk-padding-small ">
-        <div class=" customizationMenuItems uk-margin-small">
-
-          <div class="uk-h4">Identity</div>
-          <div>Note: Custom identity style settings will effect the visualisation of the whole gateway. That
-            includes <span class="uk-text-bold">buttons, links, tabs, backgrounds, etc.</span></div>
-
-        </div>
-      </div>
-      <div class="uk-padding-small">
-        <div class="uk-margin-top uk-margin-small-bottom uk-h5">See a preview</div>
-        <div id="container" class=" uk-flex uk-flex-center uk-flex-middle">
-          <div id="iframecontainer" class="">
-            <div class="uk-height-1-1">
-              <div *ngIf="hasChanges(draftCustomizationOptions, appliedCustomizationOptions)"
-                   class="  uk-width-1-1  refresh-indicator">
-                <div class="uk-position-relative uk-height-1-1">
-                  <div class="uk-position-center uk-text-center clickable uk-h3" style="color:white"
-                       (click)="applyLayout()">
-                    <div>
-                      <icon name="refresh" ratio="2.5"></icon>
+        <div class="uk-padding-small">
+          <div class="uk-margin-top uk-margin-small-bottom uk-h5">See a preview</div>
+          <div id="container" class=" uk-flex uk-flex-center uk-flex-middle">
+            <div id="iframecontainer" class="">
+              <div class="uk-height-1-1">
+                <div *ngIf="hasChanges(draftCustomizationOptions, appliedCustomizationOptions)"
+                     class="  uk-width-1-1  refresh-indicator">
+                  <div class="uk-position-relative uk-height-1-1">
+                    <div class="uk-position-center uk-text-center clickable uk-h3" style="color:white"
+                         (click)="applyLayout()">
+                      <div>
+                        <icon name="refresh" ratio="2.5"></icon>
+                      </div>
+                      <div class="uk-margin-medium-top">Style has been changed.</div>
+                      <div class="uk-margin-top"> Click to refresh the view.</div>
                     </div>
-                    <div class="uk-margin-medium-top">Style has been changed.</div>
-                    <div class="uk-margin-top"> Click to refresh the view.</div>
                   </div>
                 </div>
-              </div>
-              <iframe *ngIf="previewUrl" [src]="previewUrl" class="uk-width-1-1 "
-                      style="  border-radius: 10px;"
-              ></iframe>
+                <iframe *ngIf="previewUrl" [src]="previewUrl" class="uk-width-1-1 "
+                        style="  border-radius: 10px;"
+                ></iframe>
 
+              </div>
             </div>
           </div>
         </div>
@@ -136,6 +137,7 @@
     </div>
   </div>
 </div>
+
 <ng-template #identityOptions>
   <div class="functionalities-container uk-text-small">
     <div class="uk-margin-top">

src/app/pages/manage-communities/manage-communities.component.ts

@@ -83,7 +83,7 @@ type Tab = 'all' | 'communities' | 'ris';
         <div class="uk-card uk-card-default uk-card-body uk-position-relative">
           <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
             <div class="uk-flex uk-flex-middle">
-              <icon [flex]="true" [name]="community.status == 'all'?'earth':(community.status == 'manager'?'restricted':'incognito')" ratio="0.6"></icon>
+              <icon [flex]="true" [name]="community.isPublic()?'earth':(community.isRestricted()?'restricted':'incognito')" ratio="0.6"></icon>
             </div>
           </div>
           <a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="community.communityId">

src/app/pages/projects/add-projects.component.html

@@ -94,12 +94,12 @@
                   <div class="uk-card-body">
                     <result-preview [properties]="properties" [showOrganizations]="true"
                                     [showSubjects]="true" [result]="getResultPreview(result)"
-                                    [externalUrl]="projectUrl">
+                                    [externalUrl]="projectUrl" [hasLink]="false">
                     </result-preview>
                   </div>
                   <div class="uk-card-footer uk-padding-remove-vertical">
                     <div class="uk-grid uk-grid-small uk-flex-nowrap uk-grid-divider uk-flex-right" uk-grid>
-                      <div *ngIf="!getCommunityProject(result)">
+                      <div *ngIf="!result['isPart']">
                         <div class="uk-padding-small uk-padding-remove-horizontal">
                           <a (click)="addProject(result)" class="uk-button uk-button-link uk-flex uk-flex-middle">
                             <icon name="add" [flex]="true"></icon>
@@ -109,7 +109,7 @@
                           </a>
                         </div>
                       </div>
-                      <div *ngIf="getCommunityProject(result)">
+                      <div *ngIf="result['isPart']">
                         <div class="uk-padding-small uk-padding-remove-horizontal">
                           <a (click)="removeProject(result)"
                              class="uk-button uk-button-link uk-flex uk-flex-middle">

src/app/pages/projects/add-projects.component.ts

@@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
 import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields";
 import {Filter, Value} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
 import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service";
+import {SearchCommunityProjectsService} from "../../openaireLibrary/connect/projects/searchProjects.service";
 
 declare var UIkit;
 
@@ -38,7 +39,7 @@ export class AddProjectsComponent implements OnInit {
   public errorCodes: ErrorCodes;
   public openaireSearchUtils: SearchUtilsClass = new SearchUtilsClass();
   @Output() communityProjectsChanged = new EventEmitter();
-  @Input() communityProjects = [];
+  // @Input() communityProjects = [];
   public openaireProjects = [];
   public queryParameters: string = "";
 
@@ -58,7 +59,7 @@ export class AddProjectsComponent implements OnInit {
 
   constructor(private route: ActivatedRoute, private _router: Router, private _searchProjectsService: SearchProjectsService,
               private _manageCommunityProjectsService: ManageCommunityProjectsService,
-              private _clearCacheService: ClearCacheService,
+              private _clearCacheService: ClearCacheService, private _searchCommunityProjectsService: SearchCommunityProjectsService,
               private _fb: UntypedFormBuilder) {
     this.errorCodes = new ErrorCodes();
     this.openaireSearchUtils.status = this.errorCodes.LOADING;
@@ -121,15 +122,17 @@ export class AddProjectsComponent implements OnInit {
   public addProject(project: SearchResult) {
     this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe(
       data => {
-        this.communityProjects.push(data);
+        // this.communityProjects.push(data);
         this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" added", this.community.communityId);
+
         UIkit.notification(this.openaireEntities.PROJECT+' successfully added!', {
           status: 'success',
           timeout: 6000,
           pos: 'bottom-right'
         });
+        project["isPart"] = true;
         this.communityProjectsChanged.emit({
-          value: this.communityProjects,
+          value: project,
         });
       },
       err => {
@@ -140,20 +143,20 @@ export class AddProjectsComponent implements OnInit {
   }
 
   public removeProject(project: any) {
-    let communityProject = this.getCommunityProject(project);
-    let projectId: string = communityProject['id'];
-    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, projectId).subscribe(
+    // let communityProject = this.getCommunityProject(project);
+    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId,  project['id']).subscribe(
       data => {
-        let index = this.communityProjects.indexOf(communityProject);
-        this.communityProjects.splice(index, 1);
+        // let index = this.communityProjects.indexOf(communityProject);
+        // this.communityProjects.splice(index, 1);
         this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" removed", this.community.communityId);
         UIkit.notification(this.openaireEntities.PROJECT+' successfully removed!', {
           status: 'success',
           timeout: 6000,
           pos: 'bottom-right'
         });
+        project["isPart"] = false;
         this.communityProjectsChanged.emit({
-          value: this.communityProjects,
+          value: project,
         });
       },
       err => {
@@ -163,16 +166,19 @@ export class AddProjectsComponent implements OnInit {
     ));
   }
 
-  public getCommunityProject(project: any): string {
-    let index: number = 0;
-    for (let communityProject of this.communityProjects) {
-      if (communityProject.openaireId == project.id ||
-        (project.code == communityProject.grantId && project.funderShortname == communityProject.funder)) {
-        return communityProject;
+  public getCommunityProject(project: any) {
+    this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, 1, this.resultsPerPage, project.id, null).subscribe(
+      data => {
+        if(data.totalElements > 0){
+          project["isPart"] = true;
+        }
+      },
+      err => {
+        console.error(err);
+        //TODO check erros (service not available, bad request)
+
       }
-      index++;
-    }
-    return "";
+    ));
   }
 
   getFunders() {
@@ -217,7 +223,9 @@ export class AddProjectsComponent implements OnInit {
         data => {
           this.openaireSearchUtils.totalResults = data[0];
           this.openaireProjects = data[1];
-
+          for(let project of this.openaireProjects){
+            this.getCommunityProject(project);
+          }
           this.openaireSearchUtils.status = this.errorCodes.DONE;
           if (this.openaireSearchUtils.totalResults == 0) {
             this.openaireSearchUtils.status = this.errorCodes.NONE;

src/app/pages/projects/manage-projects.component.ts

@@ -16,12 +16,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit
 @Component({
   selector: 'manage-projects',
   template: `
-    <remove-projects #removeProjectsComponent (addProjects)="openAddProjects()" [communityProjects]="communityProjects"
-                              [loading]="showLoadingInRemove" [community]="community"
-                              (communityProjectsChanged)="communityProjectsChanged($event)">
+    <remove-projects #removeProjectsComponent (addProjects)="openAddProjects()"  
+                              [loading]="showLoadingInRemove" [community]="community">
     </remove-projects>
     <fs-modal #fsModalProjects>
-      <add-projects #addProjects [communityProjects]="communityProjects" [community]="community"
+      <add-projects *ngIf="modalIsOpen" #addProjects   [community]="community"
                              (communityProjectsChanged)="communityProjectsChanged($event)"></add-projects>
     </fs-modal>
   `
@@ -36,6 +35,7 @@ export class ManageProjectsComponent implements OnInit {
   public body: string = "Send from page";
   public properties: EnvProperties = properties;
   public community: CommunityInfo = null;
+  modalIsOpen = false;
 
   constructor(private element: ElementRef,
               private title: Title,
@@ -68,15 +68,17 @@ export class ManageProjectsComponent implements OnInit {
     this.fullscreen.back = true;
     this.fullscreen.okButton = true;
     this.fullscreen.open();
+    this.modalIsOpen = true;
   }
 
   public communityProjectsChanged($event) {
-    this.communityProjects = $event.value;
+   /* this.communityProjects = $event.value;
     this.showLoadingInRemove = false;
 
     if (this.fullscreen.isOpen) {
       this.removeProjectsComponent.applyFilters();
       this.removeProjectsComponent.createFunderFilter();
-    }
+    }*/
+    this.removeProjectsComponent.getCommunityProjects();
   }
 }

src/app/pages/projects/remove-projects.component.html

@@ -24,20 +24,21 @@
   </div>
   <div inner>
     <div class="uk-margin-top">
-      <results-and-pages [type]="openaireEntiites.PROJECTS | lowercase" [page]="page" [pageSize]="resultsPerPage"
-                         [totalResults]="previewCommunityProjects.length"></results-and-pages>
+      <results-and-pages [type]="openaireEntiites.PROJECTS | lowercase" [page]="communitySearchUtils.page" [pageSize]="resultsPerPage"
+                         [totalResults]="communitySearchUtils.totalResults"></results-and-pages>
     </div>
     <div class="uk-grid uk-flex-middle uk-margin-medium-top" uk-grid>
-      <div *ngIf="allOptions.length > 0">
+      <div *ngIf="allFunderOptions.length > 0">
         <dropdown-filter #dropdownFilter dropdownClass="uk-width-medium uk-padding-small"
-                         name="Filter by Funder" [count]="filterForm.get('funder').value.length">
+                         name="Filter by Funder" [count]="filterForm.get('funder').value?1:null">
           <h6 class="uk-margin-remove-bottom" title="Filter by Funder">Funder</h6>
           <ul class="uk-list uk-margin-remove-bottom">
-            <li *ngFor="let option of allOptions">
-              <a class="uk-link-text">
-                <label (click)="select(option.value, $event, dropdownFilter)" class="uk-flex uk-flex-middle">
+
+            <li *ngFor="let option of previewFunderOptions">
+              <a class="uk-link-text" >
+                <label (click)="select(option, $event, dropdownFilter)" class="uk-flex uk-flex-middle">
                   <input class="uk-checkbox"
-                         type="checkbox" [checked]="isSelected(option.value)">
+                         type="checkbox" [checked]="isSelected(option.value.id)">
                   <span class="uk-margin-small-left">{{option.label}}</span>
                 </label>
               </a>
@@ -55,9 +56,9 @@
       </div>
 <!--    </div>-->
       <div class="uk-width-expand@l uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center">
-        <paging-no-load *ngIf="previewCommunityProjects.length > 0"
+        <paging-no-load *ngIf="communitySearchUtils.totalResults> 0" [currentPage]="communitySearchUtils.page"
                         (pageChange)="updatePage($event)" [size]="resultsPerPage"
-                        [totalResults]="previewCommunityProjects.length" customClasses="uk-flex-right">
+                        [totalResults]="communitySearchUtils.totalResults" customClasses="uk-flex-right">
         </paging-no-load>
       </div>
     </div>
@@ -67,29 +68,28 @@
         <loading></loading>
       </div>
       <div *ngIf="!loading">
-
           <div class="uk-margin-medium-bottom">
             <div *ngIf="previewCommunityProjects.length == 0"
                  class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
               <div>No {{openaireEntiites.PROJECTS | lowercase}}
-                <span *ngIf="communityProjects.length == 0; else: notFound">for {{community.shortTitle}}</span>
+                <span *ngIf="communitySearchUtils.totalResults == 0; else: notFound">for {{community.shortTitle}}</span>
                 <ng-template #notFound>found</ng-template>
               </div>
             </div>
             <div *ngIf="previewCommunityProjects.length > 0"
                  class="uk-grid uk-grid-large uk-child-width-1-1 uk-child-width-1-2@m uk-margin-bottom" uk-grid uk-height-match="target: .uk-card-body">
-              <div *ngFor="let item of previewCommunityProjects.slice((page - 1)*resultsPerPage, page*resultsPerPage); let i=index">
+              <div *ngFor="let item of previewCommunityProjects; let i=index">
                 <div class="uk-card uk-card-default">
                   <div class="uk-card-body">
                     <h6 class="uk-margin-bottom">
-                      <a *ngIf="item.openaireId || (item.grantId && item.funder)"
+                      <a *ngIf="(item.openaireId || (item.grantId && item.funder)) && (!item['availableSince'] || !lastDBLoadDate || item['availableSince']<lastDBLoadDate)"
                          target="_blank" class="custom-external uk-link-text"
                          [href]="projectUrl+'?' + ((item.openaireId) ? 'projectId='+item.openaireId : 'grantId='+item.grantId+'&funder='+item.funder)">
                         <span *ngIf="item.name">{{item.name}}</span>
                         <span *ngIf="item.name && item.acronym"> (</span><span *ngIf="item.acronym">{{item.acronym}}</span><span *ngIf="item.name && item.acronym">)</span>
                         <span *ngIf="!item.name && !item.acronym">[no title available]</span>
                       </a>
-                      <span *ngIf="!item.openaireId && !(item.grantId && item.funder)">
+                      <span *ngIf="(!item.openaireId && !(item.grantId && item.funder) || (item['availableSince'] && lastDBLoadDate && item['availableSince'] >= lastDBLoadDate))">
                         <span *ngIf="item.name">{{item.name}}</span>
                         <span *ngIf="item.name && item.acronym"> (</span><span *ngIf="item.acronym">{{item.acronym}}</span><span *ngIf="item.name && item.acronym">)</span>
                         <span *ngIf="!item.name && !item.acronym">[no title available]</span>
@@ -124,7 +124,7 @@
             </div>
             <div class="uk-margin-small-top">
               <paging-no-load  [currentPage]="page"
-                               [totalResults]="previewCommunityProjects.length" [size]="resultsPerPage"
+                               [totalResults]="communitySearchUtils.totalResults" [size]="resultsPerPage"
                                (pageChange)="updatePage($event)" customClasses="uk-flex-right@m uk-flex-center">
               </paging-no-load>
             </div>

src/app/pages/projects/remove-projects.component.ts

@@ -19,6 +19,8 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
 import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
 import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
 import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service";
+import {debounceTime, distinctUntilChanged} from "rxjs/operators";
+import {IndexInfoService} from "../../openaireLibrary/utils/indexInfo.service";
 
 @Component({
   selector: 'remove-projects',
@@ -35,7 +37,7 @@ export class RemoveProjectsComponent implements OnInit {
   public projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0];
 
   @Output() communityProjectsChanged = new EventEmitter();
-  @Input() public communityProjects = [];
+  // @Input() public communityProjects = [];
   public previewCommunityProjects = [];
   public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass();
   public errorCodes: ErrorCodes;
@@ -51,56 +53,49 @@ export class RemoveProjectsComponent implements OnInit {
   /* Search */
   @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
   filterForm: UntypedFormGroup;
-  public fundersCtrl: UntypedFormArray;
   private searchText: RegExp = new RegExp('');
   public keyword: string = '';
-  selectedFunders: string[] = [];
-  allOptions: Option[] = [];
+  allFunderOptions: Option[] = [];
+  previewFunderOptions: Option[] = [];
   sortOptions: Option[] = [
-    //{label:"Title (desc) ", value:{ sort: "title",descending: true }},
-    {label: "Title ", value: {sort: "title", descending: false}},
-    //{label:"Grant ID (desc) ", value:{ sort: "grant",descending: true }},
-    {label: "Grant ID ", value: {sort: "grant", descending: false}},
-    //{label:"Funder (desc) ", value:{ sort: "funder",descending: true }},
+    {label: "Title ", value: {sort: "name", descending: false}},
+    {label: "Grant ID ", value: {sort: "grantId", descending: false}},
     {label: "Funder ", value: {sort: "funder", descending: false}}
   ];
 
   public openaireEntiites = OpenaireEntities;
-
+  lastDBLoadDate = null;
   constructor(private route: ActivatedRoute, private _router: Router,
               private _fb: UntypedFormBuilder,
               private communityService: CommunityService,
               private _manageCommunityProjectsService: ManageCommunityProjectsService,
               private _searchCommunityProjectsService: SearchCommunityProjectsService,
-              private _clearCacheService: ClearCacheService) {
+              private _clearCacheService: ClearCacheService, private indexInfoService: IndexInfoService) {
     this.errorCodes = new ErrorCodes();
     this.communitySearchUtils.status = this.errorCodes.LOADING;
   }
 
   ngOnInit() {
+    this.subscriptions.push(this.indexInfoService.getDBLoadLastDate(this.properties).subscribe(res => {
+      this.lastDBLoadDate = res;
+    }));
     this.communitySearchUtils.keyword = "";
 
-    this.fundersCtrl = this._fb.array([]);
     this.filterForm = this._fb.group({
       keyword: [''],
-      funder: this.fundersCtrl,
+      funder:  this._fb.control(null),
       sort: this._fb.control(this.sortOptions[0].value)
     });
 
-    this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => {
-      this.searchText = new RegExp(value, 'i');
+    this.subscriptions.push(this.filterForm.get('keyword').valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
       this.page = 1;
-      this.applyFilters();
-    }));
+      this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,(this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null),
+        this.filterForm.get("sort").value.sort  );
 
-    this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => {
-      this.page = 1;
-      this.applyFilters();
     }));
-
     this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => {
       this.page = 1;
-      this.sort();
+      this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null, this.filterForm.get("sort").value.sort );
     }));
 
     this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
@@ -111,7 +106,8 @@ export class RemoveProjectsComponent implements OnInit {
           + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0];
 
         this.keyword = '';
-        this._getCommunityProjects();
+        this._getCommunityFunders();
+        this._getCommunityProjects(1,this.keyword, null);
       }
     }));
   }
@@ -133,18 +129,13 @@ export class RemoveProjectsComponent implements OnInit {
   }
 
   public confirmedDeleteProject(data: any) {
-    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.id).subscribe(
+    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe(
       data => {
-        let index = this.communityProjects.indexOf(this.selectedCommunityProject);
-        this.communityProjects.splice(index, 1);
-        this.applyFilters();
+
         this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId);
         NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!');
-        this.communityProjectsChanged.emit({
-          value: this.communityProjects,
-        });
-        this.communitySearchUtils.totalResults--;
-        this.communitySearchUtils.page = 1;
+        this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null);
+
       },
       err => {
         this.handleError('An error has been occurred. Try again later!');
@@ -179,29 +170,21 @@ export class RemoveProjectsComponent implements OnInit {
     this.alertModalDeleteCommunity.okButtonText = "Yes";
     this.alertModalDeleteCommunity.open();
   }
-
-  public _getCommunityProjects() {
+  public getCommunityProjects() {
+  this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null );
+  }
+  public _getCommunityProjects(page, keyword, funder, orderBy = "name" ) {
     this.communitySearchUtils.status = this.errorCodes.LOADING;
-    this.communityProjects = [];
-    this.communitySearchUtils.totalResults = 0;
-    this.communitySearchUtils.page = 1;
-    this.communitySearchUtils.keyword = "";
-
-    this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe(
+    this.communitySearchUtils.page = page;
+    this.communitySearchUtils.keyword = keyword;
+    this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder, orderBy).subscribe(
       data => {
-        this.communityProjects = data;
-        this.previewCommunityProjects = this.communityProjects;
-        this.sort();
-
-        this.communitySearchUtils.totalResults = data.length;
+        this.previewCommunityProjects = data.content;
+        this.communitySearchUtils.totalResults = data.totalElements;
         this.communitySearchUtils.status = this.errorCodes.DONE;
-
         this.communityProjectsChanged.emit({
-          value: this.communityProjects,
+          value:  this.communitySearchUtils.totalResults
         });
-
-        this.createFunderFilter();
-
         this.loading = false;
       },
       err => {
@@ -215,90 +198,33 @@ export class RemoveProjectsComponent implements OnInit {
         } else {
           this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE;
         }
-
         this.loading = false;
       }
     ));
   }
-
-  public createFunderFilter(): void {
-    let funders: Set<string> = new Set<string>();
-    this.allOptions = [];
-    let i;
-    for (i = 0; i < this.communityProjects.length; i++) {
-      let funder = this.communityProjects[i].funder;
-      if (funder && !funders.has(funder)) {
-        funders.add(funder);
-        this.allOptions.push({label: funder, value: {id: funder, label: funder}});
+  public _getCommunityFunders() {
+    this.subscriptions.push(this._searchCommunityProjectsService.getProjectFunders(this.properties, this.community.communityId).subscribe(
+      data => {
+         for (let funder of data) {
+          this.allFunderOptions.push({label: funder, value: {id: funder, label: funder}});
+        }
+        this.previewFunderOptions =[...this.allFunderOptions];
+      },
+      err => {
       }
-    }
+    ));
   }
 
   public updatePage($event) {
     HelperFunctions.scroll();
     this.page = $event.value;
+    this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, null);
   }
 
   addNew() {
     this.addProjects.emit();
   }
 
-  public applyFilters() {
-    this.previewCommunityProjects = this.communityProjects.filter(project => {
-      return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project));
-    });
-    // check paging here!!!
-    if (this.previewCommunityProjects.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) {
-      this.page = 1;
-    }
-
-    this.sort();
-  }
-
-  public filterCommunityProjectByKeyword(project): boolean {
-    return this.searchText.toString() === ''
-      || ((project.name + " " + project.acronym + " " + project.grantId + " " + project.funder)).match(this.searchText) != null;
-  }
-
-  public filterCommunityProjectByFunder(project): boolean {
-    if (this.fundersCtrl.getRawValue().length == 0) {
-      return true;
-    }
-    for (let funder of this.fundersCtrl.getRawValue()) {
-      if (project.funder.toLowerCase().indexOf(funder.label.toLowerCase()) != -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private sort() {
-    let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value;
-
-    this.previewCommunityProjects.sort((left, right): number => {
-      if (sortOption.sort == "title") {
-        if ((left.name + left.acronym) > (right.name + right.acronym)) {
-          return sortOption.descending ? -1 : 1;
-        } else if ((left.name + left.acronym) < (right.name + right.acronym)) {
-          return sortOption.descending ? 1 : -1;
-        }
-      } else if (sortOption.sort == "grant") {
-        if (left.grantId > right.grantId) {
-          return sortOption.descending ? -1 : 1;
-        } else if (left.grantId < right.grantId) {
-          return sortOption.descending ? 1 : -1;
-        }
-      } else if (sortOption.sort == "funder") {
-        if (left.funder > right.funder) {
-          return sortOption.descending ? -1 : 1;
-        } else if (left.funder < right.funder) {
-          return sortOption.descending ? 1 : -1;
-        }
-      }
-
-      return 0;
-    });
-  }
 
   public onSearchClose() {
     this.communitySearchUtils.keyword = this.filterForm.get('keyword').value;
@@ -313,23 +239,25 @@ export class RemoveProjectsComponent implements OnInit {
     NotificationHandler.rise(message, 'danger');
   }
 
-  select(value: string, event, dropdownFilter: DropdownFilterComponent) {
+  select(option, event, dropdownFilter: DropdownFilterComponent) {
+    console.log(option)
     if(event.target instanceof HTMLInputElement) {
       dropdownFilter.closeDropdown();
-      if(event.target.checked && !this.selectedFunders.find(entity => value === entity)) {
-        this.selectedFunders.push(value);
-        this.fundersCtrl.setControl(this.fundersCtrl.value.length, this._fb.control(value));
+      if(event.target.checked) {
+        this.filterForm.get("funder").setValue(option.value);
+        this._getCommunityProjects(1, this.filterForm.get('keyword').value, this.filterForm.get('funder').value.id );
+          this.previewFunderOptions =[option];
       } else if(!event.target.checked) {
-        let index = this.selectedFunders.indexOf(value);
-        if(index !== -1) {
-          this.selectedFunders.splice(index, 1);
-          this.fundersCtrl.removeAt(index);
-        }
+        this.filterForm.get("funder").setValue(null);
+        this._getCommunityProjects(1, this.filterForm.get('keyword').value,null);
+        this.previewFunderOptions =[...this.allFunderOptions];
       }
     }
   }
 
   isSelected(value: string) {
-    return this.filterForm && this.filterForm.get('funder').value.find(funder => funder === value)
+    return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value;
   }
+
+
 }

src/app/pages/users/users-managers/users-managers.component.ts

@@ -25,12 +25,11 @@ export class UsersManagersComponent implements OnInit {
   public message: string;
   public inviteDisableMessage: string;
   public emailComposer: Function = (name, recipient, role):Email => {
-    return Composer.composeEmailForCommunityDashboard(name, recipient);
+    return Composer.composeEmailForCommunityDashboard(name, role, recipient);
   }
   private subscriptions: any[] = [];
   
   constructor(private communityService: CommunityService,
-              private route: ActivatedRoute,
               private title: Title) {
   }
   
@@ -43,7 +42,7 @@ export class UsersManagersComponent implements OnInit {
         this.link = this.getURL(this.community.communityId);
         this.message = 'A manager has the right to access the administration part of Research Community Dashboard, ' +
           'where he is able to customize and manage the content, invite other users as managers or members.';
-        if(community.status === "hidden") {
+        if(community.isPrivate()) {
           this.inviteDisableMessage = "Community's status is Hidden and invitation to manage the Research community dashboard is disabled. Update the  community status to enable invitations."
         }
         this.loading = false;

src/app/pages/users/users-subscribers/users-subscribers.component.ts

@@ -4,24 +4,36 @@ import {ActivatedRoute} from "@angular/router";
 import {CommunityService} from "../../../openaireLibrary/connect/community/community.service";
 import {Subscriber} from "rxjs";
 import {CommunityInfo} from "../../../openaireLibrary/connect/community/communityInfo";
+import {Email} from "../../../openaireLibrary/utils/email/email";
+import {Composer} from "../../../openaireLibrary/utils/email/composer";
+import {properties} from "../../../../environments/environment";
 
 @Component({
   selector: 'users-subscribers',
   template: `
-    <subscribers [id]="community.communityId" [type]="'community'" [name]="community.shortTitle"
+    <subscribers *ngIf="community.isOpen()" [id]="community.communityId" [type]="'community'" [name]="community.shortTitle"
                  [inviteDisableMessage]="inviteDisableMessage">
       <users-tabs tab="member"></users-tabs>
     </subscribers>
+    <role-users *ngIf="!community.isOpen()" [id]="community.communityId" [type]="community.type" [name]="community.shortTitle" [inviteDisableMessage]="inviteDisableMessage"
+                [link]="link" [role]="'member'"
+                [message]="message" [emailComposer]="emailComposer">
+        <users-tabs tab="member"></users-tabs>
+    </role-users>
   `
 })
 export class UsersSubscribersComponent implements OnInit {
   public community: CommunityInfo;
+  public link: string;
   public loading: boolean;
+  public message: string;
   public inviteDisableMessage: string;
+  public emailComposer: Function = (name, recipient, role):Email => {
+    return Composer.composeEmailForCommunityDashboard(name, role, recipient);
+  }
   private subscriptions: any[] = [];
   
   constructor(private communityService: CommunityService,
-              private route: ActivatedRoute,
               private title: Title) {
   }
   
@@ -30,9 +42,12 @@ export class UsersSubscribersComponent implements OnInit {
     this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
       if(community) {
         this.community = community;
-        this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Subscribers");
-        if(community.status !== "all") {
-          this.inviteDisableMessage = "Community's status is " + (community.status === 'manager'?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the  community status to enable invitations."
+        this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Members");
+        this.link = this.getURL(this.community.communityId);
+        this.message = 'A member can access the community dashboard and link research results with projects, ' +
+            'communities and other research projects.';
+        if(!community.isPublic()) {
+          this.inviteDisableMessage = "Community's status is " + (community.isRestricted()?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the  community status to enable invitations."
         }
         this.loading = false;
       }
@@ -46,4 +61,8 @@ export class UsersSubscribersComponent implements OnInit {
       }
     });
   }
+
+  private getURL(id: string): string {
+    return 'https://' + (properties.environment !== "production"?'beta.':'') + id + ".openaire.eu?verify=";
+  }
 }

src/app/pages/users/users-subscribers/users-subscribers.module.ts

@@ -5,11 +5,12 @@ import {LoadingModule} from "../../../openaireLibrary/utils/loading/loading.modu
 import {RouterModule} from "@angular/router";
 import {SubscribersModule} from "../../../openaireLibrary/dashboard/users/subscribers/subscribers.module";
 import {UsersTabsModule} from '../users-tabs.module';
+import {RoleUsersModule} from "../../../openaireLibrary/dashboard/users/role-users/role-users.module";
 
 @NgModule({
   imports: [CommonModule, LoadingModule, RouterModule.forChild([
     {path: '', component: UsersSubscribersComponent}
-  ]), SubscribersModule, UsersTabsModule],
+  ]), SubscribersModule, UsersTabsModule, RoleUsersModule],
   declarations: [UsersSubscribersComponent],
   exports: [UsersSubscribersComponent]
 })

src/app/pages/zenodo-communities/add-zenodo-communities.component.ts

@@ -194,7 +194,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
   public getOpenaireId(community: any): string {
     for (let com of this.selectedCommunities) {
       if (com.id == community.id) {
-        return com.openaireId;
+        return com.id;
       }
     }
     return null;

src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts

@@ -88,7 +88,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
   }
   
   public confirmedDeleteCommunity(data: any) {
-    this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.openaireId).subscribe(
+    this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe(
       data => {
         var pos = -1;
         for (var i = 0; i < this.selectedCommunities.length; i++) {

src/app/pages/zenodo-communities/zenodo-communities.component.ts

@@ -3,8 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router';
 
 import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
 import {ZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service';
-import {SearchZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service';
-
 import {CommunityService} from '../../openaireLibrary/connect/community/community.service';
 import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo';
 import {ZenodoCommunityInfo} from '../../openaireLibrary/connect/zenodoCommunities/zenodoCommunityInfo';
@@ -50,8 +48,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
 
   constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router,
               private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title,
-              private _communityService: CommunityService,
-              private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService) {
+              private _communityService: CommunityService) {
   }
   
   ngOnInit() {
@@ -65,8 +62,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
         this.masterZenodoCommunityId = this.community.zenodoCommunity;
         if (this.masterZenodoCommunityId) {
           this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-            this.properties.zenodoCommunities + this.masterZenodoCommunityId,
-            null).subscribe(
+             this.masterZenodoCommunityId).subscribe(
             result => {
               this.masterZenodoCommunity = result;
               this.selectedCommunities.unshift(this.masterZenodoCommunity);
@@ -81,25 +77,24 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
         }
         this.zenodoSearchUtils.status = this.errorCodes.LOADING;
         this.zenodoSearchUtils.status = this.errorCodes.LOADING;
-        this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe(
-          result => {
-            this.selectedCommunityIds = result;
+        // this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe(
+        //   result => {
+            this.selectedCommunityIds = this.community.otherZenodoCommunities;
             this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length;
             if (this.selectedCommunityIds.length === 0) {
               this.zenodoSearchUtils.status = this.errorCodes.NONE;
             }
             for (let i = 0; i < this.selectedCommunityIds.length; i++) {
               this.getZenodoCommunityById(
-                this.selectedCommunityIds[i]['zenodoid'],
-                this.selectedCommunityIds[i]['id']);
+                this.selectedCommunityIds[i]);
             }
 
-          },
-          error => {
-            console.log('list of zenodo communities couldn\'t be loaded');
-            this.zenodoSearchUtils.status = this.errorCodes.DONE;
-          }
-        );
+          // },
+          // error => {
+          //   console.log('list of zenodo communities couldn\'t be loaded');
+          //   this.zenodoSearchUtils.status = this.errorCodes.DONE;
+          // }
+        // );
       })
     );
 
@@ -116,9 +111,9 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
     });
   }
   
-  getZenodoCommunityById(zenodoid, openaireId) {
+  getZenodoCommunityById(zenodoid) {
     this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-      this.properties.zenodoCommunities + zenodoid, openaireId).subscribe(
+       zenodoid).subscribe(
       result => {
         this.selectedCommunities.push(result);
         this.zenodocommunitiesloadedCount++;
@@ -131,7 +126,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
       error => {
         const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo();
         emptyCommunity.id = zenodoid;
-        emptyCommunity.openaireId = openaireId;
         emptyCommunity.title = zenodoid;
         this.selectedCommunities.push(emptyCommunity);
         this.zenodocommunitiesloadedCount++;

src/app/pages/zenodo-communities/zenodo-communities.module.ts

@@ -5,7 +5,6 @@ import {RouterModule} from '@angular/router';
 import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component';
 import {AddZenodoCommunitiesComponent} from './add-zenodo-communities.component';
 import {ZenodoCommunitiesComponent} from './zenodo-communities.component';
-import {SearchZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
 import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service';
 import {ZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
 import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
@@ -22,7 +21,7 @@ import {PagingModule} from "../../openaireLibrary/utils/paging.module";
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule, RouterModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule,
+    CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule,
     AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule
   ],
   declarations: [

src/app/services/manageContentProviders.service.ts

@@ -11,7 +11,7 @@ export class ManageCommunityContentProvidersService {
 
   removeContentProvider(properties: EnvProperties, pid: string, id: string): any {
     let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
-    let url = properties.communityAPI + pid + '/contentproviders';
+    let url = properties.communityAPI + pid + '/contentproviders?contentproviderId=' +id;
     return this.http.request('delete', url, {body: id, headers: headers});
   }
 

src/app/services/manageProjects.service.ts

@@ -12,9 +12,9 @@ export class ManageCommunityProjectsService {
 
     let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
 
-    let url = properties.communityAPI+pid+"/projects";
+    let url = properties.communityAPI+pid+"/projects?projectId="+id;
     //return this.http.delete(url, options)
-    return this.http.request('delete', url, { body: id, headers: headers})
+    return this.http.request('delete', url, {  headers: headers})
   }
 
   addProject(properties:EnvProperties, pid: string, project: any) {

src/app/services/manageZenodoCommunities.service.ts

@@ -11,10 +11,10 @@ export class  ManageZenodoCommunitiesService {
     //let options = new RequestOptions({headers: headers, body: id});
 
     let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
-    let url = properties.communityAPI + pid + "/zenodocommunities";
+    let url = properties.communityAPI + pid + "/zenodocommunities?zenodocommunity="+id;
 
     //return this.http.delete(url, options);
-    return this.http.request('delete', url, { body: id, headers: headers})
+    return this.http.request('delete', url, { headers: headers})
   }
 
   addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) {
@@ -23,13 +23,9 @@ export class  ManageZenodoCommunitiesService {
 
     let headers = new HttpHeaders({'Content-Type': 'application/json'});
 
-      let url = properties.communityAPI+pid+"/zenodocommunities";
-      var zCommunity: any = {
-        "communityId": pid,
+      let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid;
 
-        "zenodoid": zenodoid
-      };
-      return this.http.post<any>(url, JSON.stringify(zCommunity), {headers: headers});
+      return this.http.post<any>(url,   headers);
                       //.map(res => <any> res.json())
     }
 

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 031329d5ca890663a0911e3dac5649eb5c00c601
+Subproject commit 3b437aafda7a716a0a89785a106456cbe520dce3

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae
+Subproject commit 99ab54cdd7b973a2ba047f0a6b37667270b58439

src/environments/environment.beta.ts

@@ -1,91 +1,14 @@
 import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties';
+import {common, commonBeta, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
-  environment: "beta",
-  dashboard: 'connect',
+let props: EnvProperties = {
   isDashboard: true,
-  adminToolsPortalType: "community",
   enablePiwikTrack: false,
   useCache: false,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
-  useNewStatistisTool: true,
-  searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
-  zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
-  openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  helpdeskEmail: "helpdesk@openaire.eu",
-  utilsService: "https://demo.openaire.eu/utils-service",
-  vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: " https://analytics.openaire.eu/piwik.php?idsite=6",
-  registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
-  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",
-  feedbackmailForMissingEntities: "feedback@openaire.eu",
-  cacheUrl: "https://demo.openaire.eu/cache/get?url=",
-  deleteCacheUrl: 'https://demo.openaire.eu/cache/clear',
-  deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache',
-  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
-  adminToolsCommunity: "openaire",
-  communityAPI: "https://beta.services.openaire.eu/openaire/community/",
-  miningBackendURL: "https://beta.services.openaire.eu/interactive-mining",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  baseLink: "",
-  domain: "https://beta.admin.connect.openaire.eu/",
-  baseOpenaireLink: "https://beta.explore.openaire.eu",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  searchLinkToAdvancedSoftware: "/search/advanced/software",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: false,
-  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://beta.openaire.eu/linking",
-  lastIndexUpdate: "2020-05-06",
-  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  admins: ["rcd@openaire.eu"],
-  adminPortalURL: "https://beta.admin.connect.openaire.eu",
-  errorLink: '/error',
-  connectPortalUrl: 'https://beta.connect.openaire.eu'
+  domain:'https://beta.admin.connect.openaire.eu'
+
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonBeta, ...props
+}

src/environments/environment.prod.ts

@@ -1,91 +1,15 @@
 import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties';
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
+
+let props: EnvProperties = {
 
-export let properties: EnvProperties = {
-  environment:"production",
-  dashboard: 'connect',
   isDashboard: true,
-  adminToolsPortalType: "community",
   enablePiwikTrack: false,
   useCache: false,
-  framesAPIURL: "https://www.openaire.eu/stats3/",
-  claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL:"https://www.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/",
-  useNewStatistisTool:false,
-  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
-  zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
-  openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  helpdeskEmail: "helpdesk@openaire.eu",
-  utilsService: "https://explore.openaire.eu/utils-service",
-  vocabulariesAPI:"https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl:" https://analytics.openaire.eu/piwik.php?idsite=6",
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain:".openaire.eu",
-  feedbackmail:"openaire.test@gmail.com",
-  feedbackmailForMissingEntities: "feedback@openaire.eu",
-  cacheUrl:"https://explore.openaire.eu/cache/get?url=",
-  deleteCacheUrl: 'https://explore.openaire.eu/cache/clear',
-  deleteBrowserCacheUrl: 'https://services.openaire.eu/uoa-admin-tools/cache',
-  adminToolsAPIURL:"https://services.openaire.eu/uoa-admin-tools/",
-  adminToolsCommunity:"openaire",
-  communityAPI: "https://services.openaire.eu/openaire/community/",
-  miningBackendURL: "https://beta.services.openaire.eu/interactive-mining",
-  csvLimit:  2000,
-  pagingLimit:  20,
-  resultsPerPage:  10,
-  baseLink: "",
-  domain: "https://admin.explore.openaire.eu/",
-  baseOpenaireLink: "https://explore.openaire.eu",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  searchLinkToAdvancedSoftware: "/search/advanced/software",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: false,
-  widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://www.openaire.eu/linking",
-  lastIndexUpdate: "2020-12-17",
-  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
-  admins: ["rcd@openaire.eu"],
-  adminPortalURL: "https://admin.connect.openaire.eu",
-  errorLink: '/error',
-  connectPortalUrl: 'https://connect.openaire.eu'
+  domain:'https://admin.connect.openaire.eu',
+
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonProd, ...props
+}

src/environments/environment.ts

@@ -4,93 +4,19 @@
 // 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, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
+
+let props: EnvProperties = {
 
-export let properties: EnvProperties = {
-  environment: 'development',
-  dashboard: 'connect',
   isDashboard: true,
-  adminToolsPortalType: "community",
   enablePiwikTrack: false,
   useCache: false,
-  framesAPIURL: 'https://beta.openaire.eu/stats3/',
-  claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',
-  statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/',
-  statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/',
-  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
-  useNewStatistisTool: true,
-  searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/',
-  searchResourcesAPIURL: 'https://beta.services.openaire.eu/search/v2/api/resources',
-  openCitationsAPIURL: 'https://services.openaire.eu/opencitations/getCitations?id=',
-  csvAPIURL: 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports',
-  searchCrossrefAPIURL: 'https://api.crossref.org/works',
-  searchDataciteAPIURL: 'https://api.datacite.org/works',
-  searchOrcidURL: 'https://pub.orcid.org/',
-  orcidURL: 'https://orcid.org/',
-  doiURL: 'https://dx.doi.org/',
-  cordisURL: 'http://cordis.europa.eu/projects/',
-  openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/',
-  r3DataURL: 'http://service.re3data.org/repository/',
-  sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=',
-  zenodo: 'https://zenodo.org/',
-  zenodoCommunities: 'https://zenodo.org/api/communities/',
-  openAccess: 'https://www.openaire.eu/support/faq#article-id-234',
-  openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310',
-  fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme',
-  h2020Guidlines: 'https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020',
-  ercGuidlines: 'http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf',
-  helpdesk: 'https://www.openaire.eu/support/helpdesk',
-  helpdeskEmail: 'helpdesk@openaire.eu',
-  utilsService: 'http://mpagasas.di.uoa.gr:8000',
-  vocabulariesAPI: 'https://beta.services.openaire.eu/provision/mvc/vocabularies/',
-  piwikBaseUrl: ' https://analytics.openaire.eu/piwik.php?idsite=6',
-  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
-  cookieDomain: '.di.uoa.gr',
-  feedbackmail: 'openaire.test@gmail.com',
-  feedbackmailForMissingEntities: 'feedback@openaire.eu',
-  cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=',
-  // deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear',
-  // deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/cache',
-  adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/',
-  adminToolsCommunity: 'openaire',
-  communityAPI: 'https://dev-openaire.d4science.org/openaire/community/',
-  miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining',
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  baseLink: "",
+  connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200',
   domain:'https://beta.admin.connect.openaire.eu',
-  baseOpenaireLink: 'https://beta.explore.openaire.eu',
-  searchLinkToPublication: '/search/publication?articleId=',
-  searchLinkToProject: '/search/project?projectId=',
-  searchLinkToDataProvider: '/search/dataprovider?datasourceId=',
-  searchLinkToDataset: '/search/dataset?datasetId=',
-  searchLinkToOrganization: '/search/organization?organizationId=',
-  searchLinkToPublications: '/search/find/publications',
-  searchLinkToDataProviders: '/search/find/dataproviders',
-  searchLinkToProjects: '/search/find/projects',
-  searchLinkToDatasets: '/search/find/datasets',
-  searchLinkToSoftware: '/search/find/software',
-  searchLinkToOrganizations: '/search/find/organizations',
-  searchLinkToCompatibleDataProviders: '/search/content-providers',
-  searchLinkToEntityRegistriesDataProviders: '/search/entity-registries',
-  searchLinkToJournals: '/search/journals',
-  searchLinkToAdvancedPublications: '/search/advanced/publications',
-  searchLinkToAdvancedProjects: '/search/advanced/projects',
-  searchLinkToAdvancedDatasets: '/search/advanced/datasets',
-  searchLinkToAdvancedSoftware: '/search/advanced/software',
-  searchLinkToAdvancedDataProviders: '/search/advanced/dataproviders',
-  searchLinkToAdvancedOrganizations: '/search/advanced/organizations',
-  lastIndexInformationLink: 'https://www.openaire.eu/aggregation-and-content-provision-workflows',
-  showLastIndexInformationLink: false,
-  widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=',
-  claimsInformationLink: 'https://www.openaire.eu/linking-beta',
-  lastIndexUpdate: '2019-05-16',
-  indexInfoAPI: 'http://beta.services.openaire.eu/openaire/info/',
-  admins: ['kostis30fylloy@gmail.com'],
-  adminPortalURL: 'https://beta.admin.connect.openaire.eu',
-  errorLink: '/error',
-  connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200'
+
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonDev, ...props
+}
+

src/mining.scss

@@ -1,5 +1,5 @@
 @use "sass:meta";
-@import "~interactiveminingv3/assets/css/variables.css";
+@import "node_modules/interactiveminingv3/assets/css/variables.css";
 
 .mining {
 

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);

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
   }
 }