Merge pull request #15636 from abpframework/auto-merge/rel-7-1/1707

Merge branch dev with rel-7.1

npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/current-user.component.html

@@ -32,7 +32,7 @@
     [class.d-block]="smallScreen && currentUserDropdown.isOpen()"
   >
     <ng-container *ngFor="let item of userMenu.items$ | async; trackBy: trackByFn">
-      <ng-container *ngIf="item.visible && item.visible()">
+      <ng-container *abpVisible="!item.visible || item.visible(item)">
         <li class="nav-item d-flex align-items-center" *abpPermission="item.requiredPolicy">
           <ng-container
             *ngIf="item.component; else htmlTemplate"

npm/ng-packs/packages/theme-basic/src/lib/components/nav-items/nav-items.component.html

@@ -1,17 +1,18 @@
 <ul class="navbar-nav">
   <ng-container *ngFor="let item of navItems.items$ | async; trackBy: trackByFn">
-    <ng-container *ngIf="item.visible && item.visible()">
+    <ng-container  *abpVisible="!item.visible || item.visible(item)">
       <li class="nav-item d-flex align-items-center" *abpPermission="item.requiredPolicy">
-        <ng-container
-          *ngIf="item.component; else htmlTemplate"
+        <ng-container 
+        
+          *ngIf="item.component; else htmlTemplate" 
           [ngComponentOutlet]="item.component"
           [ngComponentOutletInjector]="item | toInjector"
         ></ng-container>
-
+        
         <ng-template #htmlTemplate>
           <div [innerHTML]="item.html" (click)="item.action ? item.action() : null"></div>
         </ng-template>
       </li>
     </ng-container>
   </ng-container>
-</ul>
+</ul>

npm/ng-packs/packages/theme-shared/src/lib/directives/index.ts

@@ -2,3 +2,4 @@ export * from './ellipsis.directive';
 export * from './loading.directive';
 export * from './ngx-datatable-default.directive';
 export * from './ngx-datatable-list.directive';
+export * from './visible.directive';

npm/ng-packs/packages/theme-shared/src/lib/directives/visible.directive.ts

@@ -0,0 +1,59 @@
+import { OnInit, Directive, OnDestroy, Input, ViewContainerRef, TemplateRef } from '@angular/core';
+import { EMPTY, from, Observable, of, Subscription } from 'rxjs';
+
+@Directive({
+  selector: '[abpVisible]',
+})
+export class AbpVisibleDirective implements OnDestroy, OnInit {
+  conditionSubscription: Subscription | undefined;
+  isVisible: boolean | undefined;
+
+  @Input('abpVisible') set abpVisible(
+    value: boolean | Promise<boolean> | Observable<boolean> | undefined | null,
+  ) {
+    this.condition$ = checkType(value);
+    this.subscribeToCondition();
+  }
+
+  private condition$: Observable<boolean> = of(false);
+
+  constructor(
+    private viewContainerRef: ViewContainerRef,
+    private templateRef: TemplateRef<unknown>,
+  ) {}
+  ngOnInit(): void {
+    this.updateVisibility();
+  }
+  ngOnDestroy(): void {
+    this.conditionSubscription?.unsubscribe();
+  }
+
+  private subscribeToCondition() {
+    this.conditionSubscription = this.condition$.subscribe(value => {
+      this.isVisible = value;
+      this.updateVisibility();
+    });
+  }
+  private updateVisibility() {
+    this.viewContainerRef.clear();
+    // it should be false not falsy
+    if (this.isVisible === false) {
+      return;
+    }
+    this.viewContainerRef.createEmbeddedView(this.templateRef);
+  }
+}
+
+function checkType(value: boolean | Promise<boolean> | Observable<boolean> | undefined | null) {
+  if (value instanceof Promise) {
+    return from(value);
+  } else if (value instanceof Observable) {
+    return value;
+  } else if (typeof value === 'boolean') {
+    return of(value);
+  } else if (value === undefined || value === null) {
+    return of(true);
+  } else {
+    return EMPTY;
+  }
+}

npm/ng-packs/packages/theme-shared/src/lib/models/nav-item.ts

@@ -1,4 +1,5 @@
-import { Type } from '@angular/core';
+import { Injector, Type } from '@angular/core';
+import { Observable, of } from 'rxjs';
 
 export class NavItem {
   id?: string | number;
@@ -7,9 +8,13 @@ export class NavItem {
   action?: () => void;
   order?: number;
   requiredPolicy?: string;
-  visible?: () => boolean;
+  visible?: NavBarPropPredicate<NavItem>;
   constructor(props: Partial<NavItem>) {
-    props = { ...props, visible: props.visible || (() => true) };
     Object.assign(this, props);
   }
 }
+
+export type NavBarPropPredicate<T> = (
+  prop?: T,
+  injector?: Injector,
+) => boolean | Promise<boolean> | Observable<boolean>;

npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

@@ -36,6 +36,7 @@ import { HTTP_ERROR_CONFIG, httpErrorConfigFactory } from './tokens/http-error.t
 import { DateParserFormatter } from './utils/date-parser-formatter';
 import { CONFIRMATION_ICONS, DEFAULT_CONFIRMATION_ICONS } from './tokens/confirmation-icons.token';
 import { PasswordComponent } from './components/password/password.component';
+import { AbpVisibleDirective } from './directives';
 
 const declarationsWithExports = [
   BreadcrumbComponent,
@@ -52,6 +53,7 @@ const declarationsWithExports = [
   NgxDatatableListDirective,
   LoadingDirective,
   ModalCloseDirective,
+  AbpVisibleDirective,
 ];
 
 @NgModule({