Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	src/app/openaireLibrary

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/animations": "^16.1.8",
-    "@angular/cdk": "^14.2.2",
+    "@angular/cdk": "^16.1.7",
-    "@angular/common": "^14.2.3",
+    "@angular/common": "^16.1.8",
-    "@angular/compiler": "^14.2.3",
+    "@angular/compiler": "^16.1.8",
-    "@angular/core": "^14.2.3",
+    "@angular/core": "^16.1.8",
-    "@angular/forms": "^14.2.3",
+    "@angular/forms": "^16.1.8",
-    "@angular/localize": "^14.2.3",
+    "@angular/localize": "^16.1.8",
-    "@angular/material": "^14.2.2",
+    "@angular/material": "^16.1.7",
-    "@angular/platform-browser": "^14.2.3",
+    "@angular/platform-browser": "^16.1.8",
-    "@angular/platform-browser-dynamic": "^14.2.3",
+    "@angular/platform-browser-dynamic": "^16.1.8",
-    "@angular/router": "^14.2.3",
+    "@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",
+    "uikit": "3.16.24",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.3",
+    "@angular-devkit/build-angular": "^16.1.7",
-    "@angular/cli": "^14.2.3",
+    "@angular/cli": "^16.1.7",
-    "@angular/compiler-cli": "^14.2.3",
+    "@angular/compiler-cli": "^16.1.8",
-    "@angular/language-service": "^14.2.3",
+    "@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"
-       [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>
+  <div class="sidebar_main_swipe uk-flex" [class.sidebar_main_active]="open && (hasSidebar || hasInternalSidebar)" [class.sidebar_mini]="!open && (hasSidebar || hasInternalSidebar)"
-      <dashboard-sidebar *ngIf="hasSidebar" [items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
+       [class.sidebar_hover]="hover">
-      <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();
@@ -126,7 +131,7 @@ export class AppComponent implements OnInit {
     this.subscriptions.push(this.data.subscribe(data => {
       if(data && data.portal) {
         this.setProperties(data.portal);
-        this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
+        this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
       }
     }));
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
@@ -172,7 +177,7 @@ export class AppComponent implements OnInit {
     } else {
       ConnectHelper.setPortalTypeFromPid(id);
     }
-    this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
+    this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
   }
   
   public get open() {

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit ddcdd79204fccfd2e3c9aabfa9bd031d1e768f6b
+Subproject commit 2e2a71c3101660480ede67c06edc22aa00faa79d

src/app/pages/admin-tools/admin-tools-routing.module.ts

@@ -29,6 +29,16 @@ import {RouterModule} from '@angular/router';
         loadChildren: () => import('../../openaireLibrary/dashboard/helpTexts/page-help-content-form.module').then(m => m.PageHelpContentFormModule),
         pathMatch: 'full'
       },
+      {
+        path: 'plugins',
+        loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule),
+        pathMatch: 'full', data: {hasInternalSidebar: false, hasHeader: false}
+      },
+      {
+        path: 'plugins/edit',
+        loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins-form/pluginsForm.module').then(m => m.PluginsFormModule),
+        pathMatch: 'full', data: {hasInternalSidebar: true, hasHeader: false}
+      },
       {
         path: 'pages',
         loadChildren: () => import('../../openaireLibrary/dashboard/page/pages.module').then(m => m.PagesModule),

src/app/pages/admin-tools/portal-admin-tools-routing.module.ts

@@ -5,7 +5,9 @@ import {RouterModule} from "@angular/router";
   imports: [RouterModule.forChild([
     {path: '', loadChildren: () => import('./admin-tools-routing.module').then(m => m.AdminToolsRoutingModule)},
     {path: 'portals', loadChildren: () => import('../../openaireLibrary/dashboard/portal/portals.module').then(m => m.PortalsModule)},
-    {path: 'classes', loadChildren: () => import('../../openaireLibrary/dashboard/divId/divIds.module').then(m => m.DivIdsModule)}
+    {path: 'classes', loadChildren: () => import('../../openaireLibrary/dashboard/divId/divIds.module').then(m => m.DivIdsModule)},
+    {path: 'templates', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/templates/pluginTemplates.module').then(m => m.PluginTemplatesModule)},
+    {path: 'templates/plugins', loadChildren: () => import('../../openaireLibrary/dashboard/plugins/plugins.module').then(m => m.PluginsModule)},
   ])]
 })
 export class PortalAdminToolsRoutingModule {

src/app/pages/advanced-criteria/advanced-criteria.component.ts

@@ -36,7 +36,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
         <div *ngIf="!loading">
           <div *ngIf="selectionCriteria?.criteria?.length > 0" class="uk-margin-small-bottom">
             <div class="uk-text-meta uk-margin-small-bottom">Criteria</div>
-            <div [innerHTML]="criteriaUtils.getFiltersAsText(selectionCriteria.criteria)"></div>
+            <div [innerHTML]="criteriaUtils.getFiltersAsText(selectionCriteria.criteria,false)"></div>
           </div>
           <div *ngIf="selectionCriteria?.criteria?.length === 0" class="message">
             <h5 class="uk-margin-small-bottom">No criteria yet</h5>
@@ -48,7 +48,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
       </div>
     </div>
     <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
-              [okButtonDisabled]="criteria && criteria.disabled">
+              [okButtonDisabled]="!criteria || criteria.disabled">
       <div *ngIf="selectionCriteria" class="uk-container uk-container-large">
         <criteria #criteria [height]="filtersModal.bodyHeight" [entityType]="'criterion'"
                   [entityTypePlural]="'criteria'" [selectionCriteria]="selectionCriteria">

src/app/pages/affiliations/affiliations.component.html

@@ -2,10 +2,6 @@
   <div actions>
     <div class="uk-section-xsmall uk-margin-top">
       <div class="uk-flex uk-flex-center uk-flex-right@m">
-      <button *ngIf="!organizationsEnabled" class="uk-button uk-button-default uk-margin-right" [class.uk-disabled]="loading"
-              [disabled]="loading"
-              (click)="enableAffiliations()">Enable Organizations Page
-      </button>
       <button class="uk-button uk-button-default uk-flex uk-flex-middle"
               [disabled]="loading" [class.uk-disabled]="loading"
               (click)="editAffiliationOpen()">
@@ -20,6 +16,7 @@
       <div *ngIf="loading" class="uk-position-center">
         <loading></loading>
       </div>
+      <validate-page-enabled pageRoute="/organizations"></validate-page-enabled>
       <div *ngIf="!loading">
         <div *ngIf="affiliations.length == 0"
              class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
@@ -35,7 +32,7 @@
                 <div class="uk-card-body">
                   <div class="uk-flex uk-flex-middle uk-flex-column">
                     <div class="uk-flex uk-flex-center uk-height-xsmall">
-                      <img class="uk-height-max-xsmall uk-blend-multiply" [src]="affiliation.logo_url | urlPrefix">
+                      <img class="uk-height-max-xsmall uk-blend-multiply uk-width-small" [src]="affiliation.logo_url | urlPrefix">
                     </div>
                     <h5>{{affiliation.name}}</h5>
                     <div class="uk-text-truncate uk-text-small">

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

@@ -54,7 +54,6 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
       if (this.community) {
         this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Organizations');
         this.getAffiliations();
-        this.organizationsPageStatus();
       }
     }));
   }
@@ -81,10 +80,6 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
     );
   }
 
-  public get organizationsEnabled(): boolean {
-    return !this.organizationsPage || this.organizationsPage.isEnabled;
-  }
-  
   editAffiliationOpen(index: number = -1) {
     let affiliation: Affiliation;
     this.index = index;
@@ -113,6 +108,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 +160,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) {
@@ -177,13 +174,6 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
         this.handleUpdateError('An error has been occurred. Try again later!');
       });
   }
-  
-  private organizationsPageStatus() {
-    this.helpContentService.getCommunityPagesByRoute(this.community.communityId, '/organizations', this.properties.adminToolsAPIURL).subscribe((page) => {
-      this.organizationsPage = page;
-    })
-  }
-  
   handleUpdateError(message: string) {
     NotificationHandler.rise(message, "danger");
     this.loading = false;
@@ -194,13 +184,4 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
     this.loading = false;
   }
 
-  enableAffiliations() {
-    this.helpContentService.togglePages(this.community.communityId, [this.organizationsPage._id], true, this.properties.adminToolsAPIURL).subscribe(() => {
-      this.organizationsPage.isEnabled = true;
-      this._clearCacheService.purgeBrowserCache("Organizations Page enabled", this.community.communityId);
-      NotificationHandler.rise('Organizations Page has been <b>enabled successfully</b>');
-    }, error => {
-      this.handleUpdateError('An error has been occurred. Try again later!');
-    });
-  }
 }

src/app/pages/affiliations/affiliations.module.ts

@@ -17,11 +17,12 @@ import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module"
 import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module";
 import {HelpContentService} from "../../services/help-content.service";
 import {PagingModule} from "../../openaireLibrary/utils/paging.module";
