Merge pull request #743 from dhis2/fix/lint

chore: run prettier format on all codebase

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

@@ -5,6 +5,19 @@ on:
         types: ['opened', 'edited', 'reopened', 'synchronize']
 
 jobs:
+    lint:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+                  cache: 'yarn'
+            - run: yarn install --frozen-lockfile
+            - id: lint
+              run: yarn lint
     lint-pr-title:
         runs-on: ubuntu-latest
         steps:

.github/workflows/docker-test.yml

@@ -52,4 +52,4 @@ jobs:
                   AUTH0_JWKS_URI: https://dhis2.eu.auth0.com/.well-known/jwks.json
                   AUTH0_MANAGEMENT_AUDIENCE: https://dhis2.eu.auth0.com/api/v2/
                   AUTH0_MANAGEMENT_SECRET: ${{ secrets.AUTH0_MANAGEMENT_SECRET }}
-                  AUTH0_MANAGEMENT_CLIENT_ID: K4fVnj443Sqid3Xl9yBVTYw9BEjPx3gl
+                  AUTH0_MANAGEMENT_CLIENT_ID: K4fVnj443Sqid3Xl9yBVTYw9BEjPx3gl

.huskyrc.js

@@ -1,7 +1,7 @@
 const { config } = require('@dhis2/cli-style')
 const husky = require(config.husky)
 
