From 46696eb500ce8d29b1b80da588e61ca37f11e099 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 31 Oct 2023 00:09:55 +0200 Subject: [PATCH 1/8] Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index aaf970f..5af67f7 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit aaf970fae4014b0d546fdbf677c6c8a9b56c3e83 +Subproject commit 5af67f738570647ee61fb4d9ccb211bfae2890ae From e530869480202760fe10b501013746f0195c56cf Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 2 Nov 2023 11:31:23 +0200 Subject: [PATCH 2/8] [develop | DONE]: Move manage stakeholders to library --- src/app/app-routing.module.ts | 2 +- .../manageStakeholders-routing.module.ts | 18 - .../manageStakeholders.component.html | 138 -------- .../manageStakeholders.component.less | 23 -- .../manageStakeholders.component.ts | 307 ------------------ .../manageStakeholders.module.ts | 50 --- src/app/openaireLibrary | 2 +- 7 files changed, 2 insertions(+), 538 deletions(-) delete mode 100644 src/app/manageStakeholders/manageStakeholders-routing.module.ts delete mode 100644 src/app/manageStakeholders/manageStakeholders.component.html delete mode 100644 src/app/manageStakeholders/manageStakeholders.component.less delete mode 100644 src/app/manageStakeholders/manageStakeholders.component.ts delete mode 100644 src/app/manageStakeholders/manageStakeholders.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index dcf6a82..7b7d50f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,7 +23,7 @@ const routes: Routes = [ }, { path: 'admin', - loadChildren: () => import('./manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule), + loadChildren: () => import('./openaireLibrary/monitor-admin/manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule), canActivateChild: [LoginGuard], data: {hasAdminMenu: true, hasSidebar: false} }, diff --git a/src/app/manageStakeholders/manageStakeholders-routing.module.ts b/src/app/manageStakeholders/manageStakeholders-routing.module.ts deleted file mode 100644 index 09aaccc..0000000 --- a/src/app/manageStakeholders/manageStakeholders-routing.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {ManageStakeholdersComponent} from "./manageStakeholders.component"; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ManageStakeholdersComponent, - canDeactivate: [PreviousRouteRecorder] - } - ]) - ] -}) -export class ManageStakeholdersRoutingModule { -} diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html deleted file mode 100644 index 696e680..0000000 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ /dev/null @@ -1,138 +0,0 @@ -
-
- -
- - - - - -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-

Profile Templates

-
- - - -
- -
-
-
-
-

- No profiles to manage yet -

-
-
-

Profiles

-
- - - -
- -
-
-
-
-
-
-
- - -
-
-
- - - - -
- -
-
- -
-

- {{stakeholder.name}} -

