From f6a487d11523ae5d4c3d722c29e82996843cfff9 Mon Sep 17 00:00:00 2001 From: Ellen Kraffmiller Date: Mon, 20 May 2024 14:10:48 -0400 Subject: [PATCH 1/5] feat: add PR trigger to accessibility.yml --- .github/workflows/accessibility.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/accessibility.yml b/.github/workflows/accessibility.yml index 4875be319..16c3e652d 100644 --- a/.github/workflows/accessibility.yml +++ b/.github/workflows/accessibility.yml @@ -1,6 +1,7 @@ name: accessibility on: push + pull_request jobs: interaction-and-accessibility: From d63efd42fac96d3d03413a16e3c6c4d53339983e Mon Sep 17 00:00:00 2001 From: Ellen Kraffmiller Date: Mon, 20 May 2024 14:21:12 -0400 Subject: [PATCH 2/5] fix: yml syntax --- .github/workflows/accessibility.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/accessibility.yml b/.github/workflows/accessibility.yml index 16c3e652d..8a78b3d61 100644 --- a/.github/workflows/accessibility.yml +++ b/.github/workflows/accessibility.yml @@ -1,7 +1,6 @@ name: accessibility -on: push - pull_request +on: [push, pull_request] jobs: interaction-and-accessibility: From d7776b1091803d385d467fd997b04fb6664c24b4 Mon Sep 17 00:00:00 2001 From: Ellen Kraffmiller Date: Mon, 20 May 2024 14:24:43 -0400 Subject: [PATCH 3/5] fix: lint errors --- public/locales/en/pagination.json | 2 +- .../pagination/PaginationResultsInfo.tsx | 28 +++++++++---------- .../pagination/PaginationResultsInfo.spec.tsx | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/locales/en/pagination.json b/public/locales/en/pagination.json index 672595da0..ae19aa386 100644 --- a/public/locales/en/pagination.json +++ b/public/locales/en/pagination.json @@ -7,4 +7,4 @@ "moreThanPageSize": "{{accumulated}} of {{formattedCount}} {{item}}s seen" }, "pageSize": "{{item}}s per page" -} \ No newline at end of file +} diff --git a/src/sections/shared/pagination/PaginationResultsInfo.tsx b/src/sections/shared/pagination/PaginationResultsInfo.tsx index 4b677e7e7..6e97020ed 100644 --- a/src/sections/shared/pagination/PaginationResultsInfo.tsx +++ b/src/sections/shared/pagination/PaginationResultsInfo.tsx @@ -18,8 +18,8 @@ export function PaginationResultsInfo({ paginationInfo, accumulated }: Paginatio accumulated === 1 ? 'accumulated.one' : accumulated < paginationInfo.pageSize - ? 'accumulated.lessThanPageSize' - : 'accumulated.moreThanPageSize', + ? 'accumulated.lessThanPageSize' + : 'accumulated.moreThanPageSize', [accumulated, paginationInfo.pageSize] ) @@ -32,18 +32,18 @@ export function PaginationResultsInfo({ paginationInfo, accumulated }: Paginatio {typeof accumulated === 'number' ? t(defineLocale(accumulated), { - accumulated: accumulated, - count: paginationInfo.totalItems, - formattedCount: formattedCount, - item: paginationInfo.itemName - }) + accumulated: accumulated, + count: paginationInfo.totalItems, + formattedCount: formattedCount, + item: paginationInfo.itemName + }) : t('results', { - start: paginationInfo.pageStartItem, - end: paginationInfo.pageEndItem, - item: paginationInfo.itemName, - count: paginationInfo.totalItems, - formattedCount: formattedCount, - })} + start: paginationInfo.pageStartItem, + end: paginationInfo.pageEndItem, + item: paginationInfo.itemName, + count: paginationInfo.totalItems, + formattedCount: formattedCount + })} ) -} \ No newline at end of file +} diff --git a/tests/component/sections/shared/pagination/PaginationResultsInfo.spec.tsx b/tests/component/sections/shared/pagination/PaginationResultsInfo.spec.tsx index a35b8bd3b..699397683 100644 --- a/tests/component/sections/shared/pagination/PaginationResultsInfo.spec.tsx +++ b/tests/component/sections/shared/pagination/PaginationResultsInfo.spec.tsx @@ -66,4 +66,4 @@ describe('PaginationResultsInfo', () => { ) cy.findByText(`500 of ${expectedFormattedTotalCount} Items seen`).should('exist') }) -}) \ No newline at end of file +}) From 278d54d66da09d1b57de178d2a9428813901f30f Mon Sep 17 00:00:00 2001 From: Ellen Kraffmiller Date: Mon, 20 May 2024 15:07:06 -0400 Subject: [PATCH 4/5] feat: add pull_request trigger to workflows --- .github/workflows/chromatic-design-system.yml | 2 +- .github/workflows/chromatic.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/chromatic-design-system.yml b/.github/workflows/chromatic-design-system.yml index 899774450..71a3ad274 100644 --- a/.github/workflows/chromatic-design-system.yml +++ b/.github/workflows/chromatic-design-system.yml @@ -1,7 +1,7 @@ name: 'Chromatic Design System ' # Event for the workflow -on: push +on: [push, pull_request] # List of jobs jobs: diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index bd7250aec..6b850fea0 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -1,7 +1,7 @@ name: 'Chromatic' # Event for the workflow -on: push +on: [push, pull_request] # List of jobs jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e83e05a6..217b9f4c3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,6 @@ name: lint -on: push +on: [push, pull_request] jobs: lint: From e46ea1bf0e589c9fcdae7a35ed42ed1afa3358e3 Mon Sep 17 00:00:00 2001 From: Ellen Kraffmiller Date: Tue, 21 May 2024 09:32:02 -0400 Subject: [PATCH 5/5] fix: add pull_request trigger to test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad392d323..c6253089d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: test -on: push +on: [push, pull_request] env: E2E_DATAVERSE_IMAGE_TAG: unstable