Merge branch 'master' into TTA-189-create-an-anchor-for-the-edit-a-customer-action

Author: mmaquina

.git-crypt/keys/PROD/0/23ECA41E3A250D83D50F80F78CBFA564863D0420.gpg

@@ -42,6 +42,7 @@ testem.log
 /typings
 debug.log
 *.vscode
+.hintrc
 
 # System Files
 .DS_Store

.git-crypt/keys/STAGE/0/23ECA41E3A250D83D50F80F78CBFA564863D0420.gpg

@@ -14,12 +14,12 @@ build: ## Create docker image with dependencies needed for development.
 	docker-compose build timetracker_ui
 
 .PHONY: cleanup
-cleanup: ## Delete image timetracker_ui
+cleanup: ## Delete image timetracker_ui.
 	docker rmi timetracker_ui
 
 .PHONY: run
-run: ## Execute timetracker_ui dev docker containe.
-	docker-compose --env-file=.dev.env  up  -d  timetracker_ui
+run: ## Execute timetracker_ui dev docker container.
+	docker-compose --env-file=.dev.env up -d timetracker_ui
 
 .PHONY: logs
 logs: ## Show logs of timetracker_ui.
@@ -85,7 +85,7 @@ publish_prod: ## Upload a docker image to the prod azure container registry acr=
 	docker push $(acr).azurecr.io/timetracker_ui:$(image_tag)
 
 .PHONY: login
-login: ## Login in respository of docker images.
+login: ## Login in respository of docker images
 	az acr login --name $(acr)
 
 .PHONY: release

.gitignore

@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.75.22",
+  "version": "1.75.40",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",

Makefile

@@ -11,27 +11,46 @@ import { HomeComponent } from './modules/home/home.component';
 import { LoginComponent } from './modules/login/login.component';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
 import { UsersComponent } from './modules/users/pages/users.component';
+import { V2RedirectComponent } from './modules/v2-redirect/v2-redirect.component';
+import { EnvironmentType } from 'src/environments/enum';
+import { environment } from 'src/environments/environment';
 
-const routes: Routes = [
-  {
-    path: '',
-    component: HomeComponent,
-    canActivate: [LoginGuard],
-    children: [
-      { path: 'reports', canActivate: [AdminGuard], component: ReportsComponent },
-      { path: 'time-clock', component: TimeClockComponent },
-      { path: 'time-entries', component: TimeEntriesComponent },
-      { path: 'activities-management', component: ActivitiesManagementComponent },
-      { path: 'customers-management', canActivate: [AdminGuard], component: CustomerComponent },
-      { path: 'users', canActivate: [AdminGuard], component: UsersComponent },
-      { path: '', pathMatch: 'full', redirectTo: 'time-clock' },
-    ],
-  },
-  { path: 'login', component: LoginComponent },
-];
+const isNotLegacy: boolean = environment.production !== EnvironmentType.TT_PROD_LEGACY;
+let routes: Routes;
 
+if (isNotLegacy) {
+  routes = [
+    {
+      path: '',
+      component: HomeComponent,
+      canActivate: [LoginGuard],
+      children: [
+        { path: 'reports', canActivate: [AdminGuard], component: ReportsComponent },
+        { path: 'time-clock', component: TimeClockComponent },
+        { path: 'time-entries', component: TimeEntriesComponent },
+        { path: 'activities-management', component: ActivitiesManagementComponent },
+        { path: 'customers-management', canActivate: [AdminGuard], component: CustomerComponent },
+        { path: 'users', canActivate: [AdminGuard], component: UsersComponent },
+        { path: '', pathMatch: 'full', redirectTo: 'time-clock' },
+      ],
+    },
+    { path: 'login', component: LoginComponent }
+  ];
+
+} else {
+  routes = [
+    {
+      path: '',
+      children: [
+        { path: '**', component: V2RedirectComponent },
+      ],
+    },
+  ];
+}
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule],
 })
-export class AppRoutingModule { }
+export class AppRoutingModule { 
+
+}

