merge from master

rodolfoIOET · rodolfoIOET · commit d825c3601e7e · 2022-06-01T10:24:19.000-05:00
diff --git a/.github/workflows/CD-time-tracker-ui.yml b/.github/workflows/CD-time-tracker-ui.yml
@@ -35,11 +35,14 @@ jobs:
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
       run: |
-        chmod +x ./scripts/populate-var-file.sh
-        sh ./scripts/populate-var-file.sh
+        chmod +x ./scripts/populate-keys.sh
+        sh ./scripts/populate-keys.sh
 
     - name: 'run: npm install and build'
       run: |
+        set -a
+        source .env
+        set +a
         npm install
         npm run build --prod --if-present
         cp scripts/default-static-site.js ${BUILD_PATH}
diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml
@@ -48,11 +48,16 @@ jobs:
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
       run: |
-        chmod +x ./scripts/populate-var-file.sh
-        sh ./scripts/populate-var-file.sh
+        chmod +x ./scripts/populate-keys.sh
+        sh ./scripts/populate-keys.sh
 
     - name: Running tests
-      run: npm run ci-test --if-present
+      run: |
+        set -a
+        source .env
+        set +a
+        npm run ci-test --if-present
+        rm .env
 
     - name: Generate coverage report
       env:
diff --git a/Docker/Dockerfile.dev b/Docker/Dockerfile.dev
@@ -12,4 +12,4 @@ RUN chown ${USERNAME}:${USERNAME} -R ${HOME}/time-tracker-ui \
 USER ${USERNAME}
 RUN npm cache clean --force && npm install
 EXPOSE 4200
-CMD npm run config && ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck
+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
@@ -44,4 +44,4 @@ COPY .env .
 EXPOSE 4200
 EXPOSE 9876
 RUN npm cache clean --force && npm install
-CMD npm run config && npm run ci-test
+CMD npm run ci-test
diff --git a/Dockerfile b/Dockerfile
@@ -10,10 +10,15 @@ RUN chmod -R 777 ${HOME}/time-tracker-ui
 
 USER ${USERNAME}
 RUN npm cache clean --force && npm install
+EXPOSE 4200
+EXPOSE 9876
+CMD ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck
+
+
 
 FROM development as build
 COPY .env .
-RUN npm run config && npm run build
+RUN npm run build
 
 FROM nginx:1.21 AS production
 
