Merge branch 'rel-5.3' of https://github.com/abpframework/abp into rel-5.3

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs

@@ -120,7 +120,7 @@ public static class FileEntryExtensions
                     }
                 }
 
-                if (lines[i+1].Contains("<TEMPLATE-REMOVE"))
+                if (i < lines.Length - 1 && lines[i+1].Contains("<TEMPLATE-REMOVE"))
                 {
                     continue;
                 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs

@@ -59,7 +59,12 @@ public class RemoveUnnecessaryPortsStep : ProjectBuildPipelineStep
 
         var appSettingsJsonObject = JObject.Parse(dbMigratorAppSettings.Content);
         var identityServerJsonObject = (JObject)appSettingsJsonObject["IdentityServer"];
-        var clientsJsonObject = (JObject)identityServerJsonObject["Clients"];
+        var clientsJsonObject = (JObject) identityServerJsonObject?["Clients"];
+
+        if (clientsJsonObject == null)
+        {
+            return;
+        }
 
         if (context.BuildArgs.UiFramework != UiFramework.Blazor)
         {

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html

@@ -16,7 +16,6 @@
 ></nz-tree>
 <ng-template #treeTemplate let-node>
   <div
-    class="node-wrapper"
     [class.selected]="isNodeSelected(node)"
     [title]="node.title"
     (click)="onSelectedNodeChange(node)"

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts

@@ -3,6 +3,7 @@ import {
   ContentChild,
   EventEmitter,
   Input,
+  OnChanges,
   Output,
   TemplateRef,
   ViewEncapsulation,
@@ -24,7 +25,7 @@ export type DropEvent = NzFormatEmitEvent & { pos: number };
   ],
   encapsulation: ViewEncapsulation.None,
 })
-export class TreeComponent {
+export class TreeComponent implements OnChanges {
   dropPosition: number;
 
   dropdowns = {} as { [key: string]: NgbDropdown };
@@ -44,19 +45,31 @@ export class TreeComponent {
   @Input() nodes = [];
   @Input() expandedKeys: string[] = [];
   @Input() selectedNode: any;
+  @Input() changeCheckboxWithNode: boolean;
+  @Input() changedNodeValues = [];
   @Input() isNodeSelected = node => this.selectedNode?.id === node.key;
   @Input() beforeDrop = (event: NzFormatBeforeDropEvent) => {
     this.dropPosition = event.pos;
     return of(false);
   };
 
+  ngOnChanges() {
+    this.checkedKeys = [...this.changedNodeValues];
+  }
+
   onSelectedNodeChange(node) {
     this.selectedNode = node.origin.entity;
-    this.selectedNodeChange.emit(node.origin.entity);
+    if (this.changeCheckboxWithNode) {
+      this.selectedNodeChange.emit(node);
+      this.checkedKeys = [...this.changedNodeValues];
+      this.checkedKeysChange.emit(this.changedNodeValues);
+    } else {
+      this.selectedNodeChange.emit(node.origin.entity);
+    }
   }
 
   onCheckboxChange(event) {
-    this.checkedKeys = [...event.keys];
+    this.checkedKeys = this.changedNodeValues = [...event.keys];
     this.checkedKeysChange.emit(event.keys);
   }
 

templates/app-nolayers/angular/src/app/home/home.component.spec.ts

@@ -0,0 +1,62 @@
+import { CoreTestingModule } from '@abp/ng.core/testing';
+import { ThemeBasicTestingModule } from '@abp/ng.theme.basic/testing';
+import { ThemeSharedTestingModule } from '@abp/ng.theme.shared/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NgxValidateCoreModule } from '@ngx-validate/core';
+import { HomeComponent } from './home.component';
+import { OAuthService } from 'angular-oauth2-oidc';
+import { AuthService } from '@abp/ng.core';
+
+describe('HomeComponent', () => {
+  let fixture: ComponentFixture<HomeComponent>;
+  const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken']);
+  const mockAuthService = jasmine.createSpyObj('AuthService', ['navigateToLogin']);
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [HomeComponent],
+      imports: [
+        CoreTestingModule.withConfig(),
+        ThemeSharedTestingModule.withConfig(),
+        ThemeBasicTestingModule.withConfig(),
+        NgxValidateCoreModule,
+      ],
+      providers: [
+        /* mock providers here */
+        {
+          provide: OAuthService,
+          useValue: mockOAuthService,
+        },
+        {
+          provide: AuthService,
+          useValue: mockAuthService,
+        },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HomeComponent);
+    fixture.detectChanges();
+  });
+
+  it('should be initiated', () => {
+    expect(fixture.componentInstance).toBeTruthy();
+  });
+
+  describe('when login state is true', () => {
+    beforeAll(() => {
+      mockOAuthService.hasValidAccessToken.and.returnValue(true);
+    });
+
+    it('hasLoggedIn should be true', () => {
+      expect(fixture.componentInstance.hasLoggedIn).toBeTrue();
+      expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled();
+    });
+
+    it('button should not be exists', () => {
+      const element = fixture.nativeElement;
+      const cardTitle = element.querySelector('.card-title');
+      expect(cardTitle).toBeTruthy();
+    });
+  });
+});

templates/app-nolayers/angular/src/test.ts

@@ -1,11 +1,10 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
-import 'zone.js/testing';
 
 declare const require: {
   context(

templates/app/angular/src/app/home/home.component.spec.ts

@@ -0,0 +1,100 @@
+import { CoreTestingModule } from "@abp/ng.core/testing";
+import { ThemeBasicTestingModule } from "@abp/ng.theme.basic/testing";
+import { ThemeSharedTestingModule } from "@abp/ng.theme.shared/testing";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { NgxValidateCoreModule } from "@ngx-validate/core";
+import { HomeComponent } from "./home.component";
+import { OAuthService } from 'angular-oauth2-oidc';
+import { AuthService } from '@abp/ng.core';
+
+
+describe("HomeComponent", () => {
+  let fixture: ComponentFixture<HomeComponent>;
+  const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken'])
+  const mockAuthService = jasmine.createSpyObj('AuthService', ['navigateToLogin'])
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [HomeComponent],
+        imports: [
+          CoreTestingModule.withConfig(),
+          ThemeSharedTestingModule.withConfig(),
+          ThemeBasicTestingModule.withConfig(),
+          NgxValidateCoreModule,
+        ],
+        providers: [
+          /* mock providers here */
+          {
+            provide: OAuthService,
+            useValue: mockOAuthService
+          },
+          {
+            provide: AuthService,
+            useValue: mockAuthService
+          }
+        ],
+      }).compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HomeComponent);
+    fixture.detectChanges();
+  });
+
+  it("should be initiated", () => {
+    expect(fixture.componentInstance).toBeTruthy();
+  });
+
+
+
+  describe('when login state is true', () => {
+    beforeAll(() => {
+      mockOAuthService.hasValidAccessToken.and.returnValue(true)
+    });
+
+    it("hasLoggedIn should be true", () => {
+
+      expect(fixture.componentInstance.hasLoggedIn).toBeTrue();
+      expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled()
+    })
+
+    it("button should not be exists", () => {
+      const element = fixture.nativeElement
+      const button = element.querySelector('[role="button"]')
+      expect(button).toBeNull()
+    })
+
+  })
+
+  describe('when login state is false', () => {
+    beforeAll(() => {
+      mockOAuthService.hasValidAccessToken.and.returnValue(false)
+    });
+
+    it("hasLoggedIn should be false", () => {
+
+      expect(fixture.componentInstance.hasLoggedIn).toBeFalse();
+      expect(mockOAuthService.hasValidAccessToken).toHaveBeenCalled()
+    })
+
+    it("button should be exists", () => {
+      const element = fixture.nativeElement
+      const button = element.querySelector('[role="button"]')
+      expect(button).toBeDefined()
+    })
+    describe('when button clicked', () => {
+
+      beforeEach(() => {
+        const element = fixture.nativeElement
+        const button = element.querySelector('[role="button"]')
+        button.click()
+      });
+
+      it("navigateToLogin have been called", () => {
+        expect(mockAuthService.navigateToLogin).toHaveBeenCalled()
+      })
+    })
+  })
+
+});

