fix: TTA-115 Merge master into TTA-115

Author: Abigail Cabascango

README.md

@@ -35,7 +35,7 @@ We strongly recommend that you install it using Node Version Management [https:/
 
 Angular CLI is a Command Line Interface (CLI) to speed up your development with Angular.
 
-Run `npm install -g @angular/cli` to install Angular CLI
+Run `npm install -g @angular/cli` to install Angular CLI.
 
 ### Docker
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.75.1",
+  "version": "1.75.19",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",
@@ -111,12 +111,12 @@
   "husky": {
     "hooks": {
       "commit-msg": "commit-message-validator",
-      "pre-commit": "ng lint && ng test --watch=false --browsers=ChromeHeadless"
+      "pre-commit": "ng lint"
     }
   },
   "config": {
     "commit-message-validator": {
-      "pattern": "^(fix: TT-|feat: TT-|perf: TT-|build: TT-|ci: TT-|docs: TT-|refactor: TT-|style: TT-|test: TT-|code-smell: TT-)[0-9].*",
+      "pattern": "^(fix: TTA-|feat: TTA-|perf: TTA-|build: TTA-|ci: TTA-|docs: TTA-|refactor: TTA-|style: TTA-|test: TTA-|code-smell: TTA-)[0-9].*",
       "errorMessage": "Your commit message needs to start with fix: , feat:, or perf: followed by any commit message, e.g. fix: TT-43 any commit message."
     }
   },

package.json

@@ -8,12 +8,15 @@ import { FeatureToggleCookiesService } from '../shared/feature-toggles/feature-t
 import { LoginService } from './services/login.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { SocialAuthService } from 'angularx-social-login';
+import { UserService } from '../user/services/user.service';
+
 
 describe('LoginComponent', () => {
   let component: LoginComponent;
   let fixture: ComponentFixture<LoginComponent>;
   let azureAdB2CService: AzureAdB2CService;
   let loginService: LoginService;
+  let userService: UserService;
   let featureToggleCookiesService: FeatureToggleCookiesService;
 
   const azureAdB2CServiceStub = {
@@ -38,6 +41,16 @@ describe('LoginComponent', () => {
     }
   };
 
+  const userTest = {
+    name: 'user',
+    email: '[email protected]',
+    roles: ['admin'],
+    groups: ['admin'],
+    id: 'user_id',
+    tenant_id: 'tenant_test',
+    deleted: 'no',
+  };
+
   const featureToggleCookiesServiceStub = {
     setCookies() {
       return null;
@@ -66,6 +79,7 @@ describe('LoginComponent', () => {
     fixture.detectChanges();
     azureAdB2CService = TestBed.inject(AzureAdB2CService);
     loginService = TestBed.inject(LoginService);
+    userService = TestBed.inject(UserService);
     featureToggleCookiesService = TestBed.inject(FeatureToggleCookiesService);
   });
 
@@ -90,6 +104,7 @@ describe('LoginComponent', () => {
     spyOn(azureAdB2CService, 'setCookies').and.returnValue();
     spyOn(azureAdB2CService, 'signIn').and.returnValue(of(() => {}));
     spyOn(azureAdB2CService, 'getUserId').and.returnValue('userId_123');
+    spyOn(userService, 'loadUser').withArgs('userId_123').and.returnValue(of(userTest));
     spyOn(featureToggleCookiesService, 'setCookies').and.returnValue(featureToggleCookiesService.setCookies());
 
     component.login();
@@ -98,6 +113,7 @@ describe('LoginComponent', () => {
     expect(azureAdB2CService.setCookies).toHaveBeenCalled();
     expect(azureAdB2CService.getUserId).toHaveBeenCalled();
     expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
+    expect(userService.loadUser).toHaveBeenCalledWith('userId_123');
   }));
 
   it('should not sign-up or login with google if is already logged-in into the app on Production', inject([Router],  (router: Router) => {

src/app/modules/login/login.component.spec.ts

@@ -36,30 +36,35 @@ export class LoginComponent implements OnInit {
 
 
   googleAuthSDK() {
+    const sdkLoaded = 'googleSDKLoaded';
+    const gapi = 'gapi';
 
-    (<any>window)['googleSDKLoaded'] = () => {
-      (<any>window)['gapi'].load('auth2', () => {
-        this.auth2 = (<any>window)['gapi'].auth2.init({
+    (window as any)[sdkLoaded] = () => {
+      (window as any)[gapi].load('auth2', () => {
+        this.auth2 = ( window as any)[gapi].auth2.init({
           client_id: this.cliendId,
-          plugin_name:'login',
+          plugin_name: 'login',
           cookiepolicy: 'single_host_origin',
           scope: 'profile email'
         });
       });
-    }
-    (function (d, s, id) {
-      var js, gjs = d.getElementsByTagName(s)[1];
+    };
+
+    (async (d, s, id) => {
+      const keyGoogle = 'src';
+      const gjs = d.getElementsByTagName(s)[1];
+      let js = gjs;
       if (d.getElementById(id)) { return; }
       js = d.createElement(s); js.id = id;
-      js.src = "https://accounts.google.com/gsi/client";
+      js[keyGoogle] = 'https://accounts.google.com/gsi/client';
       gjs.parentNode.insertBefore(js, gjs);
-    }(document, 'script', 'async defer'));
+    })(document, 'script', 'async defer');
   }
 
   ngOnInit() {
 
     this.googleAuthSDK();
-    if(this.isProduction && this.azureAdB2CService.isLogin()){
+    if (this.isProduction && this.azureAdB2CService.isLogin()) {
         this.router.navigate(['']);
     } else {
       this.loginService.isLogin().subscribe(isLogin => {
@@ -72,14 +77,14 @@ export class LoginComponent implements OnInit {
       const {credential = ''} = response;
       this.featureToggleCookiesService.setCookies();
       this.loginService.setLocalStorage('idToken', credential);
-      this.loginService.getUser(credential).subscribe((response) => {
+      this.loginService.getUser(credential).subscribe((resp) => {
           this.loginService.setCookies();
-          const tokenObject = JSON.stringify(response);
+          const tokenObject = JSON.stringify(resp);
           const tokenJson = JSON.parse(tokenObject);
           this.loginService.setLocalStorage('user', tokenJson.token);
           this.ngZone.run(() => this.router.navigate(['']));
       });
-    }
+    };
   }
 
   login(): void {
@@ -89,14 +94,14 @@ export class LoginComponent implements OnInit {
       this.azureAdB2CService.signIn().subscribe(() => {
         this.featureToggleCookiesService.setCookies();
         this.azureAdB2CService.setCookies();
-        const userId = this.azureAdB2CService.getUserId()
+        const userId = this.azureAdB2CService.getUserId();
         this.userService.loadUser(userId).subscribe((user) => {
-          const user_groups = {
+          const userGroups = {
             groups: user.groups
-          }
-          this.loginService.setLocalStorage('user', JSON.stringify(user_groups));
+          };
+          this.loginService.setLocalStorage('user', JSON.stringify(userGroups));
           this.router.navigate(['']);
-        })
+        });
       });
     }
   }

src/app/modules/login/login.component.ts

@@ -1,4 +1,5 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpClient } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { SocialAuthService } from 'angularx-social-login';
@@ -9,11 +10,11 @@ import { LoginService } from './login.service';
 
 describe('LoginService', () => {
   let service: LoginService;
-  let httpMock: HttpTestingController;
   let cookieService: CookieService;
   let socialAuthService: SocialAuthService;
   let account;
   const socialAuthServiceStub = jasmine.createSpyObj('SocialAuthService', ['signOut', 'signIn']);
+  const httpClientSpy = jasmine.createSpyObj('HttpClient', ['post', 'get']);
   const cookieStoreStub = {};
   const helper = new JwtHelperService();
   const getAccountInfo = () => {
@@ -26,11 +27,11 @@ describe('LoginService', () => {
       providers: [
         { providers: CookieService, useValue: cookieStoreStub },
         { provide: SocialAuthService, useValue: socialAuthServiceStub },
+        { provide: HttpClient, useValue: httpClientSpy }
       ],
     });
     service = TestBed.inject(LoginService);
     cookieService = TestBed.inject(CookieService);
-    httpMock = TestBed.inject(HttpTestingController);
     socialAuthService = TestBed.inject(SocialAuthService);
     account = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6ImFiYyIsIm5hbWUiOiJhYmMiLCJlbWFpbCI6ImFiYyIsImdyb3VwcyI6WyJhYmMiXX0.UNxyDT8XzXJhI1F3LySBU7TJlpENPUPHj8my7Obw2ZM';
     let store = {};
@@ -49,6 +50,7 @@ describe('LoginService', () => {
     spyOn(localStorage, 'setItem').and.callFake(mockLocalStorage.setItem);
     spyOn(localStorage, 'clear').and.callFake(mockLocalStorage.clear);
     localStorage.setItem('user', account);
+    localStorage.setItem('user2', '"test_token_123"');
   });
 
   it('should be created', () => {
@@ -90,12 +92,16 @@ describe('LoginService', () => {
   });
 
   it('load a user by sending a token using POST', () => {
+    const token  = 'test_123';
     service.baseUrl = '/users';
-    service.getUser('token').subscribe();
-
-    const loadUserRequest = httpMock.expectOne(`${service.baseUrl}/login`);
-    expect(loadUserRequest.request.method).toBe('POST');
-  });
+    const mockSuccessDataPost = {
+      SUCCESS: true,
+      data: {}
+    };
+    httpClientSpy.post.and.returnValue(of(mockSuccessDataPost));
+    service.getUser(token).subscribe();
+    expect(httpClientSpy.post).toHaveBeenCalled();
+    });
 
   it('should return true when user is Login', () => {
     spyOn(cookieService, 'check').and.returnValue(true);
@@ -122,4 +128,40 @@ describe('LoginService', () => {
     expect(localStorage.clear).toHaveBeenCalled();
     expect(cookieService.deleteAll).toHaveBeenCalled();
   });
+
+  it('should call cookieService when app is isLegacyProd', () => {
+    service.isLegacyProd = true;
+    service.localStorageKey = 'user2';
+    spyOn(cookieService, 'check').and.returnValue(true);
+    spyOn(service, 'isValidToken').and.returnValue(of(true));
+    service.isLogin().subscribe(isLogin => {
+      expect(cookieService.check).toHaveBeenCalled();
+    });
+  });
+
+  it('should call JSON parse when app is isLegacyProd', () => {
+    spyOn(JSON, 'parse').and.returnValue('test_user_123');
+    service.isLegacyProd = true;
+    service.localStorageKey = 'user2';
+    service.getUserId();
+    service.getName();
+    service.getUserEmail();
+    service.getUserGroup();
+    expect(JSON.parse).toHaveBeenCalled();
+  });
+
+  it('should call setLocalStorage when there is a new_token ', () => {
+    spyOn(cookieService, 'check').and.returnValue(true);
+    spyOn(service, 'setLocalStorage');
+    const token  = 'test123';
+    service.baseUrl = '/users';
+    const mockSuccessDataPost = {
+      SUCCESS: true,
+      new_token: 'test_token'
+    };
+    httpClientSpy.post.and.returnValue(of(mockSuccessDataPost));
+    service.isValidToken(token).subscribe();
+    expect(service.setLocalStorage).toHaveBeenCalled();
+    expect(cookieService.check).toHaveBeenCalled();
+  });
 });

src/app/modules/login/services/login.service.spec.ts

@@ -17,10 +17,8 @@ describe('Reports Page', () => {
     let fixture: ComponentFixture<TimeEntriesTableComponent>;
     let store: MockStore<EntryState>;
     let getReportDataSourceSelectorMock;
-    let durationTime: number;
     let row: number;
     let node: number;
-    let decimalValidator: RegExp;
     const timeEntry: Entry = {
       id: '123',
       start_date: new Date(),
@@ -102,10 +100,8 @@ describe('Reports Page', () => {
     );
 
     beforeEach(() => {
-      durationTime = new Date().setHours(5, 30);
       row = 0;
       node = 0;
-      decimalValidator = /^\d+\.\d{0,2}$/;
     });
 
     it('component should be created', async () => {
@@ -155,16 +151,6 @@ describe('Reports Page', () => {
       });
     });
 
-    it('The data should be displayed as a multiple of hour when column is equal to 4', () => {
-      const column = 4;
-      expect(component.bodyExportOptions(durationTime, row, column, node)).toMatch(decimalValidator);
-    });
-
-    it('The data should not be displayed as a multiple of hour when column is different of 4', () => {
-      const column = 5;
-      expect(component.bodyExportOptions(durationTime, row, column, node)).toBe(durationTime.toString());
-    });
-
     it('The link Ticket must not contain the ticket URL enclosed with < > when export a file csv, excel or PDF', () => {
       const entry = '<a _ngcontent-vlm-c151="" class="is-url">https://TT-392-uri</a>';
       const column = 0;
@@ -247,7 +233,7 @@ describe('Reports Page', () => {
         '19',
         '[email protected]',
         '07/01/2022',
-        '9.00',
+        '09:00',
         '09:00',
         '18:00',
         'Project_Name',

src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts

@@ -105,7 +105,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
   ngOnInit(): void {
     this.rerenderTableSubscription = this.reportDataSource$.subscribe((ds) => {
       this.totalHoursSubscription = this.resultSumEntriesSelected$.subscribe((actTotalHours) => {
-            this.resultSumEntriesSelected = actTotalHours ;
+            this.resultSumEntriesSelected = actTotalHours;
             this.totalTimeSelected = moment.duration(0);
           });
       this.sumDates(ds.data);
@@ -144,9 +144,7 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
   }
 
   bodyExportOptions(data, row, column, node) {
-    const dataFormated = data.toString().replace(/<((.|\n){0,200}?)>/gi, '');
-    const durationColumnIndex = 4;
-    return column === durationColumnIndex ? moment.duration(dataFormated).asHours().toFixed(2) : dataFormated;
+    return data.toString().replace(/<((.|\n){0,200}?)>/gi, '') || '';
   }
 
 

src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts

@@ -17,7 +17,7 @@
     <input
       (blur)="onSubmit()"
       type="text"
-      placeholder="Enter your ticker number"
+      placeholder="Enter your ticket number"
       id="uri"
       formControlName="uri"
       class="url-ticket-input form-control"

src/app/modules/time-clock/components/entry-fields/entry-fields.component.html

@@ -43,7 +43,7 @@ export class TimeClockComponent implements OnInit, OnDestroy {
     }else{
       this.loginService.isLogin().subscribe(isLogin => {
         this.username = isLogin ? this.loginService.getName() : '';
-      })
+      });
     }
     this.storeSubscription = this.store.pipe(select(getActiveTimeEntry)).subscribe((activeTimeEntry) => {
       this.activeTimeEntry = activeTimeEntry;