[plugins-functionality | DONE | FIXED ] add content providers: fix upper/lower case

Manage Plugin Templates

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1
+Subproject commit e2b34b13ee3cf7e360e02fe85f79cea99954e78f

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: true, hasHeader: false}
+      },
+      {
+        path: 'plugin-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>

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

@@ -35,7 +35,7 @@ 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>
@@ -237,8 +237,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.purgeBrowserCache("Community saved", this.community.communityId);
+          this._clearCacheService.clearCacheInRoute("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);
@@ -251,8 +250,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.purgeBrowserCache("Community updated", this.community.communityId);
+        this._clearCacheService.clearCacheInRoute("Community saved",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/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 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>
+          <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>
+          <hr>
         </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>
+        <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) {
-    this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider).subscribe(
+  public addContentProvider(contentProvider: SearchResult, content = true, deposit =false) {
+    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,7 @@ 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";
 
 @NgModule({
   imports: [
@@ -48,7 +49,7 @@ import {CriteriaModule} from "./criteria/criteria.module";
         path: '', component: ManageContentProvidersComponent
       }
     ]),
-    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule
+    NoLoadPaging, LoadingModule, IconsModule, FullScreenModalModule, ResultPreviewModule, CriteriaModule, MatSlideToggleModule
   ],
   declarations: [
     ManageContentProvidersComponent,

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

@@ -7,7 +7,7 @@ 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'},
@@ -28,8 +28,8 @@ export class CriteriaUtils {
     {value: 'greater_than', label: 'greater than'}
   ]
   
-  public getFiltersAsText(criteria: Criteria[]): string {
-    let text = criteria.slice(0, 3).map((criterion, index) => (index + 1) + ". " + criterion.constraint.map(constraint => {
+  public getFiltersAsText(criteria: Criteria[], shortVersion=true): string {
+    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')) {
@@ -37,7 +37,9 @@ export class CriteriaUtils {
       }
       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

@@ -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)">
@@ -70,6 +72,8 @@
                   </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>

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

@@ -23,6 +23,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 +31,19 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
                              [community]="community"
                              (communityContentProvidersChanged)="communityContentProvidersChanged($event)"></add-content-providers>
     </fs-modal>
-    <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
-              [okButtonDisabled]="criteria && criteria.disabled">
+    <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset(); depositReset();"
+              [okButtonDisabled]="(criteria && criteria.disabled && !depositInfoChanged)">
       <div class="uk-container uk-container-large">
-        <criteria #criteria *ngIf="dataProvider" [height]="filtersModal.bodyHeight"
+        <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>
+        <br>
+        <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 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-text-center uk-text-bold uk-text-large uk-margin-medium-top">Content filters</div>
+        <criteria #criteria *ngIf="dataProvider" [height]="filtersModal.bodyHeight - 200"
                   [selectionCriteria]="dataProvider.selectioncriteria">
           <div no-criteria>
             <h5 class="uk-margin-small-bottom">No Filters for {{dataProvider.officialname}} yet</h5>
@@ -53,6 +63,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,7 +71,10 @@ export class ManageContentProvidersComponent implements OnInit {
   public openaireEntities = OpenaireEntities;
   public community: CommunityInfo;
   public dataProvider: ContentProvider;
-
+  message = "";
+  deposit= false;
+  enabled = false;
+  depositInfoChanged =false;
   constructor(private title: Title,
               private cdr: ChangeDetectorRef,
               private communityService: CommunityService,
@@ -96,17 +110,24 @@ 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.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;
       this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => {
         this.criteria.reset();
         this.removeContentProvidersComponent.getCommunityContentProviders();
@@ -128,4 +149,11 @@ export class ManageContentProvidersComponent implements OnInit {
       this.removeContentProvidersComponent.applyFilters();
     }
   }
+
+
+  depositReset(){
+    this.message = this.dataProvider.message;
+    this.deposit = this.dataProvider.deposit;
+    this.enabled = this.dataProvider.enabled;
+  }
 }

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

@@ -54,7 +54,12 @@
                           <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">
+                    <span class="uk-text-muted uk-text-xsmall">Deposit info:</span>
+                    {{item.message}}</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,18 +69,24 @@
                 </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>
-                          <span *ngIf="item.selectioncriteria?.criteria?.length > 0" class="uk-margin-small-left"
+                          <icon name="edit" [flex]="true"></icon>
+                          <!--<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>-->
+                          <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>
                     </div>

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

@@ -49,7 +49,7 @@ export class RemoveContentProvidersComponent implements OnInit {
   public keyword: string = '';
   @Output() addContentProviders: EventEmitter<void> = new EventEmitter();
   @Output() editCriteria: EventEmitter<ContentProvider> = new EventEmitter<ContentProvider>();
-  
+
   constructor(private route: ActivatedRoute, private _router: Router,
               private _fb: UntypedFormBuilder,
               private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService,
@@ -87,6 +87,7 @@ export class RemoveContentProvidersComponent implements OnInit {
         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({
@@ -183,4 +184,5 @@ export class RemoveContentProvidersComponent implements OnInit {
   openCriteria(contentProvider: ContentProvider) {
     this.editCriteria.emit(contentProvider);
   }
+
 }

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

@@ -208,12 +208,12 @@
                   [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]="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 uk-heading-divider">
-        Hero section
+        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
@@ -231,7 +231,7 @@
                                     [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 hero section background is dark':'Change to dark mode if the hero section background is light')+'</div>'"
+                        (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>

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/projects/add-projects.component.ts

@@ -123,6 +123,7 @@ export class AddProjectsComponent implements OnInit {
     this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe(
       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!', {

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

@@ -131,7 +131,7 @@ export class RemoveProjectsComponent implements OnInit {
   public confirmedDeleteProject(data: any) {
     this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe(
       data => {
-
+        this._clearCacheService.clearCacheInRoute(this.openaireEntiites.PROJECT+" removed", this.community.communityId);
         this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId);
         NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!');
         this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null);

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

@@ -344,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/zenodo-communities/manage-zenodo-communities.component.ts

@@ -5,7 +5,7 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  Output,
+  Output, SimpleChanges,
   ViewChild,
   ViewEncapsulation
 } from '@angular/core';
@@ -33,8 +33,8 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
   @Input() searchUtils: SearchUtilsClass = null;
   errorCodes: ErrorCodes;
   public rowsOnPage = 10;
-  @Input() masterCommunity = null;
-  @Input() selectedCommunities = [];
+  @Input() masterCommunity;
+  @Input() selectedCommunities;
   previewCommunities = [];
   @ViewChild('AlertModalDeleteCommunity') alertModalDeleteCommunity;
   selectedToDelete = null;
@@ -53,12 +53,12 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
               private _manageZenodoCommunitiesService: ManageZenodoCommunitiesService) {
     this.errorCodes = new ErrorCodes();
   }
-  
+
   ngOnInit() {
     this.init();
   }
-  
-  ngOnDestroy() {
+
+    ngOnDestroy() {
     this.subscriptions.forEach(subscription => {
       if (subscription instanceof Subscription) {
         subscription.unsubscribe();
@@ -67,6 +67,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
   }
   
   private init() {
+    console.log(this.selectedCommunities.length)
     this.filterForm = this._fb.control('');
     this.filterPreviewCommunities("");
     this.subscriptions.push(this.filterForm.valueChanges.subscribe(value => {
@@ -75,15 +76,18 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy {
     }));
     this.searchUtils.keyword = "";
     this.searchUtils.totalResults = this.selectedCommunities.length;
+    console.log(this.selectedCommunities.length, this.previewCommunities.length)
   }
   
   public filterPreviewCommunities(value: string) {
     this.previewCommunities = this.selectedCommunities.filter(community => {
       return !value || community.title.toLowerCase().indexOf(value.toLowerCase()) != -1
     });
+    console.log("filter", this.previewCommunities.length)
     if (this.previewCommunities.slice((this.page - 1) * this.rowsOnPage, this.page * this.rowsOnPage).length == 0) {
       this.page = 1;
     }
+    console.log("filter - slice", this.previewCommunities.length)
     this.cdr.detectChanges();
   }
   

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

@@ -37,12 +37,12 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
   masterZenodoCommunity = 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('fsModal', {static: true}) fullscreen: FullScreenModalComponent;
   @ViewChild(ManageZenodoCommunitiesComponent) manage: ManageZenodoCommunitiesComponent;
   public showLoadingInRemove: boolean = true;
 
@@ -50,7 +50,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
               private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title,
               private _communityService: CommunityService) {
   }
-  
+
   ngOnInit() {
     this.zenodoSearchUtils.status = this.errorCodes.LOADING;
     this.properties = properties;
@@ -60,41 +60,23 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
         this.community = community;
         this.title.setTitle(this.community.shortTitle.toUpperCase() + ' | Zenodo Communities');
         this.masterZenodoCommunityId = this.community.zenodoCommunity;
-        if (this.masterZenodoCommunityId) {
-          this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-             this.masterZenodoCommunityId).subscribe(
-            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 = this.community.otherZenodoCommunities;
-            this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length;
-            if (this.selectedCommunityIds.length === 0) {
-              this.zenodoSearchUtils.status = this.errorCodes.NONE;
-            }
-            for (let i = 0; i < this.selectedCommunityIds.length; i++) {
-              this.getZenodoCommunityById(
-                this.selectedCommunityIds[i]);
-            }
+        this.selectedCommunities = [];
+
+        this.zenodoSearchUtils.status = this.errorCodes.LOADING;
+
+        this.selectedCommunityIds = this.community.otherZenodoCommunities;
+        if(this.masterZenodoCommunityId){
+          this.selectedCommunityIds.unshift(this.masterZenodoCommunityId)
+        }
+        this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length;
+        if (this.selectedCommunityIds.length === 0) {
+          this.zenodoSearchUtils.status = this.errorCodes.NONE;
+        }
+        for (let i = 0; i < this.selectedCommunityIds.length; i++) {
+          this.getZenodoCommunityById(
+            this.selectedCommunityIds[i]);
+        }
 
-          // },
-          // error => {
-          //   console.log('list of zenodo communities couldn\'t be loaded');
-          //   this.zenodoSearchUtils.status = this.errorCodes.DONE;
-          // }
-        // );
       })
     );
 
@@ -102,7 +84,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
     this.fullscreen.okButtonText = "Done";
     this.fullscreen.okButton = true;
   }
-  
+
   ngOnDestroy() {
     this.subscriptions.forEach(subscription => {
       if (subscription instanceof Subscription) {
@@ -110,18 +92,23 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
       }
     });
   }
-  
+
   getZenodoCommunityById(zenodoid) {
     this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-       zenodoid).subscribe(
+      zenodoid).subscribe(
       result => {
-        this.selectedCommunities.push(result);
+        if(zenodoid == this.masterZenodoCommunityId){
+          this.masterZenodoCommunity = 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;
         }
-        
-        
+
       },
       error => {
         const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo();

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?contentproviderId=' +id;
+    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> {
-    let url = properties.communityAPI + pid + '/contentproviders';
-    let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid);
+  addContentProvider(properties: EnvProperties, pid: string, contentProvider: any, content:boolean, deposit:boolean): Observable<ContentProvider> {
+    let url = properties.communityAPI + pid + '/datasources';
+    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/assets/common-assets

@@ -1 +1 @@
-Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426
+Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79
+Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9

src/environments/environment.beta.ts

@@ -5,8 +5,8 @@ let props: EnvProperties = {
   isDashboard: true,
   enablePiwikTrack: false,
   useCache: false,
-  domain:'https://beta.admin.connect.openaire.eu'
-
+  domain:'https://beta.admin.connect.openaire.eu',
+  monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/"
 };
 
 export let properties: EnvProperties = {

src/environments/environment.prod.ts

@@ -7,6 +7,7 @@ let props: EnvProperties = {
   enablePiwikTrack: false,
   useCache: false,
   domain:'https://admin.connect.openaire.eu',
+  monitorStatsFrameUrl:"https://services.openaire.eu/stats-tool/"
 
 };
 

src/environments/environment.ts

@@ -13,7 +13,11 @@ let props: EnvProperties = {
   useCache: false,
   connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200',
   domain:'https://beta.admin.connect.openaire.eu',
+  adminToolsAPIURL: 'http://scoobydoo.di.uoa.gr:8880/uoa-admin-tools/',
+  utilsService: "http://scoobydoo.di.uoa.gr:8000",
 
+  monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/",
+  // disableFrameLoad : true
 };
 
 export let properties: EnvProperties = {