Merge branch 'master' into GH-58-B

Author: Deepika516

package-lock.json

@@ -33,9 +33,9 @@
     "@nebular/theme": "^11.0.0",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
-    "@types/lodash": "^4.14.194",
+    "@types/lodash": "^4.17.10",
     "ag-grid-angular": "^31.3.1",
-    "ag-grid-community": "^31.3.1",
+    "ag-grid-community": "^31.3.4",
     "date-fns": "^2.29.3",
     "dotenv": "^16.0.3",
     "eva-icons": "^1.1.3",
@@ -48,7 +48,7 @@
     "rxjs": "~7.8.0",
     "ts-node": "^10.9.1",
     "tslib": "^2.3.0",
-    "zone.js": "~0.12.0"
+    "zone.js": "~0.15.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^15.2.6",

package.json

@@ -1,12 +1,22 @@
 import {TestBed} from '@angular/core/testing';
 import {RouterTestingModule} from '@angular/router/testing';
 import {AppComponent} from './app.component';
+import {ActivatedRoute} from '@angular/router';
+import {TranslationService} from '@project-lib/core/localization';
+import {of} from 'rxjs';
 
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [RouterTestingModule],
       declarations: [AppComponent],
+      providers: [
+        TranslationService,
+        {
+          provide: ActivatedRoute,
+          useValue: {paramMap: of(new Map())}, // Mock ActivatedRoute
+        },
+      ],
     }).compileComponents();
   });
 

projects/arc-docs/src/app/app.component.spec.ts

@@ -1,6 +1,8 @@
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 
 import {IntroductionComponent} from './introduction.component';
