Release 1.26.1 (#1200)

Release 1.26.1

Author: olivier-rabot

.github/workflows/lint-format-tests.yaml

@@ -18,8 +18,6 @@ jobs:
           node-version: "22.20.0"
       - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
         name: Install pnpm
-        with:
-          cache: true
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Run the linter
@@ -28,6 +26,7 @@ jobs:
         run: pnpm -w test:unit:all
       - name: SonarQube Scan
         uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602
-        if: ${{ !github.event.pull_request.draft && !contains(github.head_ref || github.ref, 'renovate/') }}
+        # if: ${{ !github.event.pull_request.draft && !contains(github.head_ref || github.ref, 'renovate/') }}
+        if: ${{ !github.event.pull_request.draft }}
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

packages/backend/src/services/FoUser.js

@@ -84,23 +84,28 @@ const query = {
         CASE 
           WHEN NULLIF(pp.id, 0) IS NOT NULL THEN 
             pp.adresse_siege_label
-          ELSE (
-            SELECT pm4.adresse
+          ELSE 
+          (
+            SELECT pm4.adresse 
               FROM front.personne_morale pm4
               WHERE pm4.siret = COALESCE(u.siret, pm.siret)
               AND pm4."current" = true
-              LIMIT 1
-            )
+            UNION
+		        SELECT '- ' || eta.code_postal || ' ' || eta.commune 
+              FROM front.opm_etablissements eta 
+              WHERE eta.siret = COALESCE(u.siret, pm.siret)
+            LIMIT 1
+          )
         END AS "Adresse"
       FROM front.users AS u
         LEFT JOIN front.user_organisme uo ON uo.use_id = u.id
         LEFT JOIN front.personne_morale pm ON pm.organisme_id = uo.org_id AND pm."current" = true
         LEFT JOIN front.personne_physique pp ON pp.organisme_id = uo.org_id AND pp."current" = true
       WHERE (uo.org_id = ANY ($1) OR 
-        u.siret IN (
-          SELECT siret 
+        substr(u.siret,1,9) IN (
+          SELECT siren 
           FROM front.personne_morale pm2 
-          WHERE pm2.siret = u.siret 
+          WHERE pm2.siren = substr(u.siret,1,9) 
           AND pm2.organisme_id = ANY ($1) 
           AND pm2."current" = true))
       ) AS r

packages/frontend-usagers/src/components/user/liste.vue

@@ -220,13 +220,18 @@ const updateData = (resetOffset = false) => {
 };
 
 const getCommuneCp = (adresse) => {
-  const decomposeAdresse = adresse.split(" ");
-  const cpIndex = decomposeAdresse.findIndex((mot) =>
-    regex.formatCommuneCP.test(mot),
-  );
-  return cpIndex > 0
-    ? `${decomposeAdresse.slice(cpIndex + 1).join(" ")} (${decomposeAdresse[cpIndex]})`
-    : null;
+  try {
+    const decomposeAdresse = adresse.split(" ");
+    const cpIndex = decomposeAdresse.findIndex((mot) =>
+      regex.formatCommuneCP.test(mot),
+    );
+    return cpIndex > 0
+      ? `${decomposeAdresse.slice(cpIndex + 1).join(" ")} (${decomposeAdresse[cpIndex]})`
+      : null;
+  } catch (e) {
+    log.error("Error while decomposing address", e);
+    return "";
+  }
 };
 updateData();