chore: add workflow that doesn't succeed until PR tasks completed

.github/pull_request_template.md

@@ -0,0 +1,17 @@
+Implements _Jira issue link_
+
+Relates to _maps-app PR_
+
+---
+
+### Description
+
+_text_
+
+---
+
+### TODO
+
+- [ ] Tests added
+- [ ] PRs for Maps app created
+- [ ] _todo_

.github/workflows/check-tasklist.yml

@@ -0,0 +1,14 @@
+name: GitHub Task List Checker
+on:
+    pull_request:
+        types: [opened, edited, synchronize, reopened]
+
+jobs:
+    task-list-checker:
+        if: ${{ github.actor != 'dependabot[bot]' }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Check for incomplete task list items
+              uses: Shopify/task-list-checker@main
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}

.hooks/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn d2-style check commit "$1"

.prettierignore

@@ -0,0 +1 @@
+src/earthengine/ee_api_js_worker.js

.prettierrc.js

@@ -2,20 +2,12 @@ const { config } = require('@dhis2/cli-style')
 
 module.exports = {
     ...require(config.prettier),
-    printWidth: 80,
-    tabWidth: 4,
-    useTabs: false,
-    semi: false,
-    singleQuote: true,
-    trailingComma: 'es5',
-    bracketSpacing: true,
-    bracketSameLine: false,
-    jsxSingleQuote: false,
-    arrowParens: 'avoid',
-    rangeStart: 0,
-    rangeEnd: Infinity,
-    proseWrap: 'preserve',
-    requirePragma: false,
-    insertPragma: false,
-    endOfLine: 'lf',
+    overrides: [
+        {
+            files: 'pull_request_template.md',
+            options: {
+                tabWidth: 2,
+            },
+        },
+    ],
 }

src/Map.js

@@ -1,18 +1,18 @@
 import { Evented, Map } from 'maplibre-gl'
 import 'maplibre-gl/dist/maplibre-gl.css'
-import Layer from './layers/Layer'
-import layerTypes from './layers/layerTypes'
-import controlTypes from './controls/controlTypes'
-import controlsLocale from './controls/controlsLocale'
-import MultiTouch from './controls/MultiTouch'
-import { transformRequest } from './utils/images'
-import { mapStyle } from './utils/style'
-import { getBoundsFromLayers } from './utils/geometry'
-import syncMaps from './utils/sync'
-import { getFeaturesString } from './utils/core'
-import { OVERLAY_START_POSITION } from './utils/layers'
-import Popup from './ui/Popup'
-import Label from './ui/Label'
+import controlsLocale from './controls/controlsLocale.js'
+import controlTypes from './controls/controlTypes.js'
+import MultiTouch from './controls/MultiTouch.js'
+import Layer from './layers/Layer.js'
+import layerTypes from './layers/layerTypes.js'
+import Label from './ui/Label.js'
+import Popup from './ui/Popup.js'
+import { getFeaturesString } from './utils/core.js'
+import { getBoundsFromLayers } from './utils/geometry.js'
+import { transformRequest } from './utils/images.js'
+import { OVERLAY_START_POSITION } from './utils/layers.js'
+import { mapStyle } from './utils/style.js'
+import syncMaps from './utils/sync.js'
 import './Map.css'
 
 const renderedClass = 'dhis2-map-rendered'
