Merge remote-tracking branch 'origin/plugins-functionality' into plugins-functionality

dashboard/plugins/components/gateway-information/plugin-gateway-information.component.html

@@ -168,7 +168,7 @@
       <span class="uk-text-xsmall">
         {{openaireEntities.PUBLICATIONS}}
       </span>
-            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove"
+            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove uk-button-link"
                   [innerHTML]="resultCounts.publications | numberRound: 1:1">
       </span>
           </a>
@@ -183,7 +183,7 @@
       <span class="uk-text-xsmall">
         {{openaireEntities.DATASETS}}
       </span>
-            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove"
+            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove uk-button-link"
                   [innerHTML]="resultCounts.datasets | numberRound: 1:1">
       </span>
           </a>
@@ -196,7 +196,7 @@
         <span class="uk-text-xsmall">
           {{openaireEntities.DATASETS}}
         </span>
-            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove" [innerHTML]="resultCounts.datasets | numberRound: 1:1">
+            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove uk-button-link" [innerHTML]="resultCounts.datasets | numberRound: 1:1">
         </span>
           </a>
         </div>-->
@@ -210,7 +210,7 @@
   <span class="uk-text-xsmall">
     {{openaireEntities.SOFTWARE}}
   </span>
-            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove"
+            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove uk-button-link"
                   [innerHTML]="resultCounts.software | numberRound: 1:1">
   </span>
           </a>
@@ -225,7 +225,7 @@
   <span class="uk-text-xsmall">
     {{openaireEntities.OTHER}}
   </span>
-            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove"
+            <span *ngIf="resultCounts" class="uk-h6 uk-margin-remove uk-button-link"
                   [innerHTML]="resultCounts.other | numberRound: 1:1">
   </span>
           </a>

sdg/sdg.component.html

@@ -41,6 +41,7 @@
 		</div>
 	</div>
 </div>
+<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']" class="uk-container"></helper>
 <div class="uk-container uk-container-large uk-section"  uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
 	<div *ngIf="loading">
 		<loading></loading>

sdg/sdg.component.ts

@@ -31,6 +31,7 @@ export class SdgComponent implements OnInit, OnDestroy {
 	properties: EnvProperties = properties;
   openaireEntities = OpenaireEntities;
 	@Input() customFilter = null;
+	@Input() pageContents = null;
 	public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Sustainable Development Goals'}];
 
 	subscriptions: Subscription[] = [];

sdg/sdg.module.ts

@@ -9,13 +9,14 @@ import {Schema2jsonldModule} from "../sharedComponents/schema2jsonld/schema2json
 import {SEOServiceModule} from "../sharedComponents/SEO/SEOService.module";
 import {SdgRoutingModule} from './sdg-routing.module';
 import {SdgComponent} from './sdg.component';
+import {HelperModule} from "../utils/helper/helper.module";
 
 @NgModule({
-	imports: [
-		CommonModule, FormsModule, RouterModule,
-		SdgRoutingModule, BreadcrumbsModule, RefineFieldResultsServiceModule,
-		LoadingModule, Schema2jsonldModule, SEOServiceModule
-	],
+  imports: [
+    CommonModule, FormsModule, RouterModule,
+    SdgRoutingModule, BreadcrumbsModule, RefineFieldResultsServiceModule,
+    LoadingModule, Schema2jsonldModule, SEOServiceModule, HelperModule
+  ],
 	declarations: [
 		SdgComponent
 	],
@@ -26,4 +27,4 @@ import {SdgComponent} from './sdg.component';
 })
 export class SdgModule {
 
-}
+}

services/plugins.service.ts

@@ -52,11 +52,11 @@ export class PluginsService {
   }
   getPluginsByPageRoute(api:string, pid:string, route:string){
     let url = api  + 'community/' +pid+'/plugins/page/route?route=' + route;
-    return this.http.get<Array<Plugin>>((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) : url);
+    return this.http.get<Array<Plugin>>(/*(properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) : */url);
   }
   getPluginTemplatesByPageRoute(api:string, pid:string, route:string){
     let url =   api + 'community/' + pid + '/pluginTemplates/page/route?route=' + route;
-    return this.http.get<Array<PluginTemplate>>((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) : url);
+    return this.http.get<Array<PluginTemplate>>(/*(properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) :*/ url);
   }
 
   togglePlugin(id: string, status: boolean, api: string, community) {

utils/configuration/configuration.service.ts

@@ -37,7 +37,7 @@ export class ConfigurationService {
     if (pid == null || this.portal?.getValue()?.static) return;
     let url = properties.adminToolsAPIURL + "/" + properties.adminToolsPortalType + "/" + pid + "/full";
     this.promise = new Promise<void>(resolve => {
-      this.sub = this.http.get<Portal>((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) : url).subscribe(
+      this.sub = this.http.get<Portal>(/*(properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url) + (properties.forceCacheReload?'&forceReload=true':'')) :*/ url).subscribe(
           (portal: Portal) => {
             this.portal.next(portal);
             resolve();

utils/helper/helper.service.ts

@@ -26,7 +26,7 @@ export class HelperService {
           }
         }
 
-        return this.http.get((properties.useLongCache)? (properties.cacheUrl+encodeURIComponent(url)+ (properties.forceCacheReload?'&forceReload=true':'')): url);
+        return this.http.get(/*(properties.useLongCache)? (properties.cacheUrl+encodeURIComponent(url)+ (properties.forceCacheReload?'&forceReload=true':'')):*/ url);
                     //.map(res => <any> res.json());
 
     }
@@ -43,7 +43,7 @@ export class HelperService {
         let url = properties.adminToolsAPIURL;
         url += '/' + portalType + '/' + portal + '/pagehelpcontent/grouped?active=true&page=' +
           ((page_route.indexOf("/"+portal+"/")!=-1 ) ? ("/" + page_route.split("/"+portal+"/")[1]) : page_route);
-        return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)+ (properties.forceCacheReload?'&forceReload=true':'')) : url);
+        return this.http.get(/*(properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)+ (properties.forceCacheReload?'&forceReload=true':'')) :*/ url);
       }else {
         return of(null);
       }