From d216e857241a2ae3ba4213cefe893131befc97b3 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 17:10:22 +0530 Subject: [PATCH 01/13] feat: jest code coverage report --- .github/workflows/jest-code-coverage.yml | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/jest-code-coverage.yml diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml new file mode 100644 index 00000000000..38879979384 --- /dev/null +++ b/.github/workflows/jest-code-coverage.yml @@ -0,0 +1,29 @@ +name: Code Coverage + +on: + pull_request: + branches: + - main + +jobs: + coverage: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + - name: Install Dependencies + run: cd frontend && yarn install + + - name: Run Tests and Generate Coverage Report + run: yarn test -- --coverage + + - name: Upload Coverage Report + uses: actions/upload-artifact@v2 + with: + name: coverage + path: coverage + - name: Comment on PR with Coverage + uses: github/codeql-action/jest@v1 + with: + github-token: ${{ secrets.CI_BOT_TOKEN }} From 84337f474aeb1a95f460544c7c763504f9be7cc3 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 17:17:17 +0530 Subject: [PATCH 02/13] refactor: done some changes --- .github/workflows/jest-code-coverage.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 38879979384..900dc54e8c9 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -3,7 +3,7 @@ name: Code Coverage on: pull_request: branches: - - main + - develop jobs: coverage: @@ -14,10 +14,8 @@ jobs: uses: actions/checkout@v2 - name: Install Dependencies run: cd frontend && yarn install - - name: Run Tests and Generate Coverage Report - run: yarn test -- --coverage - + run: cd frontend && yarn test -- --coverage - name: Upload Coverage Report uses: actions/upload-artifact@v2 with: From 0feb2c86e25706e03f486afcf55f682c432e115f Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 17:21:27 +0530 Subject: [PATCH 03/13] chore: minor changes --- .github/workflows/jest-code-coverage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 900dc54e8c9..3b30a83d03a 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -4,6 +4,8 @@ on: pull_request: branches: - develop + - main + - release/v* jobs: coverage: @@ -22,6 +24,6 @@ jobs: name: coverage path: coverage - name: Comment on PR with Coverage - uses: github/codeql-action/jest@v1 + uses: ArtiomTr/jest-coverage-report-action@v2 with: github-token: ${{ secrets.CI_BOT_TOKEN }} From b3e709cd508d555bea0efd751fa23ed5d36f81ff Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 17:24:32 +0530 Subject: [PATCH 04/13] refactor: updated the command for jest --- .github/workflows/jest-code-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 3b30a83d03a..b574ba5fa4d 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -17,7 +17,7 @@ jobs: - name: Install Dependencies run: cd frontend && yarn install - name: Run Tests and Generate Coverage Report - run: cd frontend && yarn test -- --coverage + run: cd frontend && yarn test --coverage - name: Upload Coverage Report uses: actions/upload-artifact@v2 with: From 971baea76be077c8e890a06680937491340fbf9b Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 17:26:54 +0530 Subject: [PATCH 05/13] refactor: updated jest running command --- .github/workflows/jest-code-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index b574ba5fa4d..f84ffd0b8f4 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -17,7 +17,7 @@ jobs: - name: Install Dependencies run: cd frontend && yarn install - name: Run Tests and Generate Coverage Report - run: cd frontend && yarn test --coverage + run: cd frontend && yarn jest --coverage - name: Upload Coverage Report uses: actions/upload-artifact@v2 with: From 56f1be004beae3535dc29af85aee2665bb29fde0 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 18:20:54 +0530 Subject: [PATCH 06/13] refactor: updated test case --- frontend/src/ReactI18/index.tsx | 3 +-- frontend/src/i18n-translations-hash.json | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 frontend/src/i18n-translations-hash.json diff --git a/frontend/src/ReactI18/index.tsx b/frontend/src/ReactI18/index.tsx index a2d89e3c4d8..50d80ae1414 100644 --- a/frontend/src/ReactI18/index.tsx +++ b/frontend/src/ReactI18/index.tsx @@ -1,10 +1,9 @@ +import cacheBursting from 'i18n-translations-hash.json'; import i18n from 'i18next'; import LanguageDetector from 'i18next-browser-languagedetector'; import Backend from 'i18next-http-backend'; import { initReactI18next } from 'react-i18next'; -import cacheBursting from '../../i18n-translations-hash.json'; - i18n // load translation using http -> see /public/locales .use(Backend) diff --git a/frontend/src/i18n-translations-hash.json b/frontend/src/i18n-translations-hash.json new file mode 100644 index 00000000000..41293855cb4 --- /dev/null +++ b/frontend/src/i18n-translations-hash.json @@ -0,0 +1 @@ +{"/en-GB/alerts":"37ea40b758e14f100b970178809147d7","/en-GB/channels":"b855a58fce92ff62a0ce50cc40d8da0b","/en-GB/common":"d918932fcd1d34b2d84cb463812bd157","/en-GB/dashboard":"9ec66badfc02995263cf108615f6380c","/en-GB/errorDetails":"a1a1ea54ed8adc720e7942c42ce4be0f","/en-GB/explorer":"98106bbc79e701d81f5731dd53a158f0","/en-GB/generalSettings":"65fca62d2f109d73fa4bdc447c353857","/en-GB/licenses":"dc2fea934c67b5b3bf8c940019d820cd","/en-GB/login":"c9d63ef04a9af5ae6aed12b4b725add5","/en-GB/logs":"de363f7feee26d9fc72eccdf69988f09","/en-GB/organizationsettings":"e24624bba7bdd7bf071873940742b1a8","/en-GB/routes":"08585a25257ed898131ba43e4c927d7e","/en-GB/rules":"f134663a0943cdb8cd2a2c169f27ba90","/en-GB/settings":"e2c4003664cc9ba476b658f1e6304fe5","/en-GB/signup":"59c64809b8b4c7b1b8902da5aa2315f0","/en-GB/titles":"9e0515203efab287fdd50afb96bde8c8","/en-GB/trace":"fcf3fda7bee8b609b5a3ab0f749f2594","/en-GB/traceDetails":"f91795f15c286f15bf630a454febb015","/en-GB/translation":"532cce878c691d9ff3c689a73279fd2e","/en/alerts":"37ea40b758e14f100b970178809147d7","/en/channels":"c9bfbd14bb4d3f38e2a669f5fbfadc17","/en/common":"d918932fcd1d34b2d84cb463812bd157","/en/dashboard":"6de8356a6ed53c109746c0f7ef37ffcf","/en/errorDetails":"eb83b35f49830420547f30c08bd88c4e","/en/explorer":"98106bbc79e701d81f5731dd53a158f0","/en/generalSettings":"65fca62d2f109d73fa4bdc447c353857","/en/licenses":"dc2fea934c67b5b3bf8c940019d820cd","/en/login":"c9d63ef04a9af5ae6aed12b4b725add5","/en/logs":"de363f7feee26d9fc72eccdf69988f09","/en/organizationsettings":"e24624bba7bdd7bf071873940742b1a8","/en/pipeline":"9f75c31214b2ae9d362bb6e5985c2e1f","/en/routes":"08585a25257ed898131ba43e4c927d7e","/en/rules":"f134663a0943cdb8cd2a2c169f27ba90","/en/settings":"ffabe7ca89d7992d9639695b4df4d6e9","/en/signup":"59c64809b8b4c7b1b8902da5aa2315f0","/en/titles":"49d542f8f3ca9291777b9042ed8faf1a","/en/trace":"fcf3fda7bee8b609b5a3ab0f749f2594","/en/traceDetails":"f91795f15c286f15bf630a454febb015","/en/translation":"921a0256c8d4d3522754557b41e24362","/en/valueGraph":"cc57d9b83919574016dab2fc9e5adedf"} \ No newline at end of file From d08bce5c2c64a4ff28ccbab19311bc928cd062d9 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 18:25:35 +0530 Subject: [PATCH 07/13] refactor: updated token --- .github/workflows/jest-code-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index f84ffd0b8f4..55bac9701f0 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -26,4 +26,4 @@ jobs: - name: Comment on PR with Coverage uses: ArtiomTr/jest-coverage-report-action@v2 with: - github-token: ${{ secrets.CI_BOT_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} From a806de6326e6aa1aab629a7ebd018f55e59d5798 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 18:33:41 +0530 Subject: [PATCH 08/13] refactor: updated github flow --- .github/workflows/jest-code-coverage.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 55bac9701f0..2d74c77e3a5 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -10,7 +10,10 @@ on: jobs: coverage: runs-on: ubuntu-latest - + permissions: + checks: write + pull-requests: write + contents: write steps: - name: Checkout Repository uses: actions/checkout@v2 @@ -23,7 +26,10 @@ jobs: with: name: coverage path: coverage - - name: Comment on PR with Coverage - uses: ArtiomTr/jest-coverage-report-action@v2 + - uses: jwalton/gh-find-current-pr@v1 + id: findPr + - uses: ArtiomTr/jest-coverage-report-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} + output: comment + prnumber: ${{ steps.findPr.outputs.number }} From b0ee4d228618a2b6d1d3669609e2230889b07269 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 18:39:55 +0530 Subject: [PATCH 09/13] refactor: updated the working directory --- .github/workflows/jest-code-coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 2d74c77e3a5..4cfec3f3b03 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -30,6 +30,7 @@ jobs: id: findPr - uses: ArtiomTr/jest-coverage-report-action@v2 with: + working-directory: frontend github-token: ${{ secrets.GITHUB_TOKEN }} output: comment prnumber: ${{ steps.findPr.outputs.number }} From 5d986a12648f9e12909cdcf1c38b2154865c8289 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 18:45:18 +0530 Subject: [PATCH 10/13] refactor: added package-manager --- .github/workflows/jest-code-coverage.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 4cfec3f3b03..2063d7c7aa5 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -21,15 +21,11 @@ jobs: run: cd frontend && yarn install - name: Run Tests and Generate Coverage Report run: cd frontend && yarn jest --coverage - - name: Upload Coverage Report - uses: actions/upload-artifact@v2 - with: - name: coverage - path: coverage - uses: jwalton/gh-find-current-pr@v1 id: findPr - uses: ArtiomTr/jest-coverage-report-action@v2 with: + package-manager: yarn working-directory: frontend github-token: ${{ secrets.GITHUB_TOKEN }} output: comment From f4fad7af0b38e80d12b3787317269ea0fd152055 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 19:01:05 +0530 Subject: [PATCH 11/13] refactor: generate code coverage report on every push --- .github/workflows/jest-code-coverage.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 2063d7c7aa5..682a4464c97 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -1,7 +1,7 @@ name: Code Coverage on: - pull_request: + push: branches: - develop - main @@ -17,10 +17,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v2 - - name: Install Dependencies - run: cd frontend && yarn install - - name: Run Tests and Generate Coverage Report - run: cd frontend && yarn jest --coverage - uses: jwalton/gh-find-current-pr@v1 id: findPr - uses: ArtiomTr/jest-coverage-report-action@v2 From c8c27fc25dfaa39ae1b2309ce2f255fd8ff32d29 Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 19:05:25 +0530 Subject: [PATCH 12/13] refactor: for push and pull request --- .github/workflows/jest-code-coverage.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index 682a4464c97..e56efef35b7 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -6,6 +6,11 @@ on: - develop - main - release/v* + pull_request: + branches: + - develop + - main + - release/v* jobs: coverage: From 7146afc64ddb8f3daa4b338faa7dc756d92fbfab Mon Sep 17 00:00:00 2001 From: Rajat-Dabade Date: Tue, 21 Nov 2023 19:12:10 +0530 Subject: [PATCH 13/13] chore: updates --- .github/workflows/jest-code-coverage.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/jest-code-coverage.yml b/.github/workflows/jest-code-coverage.yml index e56efef35b7..ad87050c251 100644 --- a/.github/workflows/jest-code-coverage.yml +++ b/.github/workflows/jest-code-coverage.yml @@ -1,5 +1,4 @@ name: Code Coverage - on: push: branches: @@ -11,7 +10,6 @@ on: - develop - main - release/v* - jobs: coverage: runs-on: ubuntu-latest