From 9ddc1c6f624f31fd0d9a388afb2e3f3fa0f068fa Mon Sep 17 00:00:00 2001 From: Luke Watts Date: Sun, 8 Jan 2023 14:17:46 +0100 Subject: [PATCH 1/3] fix: adds accessible labels to moderation buttons Use new `showIconOnly` property and use margin-left for consistent layout. --- .../Howto/HowtoDescription/HowtoDescription.tsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pages/Howto/Content/Howto/HowtoDescription/HowtoDescription.tsx b/src/pages/Howto/Content/Howto/HowtoDescription/HowtoDescription.tsx index 5d51a95422..2993349458 100644 --- a/src/pages/Howto/Content/Howto/HowtoDescription/HowtoDescription.tsx +++ b/src/pages/Howto/Content/Howto/HowtoDescription/HowtoDescription.tsx @@ -173,21 +173,27 @@ export default class HowtoDescription extends PureComponent { data-cy={'accept'} variant={'primary'} icon="check" - mr={1} onClick={() => this.props.moderateHowto(true)} - /> + showIconOnly={true} + > + Accept + )} {/* Check if logged in user is the creator of the how-to OR a super-admin */} {loggedInUser && isAllowToEditContent(howto, loggedInUser) && ( - From 950e9be9407995ddff136d8a406060332d5e1d4e Mon Sep 17 00:00:00 2001 From: Luke Watts Date: Sun, 8 Jan 2023 14:24:24 +0100 Subject: [PATCH 2/3] chore(deps): pin to skip latest release commitlint@17.4.0 appears to break in CI pipeline: https://app.circleci.com/pipelines/github/ONEARMY/community-platform/3579/workflows/a0cef11b-74d5-48ef-adba-a29db3a29f04/jobs/22860 --- .circleci/config.yml | 3 ++- commitlint.config.ts | 4 +--- commitlint.format.ts | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 285a9daca3..e4285daa11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -215,7 +215,8 @@ jobs: rm package.json npm config set package-lock false npm i @types/node @commitlint/types @commitlint/config-conventional --force - npx commitlint --from=$(git merge-base remotes/origin/${CIRCLE_BRANCH} master) --verbose + npm ls + npx @commitlint/cli@17.4.2 --from=$(git merge-base remotes/origin/${CIRCLE_BRANCH} master) --verbose lint: docker: *docker steps: diff --git a/commitlint.config.ts b/commitlint.config.ts index 79a92e3ac4..d43dc1ce26 100644 --- a/commitlint.config.ts +++ b/commitlint.config.ts @@ -1,7 +1,7 @@ import type { UserConfig } from '@commitlint/types' import path from 'path' -const Configuration: UserConfig = { +export const Configuration: UserConfig = { extends: ['@commitlint/config-conventional'], /** Add optional custom formatter */ formatter: path.resolve(__dirname, 'commitlint.format.ts'), @@ -120,5 +120,3 @@ const Configuration: UserConfig = { }, }, } - -module.exports = Configuration diff --git a/commitlint.format.ts b/commitlint.format.ts index 537d361e13..c4133bd0eb 100644 --- a/commitlint.format.ts +++ b/commitlint.format.ts @@ -1,7 +1,7 @@ import type { Formatter, FormattableReport } from '@commitlint/types' // Custom formatter for commitlint message -const formatter: Formatter = function (report, options) { +export const formatter: Formatter = function (report, options) { const { results, valid } = report as IFormatReport if (results && !valid) { console.log('\nCommit needs to be formatted as conventional commit') @@ -21,8 +21,6 @@ const formatter: Formatter = function (report, options) { return '' } -module.exports = formatter - // Fix type definition for formattable report interface IFormatReport extends FormattableReport { errorCount: number From eedd1ddb0db828c0ca9f561d8461d62b03601b41 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 20 Jan 2023 19:43:57 -0800 Subject: [PATCH 3/3] chore: revert commitlint changes --- .circleci/config.yml | 3 +-- commitlint.config.ts | 4 +++- commitlint.format.ts | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c8f42d1f7..7b86bd109c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -225,8 +225,7 @@ jobs: rm package.json npm config set package-lock false npm i @types/node @commitlint/types @commitlint/config-conventional --force - npm ls - npx @commitlint/cli@17.4.2 --from=$(git merge-base remotes/origin/${CIRCLE_BRANCH} master) --verbose + npx commitlint --from=$(git merge-base remotes/origin/${CIRCLE_BRANCH} master) --verbose lint: docker: *docker steps: diff --git a/commitlint.config.ts b/commitlint.config.ts index d43dc1ce26..79a92e3ac4 100644 --- a/commitlint.config.ts +++ b/commitlint.config.ts @@ -1,7 +1,7 @@ import type { UserConfig } from '@commitlint/types' import path from 'path' -export const Configuration: UserConfig = { +const Configuration: UserConfig = { extends: ['@commitlint/config-conventional'], /** Add optional custom formatter */ formatter: path.resolve(__dirname, 'commitlint.format.ts'), @@ -120,3 +120,5 @@ export const Configuration: UserConfig = { }, }, } + +module.exports = Configuration diff --git a/commitlint.format.ts b/commitlint.format.ts index c4133bd0eb..537d361e13 100644 --- a/commitlint.format.ts +++ b/commitlint.format.ts @@ -1,7 +1,7 @@ import type { Formatter, FormattableReport } from '@commitlint/types' // Custom formatter for commitlint message -export const formatter: Formatter = function (report, options) { +const formatter: Formatter = function (report, options) { const { results, valid } = report as IFormatReport if (results && !valid) { console.log('\nCommit needs to be formatted as conventional commit') @@ -21,6 +21,8 @@ export const formatter: Formatter = function (report, options) { return '' } +module.exports = formatter + // Fix type definition for formattable report interface IFormatReport extends FormattableReport { errorCount: number