+import {ActivatedRoute} from '@angular/router';
+import {of} from 'rxjs';
 
 describe('IntroductionComponent', () => {
   let component: IntroductionComponent;
@@ -9,6 +11,12 @@ describe('IntroductionComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [IntroductionComponent],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {paramMap: of(new Map())}, // Mock ActivatedRoute
+        },
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(IntroductionComponent);

projects/arc-docs/src/app/docs/getting-started/components/introduction/introduction.component.spec.ts

@@ -5,8 +5,10 @@ import {GanttModule} from '../gantt.module';
 import {GanttService} from './gantt.service';
 
 describe('GanttService', () => {
+
   let service: GanttService<AnyObject>;
 
+
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [GanttModule],

projects/arc-lib/src/lib/components/gantt/services/gantt.service.spec.ts

@@ -11,9 +11,7 @@ import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {RouterTestingModule} from '@angular/router/testing';
 import {TranslateService} from '@ngx-translate/core';
-import {finishVirtualScrollInit} from 'src/testing/virtual-scroll-init';
-// import { finishvirt}
-import {AngularTranslationServiceStub} from '../../../../testing/translation-service-stub';
+
 import {DIGITS} from '@project-lib/core/constants';
 import {ThemeModule} from '@project-lib/theme/theme.module';
 import {SelectModule} from '../select.module';
@@ -292,3 +290,8 @@ describe('SelectComponent', () => {
     flush();
   }
 });
+function finishVirtualScrollInit(
+  fixture: ComponentFixture<SelectTestComponent>,
+) {
+  throw new Error('Function not implemented.');
+}

projects/arc-lib/src/lib/components/selector/select/select.component.spec.ts

@@ -1,7 +1,7 @@
-import {HttpHeaders} from '@angular/common/http';
-import {Inject, Injectable} from '@angular/core';
-import {Router} from '@angular/router';
-import {APP_CONFIG} from '@project-lib/app-config';
+import { HttpHeaders } from '@angular/common/http';
+import { Inject, Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { APP_CONFIG } from '@project-lib/app-config';
 
 import {
   CoreAuthModule,
@@ -18,20 +18,20 @@ import {
   GetTokenCommand,
   GetCurrentUserCommand,
 } from '@project-lib/core/auth';
-import {SignUpAdapter} from '@project-lib/core/auth/adapters/signup-adapter.service';
-import {CreateExternalUserCommand} from '@project-lib/core/auth/commands/create-external-user.command';
-import {CreateTokenCommand} from '@project-lib/core/auth/commands/create-token.command';
+import { SignUpAdapter } from '@project-lib/core/auth/adapters/signup-adapter.service';
+import { CreateExternalUserCommand } from '@project-lib/core/auth/commands/create-external-user.command';
+import { CreateTokenCommand } from '@project-lib/core/auth/commands/create-token.command';
 import {
   AuthTokenSkipHeader,
   ErrToastSkipHeader,
 } from '@project-lib/core/constants';
-import {IAnyObject} from '@project-lib/core/i-any-object';
+import { IAnyObject } from '@project-lib/core/i-any-object';
 import {
   AnyAdapter,
   ApiService,
   UserSessionStoreService,
 } from '@project-lib/core/index';
-import {NgxPermissionsService} from 'ngx-permissions';
+import { NgxPermissionsService } from 'ngx-permissions';
 import {
   Observable,
   switchMap,
@@ -66,7 +66,7 @@ export class AuthService {
     private readonly anyAdapter: AnyAdapter,
     private readonly permissionsService: NgxPermissionsService,
     @Inject(APP_CONFIG) private readonly appConfig: IAnyObject,
-  ) {}
+  ) { }
 
   public isLoggedIn(): Observable<boolean> {
     return this.currentUser().pipe(
@@ -343,6 +343,7 @@ export class AuthService {
     );
   }
 
+
   loginViaCognito(): void {
     const form = document.createElement('form');
     form.method = 'POST';
@@ -379,7 +380,7 @@ export class AuthService {
     const clientSecret = document.createElement('input');
     clientSecret.type = 'hidden';
     clientSecret.name = 'logout_uri';
-    clientSecret.value = this.appConfig.publicKey;
+    clientSecret.value = this.appConfig.publicKey;;
     form.appendChild(clientSecret);
     document.body.appendChild(form);
     form.submit();

projects/arc-lib/src/lib/core/auth/auth.service.ts

@@ -12,3 +12,21 @@ export class CustomValidators {
     };
   }
 }
+
+export function keyValidator(): ValidatorFn {
+  return (control: AbstractControl): {[key: string]: any} | null => {
+    const key = control.value;
+    const maxLength = 10;
+    const isValid = /^[A-Za-z][A-Za-z0-9]{0,9}$/.test(key);
+    return isValid ? null : {keyInvalid: true};
+  };
+}
+
+
+
+export function domainMatchValidator(emailDomain: string): ValidatorFn {
+  return (control: AbstractControl): {[key: string]: any} | null => {
+    const domainValue = control.value;
+    return domainValue === emailDomain ? null : { 'domainMismatch': true };
+  };
+}

projects/arc-lib/src/lib/core/validators.ts

@@ -1,6 +1,9 @@
 import {TestBed} from '@angular/core/testing';
 import {RouterTestingModule} from '@angular/router/testing';
 import {AppComponent} from './app.component';
+import {ActivatedRoute} from '@angular/router';
+import {of} from 'rxjs';
+import {IconPacksManagerService} from '@project-lib/theme/services';
 
 describe('AppComponent', () => {
   beforeEach(async () => {
@@ -10,6 +13,19 @@ describe('AppComponent', () => {
     }).compileComponents();
   });
 
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AppComponent],
+      providers: [
+        IconPacksManagerService,
+        {
+          provide: ActivatedRoute,
+          useValue: {paramMap: of(new Map())}, // Mock ActivatedRoute
+        },
+      ],
+    }).compileComponents();
+  });
+
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;

projects/arc/src/app/app.component.spec.ts

@@ -5,6 +5,8 @@ import {ThemeModule} from '@project-lib/theme/theme.module';
 
 import {MainComponent} from './main.component';
 import {MainModule} from './main.module';
+import {ActivatedRoute} from '@angular/router';
+import {of} from 'rxjs';
 
 describe('MainComponent', () => {
   let component: MainComponent;
@@ -19,6 +21,12 @@ describe('MainComponent', () => {
         CoreModule,
         ThemeModule.forRoot('boiler'),
       ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {paramMap: of(new Map())}, // Mock ActivatedRoute
+        },
+      ],
     }).compileComponents();
   });