From daf12522c20890c8c6e6779346a9effe4ae7f3c7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 7 Apr 2022 20:31:55 +0300 Subject: [PATCH] Add super admin and monitor options in sidebar. Change tabs in methodology --- src/app/app-routing.module.ts | 3 +- src/app/app.component.html | 6 +- src/app/app.component.ts | 16 +- .../edit-stakeholder.module.ts | 5 +- .../manageStakeholders.component.html | 10 +- .../manageStakeholders.component.ts | 2 + .../manageStakeholders.module.ts | 4 +- src/app/methodology/methodology.component.ts | 384 +++++++++--------- src/app/topic/topic.component.html | 2 +- 9 files changed, 220 insertions(+), 212 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7d15630..bfc80e9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -24,7 +24,8 @@ const routes: Routes = [ { path: 'admin', loadChildren: () => import('./manageStakeholders/manageStakeholders.module').then(m => m.ManageStakeholdersModule), - canActivateChild: [LoginGuard] + canActivateChild: [LoginGuard], + data: {hasAdminMenu: true} }, { path: 'admin/admin-tools', diff --git a/src/app/app.component.html b/src/app/app.component.html index 7a4d88f..b420138 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,13 +2,13 @@
-
+
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 661f0d0..e759cd4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -267,7 +267,7 @@ export class AppComponent implements OnInit, OnDestroy { this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } if (this.stakeholder) { - + this.menuItems.push({ rootItem: new MenuItem("dashboard", "Dashboard", "", "/" + this.stakeholder.alias, false, [], null, {} @@ -303,7 +303,7 @@ export class AppComponent implements OnInit, OnDestroy { , null, null, null, null), items: [] }); } - + if (!this.hasAdminMenu && this.isFrontPage) { this.menuHeader = { route: "/" + this.stakeholder.alias, @@ -333,16 +333,15 @@ export class AppComponent implements OnInit, OnDestroy { // "", '/' + this.stakeholder.alias + '/', false, [], null, {}), items: [] // }); this.adminMenuItems.push(new MenuItem("general", "General", "", "/admin/" + this.stakeholder.alias, false, [], [], {}, {name: 'badge'})); - this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, {name: 'analytics'})); + this.adminMenuItems.push(new MenuItem("indicators", "Indicators", "", "/admin/" + this.stakeholder.alias + '/indicators', false, [], [], {}, {name: 'bar_chart'})); if (this.stakeholder.defaultId) { - this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, {name: 'group'}, null, null, "/admin/" + this.stakeholder.alias+"/users")); + this.adminMenuItems.push(new MenuItem("users", "Users", "", "/admin/" + this.stakeholder.alias + "/users", false, [], [], {}, {name: 'group'}, null, null, "/admin/" + this.stakeholder.alias + "/users")); if (Session.isPortalAdministrator(this.user)) { - this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, null, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools")); + this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools")); } } this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}); this.specialSideBarMenuItem.icon = {name: 'search', class: 'uk-text-secondary'}; - this.specialSideBarMenuItem.customClass = 'uk-text-uppercase uk-text-bold uk-text-secondary'; } } else { if (this.isFrontPage || !this.hasAdminMenu) { @@ -386,6 +385,11 @@ export class AppComponent implements OnInit, OnDestroy { }; this.adminMenuItems = []; this.specialSideBarMenuItem = null; + if (Session.isPortalAdministrator(this.user)) { + this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'})); + this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'})); + this.adminMenuItems.push(new MenuItem("stakeholders", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'})); + } } } diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.module.ts b/src/app/general/edit-stakeholder/edit-stakeholder.module.ts index 58690b1..441c72f 100644 --- a/src/app/general/edit-stakeholder/edit-stakeholder.module.ts +++ b/src/app/general/edit-stakeholder/edit-stakeholder.module.ts @@ -7,12 +7,9 @@ import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; import {IconsService} from "../../openaireLibrary/utils/icons/icons.service"; import {cloud_upload, edit, remove} from "../../openaireLibrary/utils/icons/icons"; import {NotifyFormModule} from "../../openaireLibrary/notifications/notify-form/notify-form.module"; -import { - AdvancedSearchInputModule -} from "../../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module"; @NgModule({ - imports: [CommonModule, InputModule, ReactiveFormsModule, IconsModule, NotifyFormModule, AdvancedSearchInputModule], + imports: [CommonModule, InputModule, ReactiveFormsModule, IconsModule, NotifyFormModule], declarations: [EditStakeholderComponent], exports: [EditStakeholderComponent] }) diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index 5817357..02463a6 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -54,8 +54,8 @@
-
-
+
+
@@ -85,13 +85,13 @@
-
+

{{stakeholder.name}}

-
- +
+
diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index 5229399..98dece4 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -185,6 +185,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { this.alias[index] = stakeholder.alias; } }; + this.editStakeholderModal.alertTitle = 'Edit ' + this.stakeholder.name; this.editStakeholderModal.okButtonText = 'Save Changes'; } else { this.callback = (stakeholder: Stakeholder) => { @@ -195,6 +196,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { } this.alias.push(stakeholder.alias); }; + this.editStakeholderModal.alertTitle = 'Create a new ' + (isDefault?'Default ':'') + 'Profile'; this.editStakeholderModal.okButtonText = 'Create'; } this.editStakeholderModal.cancelButtonText = 'Cancel'; diff --git a/src/app/manageStakeholders/manageStakeholders.module.ts b/src/app/manageStakeholders/manageStakeholders.module.ts index d7ce7b1..1ee3bca 100644 --- a/src/app/manageStakeholders/manageStakeholders.module.ts +++ b/src/app/manageStakeholders/manageStakeholders.module.ts @@ -11,7 +11,7 @@ import {ReactiveFormsModule} from "@angular/forms"; import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; -import {incognito, restricted} from "../openaireLibrary/utils/icons/icons"; +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"; @@ -39,6 +39,6 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu }) export class ManageStakeholdersModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([incognito, restricted]); + this.iconsService.registerIcons([earth, incognito, restricted]); } } diff --git a/src/app/methodology/methodology.component.ts b/src/app/methodology/methodology.component.ts index ea3721d..83f9a4c 100644 --- a/src/app/methodology/methodology.component.ts +++ b/src/app/methodology/methodology.component.ts @@ -15,196 +15,200 @@ import {ActivatedRoute, Router} from "@angular/router";

Terminology and
construction.

- - - -
-
-
Research Outcomes
-
-
There are currently four different types of research outcomes in the OpenAIRE Research
Graph:
-
    -
  • Publication
    • -
  • Dataset
    • -
  • Software
    • -
  • Other Research Product
    • -
-
- OpenAIRE deduplicates (merges) different records of research outcomes and keeps the
metadata of all instances. -
-
-
-
-
-
Publication
-
- Research outcomes intended for human reading (published articles, pre-prints, conference
papers, presentations, technical reports, etc.) -
-
-
-
-
Dataset
-
-
Research data
-
Granularity is not defined by OpenAIRE, it reflects the granularity supported by - the sources
from which the description of the dataset has been collected.
-
-
-
-
-
Software
-
- Source code or software package developed and/or used in a research context -
-
-
-
-
Other Research Product
-
- Anything that does not fall in the previous categories (e.g. workflow, methods, protocols) -
-
-
- - - - -
-
-
Organization & Country
-
-

For research outcomes: the affiliated organizations of its - authors (and their country)

-

For projects: the organizations participating in the project - (i.e. beneficiaries of the grant) and - their countries -

-

- Country code mapping: - - https://api.openaire.eu/vocabularies/dnet:countries -

-
-
-
-
-
Type
-
-

The sub-type of a research outcome (e.g., a publication can be a pre-print, conference proceeding, - article, - etc.)

-

Resource type mapping: - https://api.openaire.eu/vocabularies/dnet:result_typologies - (click on the code to see the specific types for each result type) -

-
-
-
-
-
Access mode
-
-

The best available (across all instances) access rights of a research outcome

-

Types: open, restricted, closed, embargo (= closed for a specific period of time, then open)

-

Note: definition of restricted - may vary by data source.

-
-
-
-
-
PID (persistent identifier)
-
-

A long-lasting reference to a resource

-

Types: http://api.openaire.eu/vocabularies/dnet:pid_types -

-
-
-
-
-
Context
-
- Related research community, initiative or infrastructure. -
-
-
-
-
Journal
-
- The scientific journal an article is published in. -
-
-
-
-
Publisher
-
- The publisher of the venue (journal, book, etc.) of a research outcome. -
-
-
-
-
Content Providers (Datasources)
-
-

The different data sources ingested in the OpenAIRE Research Graph.

-
Content Provider Types:
-
    -
  • Repositories
    • -
  • Open Access Publishers & Journals
    • -
  • Aggregators
    • -
  • Entity Registries
    • -
  • Journal Aggregators
    • -
  • CRIS (Current Research Information System)
    • -
-
-
-
-
-
Repositories
-
- Information systems where scientists upload the bibliographic metadata and payloads of their - research outcomes (e.g. PDFs of their scientific articles, CSVs of their data, archive with their - software), due to obligations from their organizations, their funders, or due to community practices - (e.g. ArXiv, Europe PMC, Zenodo). -
-
-
-
-
Open Access Publishers & Journals
-
- Information systems of open access publishers or relative journals, which offer bibliographic - metadata and PDFs of their published articles. -
-
-
-
-
Aggregators
-
- Information systems that collect descriptive metadata about research products from multiple sources - in order to enable cross-data source discovery of given research products (e,g, DataCite, - BASE, DOAJ). -
-
-
-
-
Entity Registries
-
- Information systems created with the intent of maintaining authoritative registries of given - entities in the scholarly communication, such as OpenDOAR for the institutional repositories, re3data - for the data repositories, CORDA and other funder databases for projects and funding information. -
-
-
-
-
CRIS (Current Research Information System)
-
- Information systems adopted by research and academic organizations to keep track of their research - administration records and relative results; examples of CRIS content are articles or datasets funded - by projects, their principal investigators, facilities acquired thanks to funding, etc. -
-
-
- - - + +
    +
  • +
    +
    +
    Research Outcomes
    +
    +
    There are currently four different types of research outcomes in the OpenAIRE Research
    Graph:
    +
      +
    • Publication
      • +
    • Dataset
      • +
    • Software
      • +
    • Other Research Product
      • +
    +
    + OpenAIRE deduplicates (merges) different records of research outcomes and keeps the
    metadata of all instances. +
    +
    +
    +
    +
    +
    Publication
    +
    + Research outcomes intended for human reading (published articles, pre-prints, conference
    papers, presentations, technical reports, etc.) +
    +
    +
    +
    +
    Dataset
    +
    +
    Research data
    +
    Granularity is not defined by OpenAIRE, it reflects the granularity supported by + the sources
    from which the description of the dataset has been collected.
    +
    +
    +
    +
    +
    Software
    +
    + Source code or software package developed and/or used in a research context +
    +
    +
    +
    +
    Other Research Product
    +
    + Anything that does not fall in the previous categories (e.g. workflow, methods, protocols) +
    +
    +
    +
    • +
  • +
    +
    +
    Organization & Country
    +
    +

    For research outcomes: the affiliated organizations of its + authors (and their country)

    +

    For projects: the organizations participating in the project + (i.e. beneficiaries of the grant) and + their countries +

    +

    + Country code mapping: + + https://api.openaire.eu/vocabularies/dnet:countries +

    +
    +
    +
    +
    +
    Type
    +
    +

    The sub-type of a research outcome (e.g., a publication can be a pre-print, conference proceeding, + article, + etc.)

    +

    Resource type mapping: + https://api.openaire.eu/vocabularies/dnet:result_typologies + (click on the code to see the specific types for each result type) +

    +
    +
    +
    +
    +
    Access mode
    +
    +

    The best available (across all instances) access rights of a research outcome

    +

    Types: open, restricted, closed, embargo (= closed for a specific period of time, then open)

    +

    Note: definition of restricted + may vary by data source.

    +
    +
    +
    +
    +
    PID (persistent identifier)
    +
    +

    A long-lasting reference to a resource

    +

    Types: http://api.openaire.eu/vocabularies/dnet:pid_types +

    +
    +
    +
    +
    +
    Context
    +
    + Related research community, initiative or infrastructure. +
    +
    +
    +
    +
    Journal
    +
    + The scientific journal an article is published in. +
    +
    +
    +
    +
    Publisher
    +
    + The publisher of the venue (journal, book, etc.) of a research outcome. +
    +
    +
    +
    +
    Content Providers (Datasources)
    +
    +

    The different data sources ingested in the OpenAIRE Research Graph.

    +
    Content Provider Types:
    +
      +
    • Repositories
      • +
    • Open Access Publishers & Journals
      • +
    • Aggregators
      • +
    • Entity Registries
      • +
    • Journal Aggregators
      • +
    • CRIS (Current Research Information System)
      • +
    +
    +
    +
    +
    +
    Repositories
    +
    + Information systems where scientists upload the bibliographic metadata and payloads of their + research outcomes (e.g. PDFs of their scientific articles, CSVs of their data, archive with their + software), due to obligations from their organizations, their funders, or due to community practices + (e.g. ArXiv, Europe PMC, Zenodo). +
    +
    +
    +
    +
    Open Access Publishers & Journals
    +
    + Information systems of open access publishers or relative journals, which offer bibliographic + metadata and PDFs of their published articles. +
    +
    +
    +
    +
    Aggregators
    +
    + Information systems that collect descriptive metadata about research products from multiple sources + in order to enable cross-data source discovery of given research products (e,g, DataCite, + BASE, DOAJ). +
    +
    +
    +
    +
    Entity Registries
    +
    + Information systems created with the intent of maintaining authoritative registries of given + entities in the scholarly communication, such as OpenDOAR for the institutional repositories, re3data + for the data repositories, CORDA and other funder databases for projects and funding information. +
    +
    +
    +
    +
    CRIS (Current Research Information System)
    +
    + Information systems adopted by research and academic organizations to keep track of their research + administration records and relative results; examples of CRIS content are articles or datasets funded + by projects, their principal investigators, facilities acquired thanks to funding, etc. +
    +
    +
    +
    • +
More information for
-
+