diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 4555c0fa938..8591fef97eb 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -15,8 +15,7 @@ import { Router } from '@angular/router';
* Represents a expandable section in the sidebar
*/
@Component({
- /* eslint-disable @angular-eslint/component-selector */
- selector: 'li[ds-expandable-admin-sidebar-section]',
+ selector: 'ds-expandable-admin-sidebar-section',
templateUrl: './expandable-admin-sidebar-section.component.html',
styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
animations: [rotate, slide, bgColor]
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index b569df290d5..1724e88743b 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -7,6 +7,7 @@ import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
import { RouteEffects } from './services/route.effects';
import { RouterEffects } from './router/router.effects';
+import { MenuEffects } from '../shared/menu/menu.effects';
export const coreEffects = [
RequestEffects,
@@ -18,4 +19,5 @@ export const coreEffects = [
ObjectUpdatesEffects,
RouteEffects,
RouterEffects,
+ MenuEffects,
];
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index d1a1f66e41a..61091c79404 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -661,7 +661,9 @@ describe('RequestService', () => {
spyOn(service, 'getByHref').and.returnValue(observableOf(staleRE));
spyOn(store, 'dispatch');
service.setStaleByHref(href).subscribe(() => {
- expect(store.dispatch).toHaveBeenCalledWith(new RequestStaleAction(uuid));
+ const requestStaleAction = new RequestStaleAction(uuid);
+ requestStaleAction.lastUpdated = jasmine.any(Number) as any;
+ expect(store.dispatch).toHaveBeenCalledWith(requestStaleAction);
done();
});
});
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 6685df71063..de7c994faa5 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ElementRef } from '@angular/core';
import { ContextHelpService } from '../../shared/context-help.service';
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
import { map } from 'rxjs/operators';
/**
@@ -15,12 +15,23 @@ import { map } from 'rxjs/operators';
export class ContextHelpToggleComponent implements OnInit {
buttonVisible$: Observable
;
+ subscriptions: Subscription[] = [];
+
constructor(
- private contextHelpService: ContextHelpService,
- ) { }
+ protected elRef: ElementRef,
+ protected contextHelpService: ContextHelpService,
+ ) {
+ }
ngOnInit(): void {
this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0));
+ this.subscriptions.push(this.buttonVisible$.subscribe((showContextHelpToggle: boolean) => {
+ if (showContextHelpToggle) {
+ this.elRef.nativeElement.classList.remove('d-none');
+ } else {
+ this.elRef.nativeElement.classList.add('d-none');
+ }
+ }));
}
onClick() {
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 4d879835235..32b42dc8a7c 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -7,12 +7,12 @@