fix new prettier defaults

.prettierrc.js

@@ -1,3 +1,4 @@
 module.exports = {
-  singleQuote: true
+  singleQuote: true,
+  trailingComma: 'none'
 };

app/assets/javascripts/old_design/admin.js

@@ -2,19 +2,10 @@
 
 $(document).on('click', '.delete', function () {
   $(this).hide();
-  $(this)
+  $(this).closest('td').find('.confirm').show();
-    .closest('td')
-    .find('.confirm')
-    .show();
 });
 
 $(document).on('click', '.cancel', function () {
-  $(this)
+  $(this).closest('td').find('.delete').show();
-    .closest('td')
+  $(this).closest('td').find('.confirm').hide();
-    .find('.delete')
-    .show();
-  $(this)
-    .closest('td')
-    .find('.confirm')
-    .hide();
 });

app/assets/javascripts/old_design/dossiers_list_filter.js

@@ -6,11 +6,7 @@ function filters_init() {
   $('html').click(function (event) {
     var visible_filter = $('.filter_framed:visible');
     if (visible_filter.length) {
-      if (
+      if (!$(event.target).closest('.filter_framed').is(':visible')) {
-        !$(event.target)
-          .closest('.filter_framed')
-          .is(':visible')
-      ) {
         visible_filter.hide();
       }
     }
@@ -23,10 +19,7 @@ function filters_init() {
   });
 
   $('.erase-filter').on('click', function () {
-    $(this)
+    $(this).parent().find('.filter_input').val('');
-      .parent()
-      .find('.filter_input')
-      .val('');
   });
 }
 

app/javascript/components/MapEditor/SearchInput.js

@@ -11,12 +11,12 @@ import '@reach/combobox/styles.css';
 import PropTypes from 'prop-types';
 
 let cache = {};
-const useAddressSearch = searchTerm => {
+const useAddressSearch = (searchTerm) => {
   const [addresses, setAddresses] = useState([]);
   useEffect(() => {
     if (searchTerm.trim() !== '') {
       let isFresh = true;
-      fetchAddresses(searchTerm).then(addresses => {
+      fetchAddresses(searchTerm).then((addresses) => {
         if (isFresh) setAddresses(addresses);
       });
       return () => (isFresh = false);
@@ -25,12 +25,12 @@ const useAddressSearch = searchTerm => {
   return addresses;
 };
 
-const fetchAddresses = value => {
+const fetchAddresses = (value) => {
   if (cache[value]) {
     return Promise.resolve(cache[value]);
   }
   const url = `https://api-adresse.data.gouv.fr/search/`;
-  return getJSON(url, { q: value, limit: 5 }, 'get').then(result => {
+  return getJSON(url, { q: value, limit: 5 }, 'get').then((result) => {
     if (result) {
       cache[value] = result;
     }
@@ -41,7 +41,7 @@ const fetchAddresses = value => {
 const SearchInput = ({ getCoords }) => {
   const [searchTerm, setSearchTerm] = useState('');
   const addresses = useAddressSearch(searchTerm);
-  const handleSearchTermChange = event => {
+  const handleSearchTermChange = (event) => {
     setSearchTerm(event.target.value);
   };
   return (
@@ -72,7 +72,7 @@ const SearchInput = ({ getCoords }) => {
         >
           {addresses.features.length > 0 ? (
             <ComboboxList>
-              {addresses.features.map(feature => {
+              {addresses.features.map((feature) => {
                 const str = `${feature.properties.name}, ${feature.properties.city}`;
                 return (
                   <ComboboxOption

app/javascript/components/MapEditor/index.js

@@ -18,7 +18,7 @@ function filterFeatureCollection(featureCollection, source) {
   return {
     type: 'FeatureCollection',
     features: featureCollection.features.filter(
-      feature => feature.properties.source === source
+      (feature) => feature.properties.source === source
     )
   };
 }
@@ -75,7 +75,7 @@ const MapEditor = ({ featureCollection, url }) => {
     updateFeaturesList(features);
   }
 
-  const onMapLoad = map => {
+  const onMapLoad = (map) => {
     setCurrentMap(map);
 
     drawControl.current.draw.set(
@@ -83,7 +83,7 @@ const MapEditor = ({ featureCollection, url }) => {
     );
   };
 
-  const onCadastresUpdate = evt => {
+  const onCadastresUpdate = (evt) => {
     if (currentMap) {
       currentMap
         .getSource('cadastres-layer')
@@ -93,10 +93,10 @@ const MapEditor = ({ featureCollection, url }) => {
     }
   };
 
-  const onGpxImport = e => {
+  const onGpxImport = (e) => {
     let reader = new FileReader();
     reader.readAsText(e.target.files[0], 'UTF-8');
-    reader.onload = async event => {
+    reader.onload = async (event) => {
       const featureCollection = gpx(
         new DOMParser().parseFromString(event.target.result, 'text/xml')
       );
@@ -149,14 +149,14 @@ const MapEditor = ({ featureCollection, url }) => {
         }}
       >
         <SearchInput
-          getCoords={searchTerm => {
+          getCoords={(searchTerm) => {
             setCoords(searchTerm);
             setZoom([17]);
           }}
         />
       </div>
       <Map
-        onStyleLoad={map => onMapLoad(map)}
+        onStyleLoad={(map) => onMapLoad(map)}
         fitBounds={bbox}
         fitBoundsOptions={{ padding: 100 }}
         center={coords}

app/javascript/components/TypesDeChampEditor/components/TypeDeChampPieceJustificative.js

@@ -72,7 +72,7 @@ function onFileChange(handler, directUploadUrl) {
 
 function uploadFile(input, file, directUploadUrl) {
   const controller = new Uploader(input, file, directUploadUrl);
-  return controller.start().then(signedId => {
+  return controller.start().then((signedId) => {
     input.value = null;
     return signedId;
   });

app/javascript/components/TypesDeChampEditor/components/TypeDeChampRepetitionOptions.js

@@ -17,7 +17,9 @@ function TypeDeChampRepetitionOptions({
     return (
       <div className="repetition flex-grow cell">
         <SortableContainer
-          onSortEnd={params => dispatch({ type: 'onSortTypeDeChamps', params })}
+          onSortEnd={(params) =>
+            dispatch({ type: 'onSortTypeDeChamps', params })
+          }
           useDragHandle
         >
           {state.typeDeChamps.map((typeDeChamp, index) => (

app/javascript/components/TypesDeChampEditor/components/TypeDeChamps.js

@@ -12,12 +12,14 @@ function TypeDeChamps({ state: rootState, typeDeChamps }) {
     typeDeChamps
   });
 
-  const hasUnsavedChamps = state.typeDeChamps.some(tdc => tdc.id == undefined);
+  const hasUnsavedChamps = state.typeDeChamps.some(
+    (tdc) => tdc.id == undefined
+  );
 
   return (
     <div className="champs-editor">
       <SortableContainer
-        onSortEnd={params => dispatch({ type: 'onSortTypeDeChamps', params })}
+        onSortEnd={(params) => dispatch({ type: 'onSortTypeDeChamps', params })}
         lockAxis="y"
         useDragHandle
       >

app/javascript/components/TypesDeChampEditor/operations.js

@@ -5,7 +5,7 @@ export function createTypeDeChampOperation(typeDeChamp, queue) {
       method: 'post',
       payload: { type_de_champ: typeDeChamp }
     })
-    .then(data => {
+    .then((data) => {
       handleResponseData(typeDeChamp, data);
     });
 }
@@ -33,7 +33,7 @@ export function updateTypeDeChampOperation(typeDeChamp, queue) {
       method: 'patch',
       payload: { type_de_champ: typeDeChamp }
     })
-    .then(data => {
+    .then((data) => {
       handleResponseData(typeDeChamp, data);
     });
 }

app/javascript/components/TypesDeChampEditor/typeDeChampsReducer.js

@@ -59,7 +59,7 @@ function addTypeDeChamp(state, typeDeChamps, insertAfter, done) {
         });
       }
     })
-    .catch(message => state.flash.error(message));
+    .catch((message) => state.flash.error(message));
 
   let newTypeDeChamps = [...typeDeChamps, typeDeChamp];
   if (insertAfter) {
@@ -127,7 +127,7 @@ function updateTypeDeChamp(
 function removeTypeDeChamp(state, typeDeChamps, { typeDeChamp }) {
   destroyTypeDeChampOperation(typeDeChamp, state.queue)
     .then(() => state.flash.success())
-    .catch(message => state.flash.error(message));
+    .catch((message) => state.flash.error(message));
 
   return {
     ...state,
@@ -141,7 +141,7 @@ function moveTypeDeChampUp(state, typeDeChamps, { typeDeChamp }) {
 
   moveTypeDeChampOperation(typeDeChamp, newIndex, state.queue)
     .then(() => state.flash.success())
-    .catch(message => state.flash.error(message));
+    .catch((message) => state.flash.error(message));
 
   return {
     ...state,
@@ -155,7 +155,7 @@ function moveTypeDeChampDown(state, typeDeChamps, { typeDeChamp }) {
 
   moveTypeDeChampOperation(typeDeChamp, newIndex, state.queue)
     .then(() => state.flash.success())
-    .catch(message => state.flash.error(message));
+    .catch((message) => state.flash.error(message));
 
   return {
     ...state,
@@ -166,7 +166,7 @@ function moveTypeDeChampDown(state, typeDeChamps, { typeDeChamp }) {
 function onSortTypeDeChamps(state, typeDeChamps, { oldIndex, newIndex }) {
   moveTypeDeChampOperation(typeDeChamps[oldIndex], newIndex, state.queue)
     .then(() => state.flash.success())
-    .catch(message => state.flash.error(message));
+    .catch((message) => state.flash.error(message));
 
   return {
     ...state,
@@ -191,13 +191,13 @@ function getUpdateHandler(typeDeChamp, { queue, flash }) {
   let handler = updateHandlers.get(typeDeChamp);
   if (!handler) {
     handler = debounce(
-      done =>
+      (done) =>
         updateTypeDeChampOperation(typeDeChamp, queue)
           .then(() => {
             flash.success();
             done();
           })
-          .catch(message => flash.error(message)),
+          .catch((message) => flash.error(message)),
       200
     );
     updateHandlers.set(typeDeChamp, handler);

app/javascript/new_design/champs/linked-drop-down-list.js

@@ -4,7 +4,7 @@ const PRIMARY_SELECTOR = 'select[data-secondary-options]';
 const SECONDARY_SELECTOR = 'select[data-secondary]';
 const CHAMP_SELECTOR = '.editable-champ';
 
-delegate('change', PRIMARY_SELECTOR, evt => {
+delegate('change', PRIMARY_SELECTOR, (evt) => {
   const primary = evt.target;
   const secondary = primary
     .closest(CHAMP_SELECTOR)

app/javascript/new_design/champs/repetition.js

@@ -4,7 +4,7 @@ const BUTTON_SELECTOR = '.button.remove-row';
 const DESTROY_INPUT_SELECTOR = 'input[type=hidden][name*=_destroy]';
 const CHAMP_SELECTOR = '.editable-champ';
 
-delegate('click', BUTTON_SELECTOR, evt => {
+delegate('click', BUTTON_SELECTOR, (evt) => {
   evt.preventDefault();
 
   const row = evt.target.closest('.row');

app/javascript/new_design/dossiers/auto-save-controller.js

@@ -41,7 +41,7 @@ export default class AutoSaveController {
         headers: { Accept: 'application/json' }
       };
 
-      return window.fetch(form.action, fetchOptions).then(response => {
+      return window.fetch(form.action, fetchOptions).then((response) => {
         if (response.ok) {
           resolve(response);
         } else {
@@ -64,7 +64,7 @@ export default class AutoSaveController {
     const fileInputs = form.querySelectorAll(
       'input[type="file"]:not([disabled]), .editable-champ-piece_justificative input:not([disabled])'
     );
-    fileInputs.forEach(fileInput => (fileInput.disabled = true));
+    fileInputs.forEach((fileInput) => (fileInput.disabled = true));
 
     // Generate the form data
     let formData = null;
@@ -75,7 +75,7 @@ export default class AutoSaveController {
       return [null, error];
     } finally {
       // Re-enable disabled file inputs
-      fileInputs.forEach(fileInput => (fileInput.disabled = false));
+      fileInputs.forEach((fileInput) => (fileInput.disabled = false));
     }
   }
 

app/javascript/new_design/dossiers/auto-save.js

@@ -47,7 +47,7 @@ addEventListener('autosave:end', () => {
   hideSucceededStatusAfterDelay();
 });
 
-addEventListener('autosave:error', event => {
+addEventListener('autosave:error', (event) => {
   enable(document.querySelector('button.autosave-retry'));
   setState('failed');
   logError(event.detail);

app/javascript/new_design/dossiers/auto-upload.js

@@ -5,13 +5,13 @@ import { delegate } from '@utils';
 const autoUploadsControllers = new AutoUploadsControllers();
 
 function startUpload(input) {
-  Array.from(input.files).forEach(file => {
+  Array.from(input.files).forEach((file) => {
     autoUploadsControllers.upload(input, file);
   });
 }
 
 const fileInputSelector = `input[type=file][data-direct-upload-url][data-auto-attach-url]:not([disabled])`;
-delegate('change', fileInputSelector, event => {
+delegate('change', fileInputSelector, (event) => {
   startUpload(event.target);
 });
 

app/javascript/new_design/dossiers/auto-uploads-controllers.js

@@ -40,7 +40,7 @@ export default class AutoUploadsControllers {
     if (form) {
       form
         .querySelectorAll('button[type=submit]')
-        .forEach(submitButton => Rails.disableElement(submitButton));
+        .forEach((submitButton) => Rails.disableElement(submitButton));
     }
 
     //
@@ -51,7 +51,7 @@ export default class AutoUploadsControllers {
         // When DirectUploads attempts to add an event listener for "error",
         // also insert a custom event listener of our that will report errors to Sentry.
         if (arguments[0] == 'error') {
-          let handler = event => {
+          let handler = (event) => {
             let message = `FileReader ${event.target.error.name}: ${event.target.error.message}`;
             fire(document, 'sentry:capture-exception', new Error(message));
           };
@@ -71,7 +71,7 @@ export default class AutoUploadsControllers {
     if (this.inFlightUploadsCount == 0 && form) {
       form
         .querySelectorAll('button[type=submit]')
-        .forEach(submitButton => Rails.enableElement(submitButton));
+        .forEach((submitButton) => Rails.enableElement(submitButton));
     }
 
     //

app/javascript/new_design/dropdown.js

@@ -1,14 +1,14 @@
 import { delegate } from '@utils';
 
-delegate('click', 'body', event => {
+delegate('click', 'body', (event) => {
   if (!event.target.closest('.dropdown')) {
-    [...document.querySelectorAll('.dropdown')].forEach(element =>
+    [...document.querySelectorAll('.dropdown')].forEach((element) =>
       element.classList.remove('open', 'fade-in-down')
     );
   }
 });
 
-delegate('click', '.dropdown-button', event => {
+delegate('click', '.dropdown-button', (event) => {
   event.stopPropagation();
   const parent = event.target.closest('.dropdown-button').parentElement;
   if (parent.classList.contains('dropdown')) {

app/javascript/shared/activestorage/ujs.js

@@ -12,7 +12,7 @@ const ERROR_EVENT = 'direct-upload:error';
 const END_EVENT = 'direct-upload:end';
 
 function addUploadEventListener(type, handler) {
-  addEventListener(type, event => {
+  addEventListener(type, (event) => {
     // Internet Explorer and Edge will sometime replay Javascript events
     // that were dispatched just before a page navigation (!), but without
     // the event payload.
@@ -43,7 +43,7 @@ addUploadEventListener(PROGRESS_EVENT, ({ detail: { id, progress } }) => {
   ProgressBar.progress(id, progress);
 });
 
-addUploadEventListener(ERROR_EVENT, event => {
+addUploadEventListener(ERROR_EVENT, (event) => {
   let id = event.detail.id;
   let errorMsg = event.detail.error;
 

app/javascript/shared/activestorage/uploader.js

@@ -92,7 +92,7 @@ export default class Uploader {
   }
 
   directUploadWillStoreFileWithXHR(xhr) {
-    xhr.upload.addEventListener('progress', event =>
+    xhr.upload.addEventListener('progress', (event) =>
       this.uploadRequestDidProgress(event)
     );
   }

app/javascript/shared/carte-editor.js

@@ -63,8 +63,8 @@ function initMap(element, { position }) {
 }
 
 function toLatLngs({ coordinates }) {
-  return coordinates.map(polygon =>
+  return coordinates.map((polygon) =>
-    polygon[0].map(point => L.GeoJSON.coordsToLatLng(point))
+    polygon[0].map((point) => L.GeoJSON.coordsToLatLng(point))
   );
 }
 
@@ -137,7 +137,7 @@ function findInput(selector) {
 }
 
 function clearLayers(map) {
-  map.eachLayer(layer => {
+  map.eachLayer((layer) => {
     if (layer instanceof L.GeoJSON) {
       map.removeLayer(layer);
     }
@@ -185,7 +185,7 @@ const RPG_POLYGON_STYLE = Object.assign({}, POLYGON_STYLE, {
   fillColor: '#31708f'
 });
 
-delegate('click', '.carte.edit', event => {
+delegate('click', '.carte.edit', (event) => {
   const map = getCurrentMap(event.target);
 
   if (map) {
@@ -200,7 +200,7 @@ delegate('click', '.carte.edit', event => {
   }
 });
 
-delegate('click', '.toolbar .new-area', event => {
+delegate('click', '.toolbar .new-area', (event) => {
   event.preventDefault();
   const map = getCurrentMap(event.target);
 
@@ -209,7 +209,7 @@ delegate('click', '.toolbar .new-area', event => {
   }
 });
 
-$(document).on('select2:select', 'select[data-address]', event => {
+$(document).on('select2:select', 'select[data-address]', (event) => {
   const map = getCurrentMap(event.target);
   const { geometry } = event.params.data;
 

app/javascript/shared/remote-poller.js

@@ -24,7 +24,7 @@ addEventListener('export:update', ({ detail: { url } }) => {
   exportPoller.add(url);
 });
 
-delegate('click', '[data-attachment-refresh]', event => {
+delegate('click', '[data-attachment-refresh]', (event) => {
   event.preventDefault();
   attachementPoller.check();
 });

app/javascript/shared/toggle-target.js

@@ -9,7 +9,7 @@ import { delegate, toggle } from '@utils';
 
 const TOGGLE_SOURCE_SELECTOR = '[data-toggle-target]';
 
-delegate('click', TOGGLE_SOURCE_SELECTOR, evt => {
+delegate('click', TOGGLE_SOURCE_SELECTOR, (evt) => {
   evt.preventDefault();
 
   const targetSelector = evt.target.dataset.toggleTarget;

app/javascript/shared/track/matomo.js

@@ -29,7 +29,7 @@ if (enabled) {
   // Send Matomo a new event when navigating to a new page using Turbolinks
   // (see https://developer.matomo.org/guides/spa-tracking)
   let previousPageUrl = null;
-  addEventListener('turbolinks:load', event => {
+  addEventListener('turbolinks:load', (event) => {
     if (previousPageUrl) {
       window._paq.push(['setReferrerUrl', previousPageUrl]);
       window._paq.push(['setCustomUrl', window.location.href]);

app/javascript/shared/track/sentry.js

@@ -6,13 +6,13 @@ const { key, enabled, user, environment, browser } = gon.sentry || {};
 if (enabled && key) {
   Sentry.init({ dsn: key, environment });
 
-  Sentry.configureScope(scope => {
+  Sentry.configureScope((scope) => {
     scope.setUser(user);
     scope.setExtra('browser', browser.modern ? 'modern' : 'legacy');
   });
 
   // Register a way to explicitely capture messages from a different bundle.
-  addEventListener('sentry:capture-exception', event => {
+  addEventListener('sentry:capture-exception', (event) => {
     const error = event.detail;
     Sentry.captureException(error);
   });

app/javascript/shared/utils.js

@@ -46,7 +46,7 @@ export function removeClass(el, cssClass) {
 export function delegate(eventNames, selector, callback) {
   eventNames
     .split(' ')
-    .forEach(eventName =>
+    .forEach((eventName) =>
       Rails.delegate(document, selector, eventName, callback)
     );
 }
@@ -90,13 +90,13 @@ export function scrollToBottom(container) {
 }
 
 export function on(selector, eventName, fn) {
-  [...document.querySelectorAll(selector)].forEach(element =>
+  [...document.querySelectorAll(selector)].forEach((element) =>
-    element.addEventListener(eventName, event => fn(event, event.detail))
+    element.addEventListener(eventName, (event) => fn(event, event.detail))
   );
 }
 
 export function to(promise) {
-  return promise.then(result => [result]).catch(error => [null, error]);
+  return promise.then((result) => [result]).catch((error) => [null, error]);
 }
 
 export function isNumeric(n) {