From db90f5f900640f56005bd34da515b76bb6047a75 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 25 Jun 2024 09:44:54 +0300 Subject: [PATCH 1/9] [develop | DONE | CHANGED] User Menu:show admin links menu only for organizations --- src/app/users/users.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index a4112e2..89aa52c 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -8,7 +8,7 @@ From b24ace93cab0a1cf6551663173fd261adb327a3e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 25 Jun 2024 15:36:32 +0300 Subject: [PATCH 2/9] Change position of id in browse stakeholders. --- .../browse-stakeholders/browse-stakeholders.component.html | 4 ++-- src/app/openaireLibrary | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/browse-stakeholders/browse-stakeholders.component.html b/src/app/browse-stakeholders/browse-stakeholders.component.html index 25de305..237d6fe 100644 --- a/src/app/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/browse-stakeholders/browse-stakeholders.component.html @@ -23,7 +23,7 @@ -
+
-
+
No {{entities.stakeholders}} available diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 6a781dd..ab3fb51 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 6a781dd4783e47a452b92b1e8abf947e221494e3 +Subproject commit ab3fb51ea306977aa414ad1aa84dd10060c72d1b From eabde3c9def41574ee5d166f7999a3f9fd3ad628 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 26 Jun 2024 10:18:32 +0300 Subject: [PATCH 3/9] [develop]: Fix mobile view in browse stakeholders. --- .../browse-stakeholders/browse-stakeholders.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/browse-stakeholders/browse-stakeholders.component.html b/src/app/browse-stakeholders/browse-stakeholders.component.html index 237d6fe..7858f2f 100644 --- a/src/app/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/browse-stakeholders/browse-stakeholders.component.html @@ -23,7 +23,7 @@
-
+
-
+
{{item.name}}
From 7f8a8148bb02fbe3666e1b5e432727c2a0fd3cdc Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 27 Jun 2024 15:37:18 +0300 Subject: [PATCH 4/9] [develop]: Add banner class help text in app component. --- src/app/app.component.html | 3 +++ src/app/app.component.ts | 12 +++++++++++- src/app/app.module.ts | 3 ++- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index d6d9230..ac75a2a 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -4,6 +4,9 @@
+
+ +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a8da927..e054bed 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -27,6 +27,7 @@ import { import {SidebarBaseComponent} from "./openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-base.component"; import {Breadcrumb} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.component'; import {OpenaireEntities} from './openaireLibrary/utils/properties/searchFields'; +import {HelperService} from "./openaireLibrary/utils/helper/helper.service"; @Component({ @@ -73,6 +74,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { paramsSubscription: Subscription; openaireEntities = OpenaireEntities; activeType: StakeholderType; + divContents: any; constructor(protected _route: ActivatedRoute, protected _router: Router, @@ -82,6 +84,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { private smoothScroll: SmoothScroll, private stakeholderService: StakeholderService, private configurationService: ConfigurationService, + private helper: HelperService, private resourcesService: ResourcesService) { super(); this.initRouterParams(_route, event => { @@ -92,6 +95,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { ngOnInit() { super.ngOnInit(); + this.getDivContents(); if (typeof document !== 'undefined' && window) { this.innerWidth = window.innerWidth; } @@ -266,7 +270,13 @@ export class AppComponent extends SidebarBaseComponent implements OnInit { this.configurationService.clearSubscriptions(); this.smoothScroll.clearSubscriptions(); } - + + private getDivContents() { + this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', '/').subscribe(contents => { + this.divContents = contents; + })); + } + private navigateToError() { this._router.navigate([this.properties.errorLink], {queryParams: {'page': this.properties.baseLink + this._router.url}}); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ca4d9aa..2c19321 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,6 +34,7 @@ import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-re import {RouteReuseStrategy} from "@angular/router"; import {LogoUrlPipeModule} from './openaireLibrary/utils/pipes/logoUrlPipe.module'; import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs.module'; +import {HelperModule} from "./openaireLibrary/utils/helper/helper.module"; @NgModule({ @@ -51,7 +52,7 @@ import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs AppRoutingModule, SideBarModule, Schema2jsonldModule, RoleVerificationModule, LoadingModule, NotificationsSidebarModule, IconsModule, CacheIndicatorsModule, LogoUrlPipeModule, - BreadcrumbsModule + BreadcrumbsModule, HelperModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index ab3fb51..1747140 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit ab3fb51ea306977aa414ad1aa84dd10060c72d1b +Subproject commit 17471400639898d452155b4718fdef3ad45a09a6 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index c7848e0..b4d09b7 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit c7848e0107c9505116f0951b2669429629b82735 +Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13 From cfb4a33603c1de4584d1d86c0508fe0ad0505a9e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 28 Jun 2024 11:52:56 +0300 Subject: [PATCH 5/9] [develop]: Update library and fix condition for divContents in app component. --- src/app/app.component.html | 2 +- src/app/openaireLibrary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index ac75a2a..41a60e6 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -4,7 +4,7 @@
-
+
Date: Fri, 28 Jun 2024 12:36:14 +0300 Subject: [PATCH 6/9] Add adminToolsPortalType in beta and prod --- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index ab113b0..ecf6338 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -3,6 +3,7 @@ import {common, commonBeta} from "../app/openaireLibrary/utils/properties/enviro let props: EnvProperties = { dashboard: 'monitor', + adminToolsPortalType: "monitor", isDashboard: true, enablePiwikTrack: true, monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 067ce80..f12c197 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,6 +3,7 @@ import {common, commonProd} from "../app/openaireLibrary/utils/properties/enviro let props: EnvProperties = { dashboard: 'monitor', + adminToolsPortalType: "monitor", isDashboard: true, enablePiwikTrack: true, monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/", From d8ffe5e429e44afe9025e5bfe0658870a47c1693 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 2 Jul 2024 15:56:23 +0300 Subject: [PATCH 7/9] [develop]: Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e463080..c97c542 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e463080109aa00935370c61dce668174aa4800c4 +Subproject commit c97c54208f6cdcbdcc1f01939a6f13242b0b20c2 diff --git a/src/assets/common-assets b/src/assets/common-assets index c5ba870..ee1a55a 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985 +Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 From a5a15ee1b77a7b4d411c5cf0ec95b28894c1d13c Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 15 Jul 2024 20:30:46 +0300 Subject: [PATCH 8/9] Update libaries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index c97c542..92f799e 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit c97c54208f6cdcbdcc1f01939a6f13242b0b20c2 +Subproject commit 92f799e63b8f2075278faf460852776e5fbe5704 diff --git a/src/assets/common-assets b/src/assets/common-assets index ee1a55a..6bc0212 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 +Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2 From e133d51bf0fad32f9282f7462c6ba1d7b8f53599 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 15 Jul 2024 20:31:45 +0300 Subject: [PATCH 9/9] Update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5566341..134e5a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monitor-dashboard", - "version": "1.0.2", + "version": "1.0.3", "scripts": { "ng": "ng", "start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",