Merge pull request #377 from dhis2/update-commit-checking-workflows

ci: replace semantic commit checks with new workflow

.github/workflows/dhis2-verify-commits.yml

@@ -0,0 +1,32 @@
+name: 'dhis2: verify (commits)'
+
+on:
+    pull_request:
+        types: ['opened', 'edited', 'reopened', 'synchronize']
+
+jobs:
+    lint-pr-title:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - uses: c-hive/gha-yarn-cache@v1
+            - run: yarn install --frozen-lockfile
+            - id: commitlint
+              run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
+            - uses: JulienKode/[email protected]
+              with:
+                  configuration-path: ${{ steps.commitlint.outputs.config_path }}
+
+    lint-commits:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+            - uses: c-hive/gha-yarn-cache@v1
+            - run: yarn install --frozen-lockfile
+            - id: commitlint
+              run: echo ::set-output name=config_path::$(node -e "process.stdout.write(require('@dhis2/cli-style').config.commitlint)")
+            - uses: wagoid/commitlint-github-action@v4
+              with:
+                  configFile: ${{ steps.commitlint.outputs.config_path }}

cypress/integration/add-route/create-parameter-jobs/index.js

@@ -4,13 +4,13 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
  * Local helpers
  */
 
-const selectJob = jobName => {
+const selectJob = (jobName) => {
     cy.get('[data-test="dhis2-uicore-singleselect"]').click()
     cy.findByText(jobName).click()
 }
 
-const saveAndExpect = expected => {
-    cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, req => {
+const saveAndExpect = (expected) => {
+    cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, (req) => {
         expect(req.body).to.deep.equal(expected)
         req.reply({ statusCode: 201 })
     })

cypress/integration/add-route/create-parameterless-jobs/index.js

@@ -4,13 +4,13 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
  * Local helpers
  */
 
-const selectJob = jobName => {
+const selectJob = (jobName) => {
     cy.get('[data-test="dhis2-uicore-singleselect"]').click()
     cy.findByText(jobName).click()
 }
 
-const saveAndExpect = expected => {
-    cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, req => {
+const saveAndExpect = (expected) => {
+    cy.intercept({ pathname: /jobConfigurations$/, method: 'POST' }, (req) => {
         expect(req.body).to.deep.equal(expected)
         req.reply({ statusCode: 201 })
     })

cypress/integration/edit-route/delete-button/index.js

@@ -17,10 +17,13 @@ When('the user clicks the delete job button', () => {
 })
 
 Then('the job will be deleted upon confirmation', () => {
-    cy.intercept({ pathname: /jobConfigurations$/, method: 'DELETE' }, req => {
-        expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true
-        req.reply({ statusCode: 200 })
-    })
+    cy.intercept(
+        { pathname: /jobConfigurations$/, method: 'DELETE' },
+        (req) => {
+            expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true
+            req.reply({ statusCode: 200 })
+        }
+    )
 
     cy.findByText('Are you sure you want to delete this job?').should('exist')
     cy.findByRole('button', { name: 'Delete' }).click()

cypress/integration/edit-route/edit-parameter-jobs/index.js

@@ -4,15 +4,15 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
  * Local helpers
  */
 
-const selectJob = jobName => {
+const selectJob = (jobName) => {
     cy.get('[data-test="dhis2-uicore-singleselect"]').click()
     cy.findByText(jobName).click()
 }
 
-const saveAndExpect = expected => {
+const saveAndExpect = (expected) => {
     cy.intercept(
         { pathname: /jobConfigurations\/lnWRZN67iDU$/, method: 'PUT' },
-        req => {
+        (req) => {
             expect(req.body).to.deep.equal(expected)
             req.reply({ statusCode: 201 })
         }

cypress/integration/edit-route/edit-parameterless-jobs/index.js

@@ -4,15 +4,15 @@ import { Given, Then } from 'cypress-cucumber-preprocessor/steps'
  * Local helpers
  */
 
-const selectJob = jobName => {
+const selectJob = (jobName) => {
     cy.get('[data-test="dhis2-uicore-singleselect"]').click()
     cy.findByText(jobName).click()
 }
 
-const saveAndExpect = expected => {
+const saveAndExpect = (expected) => {
     cy.intercept(
         { pathname: /jobConfigurations\/lnWRZN67iDU$/, method: 'PUT' },
-        req => {
+        (req) => {
             expect(req.body).to.deep.equal(expected)
             req.reply({ statusCode: 201 })
         }

cypress/integration/list-route/filter-jobs/index.js

@@ -30,7 +30,7 @@ Given('the user enables the include-system-jobs-in-list toggle', () => {
     ]
 
     cy.findByRole('checkbox', { name: 'Include system jobs in list' }).click()
-    expected.forEach(name => {
+    expected.forEach((name) => {
         cy.findByRole('rowheader', { name }).should('exist')
     })
 })
@@ -46,7 +46,7 @@ Then('only user jobs that match the filter will be shown', () => {
 Then('only jobs that match the filter will be shown', () => {
     const expected = ['Job 1', 'System Job 1']
 
-    expected.forEach(name => {
+    expected.forEach((name) => {
         cy.findByRole('rowheader', { name }).should('exist')
     })
 })

cypress/integration/list-route/include-system-jobs/index.js

@@ -34,23 +34,23 @@ When('the user checks the include-system-jobs-in-list checkbox', () => {
 Then('system jobs are not shown', () => {
     const systemJobs = ['System Job 1', 'System Job 2', 'System Job 3']
 
-    systemJobs.forEach(name => {
+    systemJobs.forEach((name) => {
         cy.findByRole('rowheader', { name }).should('not.exist')
     })
 })
 
 Then('system jobs are shown', () => {
     const systemJobs = ['System Job 1', 'System Job 2', 'System Job 3']
 
-    systemJobs.forEach(name => {
+    systemJobs.forEach((name) => {
         cy.findByRole('rowheader', { name }).should('be.visible')
     })
 })
 
 Then('user jobs are shown', () => {
     const userJobs = ['Job 1', 'Job 2', 'Job 3']
 
-    userJobs.forEach(name => {
+    userJobs.forEach((name) => {
         cy.findByRole('rowheader', { name }).should('be.visible')
     })
 })

cypress/integration/list-route/job-toggle/index.js

@@ -11,15 +11,15 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
 Given('a disabled user job exists', () => {
     const responses = []
 
-    cy.fixture('list-route/disabled-user-job').then(fixture => {
+    cy.fixture('list-route/disabled-user-job').then((fixture) => {
         responses.push(fixture)
     })
 
-    cy.fixture('list-route/enabled-user-job').then(fixture => {
+    cy.fixture('list-route/enabled-user-job').then((fixture) => {
         responses.push(fixture)
     })
 
-    cy.intercept({ pathname: /jobConfigurations$/ }, req => {
+    cy.intercept({ pathname: /jobConfigurations$/ }, (req) => {
         const fixture = responses.shift()
         req.reply(200, fixture)
     })
@@ -28,15 +28,15 @@ Given('a disabled user job exists', () => {
 Given('an enabled user job exists', () => {
     const responses = []
 
-    cy.fixture('list-route/enabled-user-job').then(fixture => {
+    cy.fixture('list-route/enabled-user-job').then((fixture) => {
         responses.push(fixture)
     })
 
-    cy.fixture('list-route/disabled-user-job').then(fixture => {
+    cy.fixture('list-route/disabled-user-job').then((fixture) => {
         responses.push(fixture)
     })
 
-    cy.intercept({ pathname: /jobConfigurations$/ }, req => {
+    cy.intercept({ pathname: /jobConfigurations$/ }, (req) => {
         const fixture = responses.shift()
         req.reply(200, fixture)
     })

cypress/integration/list-route/user-job-actions/index.js

@@ -29,7 +29,7 @@ When('the user clicks the run manually button', () => {
 })
 
 Then('the job will be executed upon confirmation', () => {
-    cy.intercept({ pathname: /execute$/, method: 'GET' }, req => {
+    cy.intercept({ pathname: /execute$/, method: 'GET' }, (req) => {
         expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU/execute')).to.be
             .true
         req.reply({ statusCode: 200 })
@@ -54,10 +54,13 @@ When('the user clicks the delete button', () => {
 })
 
 Then('the job will be deleted upon confirmation', () => {
-    cy.intercept({ pathname: /jobConfigurations$/, method: 'DELETE' }, req => {
-        expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true
-        req.reply({ statusCode: 200 })
-    })
+    cy.intercept(
+        { pathname: /jobConfigurations$/, method: 'DELETE' },
+        (req) => {
+            expect(req.url.endsWith('jobConfigurations/lnWRZN67iDU')).to.be.true
+            req.reply({ statusCode: 200 })
+        }
+    )
 
     cy.findByText('Are you sure you want to delete this job?').should('exist')
     cy.findByRole('button', { name: 'Delete' }).click()

cypress/integration/view-route/back-to-all-jobs/index.js

@@ -17,7 +17,7 @@ Given('the user navigated to the view job page', () => {
 Then('there are two links to the job list page', () => {
     cy.findAllByRole('link', { name: 'Back to all jobs' })
         .should('have.length', 2)
-        .each(link => {
+        .each((link) => {
             expect(link).to.have.attr('href', '#/')
         })
 })

package.json

@@ -33,7 +33,7 @@
     },
     "devDependencies": {
         "@dhis2/cli-app-scripts": "^8.0.1",
-        "@dhis2/cli-style": "^9.0.1",
+        "@dhis2/cli-style": "^10.4.1",
         "@dhis2/cli-utils-cypress": "^9.0.2",
         "@dhis2/cypress-commands": "^9.0.2",
         "@dhis2/cypress-plugins": "^9.0.2",

src/components/AuthWall/selectors.js

@@ -1,4 +1,4 @@
-export const getAuthorized = me => {
+export const getAuthorized = (me) => {
     const { authorities } = me
 
     if (!authorities) {

src/components/FormErrorBox/FormErrorBox.js

@@ -17,7 +17,7 @@ const FormErrorBox = ({ submitError }) => {
             title={i18n.t('Something went wrong whilst creating your job')}
         >
             <ul className={styles.list}>
-                {submitError.map(error => (
+                {submitError.map((error) => (
                     <li key={error}>{error}</li>
                 ))}
             </ul>

src/components/FormFields/CronField.js

@@ -32,7 +32,7 @@ const CronField = () => {
                 <CronPresetButton
                     setCron={
                         /* istanbul ignore next */
-                        cron => form.change(FIELD_NAME, cron)
+                        (cron) => form.change(FIELD_NAME, cron)
                     }
                     small
                 />

src/components/FormFields/DataIntegrityChecksField.js

@@ -20,7 +20,7 @@ import styles from './DataIntegrityChecksField.module.css'
 
 const { Field, useField } = ReactFinalForm
 
-const VALIDATOR = value => {
+const VALIDATOR = (value) => {
     // should not validate when null or undefined
     // means "Run all" is selected
     if (!value == null) {
@@ -42,7 +42,7 @@ const DataIntegrityChecksField = ({ label, name }) => {
     const [runSelected, setRunSelected] = useState(hasValue)
 
     const translatedOptions = options
-        .map(option => ({
+        .map((option) => ({
             ...option,
             value: option.name,
             label: getCheckName(option.name),
@@ -114,7 +114,7 @@ const LabelComponent = ({ label, severity, highlighted, disabled }) => (
 
 LabelComponent.propTypes = TransferOption.propTypes
 
-const renderOption = option => (
+const renderOption = (option) => (
     <TransferOption {...option} label={<LabelComponent {...option} />} />
 )
 

src/components/FormFields/DataIntegrityReportTypeField.js

@@ -14,7 +14,7 @@ const DataIntegrityReportTypeField = ({ name, constants }) => {
         return null
     }
 
-    const labeledOptions = constants.map(type => ({
+    const labeledOptions = constants.map((type) => ({
         value: type,
         label: getReportTypeLabel(type),
     }))

src/components/FormFields/JobTypeField.js

@@ -23,7 +23,7 @@ const JobTypeField = () => {
             value: jobType,
             label: jobTypesMap[jobType],
         }))
-        .filter(job => !!job.label)
+        .filter((job) => !!job.label)
         .sort((job1, job2) => job1.label.localeCompare(job2.label))
 
     return (

src/components/FormFields/SkipTableTypesField.js

@@ -20,7 +20,7 @@ const SkipTableTypesField = ({ label, name, parameterName }) => {
         )
     }
 
-    const translatedOptions = options.map(option => ({
+    const translatedOptions = options.map((option) => ({
         value: option,
         label: analyticsTableTypes[option] || option,
     }))

src/components/FormFields/formatters.js

@@ -3,7 +3,7 @@
  * inputs expect and return a string, so we're formatting them to strings
  */
 
-export const formatToString = value => {
+export const formatToString = (value) => {
     if (typeof value === 'number') {
         return value.toString()
     }

src/components/JobTable/JobTable.js

@@ -31,7 +31,7 @@ const JobTable = ({ jobs }) => (
                     <TableCell>{i18n.t('No jobs to display')}</TableCell>
                 </TableRow>
             ) : (
-                jobs.map(job => <JobTableRow key={job.id} job={job} />)
+                jobs.map((job) => <JobTableRow key={job.id} job={job} />)
             )}
         </TableBody>
     </Table>

src/components/JobTable/Status.test.js

@@ -13,7 +13,7 @@ const statuses = [
 ]
 
 describe('<Status>', () => {
-    it.each(statuses)('renders without errors for %s status', status => {
+    it.each(statuses)('renders without errors for %s status', (status) => {
         shallow(<Status status={status} />)
     })
 

src/components/Modal/CronPresetModal.js

@@ -41,7 +41,7 @@ const CronPresetModal = ({ setCron, hideModal }) => {
         <Modal open small onClose={hideModal}>
             <ModalTitle>{i18n.t('Choose a preset time/interval')}</ModalTitle>
             <ModalContent>
-                {cronPresets.map(preset => (
+                {cronPresets.map((preset) => (
                     <Radio
                         {...preset}
                         checked={currentPreset === preset.value}

src/components/Store/StoreContext.test.js

@@ -15,7 +15,7 @@ describe('StoreContext.Consumer', () => {
 
         expectRenderError(
             <StoreContext.Consumer>
-                {store => store.refetchJobs()}
+                {(store) => store.refetchJobs()}
             </StoreContext.Consumer>,
             message
         )