@@ -51,7 +51,7 @@ export class MapGL extends Evented {
 
         // Translate strings
         if (locale) {
-            Object.keys(mapgl._locale).forEach(id => {
+            Object.keys(mapgl._locale).forEach((id) => {
                 const str = mapgl._locale[id]
                 if (locale[str]) {
                     mapgl._locale[id] = locale[str]
@@ -130,7 +130,7 @@ export class MapGL extends Evented {
     }
 
     async removeLayer(layer) {
-        this._layers = this._layers.filter(l => l !== layer)
+        this._layers = this._layers.filter((l) => l !== layer)
 
         await layer.removeFrom(this)
 
@@ -173,7 +173,7 @@ export class MapGL extends Evented {
     }
 
     hasLayer(layer) {
-        return !!this._layers.find(l => l === layer)
+        return !!this._layers.find((l) => l === layer)
     }
 
     addControl(config) {
@@ -223,7 +223,7 @@ export class MapGL extends Evented {
         this.fire('ready', this)
     }
 
-    onClick = evt => {
+    onClick = (evt) => {
         const eventObj = this._createClickEvent(evt)
         const { feature } = eventObj
 
@@ -238,7 +238,7 @@ export class MapGL extends Evented {
         this.fire('click', eventObj)
     }
 
-    onContextMenu = evt => {
+    onContextMenu = (evt) => {
         const eventObj = this._createClickEvent(evt)
 
         if (eventObj.feature) {
@@ -249,7 +249,7 @@ export class MapGL extends Evented {
         }
     }
 
-    onMouseMove = evt => {
+    onMouseMove = (evt) => {
         const feature = this.getEventFeature(evt)
         let layer
 
@@ -280,7 +280,7 @@ export class MapGL extends Evented {
 
     // Add rendered class if map is idle
     onIdle = () => {
-        if (this.getLayers().some(layer => layer._isLoading)) {
+        if (this.getLayers().some((layer) => layer._isLoading)) {
             return
         }
 
@@ -296,15 +296,15 @@ export class MapGL extends Evented {
         ) {
             if (this._hoverFeatures) {
                 // Clear state for existing hover features
-                this._hoverFeatures.forEach(feature =>
+                this._hoverFeatures.forEach((feature) =>
                     this.setFeatureState(feature, { hover: false })
                 )
                 this._hoverFeatures = null
             }
 
             if (Array.isArray(features)) {
                 this._hoverFeatures = features
-                features.forEach(feature =>
+                features.forEach((feature) =>
                     this.setFeatureState(feature, { hover: true })
                 )
             }
@@ -323,7 +323,7 @@ export class MapGL extends Evented {
 
     onMouseOut = () => this.hideLabel()
 
-    onError = evt => {
+    onError = (evt) => {
         // TODO: Use optional chaining when DHIS2 Maps 2.35 is not supported
         if (evt && evt.error && evt.error.message && console && console.error) {
             const { message } = evt.error
@@ -343,8 +343,8 @@ export class MapGL extends Evented {
     // TODO: throttle?
     getEventFeature(evt) {
         const layers = this.getLayers()
-            .filter(l => l.isInteractive())
-            .map(l => l.getInteractiveIds())
+            .filter((l) => l.isInteractive())
+            .map((l) => l.getInteractiveIds())
             .reduce((out, ids) => [...out, ...ids], [])
         let feature
 
@@ -358,7 +358,7 @@ export class MapGL extends Evented {
     }
 
     getLayerFromId(id) {
-        return this._layers.find(layer => layer.hasLayerId(id))
+        return this._layers.find((layer) => layer.hasLayerId(id))
     }
 
     getLayerAtIndex(index) {
@@ -396,7 +396,7 @@ export class MapGL extends Evented {
         return this._beforeId &&
             this.getMapGL()
                 .getStyle()
-                .layers.find(layer => layer.id === this._beforeId)
+                .layers.find((layer) => layer.id === this._beforeId)
             ? this._beforeId
             : undefined
     }

src/controls/Measure.js

@@ -1,9 +1,9 @@
-import turfLength from '@turf/length'
 import turfArea from '@turf/area'
 import bbox from '@turf/bbox'
+import turfLength from '@turf/length'
 import { createElement } from '../utils/dom'
-import { numberPrecision, kmToMiles } from '../utils/numbers'
 import { featureCollection } from '../utils/geometry'
+import { numberPrecision, kmToMiles } from '../utils/numbers'
 import './Measure.css'
 
 // Inspired by https://github.com/ljagis/leaflet-measure
@@ -235,19 +235,21 @@ class MeasureControl {
     _finishMeasure = () => {
         const mapgl = this._map.getMapGL()
         const geojson = this._geojson
-        const points = geojson.features.filter(f => f.geometry.type === 'Point')
+        const points = geojson.features.filter(
+            (f) => f.geometry.type === 'Point'
+        )
         const locale = this.locale
         const numFormat = this._numFormat
 
         if (points.length < 2) {
             return this._endMeasure()
         } else if (points.length > 2) {
             const lineIndex = geojson.features.findIndex(
-                f => f === this._linestring
+                (f) => f === this._linestring
             )
 
             this._linestring.geometry.coordinates = [
-                ...points.map(point => point.geometry.coordinates),
+                ...points.map((point) => point.geometry.coordinates),
                 points[0].geometry.coordinates,
             ]
 
@@ -328,12 +330,12 @@ class MeasureControl {
         this._isActive ? this._startMeasure() : this._endMeasure()
     }
 
-    _onMapClick = evt => {
+    _onMapClick = (evt) => {
         const mapgl = this._map.getMapGL()
         const geojson = this._geojson
         const locale = this.locale
         const numFormat = this._numFormat
-        let points = geojson.features.filter(f => f.geometry.type === 'Point')
+        let points = geojson.features.filter((f) => f.geometry.type === 'Point')
 
         const clikedFeature = mapgl.queryRenderedFeatures(evt.point, {
             layers: ['measure-points'],
@@ -342,7 +344,7 @@ class MeasureControl {
         // If a feature was clicked, remove it from the map
         if (clikedFeature) {
             const { id } = clikedFeature.properties
-            points = points.filter(p => p.properties.id !== id)
+            points = points.filter((p) => p.properties.id !== id)
         } else {
             points = [
                 ...points,
@@ -367,7 +369,7 @@ class MeasureControl {
             )
         } else {
             this._linestring.geometry.coordinates = points.map(
-                point => point.geometry.coordinates
+                (point) => point.geometry.coordinates
             )
 
             geojson.features.push(this._linestring)
@@ -393,7 +395,7 @@ class MeasureControl {
         if (points.length > 2) {
             this._polygon.geometry.coordinates = [
                 [
-                    ...points.map(point => point.geometry.coordinates),
+                    ...points.map((point) => point.geometry.coordinates),
                     points[0].geometry.coordinates,
                 ],
             ]
@@ -421,7 +423,7 @@ class MeasureControl {
         mapgl.getSource('measure').setData(geojson)
     }
 
-    _onMouseMove = evt => {
+    _onMouseMove = (evt) => {
         const mapgl = this._map.getMapGL()
 
         const features = mapgl.queryRenderedFeatures(evt.point, {
@@ -438,7 +440,7 @@ class MeasureControl {
         const mapgl = this._map.getMapGL()
         const layers = ['measure-points', 'measure-line', 'measure-polygon']
 
-        layers.forEach(layer => {
+        layers.forEach((layer) => {
             if (mapgl.getLayer(layer)) {
                 mapgl.moveLayer(layer)
             }

src/controls/MultiTouch.js

@@ -20,7 +20,7 @@ class MultiTouch {
         let x = 0
         let y = 0
 
-        ;[].forEach.call(event.touches, touch => {
+        ;[].forEach.call(event.touches, (touch) => {
             x += touch.screenX
             y += touch.screenY
         })
@@ -44,7 +44,7 @@ class MultiTouch {
         let x = 0
         let y = 0
 
-        ;[].forEach.call(event.touches, touch => {
+        ;[].forEach.call(event.touches, (touch) => {
             x += touch.screenX
             y += touch.screenY
         })

src/controls/Search.js

@@ -26,9 +26,9 @@ class SearchControl {
         const urlParams = new URLSearchParams(Object.entries(params))
 
         return fetch(`https://nominatim.openstreetmap.org/search?${urlParams}`)
-            .then(response => (response.ok ? response.json() : []))
-            .then(json =>
-                json.map(result => {
+            .then((response) => (response.ok ? response.json() : []))
+            .then((json) =>
+                json.map((result) => {
                     const {
                         display_name: name,
                         lon: lng,
@@ -88,7 +88,7 @@ class SearchControl {
             filter: false,
             limit: this.options.limit,
         })
-        this._typeahead.getItemValue = item => item.name
+        this._typeahead.getItemValue = (item) => item.name
 
         this._collapseSearchControl()
 
@@ -102,7 +102,7 @@ class SearchControl {
     }
 
     // Clear search list when input field is changing
-    _onKeyDown = evt =>
+    _onKeyDown = (evt) =>
         setTimeout(() => {
             const { selected } = this._typeahead
 
@@ -140,7 +140,7 @@ class SearchControl {
         this._loadingEl.style.display = 'block'
 
         this.geocodeRequest(searchInput, this._map.getBounds(), this.options)
-            .then(results => {
+            .then((results) => {
                 let items = results
 
                 this._loadingEl.style.display = 'none'
@@ -162,7 +162,7 @@ class SearchControl {
             .catch(() => (this._loadingEl.style.display = 'none'))
     }
 
-    _clear = evt => {
+    _clear = (evt) => {
         if (evt) {
             evt.preventDefault()
         }

src/controls/controlTypes.js

@@ -1,10 +1,10 @@
 import { ScaleControl } from 'maplibre-gl'
 import Attribution from './Attribution'
-import Navigation from './Navigation'
-import Search from './Search'
-import Measure from './Measure'
 import FitBounds from './FitBounds'
 import Fullscreen from './Fullscreen'
+import Measure from './Measure'
+import Navigation from './Navigation'
+import Search from './Search'
 import './Controls.css'
 
 export default {