- + + fxFlex class="mat-toolbar-tools">
@@ -73,7 +73,7 @@ + *ngIf="!hideLoadingBar && (isLoading$ | async)">
diff --git a/ui-ngx/src/app/modules/home/home.component.ts b/ui-ngx/src/app/modules/home/home.component.ts index e83e4ad91e..a18a2150c5 100644 --- a/ui-ngx/src/app/modules/home/home.component.ts +++ b/ui-ngx/src/app/modules/home/home.component.ts @@ -30,6 +30,8 @@ import { MatSidenav } from '@angular/material/sidenav'; import { AuthState } from '@core/auth/auth.models'; import { WINDOW } from '@core/services/window.service'; import { instanceOfSearchableComponent, ISearchableComponent } from '@home/models/searchable-component.models'; +import { ActiveComponentService } from '@core/services/active-component.service'; +import { RouterTabsComponent } from '@home/components/router-tabs.component'; @Component({ selector: 'tb-home', @@ -65,8 +67,11 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni showSearch = false; searchText = ''; + hideLoadingBar = false; + constructor(protected store: Store, @Inject(WINDOW) private window: Window, + private activeComponentService: ActiveComponentService, public breakpointObserver: BreakpointObserver) { super(store); } @@ -133,6 +138,8 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni this.showSearch = false; this.searchText = ''; this.activeComponent = activeComponent; + this.hideLoadingBar = activeComponent && activeComponent instanceof RouterTabsComponent; + this.activeComponentService.setCurrentActiveComponent(activeComponent); if (this.activeComponent && instanceOfSearchableComponent(this.activeComponent)) { this.searchEnabled = true; this.searchableComponent = this.activeComponent; diff --git a/ui-ngx/src/app/modules/home/menu/menu-link.component.html b/ui-ngx/src/app/modules/home/menu/menu-link.component.html index d07dc16b7e..fb79fde48c 100644 --- a/ui-ngx/src/app/modules/home/menu/menu-link.component.html +++ b/ui-ngx/src/app/modules/home/menu/menu-link.component.html @@ -15,8 +15,8 @@ limitations under the License. --> - - {{section.icon}} - + + {{section.icon}} + {{section.name | translate}} diff --git a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html index 3cd9922707..e84c7ebd69 100644 --- a/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html +++ b/ui-ngx/src/app/modules/home/menu/menu-toggle.component.html @@ -15,13 +15,12 @@ limitations under the License. --> - - {{section.icon}} - + + {{section.icon}} + {{section.name | translate}} + [ngClass]="{'tb-toggled' : section.opened}">