diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b908233..33046b1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,6 +11,11 @@ const routes: Routes = [ loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule), data: {hasSidebar: false} }, + { + path: 'user-info', + loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule), + data: {hasSidebar: false} + }, { path: 'error', component: OpenaireErrorPageComponent, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0b98f4f..11b5dd2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -46,7 +46,6 @@ export class AppComponent implements OnInit, OnDestroy { logoSmallUrl: null, position: 'center', badge: true, - stickyAnimation: true, menuPosition: "center" }; @@ -305,29 +304,26 @@ export class AppComponent implements OnInit, OnDestroy { , null, null, null, null), items: [] }); } - if (!this.hasAdminMenu && this.isFrontPage) { this.menuHeader = { - route: "/" + this.stakeholder.alias, - url: null, - title: this.stakeholder.name, + route: null, + url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu', + title: "Monitor", logoUrl: 'assets/common-assets/logo-services/monitor/small-inverted.svg', logoSmallUrl: "assets/common-assets/logo-services/monitor/small-inverted.svg", position: 'center', badge: true, - stickyAnimation: true, menuPosition: "center" }; } else { this.menuHeader = { - route: "/" + this.stakeholder.alias, - url: null, - title: this.stakeholder.name, + route: null, + url: "https://" + (this.properties.environment == 'beta' ? 'beta.' : '') + 'monitor.openaire.eu', + title: "Monitor", logoUrl: 'assets/common-assets/logo-services/monitor/small.svg', logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg", position: 'center', - badge: false, - stickyAnimation: true, + badge: true, menuPosition: "center" }; } @@ -342,7 +338,6 @@ export class AppComponent implements OnInit, OnDestroy { logoSmallUrl: "assets/common-assets/logo-services/monitor/small.svg", position: 'left', badge: true, - stickyAnimation: true, menuPosition: "center" }; this.menuItems.push({ diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html index 20a9425..8642b4e 100644 --- a/src/app/general/general.component.html +++ b/src/app/general/general.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage Profile
@@ -8,9 +8,9 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/app/general/general.component.ts b/src/app/general/general.component.ts index 921890e..fc3d9e2 100644 --- a/src/app/general/general.component.ts +++ b/src/app/general/general.component.ts @@ -20,7 +20,6 @@ export class GeneralComponent implements OnInit, OnDestroy { public loading: boolean = false; private subscriptions: any[] = []; @ViewChild('editStakeholderComponent') editStakeholderComponent: EditStakeholderComponent; - public stickyPageHeader: boolean = false; constructor(private stakeholderService: StakeholderService, private title: Title) { diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index cd896a6..fa59fd7 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage profiles @@ -14,11 +14,15 @@
  • Profiles
    • -
    -
    -
    +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts index fcc2474..845aa6b 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.ts +++ b/src/app/manageStakeholders/manageStakeholders.component.ts @@ -33,7 +33,6 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy { public stakeholder: Stakeholder; public index: number; public user = null; - public stickyPageHeader: boolean = false; public tab: Tab = 'all'; public stakeholderEntities = StakeholderEntities; /** diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 0882851..dca3f67 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -39,27 +39,31 @@
    -
    +
    -
    +
    Dashboard

    {{stakeholder.name}}

    -
    - +
    +
    +
    +
    + +
    @@ -85,162 +89,164 @@
    -
    -
    - {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description - : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description : - (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}} -
    -
    - -
    -

    - No indicators available yet. Stay tuned! -

    -
    -     - - -
    -
    {{number.title}}
    - -
    -
    -
    - -
    - {{numberResults.get(i + '-' + j) | number}} - -- -
    - - {{numberResults.get(i + '-' + j) | number}} - -
    {{indicator.name}}
    -
    - -
    -
    -     +
    +
    +
    + {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description + : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description : + (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
    - -
    - -
    + +
    +

    + No indicators available yet. Stay tuned! +

    +
    +     + + +
    -
    {{chart.title}}
    - -
    -
    -
    -

    -
    {{indicator.name + " "}}
    -

    -
    - -
    +
    {{number.title}}
    + +
    +
    +
    - -
    - + Filtered:{{indicator.indicatorPaths[0].filtersApplied}}out of{{countSelectedFilters()}} +
    --> +
    + {{numberResults.get(i + '-' + j) | number}} + --
    - + + {{numberResults.get(i + '-' + j) | number}} + +
    {{indicator.name}}
    -
    - - - - Description - - -
    -
    -
    -
    - +
    -
    -
    -
    - -
    - - Powered by - OpenAIRE Research Graph - - . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}} - +
    + +
    +
    {{chart.title}}
    + +
    +
    +
    +

    +
    {{indicator.name + " "}}
    +

    +
    + +
    + + +
    + +
    + +
    +
    + + + + Description + + +
    +
    +
    +
    + +
    +
    +

    + {{indicator.description}} +

    +

    + {{indicator.additionalDescription}} +

    +
    +
    +
    +
    +
    +
    +     +
    +
    - -
    - Send us your - feedback - . +
    + +
    + + Powered by + OpenAIRE Research Graph + + . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}} + +
    + +
    + Send us your + feedback + . +
    -
    - + +
    diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 770c3fb..013ce7d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 770c3fb3eff99ddab059f0de657f576443b01a7d +Subproject commit 013ce7d5f45dd64e28e82585451b2741c41f9d2e diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index d64f3e2..d6eeef9 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -42,7 +42,7 @@ -
    +
    • Edit
      • diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index decfb10..7af8f36 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -15,11 +15,11 @@
    -
      +
        -
      • +
      • + [attr.uk-tooltip]="'title: ' + topic.name + '; delay: 500'">
        @@ -38,13 +38,35 @@
        diff --git a/src/app/topic/topic.component.ts b/src/app/topic/topic.component.ts index 7dbcae7..c484b5d 100644 --- a/src/app/topic/topic.component.ts +++ b/src/app/topic/topic.component.ts @@ -16,6 +16,9 @@ import {Option} from "../openaireLibrary/sharedComponents/input/input.component" import {properties} from "../../environments/environment"; import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; +import {TransitionGroupComponent} from "../openaireLibrary/utils/transition-group/transition-group.component"; +import {error} from "protractor"; +import {NotificationHandler} from "../openaireLibrary/utils/notification-handler"; declare var UIkit; @@ -59,6 +62,8 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { @ViewChild('deleteModal', {static: true}) deleteModal: AlertModal; @ViewChild('editModal', {static: true}) editModal: AlertModal; + @ViewChild("topics") topics: TransitionGroupComponent; + public elementChildrenActionOnDelete: string; public filters: FormGroup; public all: Option = { @@ -209,6 +214,7 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { let callback = (topic: Topic): void => { if (this.index === -1) { this.stakeholder.topics.push(topic); + this.topics.init(); } else { this.stakeholder.topics[this.index] = HelperFunctions.copy(topic); } @@ -230,7 +236,6 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { this.changeStatus(this.stakeholder.topics[index], path, visibility); } - public deleteTopicOpen(index = this.topicIndex, childrenAction: string = null) { this.type = 'topic'; this.index = index; @@ -246,10 +251,26 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { let callback = (): void => { this.topicIndex = Math.max(0, this.index - 1); this.stakeholder.topics.splice(this.index, 1); + this.topics.init(); }; this.delete('Topic has been successfully be deleted', path, callback, (this.topicIndex === this.index)); } + public moveTopic(index: number, newIndex: number = index - 1) { + this.topics.init(); + let path = [this.stakeholder._id]; + let ids = this.stakeholder.topics.map(topic => topic._id); + HelperFunctions.swap(ids, index, newIndex); + this.stakeholderService.reorderElements(properties.monitorServiceAPIURL, path, ids).subscribe(() => { + HelperFunctions.swap(this.stakeholder.topics, index, newIndex); + if(this.topicIndex === index) { + this.topicIndex = newIndex; + } + }, error => { + NotificationHandler.rise(error.error.message) + }); + } + public chooseCategory(index: number) { this.categoryIndex = index; this.subCategoryIndex = 0; @@ -480,22 +501,14 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { this.subscriptions.push(this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, saveElement, path).subscribe(saveElement => { callback(saveElement); this.stakeholderChanged(); - UIkit.notification(message, { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(message); if (redirect) { this.router.navigate(['../' + saveElement.alias], { relativeTo: this.route }); } }, error => { - UIkit.notification(error.error.message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(error.error.message, 'danger'); })); } @@ -503,37 +516,21 @@ export class TopicComponent implements OnInit, OnDestroy, IDeactivateComponent { this.subscriptions.push(this.stakeholderService.deleteElement(this.properties.monitorServiceAPIURL, path, this.elementChildrenActionOnDelete).subscribe(() => { callback(); this.stakeholderChanged(); - UIkit.notification(message, { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(message); if (redirect) { this.back(); } }, error => { - UIkit.notification(error.error.message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(error.error.message, 'danger'); })); } private changeStatus(element: Topic | Category | SubCategory, path: string[], visibility: Visibility) { this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { element.visibility = visibility; - UIkit.notification(StringUtils.capitalize(this.type) + ' has been successfully changed to ' + element.visibility.toLowerCase(), { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(StringUtils.capitalize(this.type) + ' has been successfully changed to ' + element.visibility.toLowerCase()); }, error => { - UIkit.notification(error.error.message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(error.error.message, 'danger'); })); } diff --git a/src/app/topic/topic.module.ts b/src/app/topic/topic.module.ts index d383cdb..5062668 100644 --- a/src/app/topic/topic.module.ts +++ b/src/app/topic/topic.module.ts @@ -19,11 +19,12 @@ import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/p import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/notify-form.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; +import {TransitionGroupModule} from "../openaireLibrary/utils/transition-group/transition-group.module"; @NgModule({ imports: [ CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule, - ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule + ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule, TransitionGroupModule ], declarations: [ TopicComponent, IndicatorsComponent diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index 2caef88..73aaf4f 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -3,23 +3,18 @@
    - -
    - -
    -     -
    + [emailComposer]="emailComposer" [notificationFn]="notificationFn"> +
    Admin Dashboard - Manage {{users}}

    {{stakeholder.name}}

    - + diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts index 1dda6b3..cd381f2 100644 --- a/src/app/users/users.component.ts +++ b/src/app/users/users.component.ts @@ -46,7 +46,6 @@ export class UsersComponent implements OnInit { notification.groups = [recipient]; return notification; } - public stickyPageHeader: boolean = false; constructor(private stakeholderService: StakeholderService, private userManagementService: UserManagementService, diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme index 141c71c..00fc1f9 160000 --- a/src/assets/dashboard-theme +++ b/src/assets/dashboard-theme @@ -1 +1 @@ -Subproject commit 141c71c3104bab1382e6008697043ea87e03ea44 +Subproject commit 00fc1f9e2b9158a6be224061d742cf80a043fab8