Align dev prettier version with actionsx/prettier, fix formatting and…

… enable quality github action
hostolab · Dec 9, 2021 · f79f316 · f79f316
1 parent e47966f
commit f79f316
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 37 deletions.
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -1,8 +1,7 @@
 name: Quality
 
 # triggers on
-on: [workflow_dispatch] # Disable workflow for now (manual trigger)
-# on: [push, pull_request]
+on: [push, pull_request]
 
 jobs:
   quality:

diff --git a/app/controllers/partners/vaccination_centers_controller.rb b/app/controllers/partners/vaccination_centers_controller.rb
@@ -31,8 +31,7 @@ def create
       @same_existing_vaccination_centers = check_if_already_exists(@vaccination_center, :address, :phone_number, :finess)
       unless @same_existing_vaccination_centers && @vaccination_center.confirmation_creation.to_i.zero?
         @vaccination_center.save
-        @partner_vaccination_center = PartnerVaccinationCenter.new(partner: current_partner,
-                                                                   vaccination_center: @vaccination_center)
+        @partner_vaccination_center = PartnerVaccinationCenter.new(partner: current_partner, vaccination_center: @vaccination_center)
         @partner_vaccination_center.save
         prepare_phone_number
       end

diff --git a/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx b/app/javascript/components/partners/campaign_creator/fields/CampaignCreatorExtraInfo.jsx
@@ -24,7 +24,8 @@ export const CampaignCreatorExtraInfo = () => {
 };
 
 const dateInExtraInfoWarning = (info) => {
-  const dateRegex = /(lundi|mardi|mercredi|jeudi|vendredi|janvier|f[eé]vrier|mars|avril|mai|juin|juillet|ao[uû]t|septembre|octobre|novembre|d[eé]cembre|demain)/i;
+  const dateRegex =
+    /(lundi|mardi|mercredi|jeudi|vendredi|janvier|f[eé]vrier|mars|avril|mai|juin|juillet|ao[uû]t|septembre|octobre|novembre|d[eé]cembre|demain)/i;
   if (info.match(dateRegex)) {
     return (
       <>

diff --git a/app/javascript/components/shared/RootWrapper.jsx b/app/javascript/components/shared/RootWrapper.jsx
@@ -4,8 +4,9 @@ import { camelCaseDeep } from "components/shared/casing";
 
 const queryClient = new QueryClient();
 
-export const RootWrapper = (RootComponent) => (propsFromRails) => (
-  <QueryClientProvider client={queryClient}>
-    <RootComponent {...camelCaseDeep(propsFromRails)} />
-  </QueryClientProvider>
-);
+export const RootWrapper = (RootComponent) => (propsFromRails) =>
+  (
+    <QueryClientProvider client={queryClient}>
+      <RootComponent {...camelCaseDeep(propsFromRails)} />
+    </QueryClientProvider>
+  );
diff --git a/app/javascript/plugins/fuzzy_search.js b/app/javascript/plugins/fuzzy_search.js
@@ -71,9 +71,8 @@ if (engine) {
                     matchesTitles.indexOf(domItemTitle) >= 0
                   ) {
                     domItems[i].classList.remove("d-none");
-                    domItems[i].style.order = matchesTitles.indexOf(
-                      domItemTitle
-                    );
+                    domItems[i].style.order =
+                      matchesTitles.indexOf(domItemTitle);
                   } else {
                     domItems[i].classList.add("d-none");
                     domItems[i].style.order = "inherit";

diff --git a/app/javascript/plugins/leaflet_map.js b/app/javascript/plugins/leaflet_map.js
@@ -57,9 +57,8 @@ const leafletMap = () => {
         lmap.panTo([lat, lon]);
       }
 
-      let leafletMarkers = leafletMapContainer.getElementsByClassName(
-        "leaflet-marker"
-      );
+      let leafletMarkers =
+        leafletMapContainer.getElementsByClassName("leaflet-marker");
       if (leafletMarkers) {
         let leafletMarkersCluster = L.markerClusterGroup();
         for (let i = 0; i < leafletMarkers.length; ++i) {
@@ -86,9 +85,8 @@ const leafletMap = () => {
         lmap.addLayer(leafletMarkersCluster);
       }
 
-      let leafletGeojsons = leafletMapContainer.getElementsByClassName(
-        "leaflet-geojson"
-      );
+      let leafletGeojsons =
+        leafletMapContainer.getElementsByClassName("leaflet-geojson");
       if (leafletGeojsons) {
         let geojsonCodes = {};
         for (let i = 0; i < leafletGeojsons.length; ++i) {
@@ -156,9 +154,8 @@ const leafletMap = () => {
         L.control.layers({}, geojsonCodes, { collapsed: false }).addTo(lmap);
       }
 
-      let leafletFlyBtns = leafletMapContainer.getElementsByClassName(
-        "leaflet_fly_btn"
-      );
+      let leafletFlyBtns =
+        leafletMapContainer.getElementsByClassName("leaflet_fly_btn");
       for (let i = 0; i < leafletFlyBtns.length; ++i) {
         let leafletFlyBtn = leafletFlyBtns[i];
         let elemLat = leafletFlyBtn.getAttribute("data-lat");

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,6 +1,5 @@
 class ApplicationMailer < ActionMailer::Base
-  default :from => "Covidliste <[email protected]>",
-          "X-Auto-Response-Suppress" => "OOF"
+  default :from => "Covidliste <[email protected]>", "X-Auto-Response-Suppress" => "OOF"
   layout "mailer"
 
   def mail(headers)

diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
@@ -1,5 +1,4 @@
 class DeviseMailer < Devise::Mailer
-  default :from => "Covidliste <[email protected]>",
-          "X-Auto-Response-Suppress" => "OOF"
+  default :from => "Covidliste <[email protected]>", "X-Auto-Response-Suppress" => "OOF"
   layout "mailer"
 end
diff --git a/app/mailers/match_mailer.rb b/app/mailers/match_mailer.rb
@@ -1,6 +1,5 @@
 class MatchMailer < ApplicationMailer
-  default :from => "Covidliste <[email protected]>",
-          "X-Auto-Response-Suppress" => "OOF"
+  default :from => "Covidliste <[email protected]>", "X-Auto-Response-Suppress" => "OOF"
 
   def match_confirmation_instructions
     @match = params[:match]

diff --git a/app/mailers/slot_alert_mailer.rb b/app/mailers/slot_alert_mailer.rb
@@ -1,6 +1,5 @@
 class SlotAlertMailer < ApplicationMailer
-  default :from => "Covidliste <[email protected]>",
-          "X-Auto-Response-Suppress" => "OOF"
+  default :from => "Covidliste <[email protected]>", "X-Auto-Response-Suppress" => "OOF"
 
   include ApplicationHelper
   helper ApplicationHelper

diff --git a/app/mailers/vaccination_center_mailer.rb b/app/mailers/vaccination_center_mailer.rb
@@ -1,6 +1,5 @@
 class VaccinationCenterMailer < ApplicationMailer
-  default :from => "Covidliste <[email protected]>",
-          "X-Auto-Response-Suppress" => "OOF"
+  default :from => "Covidliste <[email protected]>", "X-Auto-Response-Suppress" => "OOF"
 
   def confirmed_vaccination_center_onboarding
     @tutorial_url = "https://docs.google.com/document/d/10IqYk739dJImngTIsQ7IJbf7RXJRG7drD4dZM_Z4xmI/edit?usp=sharing"

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   "version": "0.1.0",
   "devDependencies": {
     "pdfkit": "^0.12.1",
-    "prettier": "2.2.1",
+    "prettier": "^2.3.2",
     "puppeteer": "^9.1.1",
     "webpack-dev-server": "^3.11.2"
   }

diff --git a/yarn.lock b/yarn.lock