Tta 83 solving conflicts (#912)

* Tta 50 error when editing an entry (#907) * fix: TTA-50 Error when editing an entry * fix: TTA-50 Error when editing an entry * Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903) * Innecesary env files deleted * New changes to env files * Add 1 git-crypt collaborator New collaborators: F295BDD1 Marco Aguirre <[email protected]> * Add 1 git-crypt collaborator New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> * Add 2 git-crypt collaborators New collaborators: 1CC2872D Rodolfo Diaz <[email protected]> F295BDD1 Marco Aguirre <[email protected]> * New keys and env variables added * env files added & modified * Make run now uses .dev.env * Pipeline modified * is the .env needed? * using encrypted .stage.env * load secrets * adding env variables * scopes cannot be empty * use env * using env var * using env file * adding mask * using docker buildkit * only on tags * using buildkit directly * using dash source * docker buildkit * missing folders added * nginx fix * fixing secrets * problem with double qoutes * fixing quotes in .stage.env * fixing secrets * loading to env * quotes fixed * replacing \r * fixing trailing \n * one line expose * fixing endpoint url * removing unnecessary jobs * update creds * adding with space at the end of the file * primer commit * cambios en users list components * Se ajusta la variable isDevelopmentOrProd * revision tests * reportsUrl como variable global Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> * Set copy of package.json and npm install before copying all other project files (#906) * Set copy of package.json and npm install before copying all other project files * Fix error on COPY on Dockerfiles Co-authored-by: Gustavo Lozada <[email protected]> * feat: TTA-113 Set a new logo for TT - version 2 (#909) Co-authored-by: Jimmy Jaramillo <[email protected]> * chore(release): 1.74.0 [skip ci]nn Co-authored-by: wilc0519 <[email protected]> Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Marco Aguirre <[email protected]> Co-authored-by: Rodolfo IOET <[email protected]> Co-authored-by: jisazac <[email protected]> Co-authored-by: Juan Isaza <[email protected]> Co-authored-by: GuLozada99 <[email protected]> Co-authored-by: Gustavo Lozada <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: Jimmy Jaramillo <[email protected]> Co-authored-by: semantic-release-bot <[email protected]>
ioet · reihtw · Aug 12, 2022 · Jun 30, 2022 · Jun 30, 2022 · Jul 27, 2022
commit 912fc06001979bd4c81a798e637ca5cc71542a18
diff --git a/Docker/Dockerfile.dev b/Docker/Dockerfile.dev
@@ -5,11 +5,12 @@ ENV HOME /home/${USERNAME}
 RUN useradd -ms /bin/bash ${USERNAME}
 
 WORKDIR ${HOME}/time-tracker-ui
+COPY package.json package-lock.json ./
+RUN npm cache clean --force && npm install
 COPY . .
 RUN chown ${USERNAME}:${USERNAME} -R ${HOME}/time-tracker-ui \
     && chmod -R 777 ${HOME}/time-tracker-ui
 
 USER ${USERNAME}
-RUN npm cache clean --force && npm install
 EXPOSE 4200
 CMD ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck
diff --git a/Docker/Dockerfile.test b/Docker/Dockerfile.test
@@ -34,12 +34,13 @@ RUN mkdir -p /opt/selenium \
 RUN useradd -ms /bin/bash ${USERNAME}
 
 WORKDIR ${HOME}/time-tracker-ui
+COPY package.json package-lock.json ./
+RUN npm cache clean --force && npm install
 COPY . .
 RUN chown ${USERNAME}:${USERNAME} -R ${HOME}/time-tracker-ui
 RUN chmod -R 777 ${HOME}/time-tracker-ui
 
 USER ${USERNAME}
 EXPOSE 4200
 EXPOSE 9876
-RUN npm cache clean --force && npm install
 CMD npm run ci-test
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.73.2",
+  "version": "1.74.0",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",

diff --git a/...dules/customer-management/components/projects/components/services/project.service.spec.ts b/...dules/customer-management/components/projects/components/services/project.service.spec.ts
@@ -104,7 +104,7 @@ describe('ProjectService', () => {
   it('update project using PUT from url locally', () => {
     const project: Project = { id: '1', name: 'new name', description: 'description', project_type_id: '123', status: 'active'};
     service.url = 'projects';
-    service.isDevelopment = true;
+    service.isDevelopmentOrProd = true;
     service.updateProject(project).subscribe((response) => {
       expect(response.name).toBe('new name');
     });
@@ -115,7 +115,7 @@ describe('ProjectService', () => {
 
   it('delete project using DELETE from baseUrl', () => {
     const url = `${service.url}/1`;
-    service.isDevelopment = false;
+    service.isDevelopmentOrProd = false;
     service.deleteProject(projectsList[0].id).subscribe((projectsInResponse) => {
       expect(projectsInResponse.filter((project) => project.id !== projectsList[0].id).length).toEqual(2);
     });
@@ -126,7 +126,7 @@ describe('ProjectService', () => {
 
   it('update status project using PUT from baseUrl locally', () => {
     const url = `${service.url}/1`;
-    service.isDevelopment = true;
+    service.isDevelopmentOrProd = true;
     service.deleteProject(projectsList[0].id).subscribe((projectsInResponse) => {
       expect(projectsInResponse.filter((project) => project.id !== projectsList[0].id).length).toEqual(2);
     });

diff --git a/...pp/modules/customer-management/components/projects/components/services/project.service.ts b/...pp/modules/customer-management/components/projects/components/services/project.service.ts
@@ -11,7 +11,7 @@ import { Project } from '../../../../../shared/models';
 export class ProjectService {
   projects: Project[] = [];
   url = `${environment.timeTrackerApiUrl}/projects`;
-  isDevelopment = environment.production === EnvironmentType.TT_DEV;
+  isDevelopmentOrProd = environment.production === EnvironmentType.TT_DEV || environment.production === EnvironmentType.TT_PROD;
 
   constructor(private http: HttpClient) {}
 
@@ -34,7 +34,7 @@ export class ProjectService {
 
   updateProject(projectData): Observable<any> {
     const { id } = projectData;
-    if (this.isDevelopment) {
+    if (this.isDevelopmentOrProd) {
       if (projectData.status === 'active') {
         projectData.status = 1;
       }
@@ -43,7 +43,7 @@ export class ProjectService {
   }
 
   deleteProject(projectId: string): Observable<any> {
-    return this.isDevelopment
+    return this.isDevelopmentOrProd
       ? this.http.put(`${this.url}/${projectId}`, { status: 0 })
       : this.http.delete(`${this.url}/${projectId}`);
   }

diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
@@ -21,7 +21,7 @@
       (search)="onClearedComponent($event)"
       (change)="onSelectedProject($event)"
       ngDefaultControl="project_name">
-        
+
         <ng-template ng-option-tmp let-item="item">
           <div class="flex flex-wrap flex-row justify-between">
             <div class="p-2 text-xs">

diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts
@@ -22,7 +22,7 @@ import { TechnologyState } from '../../store/technology.reducers';
 import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
 import { SaveEntryEvent } from './save-entry-event';
 import { ProjectSelectedEvent } from './project-selected-event';
-import { get } from 'lodash';
+import { get, isEmpty } from 'lodash';
 import { DATE_FORMAT, DATE_FORMAT_YEAR } from 'src/environments/environment';
 import { TechnologiesComponent } from '../technologies/technologies.component';
 import { MatDatepicker } from '@angular/material/datepicker';
@@ -179,7 +179,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
     this.goingToWorkOnThis = this.entryToEdit?.running ? true : false;
     this.shouldRestartEntry = false;
     this.getRecentProjects();
-    if (this.entryToEdit) {
+    if (this.entryToEdit && !isEmpty(this.entryToEdit)) {
       this.isTechnologiesDisabled = false;
       this.selectedTechnologies = this.entryToEdit.technologies;
       const projectFound = this.listProjects.find((project) => project.id === this.entryToEdit.project_id);

diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.html b/src/app/modules/shared/components/sidebar/sidebar.component.html
@@ -2,7 +2,7 @@
   <div id="sidebar-wrapper" class="table-row border-r border-grayTW-lighter shadow-sm bg-whiteTW dark:bg-grayTW-dark dark:border-grayTW">
     <div class="table-cell">
       <div class="relative flex items-center border-b border-grayTW-lighter dark:border-grayTW sidebar-heading">
-        <img src="assets/img/time-tracker-logo.png" alt="ioet-logo" width="200" height="auto"/>
+        <img [src]="urlLogo" alt="ioet-logo" width="200" height="auto"/>
       </div>
       <app-user></app-user>
     <div class="list-group list-group-flush bg-whiteTW dark:bg-grayTW-darker">

diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.ts b/src/app/modules/shared/components/sidebar/sidebar.component.ts
@@ -19,6 +19,7 @@ export class SidebarComponent implements OnInit, OnDestroy {
   navStart;
   sidebarItems$: Subscription;
   isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
+  urlLogo = this.isProduction ? 'assets/img/time-tracker-logo.png' : 'assets/img/time-tracker-logo-v2.png';
 
   constructor(
     private router: Router,

diff --git a/src/app/modules/time-clock/services/entry.service.spec.ts b/src/app/modules/time-clock/services/entry.service.spec.ts
@@ -10,6 +10,7 @@ import * as moment from 'moment';
 describe('EntryService', () => {
   let service: EntryService;
   let httpMock: HttpTestingController;
+  var reportsUrl = service.urlInProductionLegacy ? service.baseUrl : service.baseUrl + '/report';
 
   beforeEach(() => {
     TestBed.configureTestingModule({imports: [HttpClientTestingModule], providers: [DatePipe]});
@@ -84,15 +85,15 @@ describe('EntryService', () => {
   });
 
   it('stops an entry using POST', () => {
-    service.urlInProduction = true;
+    service.urlInProductionLegacy = true;
     service.stopEntryRunning('id').subscribe();
 
     const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/id/stop`);
     expect(updateEntryRequest.request.method).toBe('POST');
   });
 
   it('stops an entry using PUT', () => {
-    service.urlInProduction = false;
+    service.urlInProductionLegacy = false;
     service.stopEntryRunning('id').subscribe();
 
     const updateEntryRequest = httpMock.expectOne(`${service.baseUrl}/stop`);
@@ -105,7 +106,6 @@ describe('EntryService', () => {
     const pipe: DatePipe = new DatePipe('en');
     const timeRange: TimeEntriesTimeRange = {start_date: yesterday, end_date: today};
     const userId = '123';
-    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
 
     const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
@@ -120,9 +120,7 @@ describe('EntryService', () => {
     const today = moment(new Date());
     const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
     const userId = '123';
-    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
-
     const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
     expect(loadEntryRequest.request.params.get('limit')).toEqual('9999');
   });
@@ -132,12 +130,8 @@ describe('EntryService', () => {
     const today = moment(new Date());
     const timeRange: TimeEntriesTimeRange = { start_date: yesterday, end_date: today };
     const userId = '123';
-    const reportsUrl = service.urlInProduction ? service.baseUrl : service.baseUrl + '/report';
-
     service.loadEntriesByTimeRange(timeRange, userId).subscribe();
-
     const loadEntryRequest = httpMock.expectOne(req => req.method === 'GET' && req.url === reportsUrl);
-
     const timezoneOffset = new Date().getTimezoneOffset().toString();
     expect(loadEntryRequest.request.params.get('timezone_offset')).toEqual(timezoneOffset);
   });

diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts
@@ -20,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 === EnvironmentType.TT_PROD || environment.production === EnvironmentType.TT_PROD_LEGACY;
+  urlInProductionLegacy = environment.production === EnvironmentType.TT_PROD_LEGACY;
 
   loadActiveEntry(): Observable<any> {
     return this.http.get(`${this.baseUrl}/running`);
@@ -46,7 +46,7 @@ export class EntryService {
   }
 
   stopEntryRunning(idEntry: string): Observable<any> {
-    return (this.urlInProduction ? this.http.post(`${this.baseUrl}/${idEntry}/stop`, null) : this.http.put(`${this.baseUrl}/stop`, null) );
+    return (this.urlInProductionLegacy ? this.http.post(`${this.baseUrl}/${idEntry}/stop`, null) : this.http.put(`${this.baseUrl}/stop`, null) );
   }
 
   restartEntry(idEntry: string): Observable<Entry> {
@@ -69,7 +69,7 @@ export class EntryService {
 
   loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
     const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999;
-    const loadEntriesByTimeRangeURL = this.urlInProduction ? this.baseUrl : this.baseUrl + '/report';
+    const loadEntriesByTimeRangeURL = this.urlInProductionLegacy ? this.baseUrl : this.baseUrl + '/report';
     return this.http.get(loadEntriesByTimeRangeURL,
       {
         params: {

diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -113,7 +113,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy, AfterViewInit {
   editEntry(entryId: string) {
     this.entryId = entryId;
     this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
-      this.entry = ds.data.find((entry) => entry.id === entryId);
+      this.entry = {... ds.data.find((entry) => entry.id === entryId)};
       this.canMarkEntryAsWIP = this.isEntryRunningEqualsToEntryToEdit(this.getEntryRunning(ds.data), this.entry)
         || this.isTheEntryToEditTheLastOne(ds.data);
     });

diff --git a/src/app/modules/users/components/users-list/users-list.component.html b/src/app/modules/users/components/users-list/users-list.component.html
@@ -20,10 +20,10 @@
         <td class="col-3 text-center">
           <ui-switch
             size="small"
-            (change)="!isDevelopment?switchGroup('time-tracker-admin', user):null; updateRole(ROLES.admin, user, $event);"
+            (change)="!isDevelopmentOrProd?switchGroup('time-tracker-admin', user):null; updateRole(ROLES.admin, user, $event);"
             [checked]="user.groups.includes('time-tracker-admin')"></ui-switch>
           admin
-          <span *ngIf="!isDevelopment">
+          <span *ngIf="!isDevelopmentOrProd">
             <ui-switch
             size="small"
             (change)="switchGroup('time-tracker-tester', user)"

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
@@ -27,7 +27,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
     columnDefs: [{ orderable: false, targets: [2]}]
   };
   switchGroupsSubscription: Subscription;
-  isDevelopment = true;
+  isDevelopmentOrProd = true;
 
   public get ROLES() {
     return ROLES;
@@ -38,7 +38,7 @@ export class UsersListComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   ngOnInit(): void {
-    this.isDevelopment = environment.production === EnvironmentType.TT_DEV;
+    this.isDevelopmentOrProd = environment.production === EnvironmentType.TT_DEV || environment.production === EnvironmentType.TT_PROD;
     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.spec.ts b/src/app/modules/users/services/users.service.spec.ts
@@ -35,7 +35,7 @@ describe('UsersService', () => {
   it('grant role to a User', () => {
     const userId = 'userId';
     const roleId = 'admin';
-    service.isProduction = true;
+    service.isProductionLegacy = true;
 
     service.grantRole(userId, roleId).subscribe();
 
@@ -46,7 +46,7 @@ describe('UsersService', () => {
   it('grant role to a User locally', () => {
     const userId = 'userId';
     const roleId = 'admin';
-    service.isProduction = false;
+    service.isProductionLegacy = false;
 
     service.grantRole(userId, roleId).subscribe();
 
@@ -57,7 +57,7 @@ describe('UsersService', () => {
   it('revoke role to a User', () => {
     const userId = 'userId';
     const roleId = 'admin';
-    service.isProduction = true;
+    service.isProductionLegacy = true;
 
     service.revokeRole(userId, roleId).subscribe();
 
@@ -68,7 +68,7 @@ describe('UsersService', () => {
   it('revoke role to a User locally', () => {
     const userId = 'userId';
     const roleId = 'admin';
-    service.isProduction = false;
+    service.isProductionLegacy = false;
 
     service.revokeRole(userId, roleId).subscribe();
 

diff --git a/src/app/modules/users/services/users.service.ts b/src/app/modules/users/services/users.service.ts
@@ -9,7 +9,7 @@ import { EnvironmentType } from './../../../../environments/enum';
   providedIn: 'root',
 })
 export class UsersService {
-  isProduction = environment.production === EnvironmentType.TT_PROD || environment.production === EnvironmentType.TT_PROD_LEGACY;
+  isProductionLegacy = environment.production === EnvironmentType.TT_PROD_LEGACY;
   constructor(private http: HttpClient) {}
 
   baseUrl = `${environment.timeTrackerApiUrl}/users`;
@@ -19,13 +19,13 @@ export class UsersService {
   }
 
   grantRole(userId: string, roleId: string): Observable<any> {
-    const url = this.isProduction ? `${this.baseUrl}/${userId}/roles/${roleId}/grant`
+    const url = this.isProductionLegacy ? `${this.baseUrl}/${userId}/roles/${roleId}/grant`
     : `${this.baseUrl}/${userId}/${roleId}/grant`;
     return this.http.post(url, null);
   }
 
   revokeRole(userId: string, roleId: string): Observable<any> {
-    const url = this.isProduction ? `${this.baseUrl}/${userId}/roles/${roleId}/revoke`
+    const url = this.isProductionLegacy ? `${this.baseUrl}/${userId}/roles/${roleId}/revoke`
     : `${this.baseUrl}/${userId}/${roleId}/revoke`;
     return this.http.post(url, null);
   }

diff --git a/src/assets/img/time-tracker-logo-v2.png b/src/assets/img/time-tracker-logo-v2.png