From e07a93c60f72c6f5ec74bcc55b65d531bc856b9b Mon Sep 17 00:00:00 2001 From: siva kumar <siva.kumar@muraai.com> Date: Mon, 12 Apr 2021 14:35:15 +0530 Subject: [PATCH] [ACA-4355] [ADW] The sign out takes longer than in the past (#2081) --- extension.schema.json | 5 ----- src/app/components/sidenav/sidenav.component.html | 8 ++++---- src/app/components/sidenav/sidenav.component.ts | 8 +------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/extension.schema.json b/extension.schema.json index 16d054672..a2a34d27c 100644 --- a/extension.schema.json +++ b/extension.schema.json @@ -179,11 +179,6 @@ "description": "Unique identifier", "type": "string" }, - "provider": { - "description": "Define on which system the user should be authenticate", - "type": "string", - "enum": ["BPM", "ECM", "ALL"] - }, "icon": { "description": "Element icon", "type": "string" diff --git a/src/app/components/sidenav/sidenav.component.html b/src/app/components/sidenav/sidenav.component.html index 5c47eaf98..6a84c7f1d 100644 --- a/src/app/components/sidenav/sidenav.component.html +++ b/src/app/components/sidenav/sidenav.component.html @@ -7,11 +7,11 @@ <div *ngFor="let group of groups; trackBy: trackById" class="section" [ngClass]="'section--' + mode"> <ng-container *ngSwitchCase="'expanded'"> <mat-list-item *ngFor="let item of group.items; trackBy: trackById"> - <ng-container *ngIf="isLoggedIn(item.provider) && !item.component"> + <ng-container *ngIf="!item.component"> <app-expand-menu [item]="item"></app-expand-menu> </ng-container> - <ng-container *ngIf="isLoggedIn(item.provider) && item.component"> + <ng-container *ngIf="item.component"> <adf-dynamic-component [data]="{ item: item, state: 'expanded' }" [id]="item.component"></adf-dynamic-component> </ng-container> </mat-list-item> @@ -19,11 +19,11 @@ <ng-container *ngSwitchCase="'collapsed'"> <div class="list-item" *ngFor="let item of group.items; trackBy: trackById"> - <ng-container *ngIf="isLoggedIn(item.provider) && !item.component"> + <ng-container *ngIf="!item.component"> <app-button-menu [item]="item"></app-button-menu> </ng-container> - <ng-container *ngIf="isLoggedIn(item.provider) && item.component"> + <ng-container *ngIf="item.component"> <adf-dynamic-component [data]="{ item: item, state: 'collapsed' }" [id]="item.component"> </adf-dynamic-component> </ng-container> </div> diff --git a/src/app/components/sidenav/sidenav.component.ts b/src/app/components/sidenav/sidenav.component.ts index ffa4117d0..07ec5005a 100755 --- a/src/app/components/sidenav/sidenav.component.ts +++ b/src/app/components/sidenav/sidenav.component.ts @@ -25,7 +25,6 @@ import { Component, Input, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; import { NavBarGroupRef } from '@alfresco/adf-extensions'; -import { AuthenticationService } from '@alfresco/adf-core'; import { Store } from '@ngrx/store'; import { AppStore, getSideNavState } from '@alfresco/aca-shared/store'; import { Subject } from 'rxjs'; @@ -46,7 +45,7 @@ export class SidenavComponent implements OnInit, OnDestroy { groups: Array<NavBarGroupRef> = []; private onDestroy$ = new Subject<boolean>(); - constructor(private store: Store<AppStore>, private extensions: AppExtensionService, private authService: AuthenticationService) {} + constructor(private store: Store<AppStore>, private extensions: AppExtensionService) {} ngOnInit() { this.store @@ -57,11 +56,6 @@ export class SidenavComponent implements OnInit, OnDestroy { }); } - isLoggedIn(provider: string): boolean { - if (provider === undefined) return true; - return this.authService.isLoggedInWith(provider); - } - trackById(_: number, obj: { id: string }) { return obj.id; }