-
-
- -
- -
-
- - - -
-
- {{text}} -
-
- - - -
-
- - - -
- -
-
- -
- - -
- -
-
- This stakeholder will permanently be deleted. Are you sure you want to proceed? -
- diff --git a/src/app/manageStakeholders/manageStakeholders.component.less b/src/app/manageStakeholders/manageStakeholders.component.less deleted file mode 100644 index ee70157..0000000 --- a/src/app/manageStakeholders/manageStakeholders.component.less +++ /dev/null @@ -1,23 +0,0 @@ -@import (reference) "~src/assets/openaire-theme/less/color.less"; - -.setType(@color) { - border-bottom: 4px solid fade(@color, 30%); - - & .type { - color: @color; - } -} - -.uk-card { - &.funder { - .setType(@funder-color); - } - - &.ri { - .setType(@ri-color); - } - - &.organization { - .setType(@organization-color); - } -} diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts deleted file mode 100644 index 094e045..0000000 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ /dev/null @@ -1,307 +0,0 @@ -import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core"; -import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; -import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; -import {Stakeholder, StakeholderEntities, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; -import {Subscriber, zip} from "rxjs"; -import {StakeholderUtils} from "../openaireLibrary/monitor-admin/utils/indicator-utils"; -import {UntypedFormBuilder, UntypedFormGroup} from "@angular/forms"; -import {AlertModal} from "../openaireLibrary/utils/modal/alert"; -import {Option} from "../openaireLibrary/sharedComponents/input/input.component"; -import {Title} from "@angular/platform-browser"; -import {UserManagementService} from "../openaireLibrary/services/user-management.service"; -import {Session} from "../openaireLibrary/login/utils/helper.class"; -import {EditStakeholderComponent} from "../openaireLibrary/monitor-admin/general/edit-stakeholder/edit-stakeholder.component"; -import {properties} from "../../environments/environment"; -import {ActivatedRoute} from "@angular/router"; -import {CacheIndicatorsService} from "../openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators.service"; -import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; - -type Tab = 'all' | 'templates'| 'profiles'; - -declare var UIkit; - -@Component({ - selector: 'home', - templateUrl: "./manageStakeholders.component.html", - styleUrls: ["./manageStakeholders.component.less"] -}) -export class ManageStakeholdersComponent implements OnInit, OnDestroy { - - public properties: EnvProperties; - public loading: boolean = true; - public deleteLoading: boolean = false; - public stakeholderUtils: StakeholderUtils = new StakeholderUtils(); - public defaultStakeholders: Stakeholder[]; - public stakeholders: Stakeholder[]; - public alias: string[]; - public stakeholder: Stakeholder; - public index: number; - public user = null; - public tab: Tab = 'all'; - public stakeholderEntities = StakeholderEntities; - /** - * Filtered Stakeholders - */ - public displayDefaultStakeholders: Stakeholder[]; - public displayStakeholders: Stakeholder[]; - /** - * Top filters - */ - public filters: UntypedFormGroup; - public all: Option = { - value: 'all', - label: 'All' - }; - - public callback: Function; - - /** - * Grid or List View - */ - private subscriptions: any[] = []; - @ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal; - @ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal; - @ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent; - - constructor(private stakeholderService: StakeholderService, - private cacheIndicatorsService: CacheIndicatorsService, - private userManagementService: UserManagementService, - private route: ActivatedRoute, - private title: Title, - private fb: UntypedFormBuilder) { - } - - ngOnInit(): void { - this.buildFilters(); - this.properties = properties; - this.title.setTitle('Manage profiles'); - this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { - this.user = user; - })); - let data = zip( - this.stakeholderService.getDefaultStakeholders(this.properties.monitorServiceAPIURL), - this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL), - this.stakeholderService.getAlias(this.properties.monitorServiceAPIURL) - ); - this.subscriptions.push(data.subscribe(res => { - this.defaultStakeholders = res[0]; - this.stakeholders = res[1]; - this.displayDefaultStakeholders = res[0]; - this.displayStakeholders = res[1]; - this.alias = res[2]; - this.loading = false; - }, error => { - this.loading = false; - })); - } - - ngOnDestroy(): void { - this.subscriptions.forEach(value => { - if (value instanceof Subscriber) { - value.unsubscribe(); - } else if (value instanceof Function) { - value(); - } - }); - } - - hide(element: any) { - UIkit.dropdown(element).hide(); - } - - - private buildFilters() { - this.filters = this.fb.group({ - status: this.fb.control('all'), - keyword: this.fb.control('') - }); - this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => { - this.onStatusChange(value); - })); - this.subscriptions.push(this.filters.get('keyword').valueChanges.subscribe(value => { - this.onKeywordChange(value); - })); - } - - onStatusChange(value) { - this.displayDefaultStakeholders = this.filterStatus(this.defaultStakeholders, value); - this.displayStakeholders = this.filterStatus(this.stakeholders, value); - } - - onKeywordChange(value) { - this.displayDefaultStakeholders = this.filterByKeyword(this.defaultStakeholders, value); - this.displayStakeholders = this.filterByKeyword(this.stakeholders, value); - } - - private filterStatus(stakeholders: Stakeholder[], value): Stakeholder[] { - if (value === 'all') { - return stakeholders; - } else { - return stakeholders.filter(stakeholder => stakeholder.visibility == value); - } - } - - private filterByKeyword(stakeholders: Stakeholder[], value): Stakeholder[] { - if (!value) { - return stakeholders; - } else { - return stakeholders.filter(stakeholder => - stakeholder.name && stakeholder.name.toLowerCase().includes(value.toLowerCase()) || - stakeholder.type && stakeholder.type.toLowerCase().includes(value.toLowerCase()) || - stakeholder.index_id && stakeholder.index_id.toLowerCase().includes(value.toLowerCase()) || - stakeholder.index_shortName && stakeholder.index_shortName.toLowerCase().includes(value.toLowerCase()) || - stakeholder.index_name && stakeholder.index_name.toLowerCase().includes(value.toLowerCase()) - ); - } - } - - public editStakeholder(stakeholder: Stakeholder = null, isDefault: boolean = false) { - if (isDefault) { - this.index = (stakeholder) ? this.defaultStakeholders.findIndex(value => value._id === stakeholder._id) : -1; - } else { - this.index = (stakeholder) ? this.stakeholders.findIndex(value => value._id === stakeholder._id) : -1; - } - if (!stakeholder) { - this.stakeholder = new Stakeholder(null, null, null, - null, null, null, null, null); - } else { - this.stakeholder = stakeholder; - } - this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, isDefault, this.index === -1); - if (this.index !== -1) { - this.callback = (stakeholder: Stakeholder) => { - let index: number; - if (stakeholder.defaultId == null) { - index = this.alias.findIndex(value => value == this.defaultStakeholders[this.index].alias); - this.defaultStakeholders[this.index] = stakeholder; - } else { - index = this.alias.findIndex(value => value == this.stakeholders[this.index].alias); - this.stakeholders[this.index] = stakeholder; - } - if(index != -1) { - this.alias[index] = stakeholder.alias; - } - this.editStakeholderModal.cancel(); - }; - this.editStakeholderModal.alertTitle = 'Edit ' + this.stakeholder.name; - this.editStakeholderModal.okButtonText = 'Save Changes'; - } else { - this.callback = (stakeholder: Stakeholder) => { - if (stakeholder.defaultId === null) { - this.defaultStakeholders.push(stakeholder); - } else { - this.stakeholders.push(stakeholder); - } - this.alias.push(stakeholder.alias); - this.editStakeholderModal.cancel(); - }; - this.editStakeholderModal.alertTitle = 'Create a new ' + (isDefault?'Default ':'') + 'Profile'; - this.editStakeholderModal.okButtonText = 'Create'; - } - this.editStakeholderModal.cancelButtonText = 'Cancel'; - this.editStakeholderModal.okButtonLeft = false; - this.editStakeholderModal.alertMessage = false; - this.editStakeholderModal.stayOpen = true; - this.editStakeholderModal.open(); - } - - public createReport(stakeholder: Stakeholder) { - this.cacheIndicatorsService.createReport(stakeholder.alias).subscribe(report => { - NotificationHandler.rise('A caching process for ' + stakeholder.name + ' has been started.' ) - }, error => { - console.log(error); - NotificationHandler.rise(error.message(), 'danger'); - }); - } - - public deleteStakeholderOpen(stakeholder: Stakeholder) { - this.stakeholder = stakeholder; - this.deleteStakeholderModal.alertTitle = 'Delete ' + this.stakeholder.index_name; - this.deleteStakeholderModal.cancelButtonText = 'No'; - this.deleteStakeholderModal.okButtonText = 'Yes'; - this.deleteStakeholderModal.alertMessage = false; - this.deleteStakeholderModal.stayOpen = true; - this.deleteStakeholderModal.open(); - } - - public deleteStakeholder() { - this.deleteLoading = true; - if (!this.stakeholder.defaultId) { - this.index = (this.stakeholder) ? this.defaultStakeholders.findIndex(value => value._id === this.stakeholder._id) : -1; - } else { - this.index = (this.stakeholder) ? this.stakeholders.findIndex(value => value._id === this.stakeholder._id) : -1; - } - this.subscriptions.push(this.stakeholderService.deleteElement(this.properties.monitorServiceAPIURL, [this.stakeholder._id]).subscribe(() => { - UIkit.notification(this.stakeholder.name+ ' has been successfully deleted', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - if (!this.stakeholder.defaultId) { - this.defaultStakeholders.splice(this.index, 1); - } else { - this.stakeholders.splice(this.index, 1); - } - this.alias = this.alias.filter(item => item !== this.stakeholder.alias); - this.deleteLoading = false; - this.deleteStakeholderModal.cancel(); - }, error => { - UIkit.notification('An error has occurred. Please try again later', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - this.deleteLoading = false; - this.deleteStakeholderModal.cancel(); - })); - } - - changeStakeholderStatus(stakeholder: Stakeholder, visibility: Visibility) { - let path = [ - stakeholder._id - ]; - this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => { - stakeholder.visibility = returnedElement.visibility; - UIkit.notification(stakeholder.name+ '\'s status has been successfully changed to ' + stakeholder.visibility.toLowerCase(), { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - }, error => { - UIkit.notification('An error has occurred. Please try again later', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); - })); - } - - public isManager(): boolean { - return this.isCurator() || (Session.isKindOfMonitorManager(this.user)); - } - - public isProfileManager(stakeholder: Stakeholder): boolean { - return this.isCurator() || (Session.isManager(stakeholder.type, stakeholder.alias, this.user)); - } - - public isCurator(): boolean { - return this.isAdmin() || Session.isMonitorCurator(this.user); - } - - public isAdmin(): boolean { - return Session.isPortalAdministrator(this.user); - } - - private isTab(tab: Tab): boolean { - switch (tab) { - case "all": - return true; - case "profiles": - return true; - case "templates": - return true; - default: - return false; - } - } -} diff --git a/src/app/manageStakeholders/manageStakeholders.module.ts b/src/app/manageStakeholders/manageStakeholders.module.ts deleted file mode 100644 index 230c644..0000000 --- a/src/app/manageStakeholders/manageStakeholders.module.ts +++ /dev/null @@ -1,50 +0,0 @@ -import {NgModule} from "@angular/core"; -import {ManageStakeholdersComponent} from "./manageStakeholders.component"; -import {ManageStakeholdersRoutingModule} from "./manageStakeholders-routing.module"; -import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; -import {CommonModule} from "@angular/common"; -import {RouterModule} from "@angular/router"; -import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module"; -import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; -import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; -import {ReactiveFormsModule} from "@angular/forms"; -import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; -import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {earth, incognito, restricted} from "../openaireLibrary/utils/icons/icons"; -import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; -import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; -import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; -import { - SidebarMobileToggleModule -} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module"; -import {SliderTabsModule} from "../openaireLibrary/sharedComponents/tabs/slider-tabs.module"; -import {EditStakeholderModule} from "../openaireLibrary/monitor-admin/general/edit-stakeholder/edit-stakeholder.module"; - -@NgModule({ - declarations: [ManageStakeholdersComponent], - imports: [ - ManageStakeholdersRoutingModule, - CommonModule, - RouterModule, - InputModule, - LoadingModule, - AlertModalModule, - ReactiveFormsModule, - EditStakeholderModule, - IconsModule, - PageContentModule, - LogoUrlPipeModule, - SearchInputModule, - SidebarMobileToggleModule, - SliderTabsModule - ], - providers: [ - PreviousRouteRecorder, - ], - exports: [ManageStakeholdersComponent] -}) -export class ManageStakeholdersModule { - constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([earth, incognito, restricted]); - } -} diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5af67f7..87e3c90 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5af67f738570647ee61fb4d9ccb211bfae2890ae +Subproject commit 87e3c903a8da0449a19aae5a762e9ad4e9cbeab9 From d0e1006b4df64542c0f555604e102dd617b6a9dc Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 2 Nov 2023 11:34:33 +0200 Subject: [PATCH 3/8] [develop | DONE]: Remove delete properties --- src/environments/environment.beta.ts | 6 ------ src/environments/environment.prod.ts | 6 ------ src/environments/environment.ts | 6 ------ 3 files changed, 18 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 6d544bb..eb73b59 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -8,7 +8,6 @@ export let properties: EnvProperties = { useCache: false, useLongCache: true, showContent: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", @@ -38,11 +37,6 @@ export let properties: EnvProperties = { sherpaURLSuffix: '/', zenodo: "https://zenodo.org/", zenodoCommunities: "https://zenodo.org/api/communities/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: 'https://www.openaire.eu/support/helpdesk', helpdeskEmail: 'helpdesk@openaire.eu', utilsService: "https://demo.openaire.eu/utils-service", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 49f9d5f..5e2335e 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -8,7 +8,6 @@ export let properties: EnvProperties = { useCache: false, useLongCache: true, showContent: true, - framesAPIURL: "https://www.openaire.eu/stats3/", statisticsAPIURL: "https://services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", @@ -38,11 +37,6 @@ export let properties: EnvProperties = { sherpaURLSuffix: '/', zenodo: "https://zenodo.org/", zenodoCommunities: "https://zenodo.org/api/communities/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: 'https://www.openaire.eu/support/helpdesk', helpdeskEmail: 'helpdesk@openaire.eu', utilsService: "https://explore.openaire.eu/utils-service", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ce0d4cf..aa6bb86 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,7 +14,6 @@ export let properties: EnvProperties = { useCache: false, useLongCache: false, showContent: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", @@ -45,11 +44,6 @@ export let properties: EnvProperties = { sherpaURLSuffix: '/', zenodo: "https://zenodo.org/", zenodoCommunities: "https://zenodo.org/api/communities/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: 'https://www.openaire.eu/support/helpdesk', helpdeskEmail: 'helpdesk@openaire.eu', utilsService: "http://mpagasas.di.uoa.gr:8000", From 42966b092183ccdb3ee09449843f0f624beabf6f Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 7 Nov 2023 13:46:02 +0200 Subject: [PATCH 4/8] [develop | DONE | FIXED]: Fix private overlay to be avove navbar. --- src/app/app.component.html | 42 +++++++++++++++++++------------------- src/app/openaireLibrary | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 8586544..9c28256 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,27 +3,27 @@
- -
- -
- - -
- -
-
- - - -
- You are currently in a "Preview" mode. The current view of this dashboard may differ. -
- -
+ + +
+
+ + +
+ +
+
+ + + +
+ You are currently in a "Preview" mode. The current view of this dashboard may differ. +
+
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 87e3c90..3aff9ee 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 87e3c903a8da0449a19aae5a762e9ad4e9cbeab9 +Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 From cf1ea7f2b2d67263764ea7ccfb20471ff9f1bf05 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 13 Nov 2023 16:26:38 +0200 Subject: [PATCH 5/8] [develop]: Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3aff9ee..293be5e 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 +Subproject commit 293be5e1d23e6f0f89344407331983b3e66afc9c From a94619a46fa079665eec0e3aa4e3dd5ee8d6231a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 11:38:06 +0200 Subject: [PATCH 6/8] [develop | DONE]: import indicators.less from common assets --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/styles.less | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 293be5e..054d7ff 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 293be5e1d23e6f0f89344407331983b3e66afc9c +Subproject commit 054d7ff51e7817332490bac55b6bfd3cf2f1e391 diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bb1e61..4f534fc 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit 4f534fc826ffbb6b0d3a8ddd47225f744dc3c1b8 diff --git a/src/styles.less b/src/styles.less index 98e2c65..9bbe777 100644 --- a/src/styles.less +++ b/src/styles.less @@ -5,6 +5,7 @@ @import "~src/assets/common-assets/less/general"; @import "~src/assets/common-assets/less/user"; @import "~src/assets/common-assets/less/dashboard"; +@import "~src/assets/common-assets/less/indicators"; @import "~src/assets/common-assets/less/ckeditor"; @import "~src/assets/monitor-dashboard-custom"; @import "assets/print.css"; From 8e10efff389cae0d113c6dbd7502b4fb06ee5f52 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 12 Dec 2023 10:11:05 +0200 Subject: [PATCH 7/8] Add copy.js and update libraries --- angular.json | 1 + src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index 6a72b29..dc0aa95 100644 --- a/angular.json +++ b/angular.json @@ -48,6 +48,7 @@ "src/assets/common-assets/library-css/material.scss" ], "scripts": [ + "src/assets/common-assets/js/copy.js", "node_modules/uikit/dist/js/uikit.min.js", "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 054d7ff..7b2b3c6 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 054d7ff51e7817332490bac55b6bfd3cf2f1e391 +Subproject commit 7b2b3c6cc4222ce087ba5417deae0c30adeffa5b diff --git a/src/assets/common-assets b/src/assets/common-assets index 4f534fc..77039ce 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 4f534fc826ffbb6b0d3a8ddd47225f744dc3c1b8 +Subproject commit 77039ce35b10da86cbaee1215eb045b3d21c9bfd diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5e8c1ad..2e308b3 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 +Subproject commit 2e308b336682f993c8cdef369d36c3e2f32271f1 From 3ede45600c485797d81b6d115a5a7ea9fe6e32f1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 21 Dec 2023 14:50:54 +0200 Subject: [PATCH 8/8] Change class for indicator-description to indicator overlay and improt it from indicators.less --- src/app/monitor/monitor.component.html | 2 +- src/app/monitor/monitor.component.less | 17 ----------------- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 6733d43..a97989d 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -223,7 +223,7 @@
+ class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
diff --git a/src/app/monitor/monitor.component.less b/src/app/monitor/monitor.component.less index c50e616..6bdfc05 100644 --- a/src/app/monitor/monitor.component.less +++ b/src/app/monitor/monitor.component.less @@ -5,20 +5,3 @@ opacity: 0.5; } } - -.indicator-description { - position: absolute; - top: 0; - left: 0; - background: @global-overlay-background; - width: 100%; - height: 100%; - - .inner { - background: @global-background; - border-radius: @global-border-radius; - width: 75%; - max-height: 75%; - overflow: auto; - } -} diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 7b2b3c6..41adaa3 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7b2b3c6cc4222ce087ba5417deae0c30adeffa5b +Subproject commit 41adaa308d96de18d14a7113ab7dd706c110044a diff --git a/src/assets/common-assets b/src/assets/common-assets index 77039ce..1979f5e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 77039ce35b10da86cbaee1215eb045b3d21c9bfd +Subproject commit 1979f5ec89ca960bf7c927a933a160854ae680b3 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2e308b3..df6a052 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2e308b336682f993c8cdef369d36c3e2f32271f1 +Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6