diff --git a/package.json b/package.json
@@ -2,7 +2,6 @@
   "name": "time-tracker",
   "version": "1.72.9",
   "scripts": {
-    "config": "ts-node ./scripts/setenv.ts",
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",
     "start": "ng serve",
diff --git a/scripts/populate-keys.sh b/scripts/populate-keys.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 > .env
-echo 'AUTHORITY = '$AUTHORITY'' >> .env
-echo 'CLIENT_ID = '$CLIENT_ID'' >> .env
-echo 'SCOPES = '$SCOPES'' >> .env
-echo 'STACK_EXCHANGE_ID = '$STACK_EXCHANGE_ID'' >> .env
-echo 'STACK_EXCHANGE_ACCESS_TOKEN = '$STACK_EXCHANGE_ACCESS_TOKEN'' >> .env
-echo 'AZURE_APP_CONFIGURATION_CONNECTION_STRING = '$AZURE_APP_CONFIGURATION_CONNECTION_STRING'' >> .env
+echo "AUTHORITY='$AUTHORITY'" >> .env
+echo "CLIENT_ID='$CLIENT_ID'" >> .env
+echo "SCOPES='$SCOPES'" >> .env
+echo "STACK_EXCHANGE_ID='$STACK_EXCHANGE_ID'" >> .env
+echo "STACK_EXCHANGE_ACCESS_TOKEN='$STACK_EXCHANGE_ACCESS_TOKEN'" >> .env
+echo "AZURE_APP_CONFIGURATION_CONNECTION_STRING='$AZURE_APP_CONFIGURATION_CONNECTION_STRING'" >> .env
 cat .env
diff --git a/scripts/populate-var-file.sh b/scripts/populate-var-file.sh
diff --git a/scripts/setenv.ts b/scripts/setenv.ts
diff --git a/src/app/modules/activities-management/store/activity-management.selectors.spec.ts b/src/app/modules/activities-management/store/activity-management.selectors.spec.ts
@@ -24,6 +24,49 @@ describe('ActivityManagement Selectors', () => {
     expect(selectors.allActivities.projector(activityState)).toBe(activities);
   });
 
+  it('should return all the ordered data in the state when the selector allAtiveActivities is called', () => {
+    const activities = [
+      {
+        id: '001',
+        name: 'Meeting',
+        description: 'Some description'
+      },
+      {
+        id: '002',
+        name: 'ABC',
+        description: 'Some description'
+      },
+      {
+        id: '003',
+        name: 'XYZ',
+        description: 'Some description'
+      },
+    ];
+  
+    const activitiesOrdered = [
+      {
+        id: '002',
+        name: 'ABC',
+        description: 'Some description'
+      },
+      {
+        id: '001',
+        name: 'Meeting',
+        description: 'Some description'
+      },
+      {
+        id: '003',
+        name: 'XYZ',
+        description: 'Some description'
+      },
+    ];
+
+    const activityState = { data: activities };
+
+    expect(selectors.allActiveActivities.projector(activityState)).toEqual(activitiesOrdered);
+
+  });
+
   it('should return all active data in the state when the selector allActiveActivities is called', () => {
     const activities = [{ id: 'id', name: 'abc', description: 'xxx', status: 'active' },
     { id: '2', name: 'xyz', description: 'yyy', status: 'inactive' },
diff --git a/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts b/src/app/modules/reports/components/time-range-form/time-range.component.spec.ts
@@ -115,6 +115,16 @@ describe('Reports Page', () => {
       expect(component.onSubmit).toHaveBeenCalled();
     });
 
+    it('triggers onSubmit with the form status valid', () => {
+      const valid = component.reportForm.valid;
+      spyOn(component, 'onSubmit');
+
+      component.setInitialDataOnScreen();
+
+      expect(valid).toBeTruthy();
+      expect(component.onSubmit).toHaveBeenCalled();
+    });
+
     it('When the ngOnChanges method is called, the onSubmit method is called', () => {
       const userId = 'abcd';
       spyOn(component, 'onSubmit');
@@ -124,6 +134,15 @@ describe('Reports Page', () => {
       expect(component.onSubmit).toHaveBeenCalled();
     });
 
+    it('When the ngOnChanges method is the first change, the onSubmit method is not called', () => {
+      const userId = 'abcd';
+      spyOn(component, 'onSubmit');
+
+      component.ngOnChanges({userId: new SimpleChange(null, userId, true)});
+
+      expect(component.onSubmit).not.toHaveBeenCalled();
+    });
+
     afterEach(() => {
       fixture.destroy();
     });
diff --git a/src/app/modules/shared/formatters/parse-date-time-offset/parse-date-time-offset.spec.ts b/src/app/modules/shared/formatters/parse-date-time-offset/parse-date-time-offset.spec.ts
@@ -20,4 +20,31 @@ describe('ParseDateToUtcComponent', () => {
     expect(parseTimeOffset.parseDateTimeOffset(date, timezoneOffset)).toEqual(dateOffset);
   });
 
+  it('returns "In progress" text when the date value is null', () => {
+    const parseTimeOffset = new ParseDateTimeOffset();
+    const date = null;
+    const timezoneOffset = 420;
+    const dateOffset = '09:30';
+
+    expect(parseTimeOffset.parseDateTimeOffset(date, timezoneOffset)).toEqual('In progress');
+  });
+
+  it('returns "In progress" text when the date value is undefined', () => {
+    const parseTimeOffset = new ParseDateTimeOffset();
+    const date = undefined;
+    const timezoneOffset = 420;
+    const dateOffset = '09:30';
+
+    expect(parseTimeOffset.parseDateTimeOffset(date, timezoneOffset)).toEqual('In progress');
+  });
+
+  it('returns "In progress" text when the date value is empty', () => {
+    const parseTimeOffset = new ParseDateTimeOffset();
+    const date = '';
+    const timezoneOffset = 420;
+    const dateOffset = '09:30';
+
+    expect(parseTimeOffset.parseDateTimeOffset(date, timezoneOffset)).toEqual('In progress');
+  });
+
 });
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts
@@ -361,6 +361,54 @@ describe('EntryFieldsComponent', () => {
     expect(component.activities).toEqual(action.payload);
   });
 
+  it('activites are ordered using the payload of the action', () => {
+    const activities = [
+      {
+        id: '004',
+        name: 'Meeting',
+        description: 'Some description'
+      },
+      {
+        id: '005',
+        name: 'ABCD',
+        description: 'Some description'
+      },
+      {
+        id: '006',
+        name: 'XYZA',
+        description: 'Some description'
+      },
+    ];
+  
+    const activitiesOrdered = [
+      {
+        id: '005',
+        name: 'ABCD',
+        description: 'Some description'
+      },
+      {
+        id: '004',
+        name: 'Meeting',
+        description: 'Some description'
+      },
+      {
+        id: '006',
+        name: 'XYZA',
+        description: 'Some description'
+      },
+    ];
+
+    const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
+    const action = {
+      type: ActivityManagementActionTypes.LOAD_ACTIVITIES_SUCCESS,
+      payload: activities,
+    };
+
+    actionSubject.next(action);
+
+    expect(component.activities).toEqual(activitiesOrdered);
+  });
+
   it('LoadActiveEntry is dispatchen after LOAD_ACTIVITIES_SUCCESS', () => {
     spyOn(store, 'dispatch');
 
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -1,18 +1,17 @@
-import * as keys from './keys';
 
 export const environment = {
   production: true,
   timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
-export const AUTHORITY = keys.AUTHORITY;
-export const CLIENT_ID = keys.CLIENT_ID;
-export const SCOPES = keys.SCOPES;
+export const AUTHORITY = process.env["AUTHORITY"];
+export const CLIENT_ID = process.env["CLIENT_ID"];
+export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
-export const STACK_EXCHANGE_ID = keys.STACK_EXCHANGE_ID;
-export const STACK_EXCHANGE_ACCESS_TOKEN = keys.STACK_EXCHANGE_ACCESS_TOKEN;
-export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = keys.AZURE_APP_CONFIGURATION_CONNECTION_STRING;
+export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];
+export const STACK_EXCHANGE_ACCESS_TOKEN = process.env["STACK_EXCHANGE_ACCESS_TOKEN"];
+export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = process.env["AZURE_APP_CONFIGURATION_CONNECTION_STRING"];
 export const DATE_FORMAT = 'yyyy-MM-dd';
 export const DATE_FORMAT_YEAR = 'YYYY-MM-DD';
 export const GROUPS = {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -1,21 +1,20 @@
 // This file can be replaced during build by using the `fileReplacements` array.
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
-import * as keys from './keys';
 
 export const environment = {
   production: false,
   timeTrackerApiUrl: 'http://localhost:7071/api',
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
-export const AUTHORITY = keys.AUTHORITY;
-export const CLIENT_ID = keys.CLIENT_ID;
-export const SCOPES = keys.SCOPES;
+export const AUTHORITY = process.env["AUTHORITY"];
+export const CLIENT_ID = process.env["CLIENT_ID"];
+export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
-export const STACK_EXCHANGE_ID = keys.STACK_EXCHANGE_ID;
-export const STACK_EXCHANGE_ACCESS_TOKEN = keys.STACK_EXCHANGE_ACCESS_TOKEN;
-export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = keys.AZURE_APP_CONFIGURATION_CONNECTION_STRING;
+export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];
+export const STACK_EXCHANGE_ACCESS_TOKEN = process.env["STACK_EXCHANGE_ACCESS_TOKEN"];
+export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = process.env["AZURE_APP_CONFIGURATION_CONNECTION_STRING"];
 export const DATE_FORMAT = 'yyyy-MM-dd';
 export const DATE_FORMAT_YEAR = 'YYYY-MM-DD';
 export const GROUPS = {
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,11 +1,26 @@
+const webpack = require('webpack')
 const { addTailwindPlugin } = require("@ngneat/tailwind");
 const tailwindConfig = require("./tailwind.config.js");
 
 module.exports = (config) => {
+  const config_ = {
+    ...config,
+    plugins : [
+      ...config.plugins,
+      new webpack.DefinePlugin({
+        'process.env.AUTHORITY': JSON.stringify(process.env["AUTHORITY"]),
+        'process.env.CLIENT_ID':JSON.stringify(process.env["CLIENT_ID"]),
+        'process.env.SCOPES':JSON.stringify(process.env["SCOPES"]),
+        'process.env.STACK_EXCHANGE_ID':JSON.stringify(process.env["STACK_EXCHANGE_ID"]),
+        'process.env.STACK_EXCHANGE_ACCESS_TOKEN':JSON.stringify(process.env["STACK_EXCHANGE_ACCESS_TOKEN"]),
+        'process.env.AZURE_APP_CONFIGURATION_CONNECTION_STRING':JSON.stringify(process.env["AZURE_APP_CONFIGURATION_CONNECTION_STRING"])
+    })
+  ]
+  }
   addTailwindPlugin({
-    webpackConfig: config,
+    webpackConfig: config_,
     tailwindConfig,
     patchComponentsStyles: true
   });
-  return config;
+  return config_;
 };