package-lock.json

@@ -1 +1 @@
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>

package.json

@@ -3,7 +3,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ToastrModule } from 'ngx-toastr';
 import { CommonModule, DatePipe } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, Component } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { DataTablesModule } from 'angular-datatables';
@@ -14,6 +14,8 @@ import { DragDropModule } from '@angular/cdk/drag-drop';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
+import { MatButtonModule } from '@angular/material/button';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMomentDateModule } from '@angular/material-moment-adapter';
@@ -70,6 +72,7 @@ import { UserEffects } from './modules/user/store/user.effects';
 import { EntryEffects } from './modules/time-clock/store/entry.effects';
 import { InjectTokenInterceptor } from './modules/shared/interceptors/inject.token.interceptor';
 import { SubstractDatePipe } from './modules/shared/pipes/substract-date/substract-date.pipe';
+import { SubstractDatePipeDisplayAsFloat } from './modules/shared/pipes/substract-date-return-float/substract-date-return-float.pipe';
 import { TechnologiesComponent } from './modules/shared/components/technologies/technologies.component';
 import { TimeEntriesSummaryComponent } from './modules/time-clock/components/time-entries-summary/time-entries-summary.component';
 import { TimeDetailsPipe } from './modules/time-clock/pipes/time-details.pipe';
@@ -95,6 +98,9 @@ import { SearchUserComponent } from './modules/shared/components/search-user/sea
 import { TimeRangeCustomComponent } from './modules/reports/components/time-range-custom/time-range-custom.component';
 import { TimeRangeHeaderComponent } from './modules/reports/components/time-range-custom/time-range-header/time-range-header.component';
 import { TimeRangeOptionsComponent } from './modules/reports/components/time-range-custom/time-range-options/time-range-options.component';
+import { V2RedirectComponent } from './modules/v2-redirect/v2-redirect.component';
+import { SpinnerOverlayComponent } from './modules/shared/components/spinner-overlay/spinner-overlay.component';
+import { SpinnerInterceptor } from './modules/shared/interceptors/spinner.interceptor';
 
 const maskConfig: Partial<IConfig> = {
   validation: false,
@@ -133,6 +139,7 @@ const maskConfig: Partial<IConfig> = {
     CreateProjectTypeComponent,
     EntryFieldsComponent,
     SubstractDatePipe,
+    SubstractDatePipeDisplayAsFloat,
     TechnologiesComponent,
     SearchUserComponent,
     TimeEntriesSummaryComponent,
@@ -154,6 +161,8 @@ const maskConfig: Partial<IConfig> = {
     TimeRangeCustomComponent,
     TimeRangeHeaderComponent,
     TimeRangeOptionsComponent,
+    V2RedirectComponent,
+    SpinnerOverlayComponent,
   ],
   imports: [
     NgxMaskModule.forRoot(maskConfig),
@@ -172,6 +181,7 @@ const maskConfig: Partial<IConfig> = {
     DataTablesModule,
     AutocompleteLibModule,
     NgxMaterialTimepickerModule,
+    MatProgressSpinnerModule,
     UiSwitchModule,
     DragDropModule,
     MatIconModule,
@@ -206,6 +216,11 @@ const maskConfig: Partial<IConfig> = {
       useClass: InjectTokenInterceptor,
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: SpinnerInterceptor,
+      multi: true,
+    },
     DatePipe,
     CookieService,
     {provide: Window, useValue: window}

src/app/app-routing.module.ts

@@ -64,15 +64,12 @@ export class LoginComponent implements OnInit {
   ngOnInit() {
 
     this.googleAuthSDK();
-    if (this.isProduction && this.azureAdB2CService.isLogin()) {
-        this.router.navigate(['']);
-    } else {
       this.loginService.isLogin().subscribe(isLogin => {
         if (isLogin) {
           this.router.navigate(['']);
         }
       });
-    }
+    
     window.handleCredentialResponse = (response) => {
       const {credential = ''} = response;
       this.featureToggleCookiesService.setCookies();