Merge branch '2301.1.x' into 'main'

Next patch release

See merge request maarch/MaarchParapheur!284

package-lock.json

 {
   "name": "parapheur",
-  "version": "2301.1.1",
+  "version": "2301.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "parapheur",
-      "version": "2301.1.1",
+      "version": "2301.1.2",
       "license": "GPL-3.0",
       "dependencies": {
         "@types/ws": "^8.5.4",

package.json

 {
   "name": "parapheur",
-  "version": "2301.1.1",
+  "version": "2301.1.2",
   "description": "Annoter ou Signer vos documents sur votre tablette",
   "homepage": "https://labs.maarch.org/maarch/MaarchParapheur",
   "engines": {

src/app/search/controllers/SearchController.php

@@ -42,19 +42,21 @@ class SearchController
         $baseRestriction = '';
         $baseData = [];
         if (!$hasFullRights) {
-            $baseRestriction = 'id IN (
-                SELECT DISTINCT ws1.main_document_id
+            $baseRestriction = 'EXISTS (
+                SELECT 1
                 FROM workflows ws1
-                WHERE typist = ?
-                OR (ws1.process_date IS NOT NULL AND ws1.user_id = ?)
-                OR (
-                    ws1.user_id IN (
-                        SELECT (SELECT ?::int) UNION (SELECT id FROM users WHERE substitute = ?)
-                    )
-                    AND ws1."order" = (
-                        SELECT min(ws2."order") FROM workflows ws2 WHERE ws2.process_date IS NULL AND ws2.main_document_id = ws1.main_document_id
-                    )
-                )
+                LEFT JOIN users u ON ws1.user_id = u.id AND u.substitute = ?
+                LEFT JOIN (
+                    SELECT main_document_id, MIN("order") AS min_order
+                    FROM workflows
+                    WHERE process_date IS NULL
+                    GROUP BY main_document_id
+                ) mo ON ws1.main_document_id = mo.main_document_id
+                WHERE ws1.main_document_id = main_documents.id
+                  AND (main_documents.typist = ?
+                       OR (ws1.process_date IS NOT NULL AND ws1.user_id = ?)
+                       OR (ws1.user_id = ? OR u.id IS NOT NULL)
+                       AND ws1."order" = mo.min_order)
             )';
             $baseData = [$GLOBALS['id'], $GLOBALS['id'], $GLOBALS['id'], $GLOBALS['id']];
         }
@@ -120,7 +122,7 @@ class SearchController
             $where[] = 'id = ?';
             $data[]  = $body['documentId'];
         }
-        
+
         if (Validator::arrayType()->each(Validator::in(['softDeleted', 'hardDeleted']))->notEmpty()->validate($body['documentState'] ?? null)) {
             $docStatesForQuery = [];
             if (in_array('softDeleted', $body['documentState'])) {