+import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module";
 
 @NgModule({
   imports: [
     AffiliationsRoutingModule, CommonModule, FormsModule, RouterModule,
-    AlertModalModule, ReactiveFormsModule, InputModule, PageContentModule, IconsModule, NoLoadPaging, LoadingModule, UrlPrefixModule, PagingModule
+    AlertModalModule, ReactiveFormsModule, InputModule, PageContentModule, IconsModule, NoLoadPaging, LoadingModule, UrlPrefixModule, PagingModule, ValidateEnabledPageModule
   ],
   declarations: [
     AffiliationsComponent

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

@@ -20,11 +20,19 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
       <div class="uk-grid uk-grid-large" uk-grid>
         <div class="uk-width-1-2@m">
           <div input id="name" [formInput]="communityFb.get('name')"
-               placeholder="Name of the community profile."></div>
+               placeholder="Index name of the community."></div>
         </div>
         <div class="uk-width-1-2@m">
           <div input [formInput]="communityFb.get('shortName')"
-               placeholder="Short name of the community."></div>
+               placeholder="Index short name of the community."></div>
+        </div>
+        <div class="uk-width-1-2@m">
+          <div input id="name" [formInput]="communityFb.get('displayName')"
+               placeholder="Display name of the community."></div>
+        </div>
+        <div class="uk-width-1-2@m">
+          <div input [formInput]="communityFb.get('displayShortName')"
+               placeholder="Display short name of the community."></div>
         </div>
         <div class="uk-width-1-1">
           <div class="uk-text-bold uk-margin-bottom uk-form-hint">Description of the community</div>
@@ -35,14 +43,14 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
                                       removeButtons:  'Save,NewPage,DocProps,Preview,Print,' +
                                                       'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' +
                                                       'CreateDiv,Flash,PageBreak,' +
-                                                      'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language',
+                                                      'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock,FontSize,TextColor,BGColor',
                                       extraPlugins: 'divarea'}">
           </ckeditor>
         </div>
         <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 +85,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 +108,22 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
 export class EditCommunityComponent {
   public communityFb: UntypedFormGroup;
   public statuses: Option[] = [
-    {label: 'Visible', value: 'all'},
+    // {label: 'Visible', value: 'all'},
-    {label: 'Visible to managers', value: 'manager'},
+    {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
@@ -131,8 +161,12 @@ export class EditCommunityComponent {
           communityId: this.fb.control(this.community.communityId),
           name: this.fb.control(this.community.title, Validators.required),
           shortName: this.fb.control(this.community.shortTitle, Validators.required),
+          displayName: this.fb.control(this.community.displayTitle, Validators.required),
+          displayShortName: this.fb.control(this.community.displayShortTitle, 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)
@@ -158,6 +192,7 @@ export class EditCommunityComponent {
           if (!this.isAdmin) {
             setTimeout(() => {
               this.communityFb.get('shortName').disable();
+              this.communityFb.get('name').disable();
             }, 0);
           }
         }
@@ -166,7 +201,7 @@ export class EditCommunityComponent {
   }
   
   public get isAdmin() {
-    return Session.isPortalAdministrator(this.user);
+    return Session.isPortalAdministrator(this.user) || Session.isCommunityCurator(this.user);
   }
 
   public get disabled(): boolean {
@@ -213,8 +248,7 @@ export class EditCommunityComponent {
       this.removePhoto();
       this.subscriptions.push(this.communityService.updateCommunity(
         this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => {
-          this._clearCacheService.clearCache("Community saved");
+          this._clearCacheService.clearCacheInRoute("Community saved",this.community.communityId,"/");
-          this._clearCacheService.purgeBrowserCache("Community saved", this.community.communityId);
         this.communityService.getCommunity(this.community.communityId, true).subscribe(community => {
           NotificationHandler.rise(community.shortTitle + ' has been <b>successfully created</b>');
           callback(community);
@@ -227,8 +261,7 @@ export class EditCommunityComponent {
       }));
     } else {
       this.subscriptions.push(this.communityService.updateCommunity(this.properties.communityAPI + this.community.communityId, this.communityFb.getRawValue()).subscribe(() => {
-        this._clearCacheService.clearCache("Community updated");
+        this._clearCacheService.clearCacheInRoute("Community saved",this.community.communityId,"/");
-        this._clearCacheService.purgeBrowserCache("Community updated", this.community.communityId);
         this.communityService.getCommunity(this.community.communityId, true).subscribe(community => {
           NotificationHandler.rise(community.shortTitle + ' has been <b>successfully saved</b>');
           callback(community);

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/connect-admin-customization/connect-admin-customization.component.ts

@@ -16,14 +16,28 @@ declare var UIkit;
         <admin-tabs tab="customization" portal="connect"></admin-tabs>
       </div>
       <div inner>
+        <div>
           <div class="uk-alert uk-alert-warning uk-margin-top ">
             <div class="uk-text-large">Use only after connect deployment. And only if there are css updates!</div>
             Press the following button to update the timestamp in the saved layouts and recreate the css files. 
           </div>
           <button (click)="updateCss()" class="uk-button uk-button-danger" [class.uk-disabled]="savingChanges"> Update CSS</button>
-        <button (click)="purgeBrowserCache()" class="uk-button uk-button-danger uk-margin-left" [class.uk-disabled]="savingChanges"> Purge Browser Cache</button>
+          <hr>
+        </div>
+        <div class="uk-margin-medium-top">
+          <div>Purge ICM cache for all communities</div>
 
-        <ng-container *ngIf="properties.domain != 'production'">
+          <button (click)="purgeBrowserCache()" class="uk-button uk-button-danger uk-margin-top" [class.uk-disabled]="savingChanges"> Purge Browser Cache</button>
+          <hr>
+        </div>
+        <div class="uk-margin-medium-top">
+          <div>Reload cache requests either per community or for all communities</div>  
+          <div input [(value)]="community" [placeholder]="'e.g. galaxy'" class="uk-width-1-2 uk-margin-top"></div>
+          <div input [(value)]="route" [placeholder]="'Route e.g. /'" class="uk-width-1-2 uk-margin-top"></div>
+        
+        <button (click)="forceReloadCache()" class="uk-button uk-button-danger uk-margin-top" [class.uk-disabled]="savingChanges"> Reload Cache</button>
+        </div>
+        <!--<ng-container *ngIf="properties.domain != 'production'">
           <hr>
           <div class="uk-alert uk-alert-danger uk-margin-top ">
             Delete after next deployment
@@ -33,7 +47,7 @@ declare var UIkit;
           </div>
           <div input [(value)]="community" [placeholder]="'e.g. galaxy'"></div>
           <button (click)="deleteLayout()" class="uk-button uk-button-danger" [class.uk-disabled]="!community"> Delete layout</button>
-        </ng-container>
+        </ng-container>-->
       </div>
     </div>
     
@@ -45,6 +59,7 @@ export class ConnectAdminCustomizationComponent implements OnInit {
   cssCreated: number = 0;
   totalLayouts: number = 0;
   community;
+  route;
   properties = properties;
 
   constructor( private customizationService: CustomizationService, private _clearCacheService: ClearCacheService,
@@ -133,4 +148,20 @@ export class ConnectAdminCustomizationComponent implements OnInit {
       }));
     }
   }
+
+  forceReloadCache() {
+    if (this.community) {
+      this._clearCacheService.clearCacheInRoute("Clear cache", this.community, this.route ? this.route : "/")
+    } else {
+      this.savingChanges = true;
+      this.subscriptions.push(this.communitiesService.getCommunities(this.properties, this.properties.communityAPI + 'communities').subscribe(
+        communities => {
+          communities.forEach(community => {
+            this._clearCacheService.clearCacheInRoute("Clear cache for "+ community.communityId, community.communityId, this.route ? this.route : "/")
+          });
+          this.savingChanges = false;
+        }
+      ));
+    }
+  }
 }

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

@@ -36,12 +36,21 @@
               <div class="uk-grid uk-grid-small uk-flex-nowrap uk-grid-divider uk-flex-right" uk-grid>
                 <div *ngIf="!getCommunityContentProvider(result)">
                   <div class="uk-padding-small uk-padding-remove-horizontal">
-                    <a (click)="addContentProvider(result)" class="uk-button uk-button-link uk-flex uk-flex-middle">
+                    <a class="uk-button uk-button-link uk-flex uk-flex-middle">
                       <icon name="add" [flex]="true"></icon>
                       <span class="uk-margin-small-left">
                         Add
                       </span>
                     </a>
+                    <div uk-dropdown="mode:click">
+                      <ul class="uk-nav uk-dropdown-nav">
+                        <li class="uk-nav-header uk-margin-left">Add</li>
+                        <li><a (click)="addContentProvider(result,true, false)"> as content source</a></li>
+                        <li ><a (click)="addContentProvider(result,false, true)">as suggestion for deposit</a></li>
+                        <li ><a (click)="addContentProvider(result,true, true)"> both</a></li>
+
+                      </ul>
+                    </div>
                   </div>
                 </div>
                 <div *ngIf="getCommunityContentProvider(result)">

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

@@ -102,8 +102,8 @@ export class AddContentProvidersComponent implements OnInit {
       "</div>"
   }
   
-  public addContentProvider(contentProvider: SearchResult) {
+  public addContentProvider(contentProvider: SearchResult, content = true, deposit =false) {
-    this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider).subscribe(
+    this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider, content, deposit).subscribe(
       data => {
         this.communityContentProviders.push(data);
         this._clearCacheService.purgeBrowserCache(this.openAIREEntities.DATASOURCE+" added", this.community.communityId);
@@ -120,7 +120,7 @@ export class AddContentProvidersComponent implements OnInit {
   
   public removeContentProvider(contentProvider) {
     let communityContentProvider = this.getCommunityContentProvider(contentProvider);
-    let contentProviderId: string = communityContentProvider['id'];
+    let contentProviderId: string = communityContentProvider['openaireId'];
     this.subscriptions.push(this.manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, contentProviderId).subscribe(
       data => {
         let index = this.communityContentProviders.indexOf(communityContentProvider);

src/app/pages/content-providers/communityContentProviders.module.ts

@@ -28,6 +28,9 @@ import {AddContentProvidersComponent} from "./add-content-providers.component";
 import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service";
 import {SearchDataprovidersService} from "../../openaireLibrary/services/searchDataproviders.service";
 import {CriteriaModule} from "./criteria/criteria.module";
+import {MatSlideToggleModule} from "@angular/material/slide-toggle";
+import {CKEditorModule} from "ng2-ckeditor";
+import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module";
 
 @NgModule({
   imports: [
@@ -48,7 +51,7 @@ import {CriteriaModule} from "./criteria/criteria.module";
         path: '', component: ManageContentProvidersComponent
       }
     ]),
-    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule
+    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule, MatSlideToggleModule, CKEditorModule, ReactiveFormsModule, ValidateEnabledPageModule
   ],
   declarations: [
     ManageContentProvidersComponent,

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

@@ -7,12 +7,14 @@ export class CriteriaUtils {
     {value: 'title', label: 'Title'},
     {value: 'orcid', label: 'Author\'s ORCID'},
     {value: 'contributor', label: 'Contributor'},
-    {value: 'description', label: 'Description'},
+    {value: 'description', label: 'Abstract'},
     {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,17 +22,24 @@ 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 {
+  public getFiltersAsText(criteria: Criteria[], shortVersion=true): string {
-    let text = criteria.slice(0, 3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
+    let text = criteria.slice(0, shortVersion?3:criteria.length).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
       let field = this.fields.find(field => field.value === constraint.field)?.label;
       let matchCase = false;
       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;
+      let expFeature = field =='Publisher' || field == 'Publication Year'? `<span *ngIf="constraint.get('field').value == 'publisher' || constraint.get('field').value == 'publicationyear'" class="
+                      uk-margin-xsmall-left uk-padding-remove-vertical uk-label uk-label-warning uk-text-lowercase uk-padding-xsmall">experimental feature</span>`:''
+      return field + " " + verb + " " + value  + expFeature;
     }).join(" <b>and</b> "));
     return text.join("<br>");
   }

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

@@ -1,4 +1,4 @@
-<div class="uk-position-relative" style="min-height: 60vh">
+<div class="uk-position-relative" [style]=" height == -1?'': 'min-height:60vh'">
   <div *ngIf="loading" class="uk-position-center">
     <loading></loading>
   </div>
@@ -32,6 +32,8 @@
                   </div>
                   <div *ngFor="let constraint of getConstraint(i).controls; let j=index" [formGroupName]="j.toString()"
                        class="uk-margin-bottom uk-hidden@l">
+                    <span *ngIf="constraint.get('field').value == 'publisher' || constraint.get('field').value == 'publicationyear'" class="
+                       uk-padding-remove-vertical uk-label uk-label-warning uk-text-lowercase uk-float-left uk-padding-xsmall">experimental feature</span>
                     <div class="uk-flex-middle uk-grid-small uk-margin-medium-bottom" uk-grid>
                       <div class="uk-flex uk-flex-right uk-width-1-1">
                         <button class="uk-close uk-icon" (click)="removeConstraint(i, j)">
@@ -40,13 +42,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>
@@ -66,11 +72,15 @@
                   </div>
                   <div *ngFor="let constraint of getConstraint(i).controls; let j=index"
                        [formGroupName]="j.toString()" class="uk-margin-bottom uk-visible@l">
+                    <span *ngIf="constraint.get('field').value == 'publisher' || constraint.get('field').value == 'publicationyear'" class="
+                       uk-padding-remove-vertical uk-label uk-label-warning uk-text-lowercase uk-padding-xsmall">experimental feature</span>
                     <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

@@ -49,7 +49,6 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   ngOnInit() {
-    this.reset();
     this.loading = false;
     this.subscriptions.push(this.vocabulariesService.getVocabularyByType('fos', null, properties).subscribe((fos: any[]) => {
       this.fos = fos.map(element => element.id);
@@ -60,6 +59,9 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   ngOnChanges(changes: SimpleChanges) {
+    if(changes.selectionCriteria){
+      this.reset();
+    }
     this.calculateMaxHeight();
   }
   
@@ -86,10 +88,11 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   reset() {
-    if (this.selectionCriteria?.criteria) {
     this.selectionCriteriaForm = this.fb.group({
       criteria: this.fb.array([])
     });
+    if (this.selectionCriteria?.criteria) {
+
       this.selectionCriteria.criteria.forEach(criterion => {
         let constraintArray: UntypedFormArray = this.fb.array([]);
         criterion.constraint.forEach(constraint => {
@@ -158,7 +161,7 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   get dirty() {
-    if (!this.selectionCriteria || !this.criteria) {
+    if (!this.selectionCriteria && !this.criteria) {
       return false;
     } else if (this.criteria.length !== this.criteriaArray.length) {
       return true;
@@ -222,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/manage-content-providers.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core';
+import {ChangeDetectorRef, Component, OnInit, SimpleChanges, ViewChild} from '@angular/core';
 import {RemoveContentProvidersComponent} from './remove-content-providers.component';
 import {Title} from '@angular/platform-browser';
 import {
@@ -15,6 +15,7 @@ import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFie
 import {CriteriaComponent} from "./criteria/criteria.component";
 import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
 import {ManageCommunityContentProvidersService} from "../../services/manageContentProviders.service";
+import {UntypedFormBuilder} from "@angular/forms";
 
 @Component({
   selector: 'manage-content-providers',
@@ -23,6 +24,7 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
                               [communityContentProviders]="communityContentProviders"
                               [loading]="showLoadingInRemove" [community]="community"
                               (editCriteria)="openCriteria($event)"
+                              
                               (communityContentProvidersChanged)="communityContentProvidersChanged($event)">
     </remove-content-providers>
     <fs-modal #addContentProvidersModal>
@@ -30,10 +32,23 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
                              [community]="community"
                              (communityContentProvidersChanged)="communityContentProvidersChanged($event)"></add-content-providers>
     </fs-modal>
-    <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
+    <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();"
-              [okButtonDisabled]="criteria && criteria.disabled">
+              [okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)">
       <div class="uk-container uk-container-large">
-        <criteria #criteria *ngIf="dataProvider" [height]="filtersModal.bodyHeight"
+        <div *ngIf="dataProvider" class="uk-text-large">{{dataProvider.officialname}}</div>
+        <div class="uk-flex uk-flex-center">
+          <div>
+          <mat-slide-toggle [checked]="enabled" (change)="enabled = !enabled; depositInfoChanged = true;"></mat-slide-toggle>
+          <label class="uk-margin-medium-top uk-margin-small-left ">Content source</label>
+          </div>
+          <div class="uk-margin-small-left">
+          <mat-slide-toggle [checked]="deposit" (change)="deposit = !deposit; depositInfoChanged = true;"></mat-slide-toggle>
+          <label class="uk-margin-medium-top uk-margin-small-left ">Suggest for deposit</label>
+          </div>
+        </div>
+        <div   class="uk-hr" [class.uk-hidden]="!enabled">
+        <div class="uk-text-center uk-text-bold uk-text-large uk-margin-top ">Content filters</div>
+        <criteria #criteria *ngIf="dataProvider" [height]="'-1'"
                   [selectionCriteria]="dataProvider.selectioncriteria">
           <div no-criteria>
             <h5 class="uk-margin-small-bottom">No Filters for {{dataProvider.officialname}} yet</h5>
@@ -43,6 +58,24 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
           </div>
         </criteria>
         </div>
+        <div *ngIf="deposit" class="uk-hr">
+          
+          <!--<div class="uk-width-1-1 uk-margin-medium-top" input placeholder="Type a message or instruction for researchers about deposition in this datasource"
+               [value]="message" (valueChange)="message=$event; depositInfoChanged = true;">
+          </div>-->
+          <div class="uk-margin-top uk-text-meta">Type a message or instruction for researchers about deposition in this datasource</div>
+          <ckeditor [readonly]="false"
+                    debounce="500"
+                    [formControl]="messageForm" (change)="messageChanged()"
+                    [config]="{ extraAllowedContent: '* [uk-*](*) ; span', disallowedContent: 'script; *[on*]', 
+                                        removeButtons:  'Save,NewPage,DocProps,Preview,Print,' +
+                                                        'Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,' +
+                                                        'CreateDiv,Flash,PageBreak,' +
+                                                        'Subscript,Superscript,Anchor,Smiley,Iframe,Styles,Font,About,Language,JustifyLeft,JustifyRight,JustifyCenter,JustifyBlock,FontSize,TextColor,BGColor',
+                                        extraPlugins: 'divarea'}">
+          </ckeditor>
+        </div>
+      </div>
     </fs-modal>
   `
 })
@@ -53,6 +86,7 @@ export class ManageContentProvidersComponent implements OnInit {
   @ViewChild('criteria') criteria: CriteriaComponent;
   @ViewChild('addContentProvidersModal', { static: true }) addContentProvidersModal: FullScreenModalComponent;
   @ViewChild('filtersModal', { static: true }) filtersModal: FullScreenModalComponent;
+  @ViewChild('depositModal', { static: true }) depositModal: FullScreenModalComponent;
   private subscriptions: any[] = [];
   public showLoadingInRemove: boolean = true;
   public body: string = "Send from page";
@@ -60,11 +94,16 @@ export class ManageContentProvidersComponent implements OnInit {
   public openaireEntities = OpenaireEntities;
   public community: CommunityInfo;
   public dataProvider: ContentProvider;
-
+  message = "";
+  deposit= false;
+  enabled = false;
+  depositInfoChanged =false;
+  messageForm = this.fb.control("");
   constructor(private title: Title,
               private cdr: ChangeDetectorRef,
               private communityService: CommunityService,
-              private manageCommunityContentProvidersService: ManageCommunityContentProvidersService) {
+              private manageCommunityContentProvidersService: ManageCommunityContentProvidersService,
+    private fb: UntypedFormBuilder) {
   }
 
   ngOnInit() {
@@ -96,17 +135,26 @@ export class ManageContentProvidersComponent implements OnInit {
   
   public openCriteria(contentProvider: ContentProvider) {
     this.dataProvider = contentProvider;
-    this.filtersModal.title = 'Filters';
+    this.deposit = this.dataProvider.deposit;
+    this.message = this.dataProvider.message;
+    this.enabled = this.dataProvider.enabled;
+    this.messageForm = this.fb.control(this.message);
+    this.depositInfoChanged = false;
+    this.filtersModal.title = 'Edit datasource options';
     this.filtersModal.okButtonText = "Save";
     this.filtersModal.back = true;
     this.filtersModal.okButton = true;
+
     this.filtersModal.open();
     this.cdr.detectChanges();
   }
-  
   public saveCriteria() {
     let callback = (selectionCriteria): void => {
       this.dataProvider.selectioncriteria = selectionCriteria;
+      this.dataProvider.deposit = this.deposit;
+      this.dataProvider.message = this.message;
+      this.dataProvider.enabled = this.enabled;
+      console.log(this.dataProvider)
       this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => {
         this.criteria.reset();
         this.removeContentProvidersComponent.getCommunityContentProviders();
@@ -118,6 +166,7 @@ export class ManageContentProvidersComponent implements OnInit {
       });
     }
     this.removeContentProvidersComponent.loading = true;
+    console.log()
     this.criteria.save(callback);
   }
 
@@ -128,4 +177,17 @@ export class ManageContentProvidersComponent implements OnInit {
       this.removeContentProvidersComponent.applyFilters();
     }
   }
+
+
+  depositReset(){
+    this.message = this.dataProvider.message;
+    this.messageForm.setValue(this.message);
+    this.deposit = this.dataProvider.deposit;
+    this.enabled = this.dataProvider.enabled;
+  }
+
+  messageChanged(){
+    this.message = this.messageForm.value;
+    this.depositInfoChanged = true;
+  }
 }

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

@@ -22,6 +22,8 @@
         <loading></loading>
       </div>
       <div *ngIf="!loading">
+        <validate-page-enabled pageRoute="/search/find/dataproviders"></validate-page-enabled>
+        <validate-page-enabled pageRoute="/participate/deposit/suggested"></validate-page-enabled>
         <div *ngIf="previewCommunityContentProviders.length == 0"
              class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
           <div>No <span class="uk-text-lowercase">{{openAIREEntities.DATASOURCES}} </span>
@@ -54,7 +56,13 @@
                           <span *ngIf="!item.officialname && !item.name">[no title available]</span>
                         </span>
                   </h6>
-                  <div *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-bottom uk-text-small">
+                  <div *ngIf="item.enabled" class="uk-label uk-text-primary uk-margin-small-right uk-padding-xsmall ">Content source</div>
+                  <div *ngIf="item.deposit" class="uk-label uk-label-success uk-padding-xsmall">Suggested for deposit</div>
+                  <div *ngIf="item.deposit && item.message" class=" uk-text-small uk-margin-top">
+                    <div class="uk-text-muted uk-text-xsmall">Deposit info:</div>
+                    <div [innerHTML]="item.message"></div>
+                    </div>
+                  <div *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-bottom uk-margin-small-top uk-text-small">
                     <div class="uk-text-meta uk-margin-small-bottom">Filters</div>
                     <div [innerHTML]="criteriaUtils.getFiltersAsText(item.selectioncriteria.criteria)"></div>
                     <div *ngIf="item.selectioncriteria.criteria.length > 3" class="uk-margin-small-top">
@@ -64,17 +72,23 @@
                 </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>
+                    </div>
                     <div>
                       <div class="uk-padding-small uk-padding-remove-horizontal">
                         <a (click)="openCriteria(item)" class="uk-button uk-button-link uk-flex uk-flex-middle">
-                          <icon name="filters" [flex]="true"></icon>
+                          <icon name="edit" [flex]="true"></icon>
-                          <span *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-left"
+                          <!--<span *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-left"
                                 uk-tooltip="<div>Edit filters to limit research results.<br>Results which satisfy any of the selected filters will be included in your community.</div>">
                             Edit filters
                           </span>
                           <span *ngIf="!(item.selectioncriteria?.criteria?.length > 0)" class="uk-margin-small-left"
                                 uk-tooltip="<div>Add filter to limit research results.<br>Results which satisfy any of the selected filters will be included in your community.</div>">
                           Add filters
+                        </span>-->
+                          <span  class="uk-margin-small-left"
+                                uk-tooltip="<div>Select datasource as content source and/or suggest for deposit. Add filters to limit research results.<br>Results which satisfy any of the selected filters will be included in your community.</div>">
+                            Edit Options
                           </span>
                         </a>
                       </div>

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

@@ -81,11 +81,13 @@ 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);
         this.applyFilters();
+        this._clearCacheService.clearCacheInRoute(this.openAIREEntities.DATASOURCE+" removed", this.community.communityId)
         this._clearCacheService.purgeBrowserCache(this.openAIREEntities.DATASOURCE+" removed", this.community.communityId);
         this.handleSuccess(this.openAIREEntities.DATASOURCE + ' successfully removed!')
         this.communityContentProvidersChanged.emit({
@@ -182,4 +184,5 @@ export class RemoveContentProvidersComponent implements OnInit {
   openCriteria(contentProvider: ContentProvider) {
     this.editCriteria.emit(contentProvider);
   }
+
 }

src/app/pages/customization/background-upload.component.ts

@@ -26,6 +26,7 @@ declare var UIkit;
            class="uk-float-right  uk-border-rounded uk-margin-top uk-margin-right uk-background-muted uk-button uk-button-link">
           <icon name="delete" [defaultSize]="true" [flex]="true"></icon>
         </a>
+        <div class="uk-text-small uk-margin-large-top uk-text-center" [class.uk-light]="!light">Lorem ipsum dolor sit amet...</div>
       </div>
     </div>
     <div *ngIf="background.imageFile" class="uk-margin-top">
@@ -51,7 +52,7 @@ export class BackgroundUploadComponent implements OnInit {
   @Input() oldBackground;
   // @Input() light:boolean;
   @Input() communityId: string = "";
-  
+  @Input() light:boolean; //fonts mode
   public file: File;
   // public photo: string | ArrayBuffer;
   private maxsize: number = 2000 * 1024;

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

@@ -17,7 +17,7 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust
       </div>
     </div>    
 
-    <div class="uk-text-warning uk-text-xsmall uk-margin-small-left" *ngIf="warningForContrast(color)">Contrast ratio may be too low.</div>
+    <div class="uk-text-warning uk-text-xsmall uk-margin-small-left" [class.uk-invisible]="!warningForContrast(color)">Contrast ratio may be too low.</div>
   `,
   styles:[
     `

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

@@ -1,5 +1,6 @@
-<aside *ngIf="draftCustomizationOptions" id="sidebar_main">
+<div *ngIf="draftCustomizationOptions" class="uk-flex">
-  <div id="sidebar_content">
+  <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">
@@ -11,7 +12,7 @@
           <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">
+      <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">
@@ -43,10 +44,9 @@
                   *ngTemplateOutlet="buttonOptions ; context: { }"></ng-container>
         </ng-container>
       </div>
-
     </div>
   </aside>
-<div *ngIf="draftCustomizationOptions" page-content>
+  <div page-content class="uk-width-1-1">
     <div actions>
       <div class="uk-section-small">
         <ng-container *ngTemplateOutlet="applyResetButtons;"></ng-container>
@@ -136,6 +136,8 @@
       </div>
     </div>
   </div>
+</div>
+
 <ng-template #identityOptions>
   <div class="functionalities-container uk-text-small">
     <div class="uk-margin-top">
@@ -206,12 +208,36 @@
                   [light]="false"></background>
       <background label="Light" [background]="draftCustomizationOptions.backgrounds.light"
                   [light]="true"></background>
-      <background label="Hero section" [background]="draftCustomizationOptions.backgrounds.form"
+      <background label="Custom section" [background]="draftCustomizationOptions.backgrounds.form"
-                  [light]="true"
+                  [light]="draftCustomizationOptions.backgrounds.form.fontsDarkMode"
                   [oldBackground]="publishedCustomizationOptions.backgrounds.form"
-                  [communityId]="communityId" description="The area under menu"></background>
+                  [communityId]="communityId"></background>
-      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle">
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle uk-heading-divider">
-        Hero section image
+        Custom section
+      </div>
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-medium-top uk-flex uk-flex-middle">
+        Fonts
+        <a *ngIf="( publishedCustomizationOptions.backgrounds.form.fontsDarkMode != draftCustomizationOptions.backgrounds.form.fontsDarkMode  )
+                  && draftCustomizationOptions.backgroundsIsCustom"
+           (click)="draftCustomizationOptions.backgrounds.form.fontsDarkMode=publishedCustomizationOptions.backgrounds.form.fontsDarkMode;" class="uk-margin-small-left uk-button-link"
+           uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>">
+          <icon name="settings_backup_restore" flex="true"></icon>
+        </a>
+      </div>
+      <div class="uk-margin-small-top">
+        <span>Dark mode </span>
+        <span>
+                  <mat-slide-toggle class="uk-margin-large-left"
+                                    [checked]="draftCustomizationOptions.backgrounds.form.fontsDarkMode"
+                                    (change)="draftCustomizationOptions.backgrounds.form.fontsDarkMode=!draftCustomizationOptions.backgrounds.form.fontsDarkMode;"
+                                    [attr.uk-tooltip]="'title:<div class=\'uk-width-large\'>' +
+                        (draftCustomizationOptions.backgrounds.form.fontsDarkMode?'Change to light color mode if the custom section background is dark':'Change to dark mode if the custom section background is light')+'</div>'"
+                  >
+                  </mat-slide-toggle>
+                  </span>
+      </div>
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-medium-top uk-flex uk-flex-middle">
+        Image
         <a *ngIf="(formHasChanges(publishedCustomizationOptions, draftCustomizationOptions)  )
                   && draftCustomizationOptions.backgroundsIsCustom"
            (click)="resetImageTo(publishedCustomizationOptions.backgrounds);" class="uk-margin-small-left uk-button-link"
@@ -222,7 +248,7 @@
       <div class="uk-margin-medium-bottom">
       <background-upload label="Form" [background]="draftCustomizationOptions.backgrounds.form"
                          [oldBackground]="publishedCustomizationOptions.backgrounds.form"
-                         [communityId]="communityId"></background-upload>
+                         [communityId]="communityId" [light]="draftCustomizationOptions.backgrounds.form.fontsDarkMode" ></background-upload>
       </div>
     </div>
   </div>

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

@@ -164,11 +164,6 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" },
     return JSON.stringify(object1) != JSON.stringify(object2);
   }
   saveLayout() {
-    if (!Session.isLoggedIn()) {
-      this._router.navigate(['/user-info'], {
-        queryParams: {'errorCode': LoginErrorCodes.NOT_VALID, 'redirectUrl': this._router.url}
-      });
-    }
     this.publishedLayout.layoutOptions =  this.copyObject(this.draftCustomizationOptions);
     this.publishedCustomizationOptions =  this.copyObject(this.publishedLayout.layoutOptions)
     this.publishedLayout.date = new Date();

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,18 @@ 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.clearCacheInRoute(this.openaireEntities.PROJECT+" added", this.community.communityId);
         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 +144,20 @@ export class AddProjectsComponent implements OnInit {
   }
 
   public removeProject(project: any) {
-    let communityProject = this.getCommunityProject(project);
+    // let communityProject = this.getCommunityProject(project);
-    let projectId: string = communityProject['id'];
+    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId,  project['id']).subscribe(
-    this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, projectId).subscribe(
       data => {
-        let index = this.communityProjects.indexOf(communityProject);
+        // let index = this.communityProjects.indexOf(communityProject);
-        this.communityProjects.splice(index, 1);
+        // 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 +167,19 @@ export class AddProjectsComponent implements OnInit {
     ));
   }
 
-  public getCommunityProject(project: any): string {
+  public getCommunityProject(project: any) {
-    let index: number = 0;
+    this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, 1, this.resultsPerPage, project.id, null).subscribe(
-    for (let communityProject of this.communityProjects) {
+      data => {
-      if (communityProject.openaireId == project.id ||
+        if(data.totalElements > 0){
-        (project.code == communityProject.grantId && project.funderShortname == communityProject.funder)) {
+          project["isPart"] = true;
-        return communityProject;
         }
-      index++;
+      },
+      err => {
+        console.error(err);
+        //TODO check erros (service not available, bad request)
+
       }
-    return "";
+    ));
   }
 
   getFunders() {
@@ -217,7 +224,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/communityProjects.module.ts

@@ -24,6 +24,7 @@ import {ResultPreviewModule} from "../../openaireLibrary/utils/result-preview/re
 import {ErrorMessagesModule} from "../../openaireLibrary/utils/errorMessages.module";
 import {DropdownFilterModule} from "../../openaireLibrary/utils/dropdown-filter/dropdown-filter.module";
 import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/searchFilter.module";
+import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module";
 
 @NgModule({
   imports: [
@@ -44,7 +45,7 @@ import {SearchFilterModule} from "../../openaireLibrary/searchPages/searchUtils/
         path: '', component: ManageProjectsComponent
       }
     ]),
-    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, DropdownFilterModule, SearchFilterModule
+    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, DropdownFilterModule, SearchFilterModule, ValidateEnabledPageModule
   ],
   declarations: [
     ManageProjectsComponent,

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"
+    <remove-projects #removeProjectsComponent (addProjects)="openAddProjects()"  
-                              [loading]="showLoadingInRemove" [community]="community"
+                              [loading]="showLoadingInRemove" [community]="community">
-                              (communityProjectsChanged)="communityProjectsChanged($event)">
     </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"
+      <results-and-pages [type]="openaireEntiites.PROJECTS | lowercase" [page]="communitySearchUtils.page" [pageSize]="resultsPerPage"
-                         [totalResults]="previewCommunityProjects.length"></results-and-pages>
+                         [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">
+
+            <li *ngFor="let option of previewFunderOptions">
               <a class="uk-link-text" >
-                <label (click)="select(option.value, $event, dropdownFilter)" class="uk-flex uk-flex-middle">
+                <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>
@@ -66,30 +67,30 @@
       <div *ngIf="loading" class="uk-position-center">
         <loading></loading>
       </div>
+      <validate-page-enabled pageRoute="/search/find/projects"></validate-page-enabled>
       <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 +125,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[] = [];
+  allFunderOptions: Option[] = [];
-  allOptions: Option[] = [];
+  previewFunderOptions: Option[] = [];
   sortOptions: Option[] = [
-    //{label:"Title (desc) ", value:{ sort: "title",descending: true }},
+    {label: "Title ", value: {sort: "name", descending: false}},
-    {label: "Title ", value: {sort: "title", descending: false}},
+    {label: "Grant ID ", value: {sort: "grantId", 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: "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.subscriptions.push(this.filterForm.get('keyword').valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
-      this.searchText = new RegExp(value, 'i');
       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._clearCacheService.clearCacheInRoute(this.openaireEntiites.PROJECT+" removed", this.community.communityId);
-        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({
+        this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null);
-          value: this.communityProjects,
+
-        });
-        this.communitySearchUtils.totalResults--;
-        this.communitySearchUtils.page = 1;
       },
       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.page = page;
-    this.communitySearchUtils.totalResults = 0;
+    this.communitySearchUtils.keyword = keyword;
-    this.communitySearchUtils.page = 1;
+    this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder, orderBy).subscribe(
-    this.communitySearchUtils.keyword = "";
-
-    this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe(
       data => {
-        this.communityProjects = data;
+        this.previewCommunityProjects = data.content;
-        this.previewCommunityProjects = this.communityProjects;
+        this.communitySearchUtils.totalResults = data.totalElements;
-        this.sort();
-
-        this.communitySearchUtils.totalResults = data.length;
         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 _getCommunityFunders() {
-  public createFunderFilter(): void {
+    this.subscriptions.push(this._searchCommunityProjectsService.getProjectFunders(this.properties, this.community.communityId).subscribe(
-    let funders: Set<string> = new Set<string>();
+      data => {
-    this.allOptions = [];
+         for (let funder of data) {
-    let i;
+          this.allFunderOptions.push({label: funder, value: {id: funder, label: funder}});
-    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}});
         }
+        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)) {
+      if(event.target.checked) {
-        this.selectedFunders.push(value);
+        this.filterForm.get("funder").setValue(option.value);
-        this.fundersCtrl.setControl(this.fundersCtrl.value.length, this._fb.control(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);
+        this.filterForm.get("funder").setValue(null);
-        if(index !== -1) {
+        this._getCommunityProjects(1, this.filterForm.get('keyword').value,null);
-          this.selectedFunders.splice(index, 1);
+        this.previewFunderOptions =[...this.allFunderOptions];
-          this.fundersCtrl.removeAt(index);
-        }
       }
     }
   }
 
   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/stats/stats.component.ts

@@ -133,7 +133,7 @@ export class StatsComponent implements OnInit {
         this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
       } else {
         //console.log(`calling ${this.properties.adminToolsAPIURL}/communityFull/${this.communityId}`);
-        this.configService.communityInformationState.subscribe(
+        this.configService.portalAsObservable.subscribe(
             res => {
               console.debug(res);
               if(res) {

src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html

@@ -21,6 +21,7 @@
       <div *ngIf="loading" class="uk-position-center">
         <loading></loading>
       </div>
+      <validate-page-enabled pageRoute="/subjects"></validate-page-enabled>
       <div *ngIf="!loading">
         <div *ngIf="displayedSubjects?.length == 0 && displayedSdg?.length == 0 && displayedFos?.length == 0"
           class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
@@ -31,19 +32,19 @@
             <li class="uk-active" *ngIf="displayedAllSubjects?.length" (click)="groupSubjects(displayedAllSubjects, 'all')">
               <a>All ({{displayedAllSubjects.length}})</a>
             </li>
-            <li *ngIf="displayedSubjects?.length" (click)="groupSubjects(displayedSubjects, 'freeText')">
+            <li (click)="groupSubjects(displayedSubjects, 'freeText')">
               <a>Free Text ({{displayedSubjects.length}})</a>
             </li>
-            <li *ngIf="displayedSdg?.length" (click)="groupSubjects(displayedSdg, 'sdg')">
+            <li (click)="groupSubjects(displayedSdg, 'sdg')">
               <a>SDGs ({{displayedSdg.length}})</a>
             </li>
-            <li *ngIf="displayedFos?.length" (click)="groupSubjects(displayedFos, 'fos')">
+            <li (click)="groupSubjects(displayedFos, 'fos')">
               <a>Fields of Science ({{displayedFos.length}})</a>
             </li>
           </ul>
           <ul class="uk-switcher">
-            <li *ngIf="displayedAllSubjects?.length">
+            <li>
-              <ng-container *ngIf="groupedAllSubjects?.length">
+              <ng-container *ngIf="displayedAllSubjects?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedAllSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -97,9 +98,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedAllSubjects?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedSubjects?.length">
+            <li>
-              <ng-container *ngIf="groupedSubjects?.length">
+              <ng-container *ngIf="displayedSubjects?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -153,9 +159,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedSubjects?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedSdg?.length">
+            <li>
-              <ng-container *ngIf="groupedSdg?.length">
+              <ng-container *ngIf="displayedSdg?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedSdg; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -209,9 +220,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedSdg?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedFos?.length">
+            <li>
-              <ng-container *ngIf="groupedFos?.length">
+              <ng-container *ngIf="displayedFos?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedFos; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -265,7 +281,13 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedFos?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
+
           </ul>
         </div>
       </div>

src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts

@@ -10,7 +10,9 @@ import {AlertModal} from '../../../openaireLibrary/utils/modal/alert';
 import {SearchInputComponent} from '../../../openaireLibrary/sharedComponents/search-input/search-input.component';
 import {forkJoin, Subscription} from 'rxjs';
 import {CommunityInfo} from '../../../openaireLibrary/connect/community/communityInfo';
-import {FullScreenModalComponent} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
+import {
+    FullScreenModalComponent
+} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
 import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class';
 import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler";
 import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";
@@ -342,6 +344,7 @@ export class SubjectsEditFormComponent implements OnInit {
             }
         });
         this._communityService.updateSubjects(this.community.subjects, this.community.fos, this.community.sdg);
+        this._clearCacheService.clearCacheInRoute("Subjects " + message, this.communityId);
         this._clearCacheService.purgeBrowserCache("Subjects " + message, this.communityId);
         NotificationHandler.rise('Subjects successfully ' + message + '!')
         this.loading = false;

src/app/pages/subjects/subjects-edit-form/subjects-edit-form.module.ts

@@ -18,12 +18,13 @@ import {FullScreenModalModule} from 'src/app/openaireLibrary/utils/modal/full-sc
 import {PagingModule} from "../../../openaireLibrary/utils/paging.module";
 import {SdgSelectionModule} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.module';
 import {FosSelectionModule} from '../../../openaireLibrary/fos/fos-selection/fos-selection.module';
+import {ValidateEnabledPageModule} from "../../../utils/validateEnabledPage.module";
 
 @NgModule({
   imports: [
     SubjectsEditFormRoutingModule, CommonModule, FormsModule, RouterModule,
     PageContentModule, IconsModule, AlertModalModule, NoLoadPaging, LoadingModule, InputModule,
-    SearchInputModule, FullScreenModalModule, PagingModule, SdgSelectionModule, FosSelectionModule
+    SearchInputModule, FullScreenModalModule, PagingModule, SdgSelectionModule, FosSelectionModule, ValidateEnabledPageModule
   ],
   declarations: [
     SubjectsEditFormComponent

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");
+        this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Members");
-        if(community.status !== "all") {
+        this.link = this.getURL(this.community.communityId);
-          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.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.html

@@ -22,9 +22,27 @@
             <div class="uk-card-body">
               <preview-zenodo-community [item]="item" [master]="masterCommunity && item.id==masterCommunity.id"></preview-zenodo-community>
             </div>
-            <div *ngIf="!masterCommunity || item.id!==masterCommunity.id" class="uk-card-footer uk-padding-remove-vertical">
+            <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="!inThelist(item, selectedCommunities) && !(masterCommunity && item.id==masterCommunity.id)">
+                <div *ngIf="inThelist(item, selectedCommunities) && !(masterCommunity && item.id==masterCommunity.id)">
+                  <div class="uk-padding-small uk-padding-remove-horizontal">
+                    <a (click)="removeCommunity(item)"
+                       class="uk-button uk-button-link uk-flex uk-flex-middle">
+                      <icon name="remove" [flex]="true"></icon>
+                      <span class="uk-margin-small-left">Remove</span>
+                    </a>
+                  </div>
+                </div>
+                <div *ngIf="(masterCommunity && item.id==masterCommunity.id)">
+                  <div class="uk-padding-small uk-padding-remove-horizontal">
+                    <a (click)="removeCommunity(item, true)"
+                       class="uk-button uk-button-link uk-flex uk-flex-middle">
+                      <icon name="remove" [flex]="true"></icon>
+                      <span class="uk-margin-small-left">Remove as Main</span>
+                    </a>
+                  </div>
+                </div>
+                <div *ngIf="!inThelist(item, selectedCommunities)">
                   <div class="uk-padding-small uk-padding-remove-horizontal">
                     <a (click)="addCommunity(item)" class="uk-button uk-button-link uk-flex uk-flex-middle">
                       <icon name="add" [flex]="true"></icon>
@@ -34,15 +52,17 @@
                     </a>
                   </div>
                 </div>
-                <div *ngIf="inThelist(item, selectedCommunities)">
+                <div *ngIf="!(masterCommunity)">
                   <div class="uk-padding-small uk-padding-remove-horizontal">
-                    <a (click)="removeCommunity(item)"
+                    <a (click)="addCommunity(item,true)" class="uk-button uk-button-link uk-flex uk-flex-middle">
-                       class="uk-button uk-button-link uk-flex uk-flex-middle">
+                      <icon name="add" [flex]="true"></icon>
-                      <icon name="remove" [flex]="true"></icon>
+                      <span class="uk-margin-small-left">
-                      <span class="uk-margin-small-left">Remove</span>
+                        Add as Main
+                      </span>
                     </a>
                   </div>
                 </div>
+
               </div>
             </div>
           </div>

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

@@ -11,6 +11,8 @@ import {Subject, Subscription} from 'rxjs';
 import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
 import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo";
 import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
+import {CommunityService} from "../../openaireLibrary/connect/community/community.service";
+import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
 
 declare var UIkit;
 
@@ -39,7 +41,8 @@ export class AddZenodoCommunitiesComponent implements OnInit {
               private _router: Router,
               public _fb: UntypedFormBuilder,
               private _zenodoCommunitieService: ZenodoCommunitiesService,
-              private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) {
+              private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService,
+              private _communityService: CommunityService) {
     
     this.errorCodes = new ErrorCodes();
     this.zenodoCommunitySearchUtils.status = this.errorCodes.LOADING;
@@ -130,18 +133,26 @@ export class AddZenodoCommunitiesComponent implements OnInit {
   }
   
   
-  public addCommunity(community) {
+  public addCommunity(community, master:boolean = false) {
-    this.subscriptions.push(this._manageZenodoCommunitiesService.addZCommunity(this.properties, this.community.communityId, community.id).subscribe(
+    if(master && this.getPosition(community) == -1 ){
+      this.addCommunity(community, false);
+    }
+    this.subscriptions.push(this._manageZenodoCommunitiesService.addZenodoCommunity(this.properties, this.community.communityId, community.id, master).subscribe(
       data => {
-        community["openaireId"] = data.id;
+        // this._communityService.setCommunity(this._communityService.parseCommunity(data));
+        if(master){
+          this.masterCommunity = community;
+        }else {
           this.selectedCommunities.push(community);
-        UIkit.notification('Community successfully added!', {
+        }
+        UIkit.notification('Community successfully added' + (master?" as master!":"!"), {
           status: 'success',
           timeout: 6000,
           pos: 'bottom-right'
         });
         this.zenodoCommunitiesChanged.emit({
-          value: this.selectedCommunities,
+          communities: this.selectedCommunities,
+          main:this.masterCommunity
         });
       },
       err => {
@@ -151,10 +162,19 @@ export class AddZenodoCommunitiesComponent implements OnInit {
     ));
   }
 
-  public removeCommunity(comm) {
+  public removeCommunity(comm, master:boolean = false) {
     var openaireId = this.getOpenaireId(comm);
-    this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, openaireId,).subscribe(
+    this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, openaireId, master).subscribe(
       data => {
+        this.afterRemoveActions(comm, master);
+      },
+      err => {
+        this.handleError('An error has been occurred. Try again later!');
+        console.log(err.status);
+      }
+    ));
+  }
+  getPosition(comm){
     var pos = -1;
     for (var i = 0; i < this.selectedCommunities.length; i++) {
       if (this.selectedCommunities[i].id == comm.id) {
@@ -162,26 +182,24 @@ export class AddZenodoCommunitiesComponent implements OnInit {
         break;
       }
     }
+    return pos;
+  }
+  afterRemoveActions(comm, master:boolean = false){
+    if(master){
+      this.masterCommunity = null;
+      NotificationHandler.rise('Community has been <b>removed from master</b>!')
+    }else {
+      var pos = this.getPosition(comm)
       if (pos != -1) {
         this.selectedCommunities.splice(pos, 1);
       }
-
+    }
-        UIkit.notification('Community successfully removed!', {
+    NotificationHandler.rise('Community has been <b>removed</b>!')
-          status: 'success',
-          timeout: 6000,
-          pos: 'bottom-right'
-        });
     this.zenodoCommunitiesChanged.emit({
-          value: this.selectedCommunities,
+      communities: this.selectedCommunities,
+      main: this.masterCommunity
     });
-      },
-      err => {
-        this.handleError('An error has been occurred. Try again later!');
-        console.log(err.status);
   }
-    ));
-  }
-  
   public inThelist(community: any, list): any {
     for (let com of list) {
       if (com.id == community.id) {
@@ -194,7 +212,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

@@ -1,158 +0,0 @@
-import {
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-  ViewEncapsulation
-} from '@angular/core';
-import {UntypedFormBuilder, UntypedFormControl} from '@angular/forms';
-import {ActivatedRoute, Router} from '@angular/router';
-import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
-import {properties} from "../../../environments/environment";
-import {ErrorCodes} from '../../openaireLibrary/utils/properties/errorCodes';
-import {SearchUtilsClass} from '../../openaireLibrary/searchPages/searchUtils/searchUtils.class';
-import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service';
-import {SearchInputComponent} from '../../openaireLibrary/sharedComponents/search-input/search-input.component';
-import {Subscription} from 'rxjs';
-import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo";
-import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
-import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
-
-@Component({
-  selector: 'manage-zenodo-communities',
-  templateUrl: './manage-zenodo-communities.component.html'
-})
-export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
-  properties: EnvProperties = properties;
-  @Input() community: CommunityInfo = null;
-  @Input() public loading: boolean = true;
-  @Input() searchUtils: SearchUtilsClass = null;
-  errorCodes: ErrorCodes;
-  public rowsOnPage = 10;
-  @Input() masterCommunity = null;
-  @Input() selectedCommunities = [];
-  previewCommunities = [];
-  @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity;
-  selectedToDelete = null;
-  @Output() addZenodoCommunity: EventEmitter<any> = new EventEmitter();
-  @Output() zenodoCommunitiesChanged = new EventEmitter();
-  page = 1;
-  size = 10;
-  @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
-  public filterForm: UntypedFormControl;
-  private subscriptions: any[] = [];
-
-  constructor(private route: ActivatedRoute,
-              private _router: Router,
-              public _fb: UntypedFormBuilder,
-              private cdr: ChangeDetectorRef,
-              private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) {
-    this.errorCodes = new ErrorCodes();
-  }
-  
-  ngOnInit() {
-    this.init();
-  }
-  
-  ngOnDestroy() {
-    this.subscriptions.forEach(subscription => {
-      if (subscription instanceof Subscription) {
-        subscription.unsubscribe();
-      }
-    });
-  }
-  
-  private init() {
-    this.filterForm = this._fb.control('');
-    this.filterPreviewCommunities("");
-    this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
-      this.page = 1;
-      this.filterPreviewCommunities(value);
-    }));
-    this.searchUtils.keyword = "";
-    this.searchUtils.totalResults = this.selectedCommunities.length;
-  }
-  
-  public filterPreviewCommunities(value: string) {
-    this.previewCommunities = this.selectedCommunities.filter(community => {
-      return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1
-    });
-    if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) {
-      this.page = 1;
-    }
-    this.cdr.detectChanges();
-  }
-  
-  public confirmedDeleteCommunity(data: any) {
-    this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.openaireId).subscribe(
-      data => {
-        var pos = -1;
-        for (var i = 0; i < this.selectedCommunities.length; i++) {
-          if (this.selectedCommunities[i].id == this.selectedToDelete.id) {
-            pos = i;
-            break;
-          }
-        }
-        if (pos != -1) {
-          this.selectedCommunities.splice(pos, 1);
-          this.searchUtils.totalResults = this.selectedCommunities.length;
-        }
-        this.searchUtils.totalResults = this.selectedCommunities.length;
-        this.filterPreviewCommunities(this.filterForm.value);
-        NotificationHandler.rise('Community has been <b>successfully removed</b>!')
-        this.zenodoCommunitiesChanged.emit({
-          value: this.selectedCommunities,
-        });
-      },
-      err => {
-        this.handleError('An error has been occurred. Try again later!');
-        console.log(err.status);
-      }
-    ));
-  }
-  
-  public removeCommunity(comm) {
-    this.selectedToDelete = comm;
-    this.alertModalDeleteCommunity.cancelButton = true;
-    this.alertModalDeleteCommunity.okButton = true;
-    this.alertModalDeleteCommunity.alertTitle = "Remove zenodo community";
-    let title = "";
-    if (comm.title) {
-      title = comm.title;
-    }
-
-    this.alertModalDeleteCommunity.message = "Zenodo community";
-    if (title) {
-      this.alertModalDeleteCommunity.message += " '" + title + "' ";
-    }
-    this.alertModalDeleteCommunity.message += "will be removed from your community. Are you sure?";
-    this.alertModalDeleteCommunity.okButtonText = "Yes";
-    this.alertModalDeleteCommunity.open();
-  }
-  
-  
-  totalPages(): number {
-    let totalPages: any = this.searchUtils.totalResults / (this.rowsOnPage);
-    if (!(Number.isInteger(totalPages))) {
-      totalPages = (parseInt(totalPages, 10) + 1);
-    }
-    return totalPages;
-  }
-
-  public updatePage($event) {
-    HelperFunctions.scroll();
-    this.page = $event.value;
-  }
-  
-  addNew() {
-    this.addZenodoCommunity.emit();
-  }
-  
-  handleError(message: string) {
-    NotificationHandler.rise(message, 'danger');
-  }
-}

src/app/pages/zenodo-communities/preview-z-community.component.ts

@@ -8,7 +8,7 @@ import {Component, Input} from '@angular/core';
           <a target="_blank" [href]="item.link">
             <img *ngIf="item.logoUrl"
                  src="{{item.logoUrl}}" width="80" height="80"
-                 alt="{{item.title}}">
+                 alt="">
           </a>
         </div>
         <div class="uk-width-expand">

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

@@ -1,4 +1,4 @@
-<div page-content>
+<div page-content *ngIf="community && searchUtils">
   <div actions>
     <div class="uk-section-xsmall uk-margin-top">
       <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-middle uk-grid" uk-grid>
@@ -6,7 +6,7 @@
              placeholder="Search Zenodo Community" [disabled]="searchUtils.status === errorCodes.LOADING"
              class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"></div>
         <div>
-          <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="addNew()"
+          <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="openAddZenodoCommunites()"
                   uk-tooltip="title:<div class='uk-text-bold'> Search and add more Zenodo Communities</div><div>The research results of a Zenodo community specified here will be automatically linked to your community dashboard.</div>"
                   [disabled]="searchUtils.status === errorCodes.LOADING"
                   [class.uk-disabled]="searchUtils.status === errorCodes.LOADING">
@@ -19,6 +19,7 @@
   </div>
   <div inner>
     <div class="uk-section uk-section-small uk-position-relative" style="min-height: 60vh">
+      <validate-page-enabled pageRoute="/participate/deposit/zenodo"></validate-page-enabled>
       <div *ngIf="searchUtils.status == errorCodes.LOADING" class="uk-position-center">
         <loading></loading>
       </div>
@@ -43,9 +44,9 @@
                 <div class="uk-card-body">
                   <preview-zenodo-community [item]="item" [master]="masterCommunity && item.id==masterCommunity.id"></preview-zenodo-community>
                 </div>
-                <div *ngIf="!masterCommunity || item.id!==masterCommunity.id" class="uk-card-footer uk-padding-remove-vertical">
+                <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>
+                    <div  *ngIf="item.id!==masterZenodoCommunityId" >
                       <div class="uk-padding-small uk-padding-remove-horizontal">
                         <button class="uk-button uk-button-link uk-flex uk-flex-middle"
                                 (click)="removeCommunity(item)">
@@ -54,6 +55,25 @@
                         </button>
                       </div>
                     </div>
+
+                    <div *ngIf="(item.id==masterZenodoCommunityId)">
+                      <div class="uk-padding-small uk-padding-remove-horizontal">
+                        <a (click)="removeFromMasterCommunity(item)"
+                           class="uk-button uk-button-link uk-flex uk-flex-middle">
+                          <icon name="remove" [flex]="true"></icon>
+                          <span class="uk-margin-small-left">Remove as Main</span>
+                        </a>
+                      </div>
+                    </div>
+                    <div   *ngIf="(!masterZenodoCommunityId)">
+                      <div class="uk-padding-small uk-padding-remove-horizontal">
+                        <a (click)="addAsMasterCommunity(item)"
+                           class="uk-button uk-button-link uk-flex uk-flex-middle">
+                          <icon name="add" [flex]="true"></icon>
+                          <span class="uk-margin-small-left">Add as Main</span>
+                        </a>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -72,3 +92,9 @@
   </div>
 </div>
 <modal-alert #AlertModalDeleteCommunity (alertOutput)="confirmedDeleteCommunity($event)" [overflowBody]="false"></modal-alert>
+
+<fs-modal #fsModal>
+  <add-zenodo-communities *ngIf="community" [masterCommunity]=masterCommunity
+                          [selectedCommunities]=selectedCommunities
+                          [community]="community" (zenodoCommunitiesChanged)="zenodoCommunitiesChanged($event)"></add-zenodo-communities>
+</fs-modal>

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

@@ -1,10 +1,18 @@
-import {Component, ElementRef, Input, OnDestroy, OnInit, ViewChild} from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 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';
@@ -14,95 +22,74 @@ import {Title} from '@angular/platform-browser';
 import {properties} from '../../../environments/environment';
 import {Subscription} from 'rxjs';
 import {FullScreenModalComponent} from '../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
-import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component';
+import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
+import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
+import {SearchInputComponent} from "../../openaireLibrary/sharedComponents/search-input/search-input.component";
+import {UntypedFormBuilder, UntypedFormControl} from "@angular/forms";
+import {ManageZenodoCommunitiesService} from "../../services/manageZenodoCommunities.service";
 
 @Component({
   selector: 'zenodo-communities',
-  template: `
+  templateUrl: 'zenodo-communities.component.html'
-    <manage-zenodo-communities #manage *ngIf="community && zenodoSearchUtils"
-                               [loading]="showLoadingInRemove"
-                               [masterCommunity]=masterZenodoCommunity [selectedCommunities]=selectedCommunities 
-                               [community]="community" [searchUtils]=zenodoSearchUtils (addZenodoCommunity)="openAddZenodoCommunites()"
-                               (zenodoCommunitiesChanged)="zenodoCommunitiesChanged($event)"></manage-zenodo-communities>
-    <fs-modal #fsModal>
-      <add-zenodo-communities [masterCommunity]=masterZenodoCommunity
-                              [selectedCommunities]=selectedCommunities 
-                              [community]="community" (zenodoCommunitiesChanged)="zenodoCommunitiesChanged($event)"></add-zenodo-communities>
-    </fs-modal>
-  `
 })
 export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
   public community: CommunityInfo = null;
   public toggle = false;
   public pageTitle = 'Manage zenodo communities';
   masterZenodoCommunityId = null;
-  masterZenodoCommunity = null;
+  masterCommunity = null;
   public properties: EnvProperties = null;
   selectedCommunityIds = null;
-  selectedCommunities = [];
+  selectedCommunities = null;
   zenodocommunitiesloadedCount = 0;
-  zenodoSearchUtils: SearchUtilsClass = new SearchUtilsClass();
   public errorCodes: ErrorCodes = new ErrorCodes();
   subscriptions = [];
   @ViewChild('fsModal', {static: true}) fullscreen: FullScreenModalComponent;
-  @ViewChild(ManageZenodoCommunitiesComponent) manage: ManageZenodoCommunitiesComponent;
   public showLoadingInRemove: boolean = true;
-
+  @Input() public loading: boolean = true;
+  @Input() searchUtils: SearchUtilsClass = new SearchUtilsClass();
+  public rowsOnPage = 10;
+  previewCommunities = [];
+  @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity;
+  selectedToDelete = null;
+  @Output() addZenodoCommunity: EventEmitter<any> = new EventEmitter();
+  page = 1;
+  size = 10;
+  @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent;
+  public filterForm: UntypedFormControl;
+  deleteMaster = false;
   constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router,
               private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title,
               private _communityService: CommunityService,
-              private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService) {
+              public _fb: UntypedFormBuilder,
+              private cdr: ChangeDetectorRef,
+              private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) {
   }
 
   ngOnInit() {
-    this.zenodoSearchUtils.status = this.errorCodes.LOADING;
+    this.searchUtils.status = this.errorCodes.LOADING;
     this.properties = properties;
-
+    this.subscriptions.push(this.route.params.subscribe(params => {
-    this.subscriptions.push(this._communityService.getCommunityAsObservable().subscribe(
+      //use this method to ensure that get the lattest version of the community and the updated information for the list of zenodo communities
+      this.subscriptions.push(this._communityService.getCommunity(params['community'],true).subscribe(
         community => {
             this.community = community;
             this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Zenodo Communities');
             this.masterZenodoCommunityId = this.community.zenodoCommunity;
-        if (this.masterZenodoCommunityId) {
+            this.selectedCommunities = [];
-          this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
+            this.searchUtils.status = this.errorCodes.LOADING;
-            this.properties.zenodoCommunities + this.masterZenodoCommunityId,
+            this.selectedCommunityIds = this.community.otherZenodoCommunities;
-            null).subscribe(
+            this.searchUtils.totalResults = this.selectedCommunityIds.length;
-            result => {
-              this.masterZenodoCommunity = result;
-              this.selectedCommunities.unshift(this.masterZenodoCommunity);
-            },
-            error => {
-              const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo();
-              emptyCommunity.id = this.masterZenodoCommunityId;
-              emptyCommunity.title = this.masterZenodoCommunityId;
-              this.masterZenodoCommunity = emptyCommunity;
-            }
-          ));
-        }
-        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.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length;
             if (this.selectedCommunityIds.length === 0) {
-              this.zenodoSearchUtils.status = this.errorCodes.NONE;
+              this.searchUtils.status = this.errorCodes.NONE;
             }
             for (let i = 0; i < this.selectedCommunityIds.length; i++) {
-              this.getZenodoCommunityById(
+              this.getZenodoCommunityById(this.selectedCommunityIds[i]);
-                this.selectedCommunityIds[i]['zenodoid'],
-                this.selectedCommunityIds[i]['id']);
             }
-
+            this.init();
-          },
-          error => {
-            console.log('list of zenodo communities couldn\'t be loaded');
-            this.zenodoSearchUtils.status = this.errorCodes.DONE;
-          }
-        );
         })
       );
-
+    }));
     this.fullscreen.title = "Search and Add Zenodo Communities";
     this.fullscreen.okButtonText = "Done";
     this.fullscreen.okButton = true;
@@ -116,27 +103,31 @@ 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 => {
+        if(zenodoid == this.masterZenodoCommunityId){
+          this.masterCommunity = result;
+          result.master = true;
+          this.selectedCommunities.unshift(result);
+        }else {
           this.selectedCommunities.push(result);
+        }
         this.zenodocommunitiesloadedCount++;
         if (this.zenodocommunitiesloadedCount >= this.selectedCommunityIds.length) {
-          this.zenodoSearchUtils.status = this.errorCodes.DONE;
+          this.searchUtils.status = this.errorCodes.DONE;
         }
 
-        
       },
       error => {
         const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo();
         emptyCommunity.id = zenodoid;
-        emptyCommunity.openaireId = openaireId;
         emptyCommunity.title = zenodoid;
         this.selectedCommunities.push(emptyCommunity);
         this.zenodocommunitiesloadedCount++;
         if (this.zenodocommunitiesloadedCount >= this.selectedCommunityIds.length) {
-          this.zenodoSearchUtils.status = this.errorCodes.DONE;
+          this.searchUtils.status = this.errorCodes.DONE;
         }
         console.log('Zenodo community\'' + zenodoid + '\' couldn\'t be loaded');
       }
@@ -153,11 +144,150 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
   }
 
   public zenodoCommunitiesChanged($event) {
-    this.selectedCommunities = $event.value;
+    this.selectedCommunities = $event.communities;
+    this.masterCommunity = $event.main;
+    if(!this.masterZenodoCommunityId && $event.main){
+      this.selectedCommunityIds.unshift($event.main.id)
+      this.selectedCommunities.unshift($event.main);
+    }
+    this.masterZenodoCommunityId = $event.main?$event.main.id:null;
     this.showLoadingInRemove = false;
-
     if (this.fullscreen.isOpen) {
-      this.manage.filterPreviewCommunities(this.manage.filterForm.value);
+      this.filterPreviewCommunities(this.filterForm.value);
+    }
+    this.filterPreviewCommunities(this.searchUtils.keyword);
+  }
+  private init() {
+    this.filterForm = this._fb.control('');
+    this.filterPreviewCommunities("");
+    this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
+      this.page = 1;
+      this.filterPreviewCommunities(value);
+    }));
+    this.searchUtils.keyword = "";
+    this.searchUtils.totalResults = this.selectedCommunities.length;
+  }
+
+  public filterPreviewCommunities(value: string) {
+    this.previewCommunities = this.selectedCommunities.filter(community => {
+      return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1
+    });
+    if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) {
+      this.page = 1;
+    }
+    this.cdr.detectChanges();
+  }
+
+  public confirmedDeleteCommunity(data: any) {
+    if(this.deleteMaster){
+      this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, this.selectedToDelete.id, true).subscribe(
+        data => {
+          this.afterRemoveActions();
+        }
+      ));
+    }else {
+      this.subscriptions.push(this._manageZenodoCommunitiesService.removeZenodoCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe(
+        data => {
+          this.afterRemoveActions();
+        }
+      ));
     }
   }
+  afterRemoveActions(){
+    if(this.deleteMaster){
+      this.masterCommunity = null;
+      this.masterZenodoCommunityId = null
+      NotificationHandler.rise('Community has been <b>removed from master</b>!')
+    }else {
+      var pos = -1;
+      for (var i = 0; i < this.selectedCommunities.length; i++) {
+        if (this.selectedCommunities[i].id == this.selectedToDelete.id) {
+          pos = i;
+          break;
+        }
+      }
+      if (pos != -1) {
+        this.selectedCommunities.splice(pos, 1);
+        this.selectedCommunityIds.splice(pos,1)
+          this.searchUtils.totalResults = this.selectedCommunities.length;
+      }
+      this.searchUtils.totalResults = this.selectedCommunities.length;
+      this.filterPreviewCommunities(this.filterForm.value);
+      NotificationHandler.rise('Community has been <b>successfully removed</b>!')
+    }
+  }
+  public removeCommunity(comm) {
+    this.deleteMaster = false;
+    this.selectedToDelete = comm;
+    this.alertModalDeleteCommunity.cancelButton = true;
+    this.alertModalDeleteCommunity.okButton = true;
+    this.alertModalDeleteCommunity.alertTitle = "Remove zenodo community";
+    let title = "";
+    if (comm.title) {
+      title = comm.title;
+    }
+
+    this.alertModalDeleteCommunity.message = "Zenodo community";
+    if (title) {
+      this.alertModalDeleteCommunity.message += " '" + title + "' ";
+    }
+    this.alertModalDeleteCommunity.message += "will be removed from your community. Are you sure?";
+    this.alertModalDeleteCommunity.okButtonText = "Yes";
+    this.alertModalDeleteCommunity.open();
+  }
+
+  public removeFromMasterCommunity(comm) {
+    this.deleteMaster = true;
+    this.selectedToDelete = comm;
+    this.alertModalDeleteCommunity.cancelButton = true;
+    this.alertModalDeleteCommunity.okButton = true;
+    this.alertModalDeleteCommunity.alertTitle = "Remove master zenodo community";
+    let title = "";
+    if (comm.title) {
+      title = comm.title;
+    }
+
+    this.alertModalDeleteCommunity.message = "Zenodo community";
+    if (title) {
+      this.alertModalDeleteCommunity.message += " '" + title + "' ";
+    }
+    this.alertModalDeleteCommunity.message += "will be removed as master from your community, but will remain in the list of the related communities. Do you want to proceed?";
+    this.alertModalDeleteCommunity.okButtonText = "Yes";
+    this.alertModalDeleteCommunity.open();
+  }
+
+
+  totalPages(): number {
+    let totalPages: any = this.searchUtils.totalResults / (this.rowsOnPage);
+    if (!(Number.isInteger(totalPages))) {
+      totalPages = (parseInt(totalPages, 10) + 1);
+    }
+    return totalPages;
+  }
+
+  public updatePage($event) {
+    HelperFunctions.scroll();
+    this.page = $event.value;
+  }
+
+  addNew() {
+    this.addZenodoCommunity.emit();
+  }
+
+  handleError(message: string) {
+    NotificationHandler.rise(message, 'danger');
+  }
+  public addAsMasterCommunity(community) {
+    this.subscriptions.push(this._manageZenodoCommunitiesService.addZenodoCommunity(this.properties ,this.community.communityId,community.id, true).subscribe(
+      data => {
+        this.masterCommunity = community;
+          this.masterZenodoCommunityId = community.id
+      },
+      err => {
+        this.handleError('An error has been occurred. Try again later!');
+        console.log(err.status);
+      }
+    ));
+  }
+
 }

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

@@ -2,10 +2,8 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
 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';
@@ -19,14 +17,15 @@ import {PageContentModule} from '../../openaireLibrary/dashboard/sharedComponent
 import {FullScreenModalModule} from '../../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module';
 import {HTMLToStringPipeModule} from '../../openaireLibrary/utils/pipes/HTMLToStringPipe.module';
 import {PagingModule} from "../../openaireLibrary/utils/paging.module";
+import {ValidateEnabledPageModule} from "../../utils/validateEnabledPage.module";
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule, RouterModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule,
+    CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule,
-    AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule
+    AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule, ValidateEnabledPageModule
   ],
   declarations: [
-    ManageZenodoCommunitiesComponent, ZenodoCommunitiesComponent, AddZenodoCommunitiesComponent, PreviewZenodoCommunityComponent
+    ZenodoCommunitiesComponent, AddZenodoCommunitiesComponent, PreviewZenodoCommunityComponent
   ],
   providers: [
      ManageZenodoCommunitiesService

src/app/services/manageContentProviders.service.ts

@@ -11,27 +11,29 @@ 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 + '/datasources?dsId=' +id;
     return this.http.request('delete', url, {body: id, headers: headers});
   }
 
-  addContentProvider(properties: EnvProperties, pid: string, contentProvider: any): Observable<ContentProvider> {
+  addContentProvider(properties: EnvProperties, pid: string, contentProvider: any, content:boolean, deposit:boolean): Observable<ContentProvider> {
-    let url = properties.communityAPI + pid + '/contentproviders';
+    let url = properties.communityAPI + pid + '/datasources';
-    let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid);
+    let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid, content, deposit);
     return this.http.post<ContentProvider>(url, communityContentProvider);
   }
 
   saveContentProvider(properties: EnvProperties, contentProvider: ContentProvider): Observable<ContentProvider> {
-    let url = properties.communityAPI + contentProvider.communityId + '/contentproviders';
+    let url = properties.communityAPI + contentProvider.communityId + '/datasources';
     return this.http.post<ContentProvider>(url, contentProvider);
   }
 
-  convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string): ContentProvider {
+  convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string, content:boolean, deposit:boolean): ContentProvider {
     let communityContentProvider: ContentProvider = new ContentProvider();
     communityContentProvider.communityId = community;
     communityContentProvider.officialname = contentProvider.title.name;
     communityContentProvider.name = contentProvider.englishname;
     communityContentProvider.openaireId = contentProvider.id;
+    communityContentProvider.enabled = content;
+    communityContentProvider.deposit = deposit;
 
     return communityContentProvider;
   }

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

@@ -5,35 +5,25 @@ import{EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
 @Injectable()
 export class  ManageZenodoCommunitiesService {
   constructor(private http: HttpClient ) {}
+ removeZenodoCommunity(properties:EnvProperties, pid: string,zenodoid: string, main:boolean = false) {
 
-  removeZCommunity (properties: EnvProperties, pid: string,id: string):any {
+    const options = {
-    //let headers = new Headers({'Content-Type': 'application/json', 'accept': 'application/json'});
+      headers: new HttpHeaders({
-    //let options = new RequestOptions({headers: headers, body: id});
+        'Content-Type': 'application/json',
-
+      })
-    let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'});
-    let url = properties.communityAPI + pid + "/zenodocommunities";
-
-    //return this.http.delete(url, options);
-    return this.http.request('delete', url, { body: id, headers: headers})
-  }
-
-  addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) {
-      //let headers = new Headers({'Content-Type': 'application/json'});
-      //let options = new RequestOptions({headers: headers});
-
-    let headers = new HttpHeaders({'Content-Type': 'application/json'});
-
-      let url = properties.communityAPI+pid+"/zenodocommunities";
-      var zCommunity: any = {
-        "communityId": pid,
-
-        "zenodoid": zenodoid
     };
-      return this.http.post<any>(url, JSON.stringify(zCommunity), {headers: headers});
+   let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid + "&main=" + main;
-                      //.map(res => <any> res.json())
+    return this.http.delete<any>(url,  options);
+  }
+  addZenodoCommunity(properties:EnvProperties, pid: string,zenodoid: string, main:boolean = false) {
+
+    const options = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+      })
+    };
+    let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid + "&main=" + main;
+    return this.http.post<any>(url,  options);
   }
 
-
-
-
 }

src/app/utils/validateEnabledPage.component.ts

@@ -0,0 +1,93 @@
+import {Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core";
+import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
+import {UntypedFormBuilder} from "@angular/forms";
+import {CommunityInfo} from "../openaireLibrary/connect/community/communityInfo";
+import {Page} from "../openaireLibrary/utils/entities/adminTool/page";
+import {AlertModal} from "../openaireLibrary/utils/modal/alert";
+import {ActivatedRoute, Router} from "@angular/router";
+import {Title} from "@angular/platform-browser";
+import {CommunityService} from "../openaireLibrary/connect/community/community.service";
+import {AffiliationService} from "../openaireLibrary/connect/affiliations/affiliation.service";
+import {HelpContentService} from "../services/help-content.service";
+import {ClearCacheService} from "../openaireLibrary/services/clear-cache.service";
+import {Subscription} from "rxjs";
+import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
+import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
+import {properties} from "src/environments/environment";
+
+@Component({
+  selector: 'validate-page-enabled',
+  template: `
+<div *ngIf="page && !pageEnabled" class="uk-width-1-1 uk-alert uk-alert-warning">
+  <b>{{page.name}}</b> page is not enabled. Manage pages <a [href]="community.communityId + '/admin-tools/pages'" target="_blank">here</a> or 
+  <a *ngIf="!pageEnabled" class=" uk-margin-right" [class.uk-disabled]="loading" [disabled]="loading"
+            (click)="enablePage()">enable it now</a>
+</div>
+  `
+})
+export class ValidateEnabledPageComponent implements OnInit, OnDestroy {
+  @Input() pageRoute:string;
+   public properties: EnvProperties = properties;
+
+
+  public community: CommunityInfo;
+  public page: Page;
+ loading;
+  private subs: any[] = [];
+  @ViewChild('affiliationModal') affiliationModal: AlertModal;
+  @ViewChild('removeAffiliationModal') removeAffiliationModal: AlertModal;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private title: Title,
+              private fb: UntypedFormBuilder,
+              private communityService: CommunityService,
+              private helpContentService: HelpContentService,
+              private _clearCacheService: ClearCacheService) {
+  }
+
+
+  ngOnInit() {
+    this.subs.push(this.communityService.getCommunityAsObservable().subscribe( community => {
+      this.community = community;
+        this.getPageStatus();
+    }));
+  }
+
+  ngOnDestroy() {
+    this.subs.forEach(sub => {
+      if (sub instanceof Subscription) {
+        sub.unsubscribe();
+      }
+    })
+  }
+
+  public get pageEnabled(): boolean {
+    return !this.page || this.page.isEnabled;
+  }
+
+
+  public updatePage(event) {
+    HelperFunctions.scroll();
+    this.page = event.value;
+  }
+
+
+  private getPageStatus() {
+    this.helpContentService.getCommunityPagesByRoute(this.community.communityId, this.pageRoute, this.properties.adminToolsAPIURL).subscribe((page) => {
+      this.page = page;
+    })
+  }
+
+
+  enablePage() {
+    this.loading = true;
+    this.helpContentService.togglePages(this.community.communityId, [this.page._id], true, this.properties.adminToolsAPIURL).subscribe(() => {
+      this.page.isEnabled = true;
+      this._clearCacheService.purgeBrowserCache("Page enabled", this.community.communityId);
+      NotificationHandler.rise(this.page.name + ' has been <b>enabled successfully</b>');
+      this.loading = false;
+    }, error => {
+    });
+  }
+}

src/app/utils/validateEnabledPage.module.ts

@@ -0,0 +1,17 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {RouterModule} from "@angular/router";
+import {ValidateEnabledPageComponent} from "./validateEnabledPage.component";
+import {AdminToolServiceModule} from "../openaireLibrary/services/adminToolService.module";
+import {HelpContentService} from "../services/help-content.service";
+
+@NgModule({
+  declarations: [ValidateEnabledPageComponent],
+  imports: [
+    CommonModule, RouterModule, AdminToolServiceModule
+  ],
+  exports:[ValidateEnabledPageComponent],
+  providers:[HelpContentService]
+})
+export class ValidateEnabledPageModule {
+}

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit d8e7e5439fbd606301b51fdd5ed5115d9ad75c22
+Subproject commit 3b437aafda7a716a0a89785a106456cbe520dce3

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit a5b03a914c98c4478d758f58a8ceacc8f3c0611a
+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 = {
+let props: EnvProperties = {
-  environment: "beta",
-  dashboard: 'connect',
   isDashboard: true,
-  adminToolsPortalType: "community",
   enablePiwikTrack: false,
   useCache: false,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
+  domain:'https://beta.admin.connect.openaire.eu',
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
+  monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/"
-  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'
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonBeta, ...props
+}

src/environments/environment.prod.ts

@@ -1,91 +1,16 @@
 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/",
+  domain:'https://admin.connect.openaire.eu',
-  claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
+  monitorStatsFrameUrl:"https://services.openaire.eu/stats-tool/"
-  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'
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonProd, ...props
+}

src/environments/environment.ts

@@ -4,93 +4,23 @@
 // 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/',
+  connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200',
-  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: "",
   domain:'https://beta.admin.connect.openaire.eu',
-  baseOpenaireLink: 'https://beta.explore.openaire.eu',
+  adminToolsAPIURL: 'http://scoobydoo.di.uoa.gr:8880/uoa-admin-tools/',
-  searchLinkToPublication: '/search/publication?articleId=',
+  utilsService: "http://scoobydoo.di.uoa.gr:8000",
-  searchLinkToProject: '/search/project?projectId=',
+
-  searchLinkToDataProvider: '/search/dataprovider?datasourceId=',
+  monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/",
-  searchLinkToDataset: '/search/dataset?datasetId=',
+  // disableFrameLoad : true
-  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
   }
 }