-const tasks = arr => arr.join(' && ')
+const tasks = (arr) => arr.join(' && ')
 
 module.exports = {
     hooks: {

client/config/configResolver.js

@@ -29,16 +29,16 @@ function getConfig() {
 
     //Get default config
     const configs = defaultConfigs
-        .map(filename => loadFile(filename))
-        .filter(config => !!config)
-    configs.forEach(cfg => merge(config, cfg))
+        .map((filename) => loadFile(filename))
+        .filter((config) => !!config)
+    configs.forEach((cfg) => merge(config, cfg))
 
     //Get environment specific config
     if (envConfigNames[nodeEnv]) {
         const configs = envConfigNames[nodeEnv]
-            .map(filename => loadFile(filename))
-            .filter(config => !!config)
-        configs.forEach(cfg => merge(config, cfg))
+            .map((filename) => loadFile(filename))
+            .filter((config) => !!config)
+        configs.forEach((cfg) => merge(config, cfg))
     }
 
     getConfig.config = config

client/cypress/plugins/index.js

@@ -13,6 +13,6 @@
 
 const cucumber = require('cypress-cucumber-preprocessor').default
 
-module.exports = on => {
+module.exports = (on) => {
     on('file:preprocessor', cucumber())
 }

client/package.json

@@ -12,8 +12,8 @@
         "test": "cross-env NODE_ENV=test mocha --config test/.mocharc.js",
         "format": "yarn format:js && yarn format:text",
         "format:staged": "yarn format:js --staged && yarn format:text --staged",
-        "format:js": "d2-style js apply",
-        "format:text": "d2-style text apply"
+        "format:js": "d2-style apply js",
+        "format:text": "d2-style apply text"
     },
     "dependencies": {
         "@auth0/auth0-react": "^1.6.0",

client/src/actions/actionCreators.js

@@ -2,7 +2,7 @@ import * as actions from '../constants/actionTypes'
 
 export const loadUser = actionCreator(actions.USER_LOAD)
 
-export const userLoaded = profile =>
+export const userLoaded = (profile) =>
     actionCreator(actions.USER_LOAD_SUCCESS)({
         profile,
     })

client/src/actions/epics.js

@@ -3,17 +3,17 @@ import { concatMap } from 'rxjs/operators'
 import * as api from '../api'
 import * as actions from '../constants/actionTypes'
 
-const user = action$ =>
+const user = (action$) =>
     action$.pipe(
         ofType(actions.USER_LOAD),
         concatMap(() =>
             api
                 .getMe()
-                .then(response => ({
+                .then((response) => ({
                     type: actions.ME_LOAD_SUCCESS,
                     payload: response,
                 }))
-                .catch(e => ({
+                .catch((e) => ({
                     type: actions.ME_LOAD_ERROR,
                     payload: e,
                 }))

client/src/api/index.js

@@ -82,7 +82,7 @@ export const usePagination = (
 
     const isEmpty = data?.[0].pager.total === 0
     // useSWRInfinite gathers all responses with an array entry per request - flatten it
-    const resultData = data?.flatMap(d => d?.result)
+    const resultData = data?.flatMap((d) => d?.result)
     const isAtEnd = isEmpty || data?.[0].pager.total === resultData?.length
     const isLoadingInitial = !data && !error
 
@@ -196,7 +196,7 @@ export async function fromApi(url, auth = false, extraOpts) {
     }
 
     return fetch(baseURL + url, opts)
-        .then(async response => {
+        .then(async (response) => {
             if (!response.ok) {
                 const contentType = response.headers.get('content-type')
                 const isJson = contentType.includes('application/json')
@@ -208,7 +208,7 @@ export async function fromApi(url, auth = false, extraOpts) {
             }
             return response
         })
-        .then(response => response.json())
+        .then((response) => response.json())
 }
 
 export async function getAuthHeaders() {

client/src/api/utils.js

@@ -1,6 +1,6 @@
 import { useRef, useEffect, useCallback } from 'react'
 
-const encodeQueryParameter = param => {
+const encodeQueryParameter = (param) => {
     if (Array.isArray(param)) {
         return param.map(encodeQueryParameter).join(',')
     }
@@ -20,7 +20,7 @@ const encodeQueryParameter = param => {
 }
 
 export const joinUrlPath = (...paths) => {
-    const truePaths = paths.filter(path => !!path)
+    const truePaths = paths.filter((path) => !!path)
     return truePaths
         .map((path, i) => {
             path = typeof path === 'string' ? path : String(path)
@@ -35,7 +35,7 @@ export const joinUrlPath = (...paths) => {
         .join('/')
 }
 
-export const queryParametersToQueryString = params =>
+export const queryParametersToQueryString = (params) =>
     Object.entries(params)
         .filter(([, value]) => value)
         .map(
@@ -46,7 +46,7 @@ export const queryParametersToQueryString = params =>
 
 // This is a SWR middleware for keeping the data even if key changes.
 // See https://swr.vercel.app/docs/middleware#keep-previous-result
-export const laggySWRMiddleware = useSWRNext => {
+export const laggySWRMiddleware = (useSWRNext) => {
     return (key, fetcher, config) => {
         // Use a ref to store previous returned data
         const laggyDataRef = useRef()

client/src/components/AlertsProvider/AlertsProvider.js

@@ -7,12 +7,12 @@ let alertId = 0
 
 const AlertsProvider = ({ children }) => {
     const [alerts, setAlerts] = useState([])
-    const removeAlert = id => {
-        setAlerts(alerts => alerts.filter(alert => alert.id !== id))
+    const removeAlert = (id) => {
+        setAlerts((alerts) => alerts.filter((alert) => alert.id !== id))
     }
-    const addAlert = alert => {
+    const addAlert = (alert) => {
         const id = alertId++
-        setAlerts(alerts => [
+        setAlerts((alerts) => [
             ...alerts,
             {
                 ...alert,

client/src/components/Header/DropdownButton/DropdownButton.js

@@ -4,8 +4,6 @@ import PropTypes from 'prop-types'
 import { useState, useRef } from 'react'
 import styles from './DropdownButton.module.css'
 
-
-
 const DropdownButton = ({ icon, menu }) => {
     const [isOpen, setIsOpen] = useState(false)
     const handleToggle = () => setIsOpen(!isOpen)

client/src/components/Header/DropdownMenuItemLink/DropdownMenuItemLink.js

@@ -3,12 +3,12 @@ import { useRef, useEffect } from 'react'
 import { useHistory } from 'react-router-dom'
 import styles from '../DropdownMenuItem/DropdownMenuItem.module.css'
 
-const isModifiedEvent = event =>
+const isModifiedEvent = (event) =>
     event.metaKey || event.altKey || event.ctrlKey || event.shiftKey
 
 const DropdownMenuItemLink = ({ to, children, initialFocus }) => {
     const history = useHistory()
-    const handleClick = event => {
+    const handleClick = (event) => {
         if (!isModifiedEvent(event)) {
             event.preventDefault()
             history.push(to)

client/src/components/Header/Header.js

@@ -80,7 +80,7 @@ const ProfileButton = () => {
     return <DropdownButton icon={icon} menu={menu} />
 }
 
-const NavLink = props => (
+const NavLink = (props) => (
     <NavLink_ activeClassName={styles.activeNavLink} {...props}></NavLink_>
 )
 

client/src/components/Versions/Filters/Filters.js

@@ -18,7 +18,7 @@ const Filters = ({
             {availableChannels.length > 1 && (
                 <div className={styles.channelsFilter}>
                     <h3 className={styles.subheader}>Channel</h3>
-                    {availableChannels.map(channel => (
+                    {availableChannels.map((channel) => (
                         <ChannelCheckbox
                             key={channel}
                             name={channel}
@@ -38,7 +38,7 @@ const Filters = ({
                     selected={dhisVersionFilter}
                     onChange={({ selected }) => setDhisVersionFilter(selected)}
                 >
-                    {dhisVersions.map(dhisVersion => (
+                    {dhisVersions.map((dhisVersion) => (
                         <SingleSelectOption
                             key={dhisVersion}
                             label={dhisVersion}

client/src/components/auth/AuthProvider.js

@@ -23,12 +23,8 @@ const AuthProvider = ({ children }) => (
 )
 
 const InitializeAuth = ({ children }) => {
-    const {
-        user,
-        isAuthenticated,
-        isLoading,
-        getAccessTokenSilently,
-    } = useAuth0()
+    const { user, isAuthenticated, isLoading, getAccessTokenSilently } =
+        useAuth0()
     const dispatch = useDispatch()
 
     useEffect(() => {

client/src/components/auth/ProtectedRoute.js

@@ -11,7 +11,7 @@ const ProtectedRoute = ({ component, auth, ...rest }) => {
     return (
         <Route
             {...rest}
-            render={props => {
+            render={(props) => {
                 const ProtectedComponent = withAuthenticationRequired(
                     component,
                     {

client/src/lib/form-validators/name-length-validator.js

@@ -2,4 +2,4 @@ import { createCharacterLengthRange } from '@dhis2/ui'
 
 const twoToHundredValidator = createCharacterLengthRange(2, 100)
 
-export const nameLengthValidator = value => twoToHundredValidator(value)
+export const nameLengthValidator = (value) => twoToHundredValidator(value)

client/src/lib/form-validators/semver-validator.js

@@ -1,6 +1,6 @@
 import semver from 'semver'
 
-export const semverValidator = value => {
+export const semverValidator = (value) => {
     if (!semver.valid(value)) {
         return 'Not a valid semantic version, adjust the version numbering'
     }

client/src/lib/use-alert.js

@@ -4,7 +4,7 @@ import AlertsContext from 'src/components/AlertsProvider/AlertsContext'
 export const useAlert = (message, options = {}) => {
     const { addAlert } = useContext(AlertsContext)
 
-    const show = props => {
+    const show = (props) => {
         const resolvedMessage =
             typeof message === 'function' ? message(props) : message
         const resolvedOptions =
@@ -22,7 +22,7 @@ export const useAlert = (message, options = {}) => {
 export const useSuccessAlert = () =>
     useAlert(
         ({ message }) => message,
-        options => ({
+        (options) => ({
             ...options,
             success: true,
         })
@@ -31,7 +31,7 @@ export const useSuccessAlert = () =>
 export const useErrorAlert = () =>
     useAlert(
         ({ error }) => `An error occured: ${error.message}`,
-        options => ({
+        (options) => ({
             ...options,
             critical: true,
         })

client/src/pages/AppView/AppView.js

@@ -66,7 +66,8 @@ const AboutSection = ({ appDescription, latestVersion, sourceUrl }) => (
                     {renderDhisVersionsCompatibility(
                         latestVersion.minDhisVersion,
                         latestVersion.maxDhisVersion
-                    )}.
+                    )}
+                    .
                 </span>
             </div>
             {sourceUrl && (
@@ -104,8 +105,8 @@ const AppView = ({ match }) => {
     }
 
     const appDeveloper = app.developer.organisation || 'Unspecified'
-    const logoSrc = app.images.find(img => img.logo)?.imageUrl
-    const screenshots = app.images.filter(img => !img.logo)
+    const logoSrc = app.images.find((img) => img.logo)?.imageUrl
+    const screenshots = app.images.filter((img) => !img.logo)
     const versions = app.versions.sort((a, b) => b.created - a.created)
     const latestVersion = versions[0]
 

client/src/pages/Apps/AppCards/AppCards.js

@@ -30,7 +30,7 @@ const AppCards = ({ isLoading, error, apps }) => {
 
     return (
         <div className={styles.appCards}>
-            {apps.map(app => (
+            {apps.map((app) => (
                 <AppCardItem
                     key={app.id}
                     id={app.id}

client/src/pages/Apps/Apps.js

@@ -50,19 +50,19 @@ const Apps = () => {
     })
     const { channels, types, dhisVersion, query, page } = queryParams
     const [debouncedQuery] = useDebounce(query, 300)
-    const setChannels = channels => {
+    const setChannels = (channels) => {
         setQueryParams({ channels, page: 1 })
     }
-    const setTypes = types => {
+    const setTypes = (types) => {
         setQueryParams({ types, page: 1 })
     }
-    const setDhisVersion = dhisVersion => {
+    const setDhisVersion = (dhisVersion) => {
         setQueryParams({ dhisVersion, page: 1 })
     }
-    const setQuery = query => {
+    const setQuery = (query) => {
         setQueryParams({ query, page: 1 }, 'replaceIn')
     }
-    const setPage = page => {
+    const setPage = (page) => {
         setQueryParams({ page })
     }
 

client/src/pages/Apps/Filters/Filters.js

@@ -91,7 +91,7 @@ const Filters = ({
                         onDhisVersionFilterChange(selected)
                     }
                 >
-                    {dhisVersions.map(dhisVersion => (
+                    {dhisVersions.map((dhisVersion) => (
                         <SingleSelectOption
                             key={dhisVersion}
                             label={dhisVersion}

client/src/pages/OrganisationInvitationCallback/OrganisationInvitationCallback.js

@@ -12,7 +12,7 @@ const OrganisationInvitationCallback = () => {
     const [error, setError] = useState(null)
 
     useEffect(() => {
-        const acceptInvitation = async token => {
+        const acceptInvitation = async (token) => {
             try {
                 const { organisation } = await api.acceptOrganisationInvitation(
                     token

client/src/pages/UserApp/DetailsCard/DetailsCard.js

@@ -22,7 +22,7 @@ const EditLogo = ({ appId, logo, mutate }) => {
     const handleUploadButtonClick = () => {
         inputEl.current.click()
     }
-    const handleUpload = async event => {
+    const handleUpload = async (event) => {
         setIsUploading(true)
         try {
             // TODO: Implement backend API to replace logo so that it can be
@@ -75,7 +75,7 @@ const EditLogo = ({ appId, logo, mutate }) => {
 }
 
 const DetailsCard = ({ app, mutate }) => {
-    const logo = app.images.find(img => img.logo)
+    const logo = app.images.find((img) => img.logo)
     const appDeveloper = app.developer.organisation || 'Unspecified'
     const appType = appTypeToDisplayName[app.appType]