Fix(linter): match prettier version in the CI with one in package.json (

#3291) * fix: lint.yml --> adjust github prettier to package.json version * lint: run linter
PnX-SI · Dec 20, 2024 · aff66d2 · aff66d2
1 parent e0ca4d0
commit aff66d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,5 +20,5 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
       - name: Frontend code formatting check (Prettier)
-        run: npm install prettier@~3.1.0 && npm run format:check
-        working-directory: ./frontend
+        run: npm install prettier@~3.3.3 && npm run format:check
+        working-directory: ./frontend
diff --git a/contrib/gn_module_occhab/frontend/app/components/occhab-map-form/occhab-form.component.html b/contrib/gn_module_occhab/frontend/app/components/occhab-map-form/occhab-form.component.html
@@ -476,9 +476,9 @@ <h5 class="card-header bg-primary text-white">
                   [parentFormControl]="
                     occHabForm.stationForm
                       .get('habitats')
-                      .controls[occHabForm.currentEditingHabForm].get(
-                        'id_nomenclature_community_interest'
-                      )
+                      .controls[
+                        occHabForm.currentEditingHabForm
+                      ].get('id_nomenclature_community_interest')
                   "
                   [items]="storeService.nomenclatureItems.HAB_INTERET_COM"
                   comparedKey="id_nomenclature"
@@ -515,9 +515,9 @@ <h5 class="card-header bg-primary text-white">
                   [parentFormControl]="
                     occHabForm.stationForm
                       .get('habitats')
-                      .controls[occHabForm.currentEditingHabForm].get(
-                        'id_nomenclature_determination_type'
-                      )
+                      .controls[
+                        occHabForm.currentEditingHabForm
+                      ].get('id_nomenclature_determination_type')
                   "
                   [items]="storeService.nomenclatureItems.DETERMINATION_TYP_HAB"
                   comparedKey="id_nomenclature"
@@ -533,9 +533,9 @@ <h5 class="card-header bg-primary text-white">
               [parentFormControl]="
                 occHabForm.stationForm
                   .get('habitats')
-                  .controls[occHabForm.currentEditingHabForm].get(
-                    'id_nomenclature_collection_technique'
-                  )
+                  .controls[
+                    occHabForm.currentEditingHabForm
+                  ].get('id_nomenclature_collection_technique')
               "
               [items]="storeService.nomenclatureItems.TECHNIQUE_COLLECT_HAB"
               comparedKey="id_nomenclature"

diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -8,5 +8,13 @@
   "trailingComma": "es5",
   "singleAttributePerLine": true,
   "bracketSameLine": false,
-  "htmlWhitespaceSensitivity": "ignore"
+  "htmlWhitespaceSensitivity": "ignore",
+  "overrides": [
+    {
+      "files": ["*.html"],
+      "options": {
+        "trailingComma": "none"
+      }
+    }
+  ]
 }