dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Improved detect auth user in load

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-04-24 13:15:25 +03:00
parent e53b40f8af
commit 87cb4c41fd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/app.component.ts
View File

@ -28,10 +28,9 @@ import { DomSanitizer } from '@angular/platform-browser';
import { MatIconRegistry } from '@angular/material/icon'; import { MatIconRegistry } from '@angular/material/icon';
import { combineLatest } from 'rxjs'; import { combineLatest } from 'rxjs';
import { getCurrentAuthState, selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors'; import { getCurrentAuthState, selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
import { distinctUntilChanged, filter, map, skip, tap } from 'rxjs/operators'; import { debounceTime, filter, map, skip, tap } from 'rxjs/operators';
import { AuthService } from '@core/auth/auth.service'; import { AuthService } from '@core/auth/auth.service';
import { svgIcons, svgIconsUrl } from '@shared/models/icon.models'; import { svgIcons, svgIconsUrl } from '@shared/models/icon.models';
import { isEqual } from '@core/utils';
import { ActionSettingsChangeLanguage } from '@core/settings/settings.actions'; import { ActionSettingsChangeLanguage } from '@core/settings/settings.actions';
import { SETTINGS_KEY } from '@core/settings/settings.effects'; import { SETTINGS_KEY } from '@core/settings/settings.effects';
@ -94,9 +93,9 @@ export class AppComponent implements OnInit {
this.store.pipe(select(selectIsAuthenticated)), this.store.pipe(select(selectIsAuthenticated)),
this.store.pipe(select(selectIsUserLoaded))] this.store.pipe(select(selectIsUserLoaded))]
).pipe( ).pipe(
debounceTime(1),
map(results => ({isAuthenticated: results[0], isUserLoaded: results[1]})), map(results => ({isAuthenticated: results[0], isUserLoaded: results[1]})),
filter((data) => data.isUserLoaded), filter((data) => data.isUserLoaded),
distinctUntilChanged((a, b) => isEqual(a, b)),
tap((data) => { tap((data) => {
let userLang = getCurrentAuthState(this.store).userDetails?.additionalInfo?.lang ?? null; let userLang = getCurrentAuthState(this.store).userDetails?.additionalInfo?.lang ?? null;
if (!userLang && !data.isAuthenticated) { if (!userLang && !data.isAuthenticated) {