[plugins-functionality | WIP ] add properties for stats

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

@@ -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/remove-content-providers.component.ts

@@ -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({

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

@@ -14,7 +14,10 @@ let props: EnvProperties = {
   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 = {