templates/app/angular/src/test.ts

@@ -1,11 +1,11 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
-import 'zone.js/testing';
+
 
 declare const require: {
   context(

templates/module/angular/projects/my-project-name/src/lib/my-project-name.component.spec.ts

@@ -1,16 +1,24 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MyProjectNameComponent } from './my-project-name.component';
+import { MyProjectNameComponent } from './components/my-project-name.component';
+import { MyProjectNameService } from '@my-company-name/my-project-name';
+import { of } from 'rxjs';
 
 describe('MyProjectNameComponent', () => {
   let component: MyProjectNameComponent;
   let fixture: ComponentFixture<MyProjectNameComponent>;
-
+  const mockMyProjectNameService = jasmine.createSpyObj('MyProjectNameService', {
+    sample: of([]),
+  });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ MyProjectNameComponent ]
-    })
-    .compileComponents();
+      declarations: [MyProjectNameComponent],
+      providers: [
+        {
+          provide: MyProjectNameService,
+          useValue: mockMyProjectNameService,
+        },
+      ],
+    }).compileComponents();
   }));
 
   beforeEach(() => {

templates/module/angular/projects/my-project-name/src/lib/my-project-name.service.spec.ts

@@ -1,12 +1,19 @@
 import { TestBed } from '@angular/core/testing';
-
-import { MyProjectNameService } from './my-project-name.service';
+import { MyProjectNameService } from './services/my-project-name.service';
+import { RestService } from '@abp/ng.core';
 
 describe('MyProjectNameService', () => {
   let service: MyProjectNameService;
-
+  const mockRestService = jasmine.createSpyObj('RestService', ['request']);
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: RestService,
+          useValue: mockRestService,
+        },
+      ],
+    });
     service = TestBed.inject(MyProjectNameService);
   });