From b515666cc0efad96aeb67038443edae1e6db0b3a Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 10:08:52 -0500 Subject: [PATCH 1/8] fix: TT-610 Fix pipeline --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f465cfed1..98d231b11 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ cleanup: ## Delete image timetracker_ui .PHONY: run run: ## Execute timetracker_ui docker containe. - docker-compose --env-file ./.env up -d + docker-compose up -d .PHONY: logs logs: ## Show logs of timetracker_ui. @@ -40,12 +40,12 @@ remove: ## Delete container timetracker_ui. .PHONY: test test: ## Run all tests on docker container timetracker_ui at the CLI. - docker-compose -f docker-compose.yml --env-file ./.env up -d + docker-compose -f docker-compose.yml up -d docker exec timetracker_ui bash -c "npm run ci-test" .PHONY: testdev testdev: ## Run all tests on docker container timetracker_ui at the Dev - docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file ./.env up -d + docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d docker exec timetracker_ui bash -c "npm run ci-test" .PHONY: publish From 17c1a5335b688040cbe867449c25d4705bc58d61 Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 11:10:14 -0500 Subject: [PATCH 2/8] fix: TT-610 Fix pipeline - CI Time Tracker ui --- package.json | 2 +- scripts/setenv.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 396d1b3fe..733159dd0 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build": "ng build --prod", "test": "ng test --browsers ChromeHeadless", "test-headless": "ng test --browsers ChromeHeadless", - "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless", + "ci-test": "npm run config && ng test --no-watch --no-progress --browsers ChromeHeadless", "lint": "ng lint", "e2e": "ng e2e" }, diff --git a/scripts/setenv.ts b/scripts/setenv.ts index 0c07a1b30..9bc3b5069 100644 --- a/scripts/setenv.ts +++ b/scripts/setenv.ts @@ -2,7 +2,7 @@ const { writeFile } = require('fs'); require('dotenv').config(); const pathJs = `./src/environments/keys.ts` -const contentKeys = +const contentKeys = `export const AUTHORITY = '${process.env.AUTHORITY}'; export const CLIENT_ID = '${process.env.CLIENT_ID}'; export const SCOPES = ['${process.env.SCOPES}']; @@ -19,7 +19,7 @@ writeFile(pathJs, contentKeys, function (err) { }); const pathJson = `./src/environments/.keys.json` -const contentKeysJson = +const contentKeysJson = `{ "authority": "${process.env.AUTHORITY_JSON}", "client_id": "${process.env.CLIENT_ID_JSON}", From a627255b3f8d97dac2ef767b5fe430a8390ba946 Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 13:08:55 -0500 Subject: [PATCH 3/8] fix: TT-610 Fix pipeline - read from OS env variable in .ts --- .github/workflows/CI-time-tracker-ui.yml | 4 ++-- package.json | 2 +- scripts/populate-var-file.sh | 10 ++++++++++ scripts/setenv.ts | 13 ++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 scripts/populate-var-file.sh diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml index da410589a..f63625e00 100644 --- a/.github/workflows/CI-time-tracker-ui.yml +++ b/.github/workflows/CI-time-tracker-ui.yml @@ -48,8 +48,8 @@ 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-keys.sh - sh ./scripts/populate-keys.sh + chmod +x ./scripts/populate-var-file.sh + sh ./scripts/populate-var-file.sh - name: Running tests run: npm run ci-test --if-present diff --git a/package.json b/package.json index 733159dd0..396d1b3fe 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build": "ng build --prod", "test": "ng test --browsers ChromeHeadless", "test-headless": "ng test --browsers ChromeHeadless", - "ci-test": "npm run config && ng test --no-watch --no-progress --browsers ChromeHeadless", + "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless", "lint": "ng lint", "e2e": "ng e2e" }, diff --git a/scripts/populate-var-file.sh b/scripts/populate-var-file.sh new file mode 100644 index 000000000..f395689af --- /dev/null +++ b/scripts/populate-var-file.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +> src/environments/keys.ts +echo 'export const AUTHORITY = "'$AUTHORITY'";' >> src/environments/keys.ts +echo 'export const CLIENT_ID = "'$CLIENT_ID'";' >> src/environments/keys.ts +echo 'export const SCOPES = ["'$SCOPES'"];' >> src/environments/keys.ts +echo 'export const STACK_EXCHANGE_ID = "'$STACK_EXCHANGE_ID'";' >> src/environments/keys.ts +echo 'export const STACK_EXCHANGE_ACCESS_TOKEN = "'$STACK_EXCHANGE_ACCESS_TOKEN'";' >> src/environments/keys.ts +echo 'export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = "'$AZURE_APP_CONFIGURATION_CONNECTION_STRING'";' >> src/environments/keys.ts +cat src/environments/keys.ts diff --git a/scripts/setenv.ts b/scripts/setenv.ts index 9bc3b5069..659a587b2 100644 --- a/scripts/setenv.ts +++ b/scripts/setenv.ts @@ -1,14 +1,13 @@ const { writeFile } = require('fs'); -require('dotenv').config(); const pathJs = `./src/environments/keys.ts` const contentKeys = -`export const AUTHORITY = '${process.env.AUTHORITY}'; -export const CLIENT_ID = '${process.env.CLIENT_ID}'; -export const SCOPES = ['${process.env.SCOPES}']; -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 AUTHORITY = '${process.env["AUTHORITY"]}'; +export const CLIENT_ID = '${process.env["CLIENT_ID"]}'; +export const SCOPES = ['${process.env["SCOPES"]}']; +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"]}'; `; writeFile(pathJs, contentKeys, function (err) { From 4cfca4125d724ace091482565b017e7655306205 Mon Sep 17 00:00:00 2001 From: JaviMiot <51manobandajavier@gmail.com> Date: Wed, 13 Apr 2022 16:29:13 -0500 Subject: [PATCH 4/8] feat: TT-37-show-complete-descriptions-on-hover --- .../time-entries-table.component.html | 20 ++++---- .../time-entries-table.component.scss | 48 ++++++++++++++++--- 2 files changed, 49 insertions(+), 19 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html index 9b4880904..9e7cd45b6 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html @@ -1,9 +1,5 @@
- @@ -25,7 +21,7 @@ - + - + +
{{ entry.id }} {{ entry.owner_email }} @@ -48,15 +44,15 @@ {{ entry.description }}{{ entry.description }} -
- {{ technology }} -
+
+ {{ technology }} +
-
-
+ \ No newline at end of file diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 0708ffecd..992cfa9f9 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -1,30 +1,64 @@ @import '../../../../../styles/colors.scss'; -.col{ + +.col { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: small; } -.x-sm-col{ + +.col-height { + min-height: 80px; + max-height: 150px; +} + +.x-sm-col { width: 5em; max-width: 7em; } -.sm-col{ +.sm-col { width: 6em; max-width: 8em; } -.md-col{ +.md-col { width: 9em; } -.lg-col{ +.lg-col { width: 12em; overflow: hidden; white-space: normal; + border: none; +} + +.lg-col-scroll { + width: 40em; + overflow: hidden; + white-space: normal; + display: -webkit-box; + -webkit-box-orient: vertical; + margin: 8px 10px 0px 10px; + border: none; + overflow-y: auto; } -.hidden-col{ + +.lg-col-scroll::-webkit-scrollbar { + width: 0.5em; +} + +.lg-col-scroll::-webkit-scrollbar-track { + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); +} + +.lg-col-scroll::-webkit-scrollbar-thumb { + background-color: #7a8486; + outline: 1px solid #7a8486; + border-radius: 0.5em; +} + +.hidden-col { display: none; } @@ -94,4 +128,4 @@ table.dataTable thead .sorting_desc { text-transform: capitalize; font-style: italic; cursor: pointer; -} +} \ No newline at end of file From 58b90e2d040b1267f067539a500e694d68c89d41 Mon Sep 17 00:00:00 2001 From: Oscar Lucas Date: Wed, 13 Apr 2022 20:57:40 -0500 Subject: [PATCH 5/8] Refactoring HTML and CSS Code --- .../time-entries-table.component.html | 4 ++-- .../time-entries-table.component.scss | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html index 9e7cd45b6..81d997e1d 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html @@ -45,7 +45,7 @@ {{ entry.description }} - +
{{ technology }} @@ -55,4 +55,4 @@ -
\ No newline at end of file + diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 992cfa9f9..70f71a3a0 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -8,8 +8,9 @@ } .col-height { - min-height: 80px; - max-height: 150px; + min-height: auto; + max-height: 7rem; + // height: auto; } .x-sm-col { @@ -44,6 +45,10 @@ overflow-y: auto; } +.tech-style{ + width: 12em; +} + .lg-col-scroll::-webkit-scrollbar { width: 0.5em; } @@ -128,4 +133,4 @@ table.dataTable thead .sorting_desc { text-transform: capitalize; font-style: italic; cursor: pointer; -} \ No newline at end of file +} From ba25e0c2255d78795f0d11ec83a7233dac6909ea Mon Sep 17 00:00:00 2001 From: olucas7 Date: Thu, 14 Apr 2022 15:20:54 -0500 Subject: [PATCH 6/8] Refactoring... --- .../time-entries-table.component.html | 4 +-- .../time-entries-table.component.scss | 33 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html index 81d997e1d..c473ee890 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.html @@ -44,8 +44,8 @@ - {{ entry.description }} - + {{ entry.description }} +
{{ technology }} diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 70f71a3a0..282327213 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -9,7 +9,7 @@ .col-height { min-height: auto; - max-height: 7rem; + max-height: 8rem; // height: auto; } @@ -34,7 +34,7 @@ border: none; } -.lg-col-scroll { +@mixin scroll-style { width: 40em; overflow: hidden; white-space: normal; @@ -43,25 +43,28 @@ margin: 8px 10px 0px 10px; border: none; overflow-y: auto; + overflow-wrap: break-word; + &::-webkit-scrollbar { + width: 0.5em; + } + + &::-webkit-scrollbar-track { + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + } + + &::-webkit-scrollbar-thumb { + background-color: #7a8486; + outline: 1px solid #7a8486; + border-radius: 0.5em; + } } -.tech-style{ - width: 12em; +.lg-scroll{ + @include scroll-style; } -.lg-col-scroll::-webkit-scrollbar { - width: 0.5em; -} -.lg-col-scroll::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -} -.lg-col-scroll::-webkit-scrollbar-thumb { - background-color: #7a8486; - outline: 1px solid #7a8486; - border-radius: 0.5em; -} .hidden-col { display: none; From 7f8d53bc22c1108448553ca44abca0c999912bf3 Mon Sep 17 00:00:00 2001 From: JaviMiot <51manobandajavier@gmail.com> Date: Thu, 14 Apr 2022 15:27:23 -0500 Subject: [PATCH 7/8] feat: delete text-overflow --- .../time-entries-table.component.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 282327213..318a7b662 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -3,7 +3,6 @@ .col { white-space: nowrap; overflow: hidden; - text-overflow: ellipsis; font-size: small; } @@ -44,14 +43,15 @@ border: none; overflow-y: auto; overflow-wrap: break-word; + &::-webkit-scrollbar { width: 0.5em; } - + &::-webkit-scrollbar-track { box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + &::-webkit-scrollbar-thumb { background-color: #7a8486; outline: 1px solid #7a8486; @@ -59,7 +59,7 @@ } } -.lg-scroll{ +.lg-scroll { @include scroll-style; } @@ -136,4 +136,4 @@ table.dataTable thead .sorting_desc { text-transform: capitalize; font-style: italic; cursor: pointer; -} +} \ No newline at end of file From a25f30d794c17d08bc29def5e3307b2f78e8c8ed Mon Sep 17 00:00:00 2001 From: olucas7 Date: Thu, 14 Apr 2022 15:31:27 -0500 Subject: [PATCH 8/8] Final Refactor --- .../time-entries-table/time-entries-table.component.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss index 318a7b662..06fbd51b5 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss @@ -9,7 +9,6 @@ .col-height { min-height: auto; max-height: 8rem; - // height: auto; } .x-sm-col { @@ -63,9 +62,6 @@ @include scroll-style; } - - - .hidden-col { display: none; }