MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MaDgIK:6560bd0cd938c6bd4fbdf3d2b3068aff5b928dee
Branches Tags
MaDgIK:master
MaDgIK:develop
MaDgIK:plugins-functionality
MaDgIK:umbrella
MaDgIK:on-push-strategy
MaDgIK:recommendations-functionality
MaDgIK:angular-16-irish-monitor
MaDgIK:grouped-queries
MaDgIK:develop-filters
MaDgIK:deprecated-angular-upgrade
MaDgIK:explore-redesign
MaDgIK:data-transfer-v2
MaDgIK:deprecated-master
...
compare: MaDgIK:327fe64293b7a6a2101e0ad6c979f5f39f80fc27
Branches Tags
MaDgIK:master
MaDgIK:develop
MaDgIK:plugins-functionality
MaDgIK:umbrella
MaDgIK:on-push-strategy
MaDgIK:recommendations-functionality
MaDgIK:angular-16-irish-monitor
MaDgIK:grouped-queries
MaDgIK:develop-filters
MaDgIK:deprecated-angular-upgrade
MaDgIK:explore-redesign
MaDgIK:data-transfer-v2
MaDgIK:deprecated-master

4 Commits
6560bd0cd9 ... 327fe64293

Author SHA1 Message Date
argirok 327fe64293 Merge remote-tracking branch 'origin/plugins-functionality' into plugins-functionality 2024-05-09 10:19:42 +03:00
argirok 01554f58f5 [pluginsFunctionality | DONE | CHANGED] remove cache from plugins, configuration and helper services 2024-05-09 10:18:20 +03:00
argirok 6c1c3ef2b2 [pluginsFunctionality | DONE | CHANGED] sdg page: add helptexts if input available 2024-05-09 10:17:33 +03:00
argirok 1abd7c111f [pluginsFunctionality | DONE | CHANGED] plugin-gateway-information.component.html make result numbers look like a link 2024-05-09 10:16:49 +03:00
7 changed files with 19 additions and 16 deletions
Show Stats Expand all files Collapse all files

10
dashboard/plugins/components/gateway-information/plugin-gateway-information.component.html
View File

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

1
sdg/sdg.component.html
View File

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

1
sdg/sdg.component.ts
View File

@ -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[] = [];

13
sdg/sdg.module.ts
View File

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

4
services/plugins.service.ts
View File

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

2
utils/configuration/configuration.service.ts
View File

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

4
utils/helper/helper.service.ts
View File

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