feat: TTA-66 create new environment

jimmyjaramillo · jimmyjaramillo · commit 1420c79e512d · 2022-06-24T20:10:54.000-05:00
diff --git a/.env b/.env
diff --git a/angular.json b/angular.json
@@ -78,6 +78,34 @@
                   "maximumError": "10kb"
                 }
               ]
+            },
+            "productionlegacy": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prodlegacy.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
             }
           }
         },
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,15 +10,14 @@ services:
       - 4200:4200
       - 9876:9876
     environment:
+      API_URL: ${API_URL}
       AUTHORITY: ${AUTHORITY}
       CLIENT_ID: ${CLIENT_ID}
+      CLIENT_URL: ${CLIENT_URL}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
       AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
-      AUTHORITY_JSON: ${AUTHORITY_JSON}
-      CLIENT_ID_JSON: ${CLIENT_ID_JSON}
-      SCOPES_JSON: ${SCOPES_JSON}
     volumes:
       - ./src:/home/timetracker/time-tracker-ui/src/
       - ./scripts:/home/timetracker/time-tracker-ui/scripts/
@@ -39,12 +38,11 @@ services:
       - 9876:9876
     environment:
       CHROME_BIN: /opt/google/chrome/google-chrome
+      API_URL: ${API_URL}
       AUTHORITY: ${AUTHORITY}
       CLIENT_ID: ${CLIENT_ID}
+      CLIENT_URL: ${CLIENT_URL}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
       AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
-      AUTHORITY_JSON: ${AUTHORITY_JSON}
-      CLIENT_ID_JSON: ${CLIENT_ID_JSON}
-      SCOPES_JSON: ${SCOPES_JSON}
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod",
+    "build-legacy": "ng build --configuration productionlegacy",
     "test": "ng test --browsers ChromeHeadless",
     "test-headless": "ng test --browsers ChromeHeadless",
     "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",
diff --git a/scripts/populate-keys.sh b/scripts/populate-keys.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 > .env
+echo "API_URL='$API_URL'" >> .env
 echo "AUTHORITY='$AUTHORITY'" >> .env
 echo "CLIENT_ID='$CLIENT_ID'" >> .env
+echo "CLIENT_URL='$CLIENT_URL'" >> .env
 echo "SCOPES='$SCOPES'" >> .env
 echo "STACK_EXCHANGE_ID='$STACK_EXCHANGE_ID'" >> .env
 echo "STACK_EXCHANGE_ACCESS_TOKEN='$STACK_EXCHANGE_ACCESS_TOKEN'" >> .env
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -46,7 +46,8 @@ import { ProjectEffects } from './modules/customer-management/components/project
 import { TechnologyEffects } from './modules/shared/store/technology.effects';
 import { ProjectTypeEffects } from './modules/customer-management/components/projects-type/store/project-type.effects';
 import { reducers, metaReducers } from './reducers';
-import { environment } from '../environments/environment';
+import { CLIENT_URL, environment } from '../environments/environment';
+import { EnvironmentType } from '../environments/enum';
 import { CustomerComponent } from './modules/customer-management/pages/customer.component';
 // tslint:disable-next-line: max-line-length
 import { CustomerListComponent } from './modules/customer-management/components/customer-info/components/customer-list/customer-list.component';
