From 9530677a0060084007829feee5d7c9e21a463c5b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 14:38:27 +0200 Subject: [PATCH] Fix active menus in navbar. Add user-info and reload pages. Add message in browse-stakeholders if the list is empty. --- src/app/admin/admin.component.ts | 3 +- src/app/admin/admin.module.ts | 5 +-- src/app/app-routing.module.ts | 14 +++++++- src/app/app.component.ts | 2 +- src/app/national/national.component.ts | 4 +-- src/app/national/national.module.ts | 6 ++-- src/app/openaireLibrary | 2 +- src/app/rfo/rfo.component.ts | 2 +- src/app/rpo/rpo.component.ts | 2 +- .../browse-stakeholders.component.html | 32 +++++++++---------- src/app/shared/irish.ts | 4 ++- src/app/shared/monitor/monitor.component.html | 2 +- src/assets/common-assets | 2 +- src/assets/extend-theme/less/color.less | 1 - src/assets/extend-theme/less/variables.less | 3 ++ src/assets/irish-monitor.less | 5 ++- src/styles.less | 1 + 17 files changed, 56 insertions(+), 34 deletions(-) diff --git a/src/app/admin/admin.component.ts b/src/app/admin/admin.component.ts index d8465a1..9dc57a7 100644 --- a/src/app/admin/admin.component.ts +++ b/src/app/admin/admin.component.ts @@ -15,7 +15,8 @@ import {MenuItem} from "../openaireLibrary/sharedComponents/menu"; [class.sidebar_main_active]="open && (hasSidebar || hasInternalSidebar)" [class.sidebar_mini]="!open && (hasSidebar || hasInternalSidebar)" [class.sidebar_hover]="hover"> - +
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts index cb7be86..1675bbf 100644 --- a/src/app/admin/admin.module.ts +++ b/src/app/admin/admin.module.ts @@ -5,6 +5,7 @@ import {AdminComponent} from "./admin.component"; import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; import {SideBarModule} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sideBar.module"; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; +import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; @NgModule({ imports: [CommonModule, RouterModule.forChild([ @@ -23,14 +24,14 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; { matcher: HelperFunctions.routingMatcher(['indicators', 'indicators/:topic']), loadChildren: () => import('../openaireLibrary/monitor-admin/topic/topic.module').then(m => m.TopicModule), - data: {hasInternalSidebar: true}, + data: {hasInternalSidebar: true, showLogo: true}, pathMatch: 'full' }, ] } ] } - ]), SideBarModule, LoadingModule], + ]), SideBarModule, LoadingModule, LogoUrlPipeModule], declarations: [AdminComponent], exports: [AdminComponent] }) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a9911c9..4b8a24a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,8 +2,19 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import {Irish} from "./shared/irish"; import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component"; +import {AdminLoginGuard} from "./openaireLibrary/login/adminLoginGuard.guard"; const routes: Routes = [ + { + path: 'reload', + loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule), + data: {hasSidebar: false} + }, + { + path: 'user-info', + loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule), + data: {hasSidebar: false} + }, { path: 'rpo', loadChildren: () => import('./rpo/rpo.module').then(m => m.RpoModule), @@ -25,7 +36,8 @@ const routes: Routes = [ { path: 'admin', loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule), - data: {title: Irish.METADATA_PREFIX + ' Admin | '}, + data: {title: Irish.METADATA_PREFIX + ' Admin | ', monitorCurator: true}, + canActivateChild: [AdminLoginGuard] }, {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule)}, { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 06cf3c1..48f107d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -69,7 +69,7 @@ export class AppComponent extends StakeholderBaseComponent implements OnInit { initialize() { this.menuItems = [ - new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/", false, [], null, {}, null, null, null, '/search'), + new MenuItem("national", this.stakeholderUtils.entities.country + ' ' + this.stakeholderUtils.entities.stakeholder, "", "/", false, [], null, {}, null, null, null), new MenuItem("rpo", this.stakeholderUtils.entities.organization + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rpo", false, [], null, {}, null, null, null, "/rpo"), new MenuItem("rfo", this.stakeholderUtils.entities.funder + ' ' + this.stakeholderUtils.entities.stakeholders, "", "/rfo", false, [], null, {}, null, null, null, "/rfo"), new MenuItem("researcher", "Researcher Monitors", "", "/researcher", false, [], null, {}, null, null, null, "/researcher"), diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts index 4ec296d..ac960dc 100644 --- a/src/app/national/national.component.ts +++ b/src/app/national/national.component.ts @@ -26,9 +26,9 @@ import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/s
diff --git a/src/app/national/national.module.ts b/src/app/national/national.module.ts index f11c6a5..6c8d2e7 100644 --- a/src/app/national/national.module.ts +++ b/src/app/national/national.module.ts @@ -6,9 +6,9 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; const routes: Route[] = [ { path: '', component: NationalComponent, children: [ - {path: 'search', loadChildren: () => import('../search/search.module').then(m => m.SearchModule)}, - {path: '', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, - ], data: {stakeholder: 'tubitak'} + {path: 'search', loadChildren: () => import('../search/search.module').then(m => m.SearchModule), data: {activeMenuItem: "national"}}, + {path: '', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule), data: {activeMenuItem: "national"}}, + ], data: {stakeholder: 'irish'} } ]; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 16b6a34..79d49c8 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 16b6a34d25608ec50e195159db9978046b55eda9 +Subproject commit 79d49c80e334c7674456b427e5cb59f2a9e4ae50 diff --git a/src/app/rfo/rfo.component.ts b/src/app/rfo/rfo.component.ts index 083582d..552c9ed 100644 --- a/src/app/rfo/rfo.component.ts +++ b/src/app/rfo/rfo.component.ts @@ -30,7 +30,7 @@ import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/s {{entities.stakeholder}} -
  • +
  • Browse Research Outputs
    • diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts index ff08001..40a9b07 100644 --- a/src/app/rpo/rpo.component.ts +++ b/src/app/rpo/rpo.component.ts @@ -30,7 +30,7 @@ import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/s {{entities.stakeholder}} -
  • +
  • Browse Research Outputs
    • diff --git a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html index 71b9a30..f03149c 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html @@ -3,12 +3,12 @@
    -
    +
    + placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-1-2@m uk-width-1-1">
    -
    +
    Grid List
    @@ -37,8 +37,10 @@
    -
    - No {{entities.stakeholders}} available +
    +
    + No {{entities.stakeholders}} available +
    @@ -64,20 +66,18 @@
    -
    -
    -
    +
    +
    +
    Type
    -
    - {{item.type}} +
    + {{getFunderTypeLabel(item.funderType)}}
    -
    % Open Access -
    @@ -94,7 +94,7 @@ Logo Name - Type + Type Open Access % @@ -114,9 +114,9 @@ {{item.name}}
    - -
    - {{item.type}} + +
    + {{getFunderTypeLabel(item.funderType)}}
    diff --git a/src/app/shared/irish.ts b/src/app/shared/irish.ts index 6b00f27..b622039 100644 --- a/src/app/shared/irish.ts +++ b/src/app/shared/irish.ts @@ -18,10 +18,12 @@ export class Irish { StakeholderConfiguration.TYPES = [ {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder}, {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization}, - {value: 'country', label: StakeholderConfiguration.ENTITIES.country} + {value: 'country', label: StakeholderConfiguration.ENTITIES.country}, + {value: 'datasource', label: StakeholderConfiguration.ENTITIES.datasource} ] StakeholderConfiguration.FUNDER_TYPES = [ + {value: null, label: 'None'}, {value: 'private', label: 'Private'}, {value: 'government', label: 'Government'} ]; diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html index f721e1d..0fc12f2 100644 --- a/src/app/shared/monitor/monitor.component.html +++ b/src/app/shared/monitor/monitor.component.html @@ -1,5 +1,5 @@
    -
    +
    diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bb1e61..b68f375 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1 diff --git a/src/assets/extend-theme/less/color.less b/src/assets/extend-theme/less/color.less index 9018756..45b3b96 100644 --- a/src/assets/extend-theme/less/color.less +++ b/src/assets/extend-theme/less/color.less @@ -4,7 +4,6 @@ @secondary-color: #FF7901; @ciel-color: #DCE9E3; @default-color: #F9FBFC; -@muted-color: @gray-300; @funder-color: #4D276F; diff --git a/src/assets/extend-theme/less/variables.less b/src/assets/extend-theme/less/variables.less index 204c092..9503001 100644 --- a/src/assets/extend-theme/less/variables.less +++ b/src/assets/extend-theme/less/variables.less @@ -3,6 +3,9 @@ /** Backgrounds */ @global-primary-gradient: radial-gradient(closest-side at 50% 50%, @primary-light-color 0%, @primary-dark-color 100%); +/** Border */ +@global-border: @gray-300; + /* Controls */ @global-control-small-height: 25px; @global-control-height: 33px; diff --git a/src/assets/irish-monitor.less b/src/assets/irish-monitor.less index f35c7b1..b03a0a9 100644 --- a/src/assets/irish-monitor.less +++ b/src/assets/irish-monitor.less @@ -13,6 +13,7 @@ @import (multiple) "~src/assets/common-assets/less/general"; @import (multiple) "~src/assets/common-assets/less/landing"; @import (multiple) "~src/assets/common-assets/less/dashboard"; + @import (multiple) "~src/assets/common-assets/less/indicators"; @primary-color: @funder-color; @primary-light-color: #9A4DDD; @@ -27,7 +28,7 @@ @import (multiple) "~src/assets/common-assets/less/general"; @import (multiple) "~src/assets/common-assets/less/landing"; @import (multiple) "~src/assets/common-assets/less/dashboard"; - + @import (multiple) "~src/assets/common-assets/less/indicators"; @primary-color: @organization-color; @primary-light-color: #ffe165; @primary-dark-color: #9c7d00; @@ -41,6 +42,7 @@ @import (multiple) "~src/assets/common-assets/less/general"; @import (multiple) "~src/assets/common-assets/less/landing"; @import (multiple) "~src/assets/common-assets/less/dashboard"; + @import (multiple) "~src/assets/common-assets/less/indicators"; @primary-color: @datasource-color; @primary-light-color: #D45E50; @@ -55,6 +57,7 @@ @import (multiple) "~src/assets/common-assets/less/general"; @import (multiple) "~src/assets/common-assets/less/landing"; @import (multiple) "~src/assets/common-assets/less/dashboard"; + @import (multiple) "~src/assets/common-assets/less/indicators"; @primary-color: @researcher-color; @primary-light-color: #3086ED; diff --git a/src/styles.less b/src/styles.less index a2c20e3..b3be04d 100644 --- a/src/styles.less +++ b/src/styles.less @@ -6,5 +6,6 @@ @import "~src/assets/common-assets/less/landing"; @import "~src/assets/common-assets/less/linking"; @import "~src/assets/common-assets/less/dashboard"; +@import "~src/assets/common-assets/less/indicators"; @import "~src/assets/common-assets/less/ckeditor"; @import "~src/assets/irish-monitor";