From 21888246dbd3a8b572a0e937ffc07359833bfbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Dieguez=20P=C3=A9rez?= Date: Mon, 15 Jan 2024 11:04:14 +0200 Subject: [PATCH] Fixing issues for 10.2 release (#272) * Update README.md * Bugfix/v10.2/260 frontend is making continuous requests when logout (#267) * Fix: Frontend is making continuous requests when logout (260) * Fix: Incorrect rendering of multi-selection filter when choosing multiple values (268) (#270) * Fix: Unable to login with token query param (269) (#271) --------- Co-authored-by: rvald26 <37116247+rvald26@users.noreply.github.com> Co-authored-by: Manuel Abascal --- README.md | 1 + .../app/shared/components/auth/login/login.component.ts | 2 -- .../utm-notification-alert.component.ts | 1 - .../shared/directives/auth/has-any-authority.directive.ts | 5 ++++- frontend/src/styles.scss | 7 +++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 936a9b2fb..1b7b7a22d 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ Resources needed for one month of hot log storage. - You may combine these tiers to allocate resources based on the number of devices and desired hot log storage retention ## Installation steps +The installation can be performed using an installer file or an [ISO image](https://utmstack.com/install). The "Preparing for installation" instructions below are only for the installer file option; please skip them if you use the ISO image instead. ### Preparing for installation diff --git a/frontend/src/app/shared/components/auth/login/login.component.ts b/frontend/src/app/shared/components/auth/login/login.component.ts index 0188addb9..de2829975 100644 --- a/frontend/src/app/shared/components/auth/login/login.component.ts +++ b/frontend/src/app/shared/components/auth/login/login.component.ts @@ -58,8 +58,6 @@ export class LoginComponent implements OnInit, AfterViewInit { this.apiServiceCheckerService.isOnlineApi$.subscribe(result => { if (result) { - this.startNavigation(); - this.activatedRoute.queryParams.subscribe(params => { if (params.token) { this.loginService.loginWithToken(params.token, true).then(() => { diff --git a/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts b/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts index 177774c8e..279026830 100644 --- a/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts +++ b/frontend/src/app/shared/components/layout/header/shared/notification/utm-notification-alert/utm-notification-alert.component.ts @@ -42,7 +42,6 @@ export class UtmNotificationAlertComponent implements OnInit, OnDestroy { } ngOnDestroy() { - console.log('destroy'); this.destroy$.next(true); clearInterval(this.timeoutAlert); clearInterval(this.intervalAlert); diff --git a/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts b/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts index 9364b6f59..8f9486b69 100644 --- a/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts +++ b/frontend/src/app/shared/directives/auth/has-any-authority.directive.ts @@ -1,4 +1,5 @@ import {Directive, Input, TemplateRef, ViewContainerRef} from '@angular/core'; +import {distinctUntilChanged} from 'rxjs/operators'; import {AccountService} from '../../../core/auth/account.service'; /** @@ -30,7 +31,9 @@ export class HasAnyAuthorityDirective { this.authorities = typeof value === 'string' ? [value] : value; this.updateView(); // Get notified each time authentication state changes. - this.accountService.getAuthenticationState().subscribe(identity => this.updateView()); + this.accountService.getAuthenticationState() + .pipe(distinctUntilChanged((prev, next) => prev && next && prev.id === next.id)) + .subscribe(identity => this.updateView()); } private updateView(): void { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 78884eee3..9a7413c9a 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1292,5 +1292,12 @@ $topnav-background-color: #FFFFFF; } } +app-rules { + .ng-select .ng-select-container { + min-height: 33px !important; + height: auto !important; + } +} +