@@ -168,7 +169,7 @@ const maskConfig: Partial<IConfig> = {
     StoreModule.forRoot(reducers, {
       metaReducers,
     }),
-    !environment.production
+    environment.production === EnvironmentType.TT_DEV
       ? StoreDevtoolsModule.instrument({
           maxAge: 15, // Retains last 15 states
         })
@@ -206,9 +207,7 @@ const maskConfig: Partial<IConfig> = {
         providers: [
           {
             id: GoogleLoginProvider.PROVIDER_ID,
-            provider: new GoogleLoginProvider(
-              '565556796659-hscrj9e6m2krc41cfng898793ocfnb8j.apps.googleusercontent.com'
-            )
+            provider: new GoogleLoginProvider(CLIENT_URL)
           }
         ]
       } as SocialAuthServiceConfig,
diff --git a/src/app/guards/login-guard/login.guard.ts b/src/app/guards/login-guard/login.guard.ts
@@ -3,12 +3,14 @@ import { Router, CanActivate } from '@angular/router';
 import { AzureAdB2CService } from '../../modules/login/services/azure.ad.b2c.service';
 import { LoginService } from '../../modules/login/services/login.service';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
+
 
 @Injectable({
   providedIn: 'root',
 })
 export class LoginGuard implements CanActivate {
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
   constructor(
     private azureAdB2CService: AzureAdB2CService,
     private router: Router,
diff --git a/src/app/modules/activities-management/pages/activities-management.component.ts b/src/app/modules/activities-management/pages/activities-management.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 
 @Component({
   selector: 'app-activities-management',
@@ -11,6 +12,6 @@ export class ActivitiesManagementComponent implements OnInit {
   showOptionInDevelopment = true;
 
   ngOnInit() {
-    this.showOptionInDevelopment = !environment.production;
+    this.showOptionInDevelopment = environment.production === EnvironmentType.TT_DEV;
   }
 }
diff --git a/src/app/modules/customer-management/components/projects/components/services/project.service.ts b/src/app/modules/customer-management/components/projects/components/services/project.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { environment } from '../../../../../../../environments/environment';
+import { EnvironmentType } from '../../../../../../../environments/enum';
 import { Project } from '../../../../../shared/models';
 
 @Injectable({
@@ -10,7 +11,7 @@ import { Project } from '../../../../../shared/models';
 export class ProjectService {
   projects: Project[] = [];
   url = `${environment.timeTrackerApiUrl}/projects`;
-  isDevelopment = !environment.production;
+  isDevelopment = environment.production === EnvironmentType.TT_DEV;
 
   constructor(private http: HttpClient) {}
 
diff --git a/src/app/modules/home/home.component.ts b/src/app/modules/home/home.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { LoadUser } from 'src/app/modules/user/store/user.actions';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 import { AzureAdB2CService } from '../login/services/azure.ad.b2c.service';
 import { LoginService } from '../login/services/login.service';
 
@@ -11,7 +12,7 @@ import { LoginService } from '../login/services/login.service';
   styleUrls: ['./home.component.scss'],
 })
 export class HomeComponent implements OnInit {
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
   constructor(
     private azureAdB2CService: AzureAdB2CService,
     private loginService: LoginService,
diff --git a/src/app/modules/login/login.component.ts b/src/app/modules/login/login.component.ts
@@ -5,6 +5,7 @@ import { FeatureToggleCookiesService } from '../shared/feature-toggles/feature-t
 
 import { SocialAuthService, SocialUser } from 'angularx-social-login';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 import { LoginService } from './services/login.service';
 @Component({
   selector: 'app-login',
@@ -13,7 +14,7 @@ import { LoginService } from './services/login.service';
 })
 export class LoginComponent implements OnInit {
   socialUser: SocialUser;
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   constructor(
     private azureAdB2CService: AzureAdB2CService,
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.ts b/src/app/modules/shared/components/sidebar/sidebar.component.ts
@@ -7,6 +7,8 @@ import { UserInfoService } from 'src/app/modules/user/services/user-info.service
 import { AzureAdB2CService } from '../../../login/services/azure.ad.b2c.service';
 import { LoginService } from '../../../login/services/login.service';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
+
 @Component({
   selector: 'app-sidebar',
   templateUrl: './sidebar.component.html',
@@ -16,7 +18,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
   itemsSidebar: ItemSidebar[] = [];
   navStart;
   sidebarItems$: Subscription;
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   constructor(
     private router: Router,
diff --git a/src/app/modules/shared/components/user/user.component.ts b/src/app/modules/shared/components/user/user.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 import { AzureAdB2CService } from '../../../login/services/azure.ad.b2c.service';
 import { LoginService } from '../../../login/services/login.service';
 
@@ -11,7 +12,7 @@ import { LoginService } from '../../../login/services/login.service';
 export class UserComponent implements OnInit {
   userName: string;
   userEmail: string;
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   constructor(private azureAdB2CService: AzureAdB2CService, private loginService: LoginService) {}
 
diff --git a/src/app/modules/shared/feature-toggles/filters/feature-filter-provider.service.ts b/src/app/modules/shared/feature-toggles/filters/feature-filter-provider.service.ts
@@ -7,13 +7,15 @@ import { TargetingFilterParameters } from './targeting/targeting-feature-filter-
 import { TargetingFeatureFilterModel } from './targeting/targeting-feature-filter.model';
 import { LoginService } from '../../../login/services/login.service';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
+
 
 @Injectable({
   providedIn: 'root',
 })
 export class FeatureFilterProvider {
   constructor(private userService: AzureAdB2CService, private loginService: LoginService) {}
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   getFilterFromConfiguration(featureFilterConfiguration: FeatureFilterConfiguration): FeatureFilterModel {
     const featureName = featureFilterConfiguration.name;
diff --git a/src/app/modules/shared/interceptors/inject.token.interceptor.ts b/src/app/modules/shared/interceptors/inject.token.interceptor.ts
@@ -9,11 +9,12 @@ import { Observable } from 'rxjs';
 
 import { AzureAdB2CService } from 'src/app/modules/login/services/azure.ad.b2c.service';
 import { environment } from './../../../../environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 import { LoginService } from '../../login/services/login.service';
 
 @Injectable()
 export class InjectTokenInterceptor implements HttpInterceptor {
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
   constructor(private azureAdB2CService: AzureAdB2CService, private loginService: LoginService) { }
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
diff --git a/src/app/modules/time-clock/pages/time-clock.component.ts b/src/app/modules/time-clock/pages/time-clock.component.ts
@@ -12,6 +12,8 @@ import { EntryActionTypes, LoadEntriesSummary, StopTimeEntryRunning } from './..
 import { getActiveTimeEntry } from './../store/entry.selectors';
 import { LoginService } from '../../login/services/login.service';
 import { environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
+
 @Component({
   selector: 'app-time-clock',
   templateUrl: './time-clock.component.html',
@@ -25,7 +27,7 @@ export class TimeClockComponent implements OnInit, OnDestroy {
   activeTimeEntry: Entry;
   clockOutSubscription: Subscription;
   storeSubscription: Subscription;
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   constructor(
     private azureAdB2CService: AzureAdB2CService,
diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts
@@ -4,6 +4,7 @@ import { HttpClient } from '@angular/common/http';
 
 import { Observable } from 'rxjs';
 import { environment } from './../../../../environments/environment';
+import { EnvironmentType } from './../../../../environments/enum';
 import { TimeEntriesTimeRange } from '../models/time-entries-time-range';
 import { DatePipe } from '@angular/common';
 import { Entry } from '../../shared/models';
@@ -19,7 +20,7 @@ export class EntryService {
 
   static TIME_ENTRIES_DATE_TIME_FORMAT = 'yyyy-MM-ddTHH:mm:ssZZZZZ';
   baseUrl = `${environment.timeTrackerApiUrl}/time-entries`;
-  urlInProduction = environment.production;
+  urlInProduction = environment.production === EnvironmentType.TT_PROD || environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   loadActiveEntry(): Observable<any> {
     return this.http.get(`${this.baseUrl}/running`);
diff --git a/src/app/modules/users/components/users-list/users-list.component.ts b/src/app/modules/users/components/users-list/users-list.component.ts
@@ -5,6 +5,7 @@ import { DataTableDirective } from 'angular-datatables';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { delay, filter } from 'rxjs/operators';
 import { ROLES, environment } from 'src/environments/environment';
+import { EnvironmentType } from 'src/environments/enum';
 import { User } from '../../models/users';
 import { LoadUsers, UserActionTypes, AddUserToGroup, RemoveUserFromGroup } from '../../store/user.actions';
 import { getIsLoading } from '../../store/user.selectors';
@@ -37,7 +38,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   ngOnInit(): void {
-    this.isDevelopment = !environment.production;
+    this.isDevelopment = environment.production === EnvironmentType.TT_DEV;
     this.store.dispatch(new LoadUsers());
     this.loadUsersSubscription = this.actionsSubject$
       .pipe(filter((action: any) => action.type === UserActionTypes.LOAD_USERS_SUCCESS))
diff --git a/src/app/modules/users/services/users.service.ts b/src/app/modules/users/services/users.service.ts
@@ -3,11 +3,13 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { User } from '../models/users';
 import { environment } from './../../../../environments/environment';
+import { EnvironmentType } from './../../../../environments/enum';
+
 @Injectable({
   providedIn: 'root',
 })
 export class UsersService {
-  isProduction = environment.production;
+  isProduction = environment.production === EnvironmentType.TT_PROD || environment.production === EnvironmentType.TT_PROD_LEGACY;
   constructor(private http: HttpClient) {}
 
   baseUrl = `${environment.timeTrackerApiUrl}/users`;
diff --git a/src/app/reducers/index.ts b/src/app/reducers/index.ts
@@ -1,6 +1,7 @@
 import { ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store';
 import { localStorageSync } from 'ngrx-store-localstorage';
 import { environment } from '../../environments/environment';
+import { EnvironmentType } from '../../environments/enum';
 import { userReducer } from '../modules/user/store/user.reducer';
 import { entryReducer } from '../modules/time-clock/store/entry.reducer';
 import { technologyReducer } from '../modules/shared/store/technology.reducers';
@@ -35,6 +36,6 @@ export function localStorageSyncReducer(reducer: ActionReducer<any>): ActionRedu
   return localStorageSync({ keys: [{ user: ['groups'] }], rehydrate: true })(reducer);
 }
 
-export const metaReducers: MetaReducer<State>[] = !environment.production
+export const metaReducers: MetaReducer<State>[] = environment.production === EnvironmentType.TT_DEV
   ? [localStorageSyncReducer]
   : [localStorageSyncReducer];
diff --git a/src/environments/enum.ts b/src/environments/enum.ts
@@ -10,3 +10,9 @@ export enum UserEnum {
   ID = 'id',
   NAME = 'name',
 }
+
+export enum EnvironmentType {
+  TT_DEV = 'dev',
+  TT_PROD_LEGACY = 'prod_legacy',
+  TT_PROD = 'prod_v2',
+}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -1,12 +1,14 @@
+import { EnvironmentType } from './enum';
 
 export const environment = {
-  production: true,
-  timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
+  production: EnvironmentType.TT_PROD,
+  timeTrackerApiUrl:  process.env["API_URL"],
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
 export const AUTHORITY = process.env["AUTHORITY"];
 export const CLIENT_ID = process.env["CLIENT_ID"];
+export const CLIENT_URL = process.env["CLIENT_URL"];
 export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
 export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];
diff --git a/src/environments/environment.prodlegacy.ts b/src/environments/environment.prodlegacy.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
diff --git a/src/main.ts b/src/main.ts
diff --git a/webpack.config.js b/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { Component, Input, OnInit } from '@angular/core';`
`2`	`2`	`import { environment } from 'src/environments/environment';`
	`3`	`+import { EnvironmentType } from 'src/environments/enum';`
`3`	`4`
`4`	`5`	`@Component({`
`5`	`6`	`selector: 'app-activities-management',`
`@@ -11,6 +12,6 @@ export class ActivitiesManagementComponent implements OnInit {`
`11`	`12`	`showOptionInDevelopment = true;`
`12`	`13`
`13`	`14`	`ngOnInit() {`
`14`		`- this.showOptionInDevelopment = !environment.production;`
	`15`	`+ this.showOptionInDevelopment = environment.production === EnvironmentType.TT_DEV;`
`15`	`16`	`}`
`16`	`17`	`}`