📝(core) documentation

Documentation is a way to document things

Signed-off-by: charles <charles.englebert@protonmail.com>

.github/workflows/docker-hub.yml

@@ -36,12 +36,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      # -
-      #   name: Run trivy scan
-      #   uses: numerique-gouv/action-trivy-cache@main
-      #   with:
-      #     docker-build-args: '--target backend-production -f Dockerfile'
-      #     docker-image-name: 'docker.io/lasuite/impress-backend:${{ github.sha }}'
+      -
+        name: Run trivy scan
+        uses: numerique-gouv/action-trivy-cache@main
+        with:
+          docker-build-args: '--target backend-production -f Dockerfile'
+          docker-image-name: 'docker.io/lasuite/impress-backend:${{ github.sha }}'
       -
         name: Build and push
         uses: docker/build-push-action@v6

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Fixed
+
+🐛(frontend) fix broadcast store sync #1846
+
 ## [v4.5.0] - 2026-01-28
 
 ### Added 
@@ -16,12 +20,16 @@ and this project adheres to
 - ✨(frontend) Add stat for Crisp #1824
 - ✨(auth) add silent login #1690
 - 🔧(project) add DJANGO_EMAIL_URL_APP environment variable #1825
+- ✨(frontend) activate Find search #1834
+- ✨ handle searching on subdocuments #1834
+- ✨(backend) add search feature flags #1897
 
 ### Changed
 
 - ♿(frontend) improve accessibility:
   - ♿️(frontend) fix subdoc opening and emoji pick focus #1745
 - ✨(backend) add field for button label in email template #1817
+- ✨(backend) improve fallback logic on search endpoint #1834
 
 ### Fixed
 
@@ -35,6 +43,8 @@ and this project adheres to
 ### Removed
 
 - 🔥(project) remove all code related to template #1780
+- 🔥(api) remove `documents/<document_id>/descendants/` endpoint #1834
+- 🔥(api) remove pagination on `documents/search/` endpoint #1834
 
 ### Security
 

Makefile

@@ -79,10 +79,16 @@ create-env-local-files:
 	@touch env.d/development/kc_postgresql.local
 .PHONY: create-env-local-files
 
+generate-secret-keys:
+generate-secret-keys: ## generate secret keys to be stored in common.local
+	@bin/generate-oidc-store-refresh-token-key.sh
+.PHONY: generate-secret-keys
+
 pre-bootstrap: \
 	data/media \
 	data/static \
-	create-env-local-files
+	create-env-local-files \
+	generate-secret-keys
 .PHONY: pre-bootstrap
 
 post-bootstrap: \

README.md

@@ -147,6 +147,11 @@ $ make frontend-test
 $ make frontend-lint
 ```
 
+Backend tests can be run without docker. This is useful to configure PyCharm of VSCode to do it. 
+Removing docker for testing requires to overwrite some URL and port values that are different in and out of 
+Docker. `env.d/development/common` contains all variables, some fo them having to be overwritten by those in
+`env.d/development/common.test`.
+
 **Adding content**
 
 You can create a basic demo site by running this command:

bin/fernetkey

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=bin/_config.sh
-source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
-
-_dc_run app-dev python -c 'from cryptography.fernet import Fernet;import sys; sys.stdout.write("\n" + Fernet.generate_key().decode() + "\n");'

bin/generate-oidc-store-refresh-token-key.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Generate the secret OIDC_STORE_REFRESH_TOKEN_KEY and store it to common.local
+
+set -eo pipefail
+
+COMMON_LOCAL="env.d/development/common.local"
+
+OIDC_STORE_REFRESH_TOKEN_KEY=$(openssl rand -base64 32)
+
+echo "OIDC_STORE_REFRESH_TOKEN_KEY=${OIDC_STORE_REFRESH_TOKEN_KEY}" > "${COMMON_LOCAL}"
+echo "✓ OIDC_STORE_REFRESH_TOKEN_KEY generated and stored in ${COMMON_LOCAL}"

docs/env.md

@@ -21,9 +21,10 @@ These are the environment variables you can set for the `impress-backend` contai
 | AWS_S3_ENDPOINT_URL                             | S3 endpoint                                                                                                                                                                |                                                                         |
 | AWS_S3_REGION_NAME                              | Region name for s3 endpoint                                                                                                                                                |                                                                         |
 | AWS_S3_SECRET_ACCESS_KEY                        | Access key for s3 endpoint                                                                                                                                                 |                                                                         |
+| AWS_S3_SIGNATURE_VERSION                        | S3 signature version (`s3v4` or `s3`)                                                                                                                                      | s3v4                                                                    |
 | AWS_STORAGE_BUCKET_NAME                         | Bucket name for s3 endpoint                                                                                                                                                | impress-media-storage                                                   |
 | CACHES_DEFAULT_TIMEOUT                          | Cache default timeout                                                                                                                                                      | 30                                                                      |
-| CACHES_DEFAULT_KEY_PREFIX                               | The prefix used to every cache keys.                                                                                                                                       | docs                                                                    |
+| CACHES_DEFAULT_KEY_PREFIX                       | The prefix used to every cache keys.                                                                                                                                       | docs                                                                    |
 | COLLABORATION_API_URL                           | Collaboration api host                                                                                                                                                     |                                                                         |
 | COLLABORATION_SERVER_SECRET                     | Collaboration api secret                                                                                                                                                   |                                                                         |
 | COLLABORATION_WS_NOT_CONNECTED_READY_ONLY       | Users not connected to the collaboration server cannot edit                                                                                                                | false                                                                   |
@@ -33,7 +34,7 @@ These are the environment variables you can set for the `impress-backend` contai
 | CONVERSION_API_SECURE                           | Require secure conversion api                                                                                                                                              | false                                                                   |
 | CONVERSION_API_TIMEOUT                          | Conversion api timeout                                                                                                                                                     | 30                                                                      |
 | CONVERSION_FILE_MAX_SIZE                        | The file max size allowed when uploaded to convert it                                                                                                                      | 20971520 (20MB)                                                         |
-| CONVERSION_FILE_EXTENSIONS_ALLOWED              | Extension list managed by the conversion service                                                                                                                           | [".docx", ".md"]
+| CONVERSION_FILE_EXTENSIONS_ALLOWED              | Extension list managed by the conversion service                                                                                                                           | [".docx", ".md"]                                                        |
 | CRISP_WEBSITE_ID                                | Crisp website id for support                                                                                                                                               |                                                                         |
 | DB_ENGINE                                       | Engine to use for database connections                                                                                                                                     | django.db.backends.postgresql_psycopg2                                  |
 | DB_HOST                                         | Host of the database                                                                                                                                                       | localhost                                                               |
@@ -56,15 +57,15 @@ These are the environment variables you can set for the `impress-backend` contai
 | DJANGO_EMAIL_HOST_USER                          | User to authenticate with on the email host                                                                                                                                |                                                                         |
 | DJANGO_EMAIL_LOGO_IMG                           | Logo for the email                                                                                                                                                         |                                                                         |
 | DJANGO_EMAIL_PORT                               | Port used to connect to email host                                                                                                                                         |                                                                         |
-| DJANGO_EMAIL_URL_APP                            | Url used in the email to go to the app                                                                                                                                         |                                                                         |
+| DJANGO_EMAIL_URL_APP                            | Url used in the email to go to the app                                                                                                                                     |                                                                         |
 | DJANGO_EMAIL_USE_SSL                            | Use ssl for email host connection                                                                                                                                          | false                                                                   |
 | DJANGO_EMAIL_USE_TLS                            | Use tls for email host connection                                                                                                                                          | false                                                                   |
 | DJANGO_SECRET_KEY                               | Secret key                                                                                                                                                                 |                                                                         |
 | DJANGO_SERVER_TO_SERVER_API_TOKENS              |                                                                                                                                                                            | []                                                                      |
-| DOCSPEC_API_URL                               | URL to endpoint of DocSpec conversion API    |            |
+| DOCSPEC_API_URL                                 | URL to endpoint of DocSpec conversion API                                                                                                                                  |                                                                         |
 | DOCUMENT_IMAGE_MAX_SIZE                         | Maximum size of document in bytes                                                                                                                                          | 10485760                                                                |
 | FRONTEND_CSS_URL                                | To add a external css file to the app                                                                                                                                      |                                                                         |
-| FRONTEND_JS_URL                                | To add a external js file to the app                                                                                                                                      |                                                                         |
+| FRONTEND_JS_URL                                 | To add a external js file to the app                                                                                                                                       |                                                                         |
 | FRONTEND_HOMEPAGE_FEATURE_ENABLED               | Frontend feature flag to display the homepage                                                                                                                              | false                                                                   |
 | FRONTEND_THEME                                  | Frontend theme to use                                                                                                                                                      |                                                                         |
 | LANGUAGE_CODE                                   | Default language                                                                                                                                                           | en-us                                                                   |
@@ -98,6 +99,9 @@ These are the environment variables you can set for the `impress-backend` contai
 | OIDC_RP_SCOPES                                  | Scopes requested for OIDC                                                                                                                                                  | openid email                                                            |
 | OIDC_RP_SIGN_ALGO                               | verification algorithm used OIDC tokens                                                                                                                                    | RS256                                                                   |
 | OIDC_STORE_ID_TOKEN                             | Store OIDC token                                                                                                                                                           | true                                                                    |
+| OIDC_STORE_ACCESS_TOKEN                         | If True stores OIDC access token in session.                                                                                                                               | false                                                                   |
+| OIDC_STORE_REFRESH_TOKEN                        | If True stores OIDC refresh token in session.                                                                                                                              | false                                                                   |
+| OIDC_STORE_REFRESH_TOKEN_KEY                    | Key to encrypt refresh token stored in session, must be a valid Fernet key                                                                                                 |                                                                         |    
 | OIDC_USERINFO_FULLNAME_FIELDS                   | OIDC token claims to create full name                                                                                                                                      | ["first_name", "last_name"]                                             |
 | OIDC_USERINFO_SHORTNAME_FIELD                   | OIDC token claims to create shortname                                                                                                                                      | first_name                                                              |
 | OIDC_USE_NONCE                                  | Use nonce for OIDC                                                                                                                                                         | true                                                                    |
@@ -107,8 +111,9 @@ These are the environment variables you can set for the `impress-backend` contai
 | SEARCH_INDEXER_CLASS                            | Class of the backend for document indexation & search                                                                                                                      |                                                                         |
 | SEARCH_INDEXER_COUNTDOWN                        | Minimum debounce delay of indexation jobs (in seconds)                                                                                                                     | 1                                                                       |
 | SEARCH_INDEXER_QUERY_LIMIT                      | Maximum number of results expected from search endpoint                                                                                                                    | 50                                                                      |
-| SEARCH_INDEXER_SECRET                           | Token for indexation queries                                                                                                                                               |                                                                         |
-| SEARCH_INDEXER_URL                              | Find application endpoint for indexation                                                                                                                                   |                                                                         |
+| SEARCH_URL                        | Find application endpoint for search queries                                                                                                                               |                                                                         |
+| SEARCH_INDEXER_SECRET                           | Token required for indexation queries                                                                                                                                      |                                                                         |
+| INDEXING_URL                                    | Find application endpoint for indexation                                                                                                                                   |                                                                         |
 | SENTRY_DSN                                      | Sentry host                                                                                                                                                                |                                                                         |
 | SESSION_COOKIE_AGE                              | duration of the cookie session                                                                                                                                             | 60*60*12                                                                |
 | SIGNUP_NEW_USER_TO_MARKETING_EMAIL              | Register new user to the marketing onboarding. If True, see env LASUITE_MARKETING_* system                                                                                 | False                                                                   |

docs/search.md

@@ -1,8 +1,8 @@
-# Setup the Find search for Impress
+# Setup Find search for Docs
 
-This configuration will enable the fulltext search feature for Docs :
-- Each save on **core.Document** or **core.DocumentAccess** will trigger the indexer
-- The `api/v1.0/documents/search/` will work as a proxy with the Find API for fulltext search.
+This configuration will enable Find searches:
+- Each save on **core.Document** or **core.DocumentAccess** will trigger the indexing of the document into Find.
+- The `api/v1.0/documents/search/` will be used as proxy for searching documents from Find indexes.
 
 ## Create an index service for Docs
 
@@ -15,27 +15,38 @@ See [how-to-use-indexer.md](how-to-use-indexer.md) for details.
 
 ## Configure settings of Docs
 
-Add those Django settings the Docs application to enable the feature.
+Find uses a service provider authentication for indexing and a OIDC authentication for searching.
+
+Add those Django settings to the Docs application to enable the feature.
 
 ```shell
 SEARCH_INDEXER_CLASS="core.services.search_indexers.FindDocumentIndexer"
+
 SEARCH_INDEXER_COUNTDOWN=10  # Debounce delay in seconds for the indexer calls.
+SEARCH_INDEXER_QUERY_LIMIT=50 # Maximum number of results expected from the search endpoint
 
-# The token from service "docs" of Find application (development).
+INDEXING_URL="http://find:8000/api/v1.0/documents/index/"
+SEARCH_URL="http://find:8000/api/v1.0/documents/search/"
+
+# Service provider authentication
 SEARCH_INDEXER_SECRET="find-api-key-for-docs-with-exactly-50-chars-length"
-SEARCH_INDEXER_URL="http://find:8000/api/v1.0/documents/index/"
 
-# Search endpoint. Uses the OIDC token for authentication
-SEARCH_INDEXER_QUERY_URL="http://find:8000/api/v1.0/documents/search/"
-# Maximum number of results expected from the search endpoint
-SEARCH_INDEXER_QUERY_LIMIT=50
+# OIDC authentication
+OIDC_STORE_ACCESS_TOKEN=True  # Store the access token in the session
+OIDC_STORE_REFRESH_TOKEN=True  # Store the encrypted refresh token in the session
+OIDC_STORE_REFRESH_TOKEN_KEY="<your-32-byte-encryption-key==>"
 ```
 
-We also need to enable the **OIDC Token** refresh or the authentication will fail quickly.
+`OIDC_STORE_REFRESH_TOKEN_KEY` must be a valid Fernet key (32 url-safe base64-encoded bytes).
+To create one, use the `bin/generate-oidc-store-refresh-token-key.sh` command.
 
-```shell
-# Store OIDC tokens in the session
-OIDC_STORE_ACCESS_TOKEN = True  # Store the access token in the session
-OIDC_STORE_REFRESH_TOKEN = True  # Store the encrypted refresh token in the session
-OIDC_STORE_REFRESH_TOKEN_KEY = "your-32-byte-encryption-key=="  # Must be a valid Fernet key (32 url-safe base64-encoded bytes)
-```
+## Feature flags
+
+The Find search integration is controlled by two feature flags:
+- `flag_find_hybrid_search`
+- `flag_find_full_text_search`
+
+If a user has both flags activated the most advanced search is used (hybrid > full text > title).
+A user with no flag will default to the basic title search.
+
+Feature flags can be activated through the admin interface. 

env.d/development/common

@@ -52,12 +52,8 @@ OIDC_REDIRECT_ALLOWED_HOSTS="localhost:8083,localhost:3000"
 OIDC_AUTH_REQUEST_EXTRA_PARAMS={"acr_values": "eidas1"}
 
 # Store OIDC tokens in the session. Needed by search/ endpoint.
-# OIDC_STORE_ACCESS_TOKEN = True
-# OIDC_STORE_REFRESH_TOKEN = True # Store the encrypted refresh token in the session.
-
-# Must be a valid Fernet key (32 url-safe base64-encoded bytes)
-# To create one, use the bin/fernetkey command.
-# OIDC_STORE_REFRESH_TOKEN_KEY="your-32-byte-encryption-key=="
+OIDC_STORE_ACCESS_TOKEN=True
+OIDC_STORE_REFRESH_TOKEN=True # Store the encrypted refresh token in the session.
 
 # AI
 AI_FEATURE_ENABLED=true
@@ -82,8 +78,9 @@ DOCSPEC_API_URL=http://docspec:4000/conversion
 # Theme customization
 THEME_CUSTOMIZATION_CACHE_TIMEOUT=15
 
-# Indexer (disabled)
-# SEARCH_INDEXER_CLASS="core.services.search_indexers.SearchIndexer"
+# Indexer
+SEARCH_INDEXER_CLASS=core.services.search_indexers.FindDocumentIndexer
 SEARCH_INDEXER_SECRET=find-api-key-for-docs-with-exactly-50-chars-length  # Key generated by create_demo in Find app.
-SEARCH_INDEXER_URL="http://find:8000/api/v1.0/documents/index/"
-SEARCH_INDEXER_QUERY_URL="http://find:8000/api/v1.0/documents/search/"
+INDEXING_URL=http://find:8000/api/v1.0/documents/index/
+SEARCH_URL=http://find:8000/api/v1.0/documents/search/
+SEARCH_INDEXER_QUERY_LIMIT=50

env.d/development/common.test

@@ -0,0 +1,7 @@
+# Test environment configuration for running tests without docker
+# Base configuration is loaded from 'common' file
+
+DJANGO_SETTINGS_MODULE=impress.settings
+DJANGO_CONFIGURATION=Test
+DB_PORT=15432
+AWS_S3_ENDPOINT_URL=http://localhost:9000

src/backend/core/api/permissions.py

@@ -12,6 +12,7 @@ from core.models import DocumentAccess, RoleChoices, get_trashbin_cutoff
 ACTION_FOR_METHOD_TO_PERMISSION = {
     "versions_detail": {"DELETE": "versions_destroy", "GET": "versions_retrieve"},
     "children": {"GET": "children_list", "POST": "children_create"},
+    "search": {"GET": "retrieve"},
 }
 
 

src/backend/core/api/serializers.py

@@ -980,8 +980,5 @@ class ThreadSerializer(serializers.ModelSerializer):
 class SearchDocumentSerializer(serializers.Serializer):
     """Serializer for fulltext search requests through Find application"""
 
-    q = serializers.CharField(required=True, allow_blank=False, trim_whitespace=True)
-    page_size = serializers.IntegerField(
-        required=False, min_value=1, max_value=50, default=20
-    )
-    page = serializers.IntegerField(required=False, min_value=1, default=1)
+    q = serializers.CharField(required=True, allow_blank=True, trim_whitespace=True)
+    path = serializers.CharField(required=False, allow_blank=False)

src/backend/core/api/viewsets.py

@@ -32,6 +32,7 @@ from django.utils.translation import gettext_lazy as _
 
 import requests
 import rest_framework as drf
+import waffle
 from botocore.exceptions import ClientError
 from csp.constants import NONE
 from csp.decorators import csp_update
@@ -63,8 +64,13 @@ from core.services.search_indexers import (
 from core.tasks.mail import send_ask_for_access_mail
 from core.utils import extract_attachments, filter_descendants
 
+from ..enums import SearchType
 from . import permissions, serializers, utils
-from .filters import DocumentFilter, ListDocumentFilter, UserSearchFilter
+from .filters import (
+    DocumentFilter,
+    ListDocumentFilter,
+    UserSearchFilter,
+)
 from .throttling import (
     DocumentThrottle,
     UserListThrottleBurst,
@@ -459,14 +465,12 @@ class DocumentViewSet(
         It performs early filtering on model fields, annotates user roles, and removes
         descendant documents to keep only the highest ancestors readable by the current user.
         """
-        user = self.request.user
+        user = request.user
 
         # Not calling filter_queryset. We do our own cooking.
         queryset = self.get_queryset()
 
-        filterset = ListDocumentFilter(
-            self.request.GET, queryset=queryset, request=self.request
-        )
+        filterset = ListDocumentFilter(request.GET, queryset=queryset, request=request)
         if not filterset.is_valid():
             raise drf.exceptions.ValidationError(filterset.errors)
         filter_data = filterset.form.cleaned_data
@@ -956,26 +960,6 @@ class DocumentViewSet(
 
         return self.get_response_for_queryset(queryset)
 
-    @drf.decorators.action(
-        detail=True,
-        methods=["get"],
-        ordering=["path"],
-    )
-    def descendants(self, request, *args, **kwargs):
-        """Handle listing descendants of a document"""
-        document = self.get_object()
-
-        queryset = document.get_descendants().filter(ancestors_deleted_at__isnull=True)
-        queryset = self.filter_queryset(queryset)
-
-        filterset = DocumentFilter(request.GET, queryset=queryset)
-        if not filterset.is_valid():
-            raise drf.exceptions.ValidationError(filterset.errors)
-
-        queryset = filterset.qs
-
-        return self.get_response_for_queryset(queryset)
-
     @drf.decorators.action(
         detail=True,
         methods=["get"],
@@ -1183,57 +1167,6 @@ class DocumentViewSet(
             {"id": str(duplicated_document.id)}, status=status.HTTP_201_CREATED
         )
 
-    def _search_simple(self, request, text):
-        """
-        Returns a queryset filtered by the content of the document title
-        """
-        # As the 'list' view we get a prefiltered queryset (deleted docs are excluded)
-        queryset = self.get_queryset()
-        filterset = DocumentFilter({"title": text}, queryset=queryset)
-
-        if not filterset.is_valid():
-            raise drf.exceptions.ValidationError(filterset.errors)
-
-        queryset = filterset.filter_queryset(queryset)
-
-        return self.get_response_for_queryset(
-            queryset.order_by("-updated_at"),
-            context={
-                "request": request,
-            },
-        )
-
-    def _search_fulltext(self, indexer, request, params):
-        """
-        Returns a queryset from the results the fulltext search of Find
-        """
-        access_token = request.session.get("oidc_access_token")
-        user = request.user
-        text = params.validated_data["q"]
-        queryset = models.Document.objects.all()
-
-        # Retrieve the documents ids from Find.
-        results = indexer.search(
-            text=text,
-            token=access_token,
-            visited=get_visited_document_ids_of(queryset, user),
-        )
-
-        docs_by_uuid = {str(d.pk): d for d in queryset.filter(pk__in=results)}
-        ordered_docs = [docs_by_uuid[id] for id in results]
-
-        page = self.paginate_queryset(ordered_docs)
-
-        serializer = self.get_serializer(
-            page if page else ordered_docs,
-            many=True,
-            context={
-                "request": request,
-            },
-        )
-
-        return self.get_paginated_response(serializer.data)
-
     @drf.decorators.action(detail=False, methods=["get"], url_path="search")
     @method_decorator(refresh_oidc_access_token)
     def search(self, request, *args, **kwargs):
@@ -1250,15 +1183,110 @@ class DocumentViewSet(
         """
         params = serializers.SearchDocumentSerializer(data=request.query_params)
         params.is_valid(raise_exception=True)
+        search_type = self._get_search_type()
+
+        if search_type == SearchType.TITLE:
+            return self._title_search(request, params.validated_data, *args, **kwargs)
 
         indexer = get_document_indexer()
+        if indexer is None:
+            # fallback on title search if the indexer is not configured
+            return self._title_search(request, params.validated_data, *args, **kwargs)
 
-        if indexer:
-            return self._search_fulltext(indexer, request, params=params)
+        try:
+            return self._search_with_indexer(
+                indexer, request, params=params, search_type=search_type
+            )
+        except requests.exceptions.RequestException as e:
+            logger.error("Error while searching documents with indexer: %s", e)
+            # fallback on title search if the indexer is not reached
+            return self._title_search(request, params.validated_data, *args, **kwargs)
 
-        # The indexer is not configured, we fallback on a simple icontains filter by the
-        # model field 'title'.
-        return self._search_simple(request, text=params.validated_data["q"])
+    def _get_search_type(self) -> SearchType:
+        """
+        Returns the search type to use for the search endpoint based on feature flags.
+        If a user has both flags activated the most advanced search is used
+        (HYBRID > FULL_TEXT > TITLE).
+        A user with no flag will default to the basic title search.
+        """
+        if waffle.flag_is_active(self.request, "flag_find_hybrid_search"):
+            return SearchType.HYBRID
+        if waffle.flag_is_active(self.request, "flag_find_full_text_search"):
+            return SearchType.FULL_TEXT
+        return SearchType.TITLE
+
+    @staticmethod
+    def _search_with_indexer(indexer, request, params, search_type):
+        """
+        Returns a list of documents matching the query (q) according to the configured indexer.
+        """
+        queryset = models.Document.objects.all()
+
+        results = indexer.search(
+            q=params.validated_data["q"],
+            search_type=search_type,
+            token=request.session.get("oidc_access_token"),
+            path=(
+                params.validated_data["path"]
+                if "path" in params.validated_data
+                else None
+            ),
+            visited=get_visited_document_ids_of(queryset, request.user),
+        )
+
+        return drf_response.Response(
+            {
+                "count": len(results),
+                "next": None,
+                "previous": None,
+                "results": results,
+            }
+        )
+
+    def _title_search(self, request, validated_data, *args, **kwargs):
+        """
+        Fallback search method when no indexer is configured.
+        Only searches in the title field of documents.
+        """
+        request.GET = request.GET.copy()
+        request.GET["title"] = validated_data["q"]
+
+        if "path" not in validated_data or not validated_data["path"]:
+            return self.list(request, *args, **kwargs)
+
+        return self._list_descendants(request)
+
+    def _list_descendants(self, request):
+        """
+        List all documents whose path starts with the provided path parameter.
+        Includes the parent document itself.
+        Used internally by the search endpoint when path filtering is requested.
+        """
+        # Get parent document without access filtering
+        parent_path = request.GET["path"]
+        try:
+            parent = models.Document.objects.get(path=parent_path)
+        except models.Document.DoesNotExist as exc:
+            raise drf.exceptions.NotFound("Document not found from path.") from exc
+
+        # Check object-level permissions using DocumentPermission logic
+        self.check_object_permissions(request, parent)
+
+        # Get descendants and include the parent, ordered by path
+        queryset = (
+            parent.get_descendants(include_self=True)
+            .filter(ancestors_deleted_at__isnull=True)
+            .order_by("path")
+        )
+        queryset = self.filter_queryset(queryset)
+
+        # filter by title
+        filterset = DocumentFilter(request.GET, queryset=queryset)
+        if not filterset.is_valid():
+            raise drf.exceptions.ValidationError(filterset.errors)
+
+        queryset = filterset.qs
+        return self.get_response_for_queryset(queryset)
 
     @drf.decorators.action(detail=True, methods=["get"], url_path="versions")
     def versions_list(self, request, *args, **kwargs):

src/backend/core/enums.py

@@ -3,7 +3,7 @@ Core application enums declaration
 """
 
 import re
-from enum import StrEnum
+from enum import Enum, StrEnum
 
 from django.conf import global_settings, settings
 from django.db import models
@@ -46,3 +46,15 @@ class DocumentAttachmentStatus(StrEnum):
 
     PROCESSING = "processing"
     READY = "ready"
+
+
+class SearchType(str, Enum):
+    """
+    Defines the possible search types for a document search query.
+        - TITLE: DRF based search in the title of the documents only.
+        - HYBRID and FULL_TEXT: more advanced search based on Find indexer.
+    """
+
+    TITLE = "title"
+    HYBRID = "hybrid"
+    FULL_TEXT = "full-text"

src/backend/core/services/search_indexers.py

@@ -8,12 +8,12 @@ from functools import cache
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import ImproperlyConfigured
-from django.db.models import Subquery
 from django.utils.module_loading import import_string
 
 import requests
 
 from core import models, utils
+from core.enums import SearchType
 
 logger = logging.getLogger(__name__)
 
@@ -69,7 +69,7 @@ def get_batch_accesses_by_users_and_teams(paths):
     return dict(access_by_document_path)
 
 
-def get_visited_document_ids_of(queryset, user):
+def get_visited_document_ids_of(queryset, user) -> tuple[str, ...]:
     """
     Returns the ids of the documents that have a linktrace to the user and NOT owned.
     It will be use to limit the opensearch responses to the public documents already
@@ -78,7 +78,9 @@ def get_visited_document_ids_of(queryset, user):
     if isinstance(user, AnonymousUser):
         return []
 
-    qs = models.LinkTrace.objects.filter(user=user)
+    visited_ids = models.LinkTrace.objects.filter(user=user).values_list(
+        "document_id", flat=True
+    )
 
     docs = (
         queryset.exclude(accesses__user=user)
@@ -86,12 +88,12 @@ def get_visited_document_ids_of(queryset, user):
             deleted_at__isnull=True,
             ancestors_deleted_at__isnull=True,
         )
-        .filter(pk__in=Subquery(qs.values("document_id")))
+        .filter(pk__in=visited_ids)
         .order_by("pk")
         .distinct("pk")
     )
 
-    return [str(id) for id in docs.values_list("pk", flat=True)]
+    return tuple(str(id) for id in docs.values_list("pk", flat=True))
 
 
 class BaseDocumentIndexer(ABC):
@@ -107,15 +109,13 @@ class BaseDocumentIndexer(ABC):
         Initialize the indexer.
         """
         self.batch_size = settings.SEARCH_INDEXER_BATCH_SIZE
-        self.indexer_url = settings.SEARCH_INDEXER_URL
+        self.indexer_url = settings.INDEXING_URL
         self.indexer_secret = settings.SEARCH_INDEXER_SECRET
-        self.search_url = settings.SEARCH_INDEXER_QUERY_URL
+        self.search_url = settings.SEARCH_URL
         self.search_limit = settings.SEARCH_INDEXER_QUERY_LIMIT
 
         if not self.indexer_url:
-            raise ImproperlyConfigured(
-                "SEARCH_INDEXER_URL must be set in Django settings."
-            )
+            raise ImproperlyConfigured("INDEXING_URL must be set in Django settings.")
 
         if not self.indexer_secret:
             raise ImproperlyConfigured(
@@ -123,9 +123,7 @@ class BaseDocumentIndexer(ABC):
             )
 
         if not self.search_url:
-            raise ImproperlyConfigured(
-                "SEARCH_INDEXER_QUERY_URL must be set in Django settings."
-            )
+            raise ImproperlyConfigured("SEARCH_URL must be set in Django settings.")
 
     def index(self, queryset=None, batch_size=None):
         """
@@ -184,8 +182,16 @@ class BaseDocumentIndexer(ABC):
         Must be implemented by subclasses.
         """
 
-    # pylint: disable-next=too-many-arguments,too-many-positional-arguments
-    def search(self, text, token, visited=(), nb_results=None):
+    # pylint: disable=too-many-arguments, too-many-positional-arguments
+    def search(  # noqa : PLR0913
+        self,
+        q: str,
+        token: str,
+        visited: tuple[str, ...] = (),
+        nb_results: int = None,
+        path: str = None,
+        search_type: SearchType = None,
+    ):
         """
         Search for documents in Find app.
         Ensure the same default ordering as "Docs" list : -updated_at
@@ -193,7 +199,7 @@ class BaseDocumentIndexer(ABC):
         Returns ids of the documents
 
         Args:
-            text (str): Text search content.
+            q (str): user query.
             token (str): OIDC Authentication token.
             visited (list, optional):
                 List of ids of active public documents with LinkTrace
@@ -201,21 +207,27 @@ class BaseDocumentIndexer(ABC):
             nb_results (int, optional):
                 The number of results to return.
                 Defaults to 50 if not specified.
+            path (str, optional):
+                The parent path to search descendants of.
+            search_type:
+                hybrid or full-text search
         """
         nb_results = nb_results or self.search_limit
-        response = self.search_query(
+        results = self.search_query(
             data={
-                "q": text,
+                "q": q,
                 "visited": visited,
                 "services": ["docs"],
                 "nb_results": nb_results,
                 "order_by": "updated_at",
                 "order_direction": "desc",
+                "path": path,
+                "search_type": search_type,
             },
             token=token,
         )
 
-        return [d["_id"] for d in response]
+        return results
 
     @abstractmethod
     def search_query(self, data, token) -> dict:
@@ -226,11 +238,76 @@ class BaseDocumentIndexer(ABC):
         """
 
 
-class SearchIndexer(BaseDocumentIndexer):
+class FindDocumentIndexer(BaseDocumentIndexer):
     """
-    Document indexer that pushes documents to La Suite Find app.
+    Document indexer that indexes and searches documents with La Suite Find app.
     """
 
+    # pylint: disable=too-many-arguments, too-many-positional-arguments
+    def search(  # noqa : PLR0913
+        self,
+        q: str,
+        token: str,
+        visited: tuple[()] = (),
+        nb_results: int = None,
+        path: str = None,
+        search_type: SearchType = None,
+    ):
+        """format Find search results"""
+        search_results = (
+            super()
+            .search(
+                q=q,
+                token=token,
+                visited=visited,
+                nb_results=nb_results,
+                path=path,
+                search_type=search_type,
+            )
+            .get("results", [])
+        )
+        return [
+            {
+                **hit["_source"],
+                "id": hit["_id"],
+                "title": self.get_title(hit["_source"]),
+            }
+            for hit in search_results
+        ]
+
+    @staticmethod
+    def get_title(source):
+        """
+        Find returns the titles with an extension depending on the language.
+        This function extracts the title in a generic way.
+
+        Handles multiple cases:
+        - Localized title fields like "title.<some_extension>"
+        - Fallback to plain "title" field if localized version not found
+        - Returns empty string if no title field exists
+
+        Args:
+            source (dict): The _source dictionary from a search hit
+
+        Returns:
+            str: The extracted title or empty string if not found
+
+        Example:
+            >>> get_title({"title.fr": "Bonjour", "id": 1})
+            "Bonjour"
+            >>> get_title({"title": "Hello", "id": 1})
+            "Hello"
+            >>> get_title({"id": 1})
+            ""
+        """
+        titles = utils.get_value_by_pattern(source, r"^title\.")
+        for title in titles:
+            if title:
+                return title
+        if "title" in source:
+            return source["title"]
+        return ""
+
     def serialize_document(self, document, accesses):
         """
         Convert a Document to the JSON format expected by La Suite Find.

src/backend/core/tasks/search.py

@@ -63,7 +63,7 @@ def batch_document_indexer_task(timestamp):
         logger.info("Indexed %d documents", count)
 
 
-def trigger_batch_document_indexer(item):
+def trigger_batch_document_indexer(document):
     """
     Trigger indexation task with debounce a delay set by the SEARCH_INDEXER_COUNTDOWN setting.
 
@@ -82,14 +82,14 @@ def trigger_batch_document_indexer(item):
         if batch_indexer_throttle_acquire(timeout=countdown):
             logger.info(
                 "Add task for batch document indexation from updated_at=%s in %d seconds",
-                item.updated_at.isoformat(),
+                document.updated_at.isoformat(),
                 countdown,
             )
 
             batch_document_indexer_task.apply_async(
-                args=[item.updated_at], countdown=countdown
+                args=[document.updated_at], countdown=countdown
             )
         else:
-            logger.info("Skip task for batch document %s indexation", item.pk)
+            logger.info("Skip task for batch document %s indexation", document.pk)
     else:
-        document_indexer_task.apply(args=[item.pk])
+        document_indexer_task.apply(args=[document.pk])

src/backend/core/tests/commands/test_index.py

@@ -11,7 +11,7 @@ from django.db import transaction
 import pytest
 
 from core import factories
-from core.services.search_indexers import SearchIndexer
+from core.services.search_indexers import FindDocumentIndexer
 
 
 @pytest.mark.django_db
@@ -19,7 +19,7 @@ from core.services.search_indexers import SearchIndexer
 def test_index():
     """Test the command `index` that run the Find app indexer for all the available documents."""
     user = factories.UserFactory()
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     with transaction.atomic():
         doc = factories.DocumentFactory()
@@ -36,7 +36,7 @@ def test_index():
         str(no_title_doc.path): {"users": [user.sub]},
     }
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         call_command("index")
 
         push_call_args = [call.args[0] for call in mock_push.call_args_list]

src/backend/core/tests/conftest.py

@@ -39,12 +39,10 @@ def indexer_settings_fixture(settings):
 
     get_document_indexer.cache_clear()
 
-    settings.SEARCH_INDEXER_CLASS = "core.services.search_indexers.SearchIndexer"
+    settings.SEARCH_INDEXER_CLASS = "core.services.search_indexers.FindDocumentIndexer"
     settings.SEARCH_INDEXER_SECRET = "ThisIsAKeyForTest"
-    settings.SEARCH_INDEXER_URL = "http://localhost:8081/api/v1.0/documents/index/"
-    settings.SEARCH_INDEXER_QUERY_URL = (
-        "http://localhost:8081/api/v1.0/documents/search/"
-    )
+    settings.INDEXING_URL = "http://localhost:8081/api/v1.0/documents/index/"
+    settings.SEARCH_URL = "http://localhost:8081/api/v1.0/documents/search/"
     settings.SEARCH_INDEXER_COUNTDOWN = 1
 
     yield settings

src/backend/core/tests/documents/test_api_documents_descendants_filters.py

@@ -1,95 +0,0 @@
-"""
-Tests for Documents API endpoint in impress's core app: list
-"""
-
-import pytest
-from faker import Faker
-from rest_framework.test import APIClient
-
-from core import factories
-from core.api.filters import remove_accents
-
-fake = Faker()
-pytestmark = pytest.mark.django_db
-
-
-# Filters: unknown field
-
-
-def test_api_documents_descendants_filter_unknown_field():
-    """
-    Trying to filter by an unknown field should be ignored.
-    """
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory()
-
-    document = factories.DocumentFactory(users=[user])
-    expected_ids = {
-        str(document.id)
-        for document in factories.DocumentFactory.create_batch(2, parent=document)
-    }
-
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/?unknown=true"
-    )
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == 2
-    assert {result["id"] for result in results} == expected_ids
-
-
-# Filters: title
-
-
-@pytest.mark.parametrize(
-    "query,nb_results",
-    [
-        ("Project Alpha", 1),  # Exact match
-        ("project", 2),  # Partial match (case-insensitive)
-        ("Guide", 2),  # Word match within a title
-        ("Special", 0),  # No match (nonexistent keyword)
-        ("2024", 2),  # Match by numeric keyword
-        ("", 6),  # Empty string
-        ("velo", 1),  # Accent-insensitive match (velo vs vélo)
-        ("bêta", 1),  # Accent-insensitive match (bêta vs beta)
-    ],
-)
-def test_api_documents_descendants_filter_title(query, nb_results):
-    """Authenticated users should be able to search documents by their unaccented title."""
-    user = factories.UserFactory()
-    client = APIClient()
-    client.force_login(user)
-
-    document = factories.DocumentFactory(users=[user])
-
-    # Create documents with predefined titles
-    titles = [
-        "Project Alpha Documentation",
-        "Project Beta Overview",
-        "User Guide",
-        "Financial Report 2024",
-        "Annual Review 2024",
-        "Guide du vélo urbain",  # <-- Title with accent for accent-insensitive test
-    ]
-    for title in titles:
-        factories.DocumentFactory(title=title, parent=document)
-
-    # Perform the search query
-    response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/?title={query:s}"
-    )
-
-    assert response.status_code == 200
-    results = response.json()["results"]
-    assert len(results) == nb_results
-
-    # Ensure all results contain the query in their title
-    for result in results:
-        assert (
-            remove_accents(query).lower().strip()
-            in remove_accents(result["title"]).lower()
-        )

src/backend/core/tests/documents/test_api_documents_search.py

@@ -1,46 +1,40 @@
 """
-Tests for Documents API endpoint in impress's core app: list
+Tests for Documents API endpoint in impress's core app: search
 """
 
-import random
-from json import loads as json_loads
-
-from django.test import RequestFactory
+from unittest import mock
 
 import pytest
 import responses
 from faker import Faker
+from rest_framework import response as drf_response
 from rest_framework.test import APIClient
+from waffle.testutils import override_flag
 
-from core import factories, models
+from core import factories
+from core.enums import SearchType
 from core.services.search_indexers import get_document_indexer
 
 fake = Faker()
 pytestmark = pytest.mark.django_db
 
 
-def build_search_url(**kwargs):
-    """Build absolute uri for search endpoint with ORDERED query arguments"""
-    return (
-        RequestFactory()
-        .get("/api/v1.0/documents/search/", dict(sorted(kwargs.items())))
-        .build_absolute_uri()
-    )
+@pytest.fixture(autouse=True)
+def enable_flag_find_hybrid_search():
+    """Enable flag_find_hybrid_search for all tests in this module."""
+    with override_flag("flag_find_hybrid_search", active=True):
+        yield
 
 
-@pytest.mark.parametrize("role", models.LinkRoleChoices.values)
-@pytest.mark.parametrize("reach", models.LinkReachChoices.values)
+@mock.patch("core.services.search_indexers.FindDocumentIndexer.search_query")
 @responses.activate
-def test_api_documents_search_anonymous(reach, role, indexer_settings):
+def test_api_documents_search_anonymous(search_query, indexer_settings):
     """
-    Anonymous users should not be allowed to search documents whatever the
-    link reach and link role
+    Anonymous users should be allowed to search documents with Find.
     """
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = "http://find/api/v1.0/search"
+    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
 
-    factories.DocumentFactory(link_reach=reach, link_role=role)
-
-    # Find response
+    # mock Find response
     responses.add(
         responses.POST,
         "http://find/api/v1.0/search",
@@ -48,7 +42,23 @@ def test_api_documents_search_anonymous(reach, role, indexer_settings):
         status=200,
     )
 
-    response = APIClient().get("/api/v1.0/documents/search/", data={"q": "alpha"})
+    q = "alpha"
+    response = APIClient().get("/api/v1.0/documents/search/", data={"q": q})
+
+    assert search_query.call_count == 1
+    assert search_query.call_args[1] == {
+        "data": {
+            "q": q,
+            "visited": [],
+            "services": ["docs"],
+            "nb_results": 50,
+            "order_by": "updated_at",
+            "order_direction": "desc",
+            "path": None,
+            "search_type": SearchType.HYBRID,
+        },
+        "token": None,
+    }
 
     assert response.status_code == 200
     assert response.json() == {
@@ -59,64 +69,121 @@ def test_api_documents_search_anonymous(reach, role, indexer_settings):
     }
 
 
-def test_api_documents_search_endpoint_is_none(indexer_settings):
+@mock.patch("core.api.viewsets.DocumentViewSet.list")
+def test_api_documents_search_fall_back_on_search_list(mock_list, indexer_settings):
     """
-    Missing SEARCH_INDEXER_QUERY_URL, so the indexer is not properly configured.
-    Should fallback on title filter
+    When indexer is not configured and no path is provided,
+    should fall back on list method
     """
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = None
-
+    indexer_settings.SEARCH_URL = None
     assert get_document_indexer() is None
 
     user = factories.UserFactory()
-    document = factories.DocumentFactory(title="alpha")
-    access = factories.UserDocumentAccessFactory(document=document, user=user)
-
     client = APIClient()
     client.force_login(user)
 
-    response = client.get("/api/v1.0/documents/search/", data={"q": "alpha"})
-
-    assert response.status_code == 200
-    content = response.json()
-    results = content.pop("results")
-    assert content == {
-        "count": 1,
+    mocked_response = {
+        "count": 0,
         "next": None,
         "previous": None,
+        "results": [{"title": "mocked list result"}],
     }
-    assert len(results) == 1
-    assert results[0] == {
-        "id": str(document.id),
-        "abilities": document.get_abilities(user),
-        "ancestors_link_reach": None,
-        "ancestors_link_role": None,
-        "computed_link_reach": document.computed_link_reach,
-        "computed_link_role": document.computed_link_role,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "depth": 1,
-        "excerpt": document.excerpt,
-        "link_reach": document.link_reach,
-        "link_role": document.link_role,
-        "nb_accesses_ancestors": 1,
-        "nb_accesses_direct": 1,
-        "numchild": 0,
-        "path": document.path,
-        "title": document.title,
-        "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
-        "deleted_at": None,
-        "user_role": access.role,
+    mock_list.return_value = drf_response.Response(mocked_response)
+
+    q = "alpha"
+    response = client.get("/api/v1.0/documents/search/", data={"q": q})
+
+    assert mock_list.call_count == 1
+    assert mock_list.call_args[0][0].GET.get("title") == q
+    assert response.json() == mocked_response
+
+
+@mock.patch("core.api.viewsets.DocumentViewSet._list_descendants")
+def test_api_documents_search_fallback_on_search_list_sub_docs(
+    mock_list_descendants, indexer_settings
+):
+    """
+    When indexer is not configured and path parameter is provided,
+    should call _list_descendants() method
+    """
+    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
+    assert get_document_indexer() is not None
+
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    parent = factories.DocumentFactory(title="parent", users=[user])
+
+    mocked_response = {
+        "count": 0,
+        "next": None,
+        "previous": None,
+        "results": [{"title": "mocked _list_descendants result"}],
     }
+    mock_list_descendants.return_value = drf_response.Response(mocked_response)
+
+    q = "alpha"
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": q, "path": parent.path}
+    )
+
+    assert mock_list_descendants.call_count == 1
+    assert mock_list_descendants.call_args[0][0].GET.get("title") == q
+    assert mock_list_descendants.call_args[0][0].GET.get("path") == parent.path
+    assert response.json() == mocked_response
+
+
+@mock.patch("core.api.viewsets.DocumentViewSet._title_search")
+def test_api_documents_search_indexer_crashes(mock_title_search, indexer_settings):
+    """
+    When indexer is configured but crashes -> falls back on title_search
+    """
+    # indexer is properly configured
+    indexer_settings.SEARCH_URL = None
+    assert get_document_indexer() is None
+    # but returns an error when the query is sent
+    responses.add(
+        responses.POST,
+        "http://find/api/v1.0/search",
+        json=[{"error": "Some indexer error"}],
+        status=404,
+    )
+
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    mocked_response = {
+        "count": 0,
+        "next": None,
+        "previous": None,
+        "results": [{"title": "mocked title_search result"}],
+    }
+    mock_title_search.return_value = drf_response.Response(mocked_response)
+
+    parent = factories.DocumentFactory(title="parent", users=[user])
+    q = "alpha"
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": "alpha", "path": parent.path}
+    )
+
+    # the search endpoint did not crash
+    assert response.status_code == 200
+    # fallback on title_search
+    assert mock_title_search.call_count == 1
+    assert mock_title_search.call_args[0][0].GET.get("q") == q
+    assert mock_title_search.call_args[0][0].GET.get("path") == parent.path
+    assert response.json() == mocked_response
 
 
 @responses.activate
 def test_api_documents_search_invalid_params(indexer_settings):
     """Validate the format of documents as returned by the search view."""
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = "http://find/api/v1.0/search"
+    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
+    assert get_document_indexer() is not None
 
     user = factories.UserFactory()
-
     client = APIClient()
     client.force_login(user)
 
@@ -125,49 +192,28 @@ def test_api_documents_search_invalid_params(indexer_settings):
     assert response.status_code == 400
     assert response.json() == {"q": ["This field is required."]}
 
-    response = client.get("/api/v1.0/documents/search/", data={"q": "    "})
-
-    assert response.status_code == 400
-    assert response.json() == {"q": ["This field may not be blank."]}
-
-    response = client.get(
-        "/api/v1.0/documents/search/", data={"q": "any", "page": "NaN"}
-    )
-
-    assert response.status_code == 400
-    assert response.json() == {"page": ["A valid integer is required."]}
-
 
 @responses.activate
-def test_api_documents_search_format(indexer_settings):
+def test_api_documents_search_success(indexer_settings):
     """Validate the format of documents as returned by the search view."""
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = "http://find/api/v1.0/search"
-
+    indexer_settings.SEARCH_URL = "http://find/api/v1.0/search"
     assert get_document_indexer() is not None
 
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    user_a, user_b, user_c = factories.UserFactory.create_batch(3)
-    document = factories.DocumentFactory(
-        title="alpha",
-        users=(user_a, user_c),
-        link_traces=(user, user_b),
-    )
-    access = factories.UserDocumentAccessFactory(document=document, user=user)
+    document = {"id": "doc-123", "title": "alpha", "path": "path/to/alpha.pdf"}
 
     # Find response
     responses.add(
         responses.POST,
         "http://find/api/v1.0/search",
         json=[
-            {"_id": str(document.pk)},
+            {
+                "_id": str(document["id"]),
+                "_source": {"title": document["title"], "path": document["path"]},
+            },
         ],
         status=200,
     )
-    response = client.get("/api/v1.0/documents/search/", data={"q": "alpha"})
+    response = APIClient().get("/api/v1.0/documents/search/", data={"q": "alpha"})
 
     assert response.status_code == 200
     content = response.json()
@@ -177,249 +223,6 @@ def test_api_documents_search_format(indexer_settings):
         "next": None,
         "previous": None,
     }
-    assert len(results) == 1
-    assert results[0] == {
-        "id": str(document.id),
-        "abilities": document.get_abilities(user),
-        "ancestors_link_reach": None,
-        "ancestors_link_role": None,
-        "computed_link_reach": document.computed_link_reach,
-        "computed_link_role": document.computed_link_role,
-        "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
-        "creator": str(document.creator.id),
-        "depth": 1,
-        "excerpt": document.excerpt,
-        "link_reach": document.link_reach,
-        "link_role": document.link_role,
-        "nb_accesses_ancestors": 3,
-        "nb_accesses_direct": 3,
-        "numchild": 0,
-        "path": document.path,
-        "title": document.title,
-        "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
-        "deleted_at": None,
-        "user_role": access.role,
-    }
-
-
-@responses.activate
-@pytest.mark.parametrize(
-    "pagination, status, expected",
-    (
-        (
-            {"page": 1, "page_size": 10},
-            200,
-            {
-                "count": 10,
-                "previous": None,
-                "next": None,
-                "range": (0, None),
-            },
-        ),
-        (
-            {},
-            200,
-            {
-                "count": 10,
-                "previous": None,
-                "next": None,
-                "range": (0, None),
-                "api_page_size": 21,  # default page_size is 20
-            },
-        ),
-        (
-            {"page": 2, "page_size": 10},
-            404,
-            {},
-        ),
-        (
-            {"page": 1, "page_size": 5},
-            200,
-            {
-                "count": 10,
-                "previous": None,
-                "next": {"page": 2, "page_size": 5},
-                "range": (0, 5),
-            },
-        ),
-        (
-            {"page": 2, "page_size": 5},
-            200,
-            {
-                "count": 10,
-                "previous": {"page_size": 5},
-                "next": None,
-                "range": (5, None),
-            },
-        ),
-        ({"page": 3, "page_size": 5}, 404, {}),
-    ),
-)
-def test_api_documents_search_pagination(
-    indexer_settings, pagination, status, expected
-):
-    """Documents should be ordered by descending "score" by default"""
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = "http://find/api/v1.0/search"
-
-    assert get_document_indexer() is not None
-
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    docs = factories.DocumentFactory.create_batch(10, title="alpha", users=[user])
-
-    docs_by_uuid = {str(doc.pk): doc for doc in docs}
-    api_results = [{"_id": id} for id in docs_by_uuid.keys()]
-
-    # reorder randomly to simulate score ordering
-    random.shuffle(api_results)
-
-    # Find response
-    # pylint: disable-next=assignment-from-none
-    api_search = responses.add(
-        responses.POST,
-        "http://find/api/v1.0/search",
-        json=api_results,
-        status=200,
-    )
-
-    response = client.get(
-        "/api/v1.0/documents/search/",
-        data={
-            "q": "alpha",
-            **pagination,
-        },
-    )
-
-    assert response.status_code == status
-
-    if response.status_code < 300:
-        previous_url = (
-            build_search_url(q="alpha", **expected["previous"])
-            if expected["previous"]
-            else None
-        )
-        next_url = (
-            build_search_url(q="alpha", **expected["next"])
-            if expected["next"]
-            else None
-        )
-        start, end = expected["range"]
-
-        content = response.json()
-
-        assert content["count"] == expected["count"]
-        assert content["previous"] == previous_url
-        assert content["next"] == next_url
-
-        results = content.pop("results")
-
-        # The find api results ordering by score is kept
-        assert [r["id"] for r in results] == [r["_id"] for r in api_results[start:end]]
-
-        # Check the query parameters.
-        assert api_search.call_count == 1
-        assert api_search.calls[0].response.status_code == 200
-        assert json_loads(api_search.calls[0].request.body) == {
-            "q": "alpha",
-            "visited": [],
-            "services": ["docs"],
-            "nb_results": 50,
-            "order_by": "updated_at",
-            "order_direction": "desc",
-        }
-
-
-@responses.activate
-@pytest.mark.parametrize(
-    "pagination, status, expected",
-    (
-        (
-            {"page": 1, "page_size": 10},
-            200,
-            {"count": 10, "previous": None, "next": None, "range": (0, None)},
-        ),
-        (
-            {},
-            200,
-            {"count": 10, "previous": None, "next": None, "range": (0, None)},
-        ),
-        (
-            {"page": 2, "page_size": 10},
-            404,
-            {},
-        ),
-        (
-            {"page": 1, "page_size": 5},
-            200,
-            {
-                "count": 10,
-                "previous": None,
-                "next": {"page": 2, "page_size": 5},
-                "range": (0, 5),
-            },
-        ),
-        (
-            {"page": 2, "page_size": 5},
-            200,
-            {
-                "count": 10,
-                "previous": {"page_size": 5},
-                "next": None,
-                "range": (5, None),
-            },
-        ),
-        ({"page": 3, "page_size": 5}, 404, {}),
-    ),
-)
-def test_api_documents_search_pagination_endpoint_is_none(
-    indexer_settings, pagination, status, expected
-):
-    """Documents should be ordered by descending "-updated_at" by default"""
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = None
-
-    assert get_document_indexer() is None
-
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    factories.DocumentFactory.create_batch(10, title="alpha", users=[user])
-
-    response = client.get(
-        "/api/v1.0/documents/search/",
-        data={
-            "q": "alpha",
-            **pagination,
-        },
-    )
-
-    assert response.status_code == status
-
-    if response.status_code < 300:
-        previous_url = (
-            build_search_url(q="alpha", **expected["previous"])
-            if expected["previous"]
-            else None
-        )
-        next_url = (
-            build_search_url(q="alpha", **expected["next"])
-            if expected["next"]
-            else None
-        )
-        queryset = models.Document.objects.order_by("-updated_at")
-        start, end = expected["range"]
-        expected_results = [str(d.pk) for d in queryset[start:end]]
-
-        content = response.json()
-
-        assert content["count"] == expected["count"]
-        assert content["previous"] == previous_url
-        assert content["next"] == next_url
-
-        results = content.pop("results")
-
-        assert [r["id"] for r in results] == expected_results
+    assert results == [
+        {"id": document["id"], "title": document["title"], "path": document["path"]}
+    ]

src/backend/core/tests/documents/test_api_documents_search_descendants.py

@@ -1,5 +1,6 @@
 """
-Tests for Documents API endpoint in impress's core app: descendants
+Tests for search API endpoint in impress's core app when indexer is not
+available and a path param is given.
 """
 
 import random
@@ -10,26 +11,61 @@ import pytest
 from rest_framework.test import APIClient
 
 from core import factories
+from core.api.filters import remove_accents
 
 pytestmark = pytest.mark.django_db
 
 
+@pytest.fixture(autouse=True)
+def disable_indexer(indexer_settings):
+    """Disable search indexer for all tests in this file."""
+    indexer_settings.SEARCH_INDEXER_CLASS = None
+
+
 def test_api_documents_descendants_list_anonymous_public_standalone():
     """Anonymous users should be allowed to retrieve the descendants of a public document."""
-    document = factories.DocumentFactory(link_reach="public")
-    child1, child2 = factories.DocumentFactory.create_batch(2, parent=document)
-    grand_child = factories.DocumentFactory(parent=child1)
+    document = factories.DocumentFactory(link_reach="public", title="doc parent")
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="doc child"
+    )
+    grand_child = factories.DocumentFactory(parent=child1, title="doc grand child")
 
     factories.UserDocumentAccessFactory(document=child1)
 
-    response = APIClient().get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = APIClient().get(
+        "/api/v1.0/documents/search/", data={"q": "doc", "path": document.path}
+    )
 
     assert response.status_code == 200
     assert response.json() == {
-        "count": 3,
+        "count": 4,
         "next": None,
         "previous": None,
         "results": [
+            {
+                # the search should include the parent document itself
+                "abilities": document.get_abilities(AnonymousUser()),
+                "ancestors_link_reach": None,
+                "ancestors_link_role": None,
+                "computed_link_reach": "public",
+                "computed_link_role": document.computed_link_role,
+                "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
+                "creator": str(document.creator.id),
+                "deleted_at": None,
+                "depth": 1,
+                "excerpt": document.excerpt,
+                "id": str(document.id),
+                "is_favorite": False,
+                "link_reach": document.link_reach,
+                "link_role": document.link_role,
+                "numchild": 2,
+                "nb_accesses_ancestors": 0,
+                "nb_accesses_direct": 0,
+                "path": document.path,
+                "title": document.title,
+                "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
+                "user_role": None,
+            },
             {
                 "abilities": child1.get_abilities(AnonymousUser()),
                 "ancestors_link_reach": "public",
@@ -110,26 +146,60 @@ def test_api_documents_descendants_list_anonymous_public_parent():
     Anonymous users should be allowed to retrieve the descendants of a document who
     has a public ancestor.
     """
-    grand_parent = factories.DocumentFactory(link_reach="public")
+    grand_parent = factories.DocumentFactory(
+        link_reach="public", title="grand parent doc"
+    )
     parent = factories.DocumentFactory(
-        parent=grand_parent, link_reach=random.choice(["authenticated", "restricted"])
+        parent=grand_parent,
+        link_reach=random.choice(["authenticated", "restricted"]),
+        title="parent doc",
     )
     document = factories.DocumentFactory(
-        link_reach=random.choice(["authenticated", "restricted"]), parent=parent
+        link_reach=random.choice(["authenticated", "restricted"]),
+        parent=parent,
+        title="document",
     )
-    child1, child2 = factories.DocumentFactory.create_batch(2, parent=document)
-    grand_child = factories.DocumentFactory(parent=child1)
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="child doc"
+    )
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child doc")
 
     factories.UserDocumentAccessFactory(document=child1)
 
-    response = APIClient().get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = APIClient().get(
+        "/api/v1.0/documents/search/", data={"q": "doc", "path": document.path}
+    )
 
     assert response.status_code == 200
     assert response.json() == {
-        "count": 3,
+        "count": 4,
         "next": None,
         "previous": None,
         "results": [
+            {
+                # the search should include the parent document itself
+                "abilities": document.get_abilities(AnonymousUser()),
+                "ancestors_link_reach": "public",
+                "ancestors_link_role": grand_parent.link_role,
+                "computed_link_reach": document.computed_link_reach,
+                "computed_link_role": document.computed_link_role,
+                "created_at": document.created_at.isoformat().replace("+00:00", "Z"),
+                "creator": str(document.creator.id),
+                "deleted_at": None,
+                "depth": 3,
+                "excerpt": document.excerpt,
+                "id": str(document.id),
+                "is_favorite": False,
+                "link_reach": document.link_reach,
+                "link_role": document.link_role,
+                "numchild": 2,
+                "nb_accesses_ancestors": 0,
+                "nb_accesses_direct": 0,
+                "path": document.path,
+                "title": document.title,
+                "updated_at": document.updated_at.isoformat().replace("+00:00", "Z"),
+                "user_role": None,
+            },
             {
                 "abilities": child1.get_abilities(AnonymousUser()),
                 "ancestors_link_reach": "public",
@@ -208,11 +278,13 @@ def test_api_documents_descendants_list_anonymous_restricted_or_authenticated(re
     """
     Anonymous users should not be able to retrieve descendants of a document that is not public.
     """
-    document = factories.DocumentFactory(link_reach=reach)
-    child = factories.DocumentFactory(parent=document)
-    _grand_child = factories.DocumentFactory(parent=child)
+    document = factories.DocumentFactory(title="parent", link_reach=reach)
+    child = factories.DocumentFactory(title="child", parent=document)
+    _grand_child = factories.DocumentFactory(title="grand child", parent=child)
 
-    response = APIClient().get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = APIClient().get(
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
+    )
 
     assert response.status_code == 401
     assert response.json() == {
@@ -232,17 +304,18 @@ def test_api_documents_descendants_list_authenticated_unrelated_public_or_authen
     client = APIClient()
     client.force_login(user)
 
-    document = factories.DocumentFactory(link_reach=reach)
+    document = factories.DocumentFactory(link_reach=reach, title="parent")
     child1, child2 = factories.DocumentFactory.create_batch(
-        2, parent=document, link_reach="restricted"
+        2, parent=document, link_reach="restricted", title="child"
     )
-    grand_child = factories.DocumentFactory(parent=child1)
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     factories.UserDocumentAccessFactory(document=child1)
 
     response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/",
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
     )
+
     assert response.status_code == 200
     assert response.json() == {
         "count": 3,
@@ -335,17 +408,23 @@ def test_api_documents_descendants_list_authenticated_public_or_authenticated_pa
     client = APIClient()
     client.force_login(user)
 
-    grand_parent = factories.DocumentFactory(link_reach=reach)
-    parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
-    document = factories.DocumentFactory(link_reach="restricted", parent=parent)
-    child1, child2 = factories.DocumentFactory.create_batch(
-        2, parent=document, link_reach="restricted"
+    grand_parent = factories.DocumentFactory(link_reach=reach, title="grand parent")
+    parent = factories.DocumentFactory(
+        parent=grand_parent, link_reach="restricted", title="parent"
     )
-    grand_child = factories.DocumentFactory(parent=child1)
+    document = factories.DocumentFactory(
+        link_reach="restricted", parent=parent, title="document"
+    )
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, link_reach="restricted", title="child"
+    )
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     factories.UserDocumentAccessFactory(document=child1)
 
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
+    )
 
     assert response.status_code == 200
     assert response.json() == {
@@ -435,15 +514,18 @@ def test_api_documents_descendants_list_authenticated_unrelated_restricted():
     client = APIClient()
     client.force_login(user)
 
-    document = factories.DocumentFactory(link_reach="restricted")
-    child1, _child2 = factories.DocumentFactory.create_batch(2, parent=document)
-    _grand_child = factories.DocumentFactory(parent=child1)
+    document = factories.DocumentFactory(link_reach="restricted", title="parent")
+    child1, _child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="child"
+    )
+    _grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     factories.UserDocumentAccessFactory(document=child1)
 
     response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/",
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
     )
+
     assert response.status_code == 403
     assert response.json() == {
         "detail": "You do not have permission to perform this action."
@@ -460,17 +542,19 @@ def test_api_documents_descendants_list_authenticated_related_direct():
     client = APIClient()
     client.force_login(user)
 
-    document = factories.DocumentFactory()
+    document = factories.DocumentFactory(title="parent")
     access = factories.UserDocumentAccessFactory(document=document, user=user)
     factories.UserDocumentAccessFactory(document=document)
 
-    child1, child2 = factories.DocumentFactory.create_batch(2, parent=document)
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="child"
+    )
     factories.UserDocumentAccessFactory(document=child1)
 
-    grand_child = factories.DocumentFactory(parent=child1)
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/",
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
     )
     assert response.status_code == 200
     assert response.json() == {
@@ -561,21 +645,27 @@ def test_api_documents_descendants_list_authenticated_related_parent():
     client = APIClient()
     client.force_login(user)
 
-    grand_parent = factories.DocumentFactory(link_reach="restricted")
+    grand_parent = factories.DocumentFactory(link_reach="restricted", title="parent")
     grand_parent_access = factories.UserDocumentAccessFactory(
         document=grand_parent, user=user
     )
 
-    parent = factories.DocumentFactory(parent=grand_parent, link_reach="restricted")
-    document = factories.DocumentFactory(parent=parent, link_reach="restricted")
+    parent = factories.DocumentFactory(
+        parent=grand_parent, link_reach="restricted", title="parent"
+    )
+    document = factories.DocumentFactory(
+        parent=parent, link_reach="restricted", title="document"
+    )
 
-    child1, child2 = factories.DocumentFactory.create_batch(2, parent=document)
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="child"
+    )
     factories.UserDocumentAccessFactory(document=child1)
 
-    grand_child = factories.DocumentFactory(parent=child1)
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/",
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
     )
     assert response.status_code == 200
     assert response.json() == {
@@ -673,7 +763,7 @@ def test_api_documents_descendants_list_authenticated_related_child():
     factories.UserDocumentAccessFactory(document=document)
 
     response = client.get(
-        f"/api/v1.0/documents/{document.id!s}/descendants/",
+        "/api/v1.0/documents/search/", data={"q": "doc", "path": document.path}
     )
     assert response.status_code == 403
     assert response.json() == {
@@ -694,12 +784,15 @@ def test_api_documents_descendants_list_authenticated_related_team_none(
     client = APIClient()
     client.force_login(user)
 
-    document = factories.DocumentFactory(link_reach="restricted")
-    factories.DocumentFactory.create_batch(2, parent=document)
+    document = factories.DocumentFactory(link_reach="restricted", title="document")
+    factories.DocumentFactory.create_batch(2, parent=document, title="child")
 
     factories.TeamDocumentAccessFactory(document=document, team="myteam")
 
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": "doc", "path": document.path}
+    )
+
     assert response.status_code == 403
     assert response.json() == {
         "detail": "You do not have permission to perform this action."
@@ -719,13 +812,17 @@ def test_api_documents_descendants_list_authenticated_related_team_members(
     client = APIClient()
     client.force_login(user)
 
-    document = factories.DocumentFactory(link_reach="restricted")
-    child1, child2 = factories.DocumentFactory.create_batch(2, parent=document)
-    grand_child = factories.DocumentFactory(parent=child1)
+    document = factories.DocumentFactory(link_reach="restricted", title="parent")
+    child1, child2 = factories.DocumentFactory.create_batch(
+        2, parent=document, title="child"
+    )
+    grand_child = factories.DocumentFactory(parent=child1, title="grand child")
 
     access = factories.TeamDocumentAccessFactory(document=document, team="myteam")
 
-    response = client.get(f"/api/v1.0/documents/{document.id!s}/descendants/")
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": "child", "path": document.path}
+    )
 
     # pylint: disable=R0801
     assert response.status_code == 200
@@ -805,3 +902,53 @@ def test_api_documents_descendants_list_authenticated_related_team_members(
             },
         ],
     }
+
+
+@pytest.mark.parametrize(
+    "query,nb_results",
+    [
+        ("", 7),  # Empty string
+        ("Project Alpha", 1),  # Exact match
+        ("project", 2),  # Partial match (case-insensitive)
+        ("Guide", 2),  # Word match within a title
+        ("Special", 0),  # No match (nonexistent keyword)
+        ("2024", 2),  # Match by numeric keyword
+        ("velo", 1),  # Accent-insensitive match (velo vs vélo)
+        ("bêta", 1),  # Accent-insensitive match (bêta vs beta)
+    ],
+)
+def test_api_documents_descendants_search_on_title(query, nb_results):
+    """Authenticated users should be able to search documents by their unaccented title."""
+    user = factories.UserFactory()
+    client = APIClient()
+    client.force_login(user)
+
+    parent = factories.DocumentFactory(users=[user])
+
+    # Create documents with predefined titles
+    titles = [
+        "Project Alpha Documentation",
+        "Project Beta Overview",
+        "User Guide",
+        "Financial Report 2024",
+        "Annual Review 2024",
+        "Guide du vélo urbain",  # <-- Title with accent for accent-insensitive test
+    ]
+    for title in titles:
+        factories.DocumentFactory(title=title, parent=parent)
+
+    # Perform the search query
+    response = client.get(
+        "/api/v1.0/documents/search/", data={"q": query, "path": parent.path}
+    )
+
+    assert response.status_code == 200
+    results = response.json()["results"]
+    assert len(results) == nb_results
+
+    # Ensure all results contain the query in their title
+    for result in results:
+        assert (
+            remove_accents(query).lower().strip()
+            in remove_accents(result["title"]).lower()
+        )

src/backend/core/tests/test_services_find_document_indexer.py

@@ -1,5 +1,5 @@
 """
-Unit tests for the Document model
+Unit tests for FindDocumentIndexer
 """
 # pylint: disable=too-many-lines
 
@@ -12,7 +12,8 @@ from django.db import transaction
 import pytest
 
 from core import factories, models
-from core.services.search_indexers import SearchIndexer
+from core.enums import SearchType
+from core.services.search_indexers import FindDocumentIndexer
 
 pytestmark = pytest.mark.django_db
 
@@ -30,7 +31,7 @@ def reset_throttle():
     reset_batch_indexer_throttle()
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer(mock_push):
@@ -41,7 +42,7 @@ def test_models_documents_post_save_indexer(mock_push):
     accesses = {}
     data = [call.args[0] for call in mock_push.call_args_list]
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     assert len(data) == 1
 
@@ -64,14 +65,14 @@ def test_models_documents_post_save_indexer_no_batches(indexer_settings):
     """Test indexation task on doculment creation, no throttle"""
     indexer_settings.SEARCH_INDEXER_COUNTDOWN = 0
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         with transaction.atomic():
             doc1, doc2, doc3 = factories.DocumentFactory.create_batch(3)
 
     accesses = {}
     data = [call.args[0] for call in mock_push.call_args_list]
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     # 3 calls
     assert len(data) == 3
@@ -91,7 +92,7 @@ def test_models_documents_post_save_indexer_no_batches(indexer_settings):
     assert cache.get("file-batch-indexer-throttle") is None
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer_not_configured(mock_push, indexer_settings):
     """Task should not start an indexation when disabled"""
@@ -106,13 +107,13 @@ def test_models_documents_post_save_indexer_not_configured(mock_push, indexer_se
     assert mock_push.assert_not_called
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer_wrongly_configured(
     mock_push, indexer_settings
 ):
     """Task should not start an indexation when disabled"""
-    indexer_settings.SEARCH_INDEXER_URL = None
+    indexer_settings.INDEXING_URL = None
 
     user = factories.UserFactory()
 
@@ -123,7 +124,7 @@ def test_models_documents_post_save_indexer_wrongly_configured(
     assert mock_push.assert_not_called
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer_with_accesses(mock_push):
@@ -145,7 +146,7 @@ def test_models_documents_post_save_indexer_with_accesses(mock_push):
 
     data = [call.args[0] for call in mock_push.call_args_list]
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     assert len(data) == 1
     assert sorted(data[0], key=itemgetter("id")) == sorted(
@@ -158,7 +159,7 @@ def test_models_documents_post_save_indexer_with_accesses(mock_push):
     )
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer_deleted(mock_push):
@@ -207,7 +208,7 @@ def test_models_documents_post_save_indexer_deleted(mock_push):
 
     data = [call.args[0] for call in mock_push.call_args_list]
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     assert len(data) == 2
 
@@ -244,14 +245,14 @@ def test_models_documents_indexer_hard_deleted():
         factories.UserDocumentAccessFactory(document=doc, user=user)
 
     # Call task on deleted document.
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         doc.delete()
 
     # Hard delete document are not re-indexed.
     assert mock_push.assert_not_called
 
 
-@mock.patch.object(SearchIndexer, "push")
+@mock.patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 @pytest.mark.django_db(transaction=True)
 def test_models_documents_post_save_indexer_restored(mock_push):
@@ -308,7 +309,7 @@ def test_models_documents_post_save_indexer_restored(mock_push):
 
     data = [call.args[0] for call in mock_push.call_args_list]
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     # All docs are re-indexed
     assert len(data) == 2
@@ -337,16 +338,16 @@ def test_models_documents_post_save_indexer_restored(mock_push):
 @pytest.mark.usefixtures("indexer_settings")
 def test_models_documents_post_save_indexer_throttle():
     """Test indexation task skipping on document update"""
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
     user = factories.UserFactory()
 
-    with mock.patch.object(SearchIndexer, "push"):
+    with mock.patch.object(FindDocumentIndexer, "push"):
         with transaction.atomic():
             docs = factories.DocumentFactory.create_batch(5, users=(user,))
 
     accesses = {str(item.path): {"users": [user.sub]} for item in docs}
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         # Simulate 1 running task
         cache.set("document-batch-indexer-throttle", 1)
 
@@ -359,7 +360,7 @@ def test_models_documents_post_save_indexer_throttle():
 
         assert [call.args[0] for call in mock_push.call_args_list] == []
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         # No waiting task
         cache.delete("document-batch-indexer-throttle")
 
@@ -389,7 +390,7 @@ def test_models_documents_access_post_save_indexer():
     """Test indexation task on DocumentAccess update"""
     users = factories.UserFactory.create_batch(3)
 
-    with mock.patch.object(SearchIndexer, "push"):
+    with mock.patch.object(FindDocumentIndexer, "push"):
         with transaction.atomic():
             doc = factories.DocumentFactory(users=users)
             doc_accesses = models.DocumentAccess.objects.filter(document=doc).order_by(
@@ -398,7 +399,7 @@ def test_models_documents_access_post_save_indexer():
 
     reset_batch_indexer_throttle()
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         with transaction.atomic():
             for doc_access in doc_accesses:
                 doc_access.save()
@@ -426,7 +427,7 @@ def test_models_items_access_post_save_indexer_no_throttle(indexer_settings):
 
     reset_batch_indexer_throttle()
 
-    with mock.patch.object(SearchIndexer, "push") as mock_push:
+    with mock.patch.object(FindDocumentIndexer, "push") as mock_push:
         with transaction.atomic():
             for doc_access in doc_accesses:
                 doc_access.save()
@@ -439,3 +440,77 @@ def test_models_items_access_post_save_indexer_no_throttle(indexer_settings):
         assert [len(d) for d in data] == [1] * 3
         # the same document is indexed 3 times
         assert [d[0]["id"] for d in data] == [str(doc.pk)] * 3
+
+
+@mock.patch.object(FindDocumentIndexer, "search_query")
+@pytest.mark.usefixtures("indexer_settings")
+def test_find_document_indexer_search(mock_search_query):
+    """Test search function of FindDocumentIndexer returns formatted results"""
+
+    # Mock API response from Find
+    hits = [
+        {
+            "_id": "doc-123",
+            "_source": {
+                "title": "Test Document",
+                "content": "This is test content",
+                "updated_at": "2024-01-01T00:00:00Z",
+                "path": "/some/path/doc-123",
+            },
+        },
+        {
+            "_id": "doc-456",
+            "_source": {
+                "title.fr": "Document de test",
+                "content": "Contenu de test",
+                "updated_at": "2024-01-02T00:00:00Z",
+            },
+        },
+    ]
+    mock_search_query.return_value = hits
+
+    q = "test"
+    token = "fake-token"
+    nb_results = 10
+    path = "/some/path/"
+    visited = ["doc-123"]
+    search_type = SearchType.HYBRID
+    results = FindDocumentIndexer().search(
+        q=q,
+        token=token,
+        nb_results=nb_results,
+        path=path,
+        visited=visited,
+        search_type=search_type,
+    )
+
+    mock_search_query.assert_called_once()
+    call_args = mock_search_query.call_args
+    assert call_args[1]["data"] == {
+        "q": q,
+        "visited": visited,
+        "services": ["docs"],
+        "nb_results": nb_results,
+        "order_by": "updated_at",
+        "order_direction": "desc",
+        "path": path,
+        "search_type": search_type,
+    }
+
+    assert len(results) == 2
+    assert results == [
+        {
+            "id": hits[0]["_id"],
+            "title": hits[0]["_source"]["title"],
+            "content": hits[0]["_source"]["content"],
+            "updated_at": hits[0]["_source"]["updated_at"],
+            "path": hits[0]["_source"]["path"],
+        },
+        {
+            "id": hits[1]["_id"],
+            "title": hits[1]["_source"]["title.fr"],
+            "title.fr": hits[1]["_source"]["title.fr"],  # <- Find response artefact
+            "content": hits[1]["_source"]["content"],
+            "updated_at": hits[1]["_source"]["updated_at"],
+        },
+    ]

src/backend/core/tests/test_services_search_indexers.py

@@ -15,7 +15,7 @@ from requests import HTTPError
 from core import factories, models, utils
 from core.services.search_indexers import (
     BaseDocumentIndexer,
-    SearchIndexer,
+    FindDocumentIndexer,
     get_document_indexer,
     get_visited_document_ids_of,
 )
@@ -78,41 +78,41 @@ def test_services_search_indexer_is_configured(indexer_settings):
 
     # Valid class
     indexer_settings.SEARCH_INDEXER_CLASS = (
-        "core.services.search_indexers.SearchIndexer"
+        "core.services.search_indexers.FindDocumentIndexer"
     )
 
     get_document_indexer.cache_clear()
     assert get_document_indexer() is not None
 
-    indexer_settings.SEARCH_INDEXER_URL = ""
+    indexer_settings.INDEXING_URL = ""
 
     # Invalid url
     get_document_indexer.cache_clear()
     assert not get_document_indexer()
 
 
-def test_services_search_indexer_url_is_none(indexer_settings):
+def test_services_indexing_url_is_none(indexer_settings):
     """
-    Indexer should raise RuntimeError if SEARCH_INDEXER_URL is None or empty.
+    Indexer should raise RuntimeError if INDEXING_URL is None or empty.
     """
-    indexer_settings.SEARCH_INDEXER_URL = None
+    indexer_settings.INDEXING_URL = None
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
-    assert "SEARCH_INDEXER_URL must be set in Django settings." in str(exc_info.value)
+    assert "INDEXING_URL must be set in Django settings." in str(exc_info.value)
 
 
-def test_services_search_indexer_url_is_empty(indexer_settings):
+def test_services_indexing_url_is_empty(indexer_settings):
     """
-    Indexer should raise RuntimeError if SEARCH_INDEXER_URL is empty string.
+    Indexer should raise RuntimeError if INDEXING_URL is empty string.
     """
-    indexer_settings.SEARCH_INDEXER_URL = ""
+    indexer_settings.INDEXING_URL = ""
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
-    assert "SEARCH_INDEXER_URL must be set in Django settings." in str(exc_info.value)
+    assert "INDEXING_URL must be set in Django settings." in str(exc_info.value)
 
 
 def test_services_search_indexer_secret_is_none(indexer_settings):
@@ -122,7 +122,7 @@ def test_services_search_indexer_secret_is_none(indexer_settings):
     indexer_settings.SEARCH_INDEXER_SECRET = None
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
     assert "SEARCH_INDEXER_SECRET must be set in Django settings." in str(
         exc_info.value
@@ -136,39 +136,35 @@ def test_services_search_indexer_secret_is_empty(indexer_settings):
     indexer_settings.SEARCH_INDEXER_SECRET = ""
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
     assert "SEARCH_INDEXER_SECRET must be set in Django settings." in str(
         exc_info.value
     )
 
 
-def test_services_search_endpoint_is_none(indexer_settings):
+def test_services_search_url_is_none(indexer_settings):
     """
-    Indexer should raise RuntimeError if SEARCH_INDEXER_QUERY_URL is None.
+    Indexer should raise RuntimeError if SEARCH_URL is None.
     """
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = None
+    indexer_settings.SEARCH_URL = None
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
-    assert "SEARCH_INDEXER_QUERY_URL must be set in Django settings." in str(
-        exc_info.value
-    )
+    assert "SEARCH_URL must be set in Django settings." in str(exc_info.value)
 
 
-def test_services_search_endpoint_is_empty(indexer_settings):
+def test_services_search_url_is_empty(indexer_settings):
     """
-    Indexer should raise RuntimeError if SEARCH_INDEXER_QUERY_URL is empty.
+    Indexer should raise RuntimeError if SEARCH_URL is empty.
     """
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = ""
+    indexer_settings.SEARCH_URL = ""
 
     with pytest.raises(ImproperlyConfigured) as exc_info:
-        SearchIndexer()
+        FindDocumentIndexer()
 
-    assert "SEARCH_INDEXER_QUERY_URL must be set in Django settings." in str(
-        exc_info.value
-    )
+    assert "SEARCH_URL must be set in Django settings." in str(exc_info.value)
 
 
 @pytest.mark.usefixtures("indexer_settings")
@@ -192,7 +188,7 @@ def test_services_search_indexers_serialize_document_returns_expected_json():
         }
     }
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
     result = indexer.serialize_document(document, accesses)
 
     assert set(result.pop("users")) == {str(user_a.sub), str(user_b.sub)}
@@ -221,7 +217,7 @@ def test_services_search_indexers_serialize_document_deleted():
     parent.soft_delete()
     document.refresh_from_db()
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
     result = indexer.serialize_document(document, {})
 
     assert result["is_active"] is False
@@ -232,7 +228,7 @@ def test_services_search_indexers_serialize_document_empty():
     """Empty documents returns empty content in the serialized json."""
     document = factories.DocumentFactory(content="", title=None)
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
     result = indexer.serialize_document(document, {})
 
     assert result["content"] == ""
@@ -246,7 +242,7 @@ def test_services_search_indexers_index_errors(indexer_settings):
     """
     factories.DocumentFactory()
 
-    indexer_settings.SEARCH_INDEXER_URL = "http://app-find/api/v1.0/documents/index/"
+    indexer_settings.INDEXING_URL = "http://app-find/api/v1.0/documents/index/"
 
     responses.add(
         responses.POST,
@@ -256,10 +252,10 @@ def test_services_search_indexers_index_errors(indexer_settings):
     )
 
     with pytest.raises(HTTPError):
-        SearchIndexer().index()
+        FindDocumentIndexer().index()
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 def test_services_search_indexers_batches_pass_only_batch_accesses(
     mock_push, indexer_settings
 ):
@@ -276,7 +272,7 @@ def test_services_search_indexers_batches_pass_only_batch_accesses(
         access = factories.UserDocumentAccessFactory(document=document)
         expected_user_subs[str(document.id)] = str(access.user.sub)
 
-    assert SearchIndexer().index() == 5
+    assert FindDocumentIndexer().index() == 5
 
     # Should be 3 batches: 2 + 2 + 1
     assert mock_push.call_count == 3
@@ -299,7 +295,7 @@ def test_services_search_indexers_batches_pass_only_batch_accesses(
     assert seen_doc_ids == {str(d.id) for d in documents}
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 def test_services_search_indexers_batch_size_argument(mock_push):
     """
@@ -314,7 +310,7 @@ def test_services_search_indexers_batch_size_argument(mock_push):
         access = factories.UserDocumentAccessFactory(document=document)
         expected_user_subs[str(document.id)] = str(access.user.sub)
 
-    assert SearchIndexer().index(batch_size=2) == 5
+    assert FindDocumentIndexer().index(batch_size=2) == 5
 
     # Should be 3 batches: 2 + 2 + 1
     assert mock_push.call_count == 3
@@ -337,7 +333,7 @@ def test_services_search_indexers_batch_size_argument(mock_push):
     assert seen_doc_ids == {str(d.id) for d in documents}
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 def test_services_search_indexers_ignore_empty_documents(mock_push):
     """
@@ -349,7 +345,7 @@ def test_services_search_indexers_ignore_empty_documents(mock_push):
     empty_title = factories.DocumentFactory(title="")
     empty_content = factories.DocumentFactory(content="")
 
-    assert SearchIndexer().index() == 3
+    assert FindDocumentIndexer().index() == 3
 
     assert mock_push.call_count == 1
 
@@ -365,7 +361,7 @@ def test_services_search_indexers_ignore_empty_documents(mock_push):
     }
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 def test_services_search_indexers_skip_empty_batches(mock_push, indexer_settings):
     """
     Documents indexing batch can be empty if all the docs are empty.
@@ -377,14 +373,14 @@ def test_services_search_indexers_skip_empty_batches(mock_push, indexer_settings
     # Only empty docs
     factories.DocumentFactory.create_batch(5, content="", title="")
 
-    assert SearchIndexer().index() == 1
+    assert FindDocumentIndexer().index() == 1
     assert mock_push.call_count == 1
 
     results = [doc["id"] for doc in mock_push.call_args[0][0]]
     assert results == [str(document.id)]
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 def test_services_search_indexers_ancestors_link_reach(mock_push):
     """Document accesses and reach should take into account ancestors link reaches."""
@@ -395,7 +391,7 @@ def test_services_search_indexers_ancestors_link_reach(mock_push):
     parent = factories.DocumentFactory(parent=grand_parent, link_reach="public")
     document = factories.DocumentFactory(parent=parent, link_reach="restricted")
 
-    assert SearchIndexer().index() == 4
+    assert FindDocumentIndexer().index() == 4
 
     results = {doc["id"]: doc for doc in mock_push.call_args[0][0]}
     assert len(results) == 4
@@ -405,7 +401,7 @@ def test_services_search_indexers_ancestors_link_reach(mock_push):
     assert results[str(document.id)]["reach"] == "public"
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 def test_services_search_indexers_ancestors_users(mock_push):
     """Document accesses and reach should include users from ancestors."""
@@ -415,7 +411,7 @@ def test_services_search_indexers_ancestors_users(mock_push):
     parent = factories.DocumentFactory(parent=grand_parent, users=[user_p])
     document = factories.DocumentFactory(parent=parent, users=[user_d])
 
-    assert SearchIndexer().index() == 3
+    assert FindDocumentIndexer().index() == 3
 
     results = {doc["id"]: doc for doc in mock_push.call_args[0][0]}
     assert len(results) == 3
@@ -428,7 +424,7 @@ def test_services_search_indexers_ancestors_users(mock_push):
     }
 
 
-@patch.object(SearchIndexer, "push")
+@patch.object(FindDocumentIndexer, "push")
 @pytest.mark.usefixtures("indexer_settings")
 def test_services_search_indexers_ancestors_teams(mock_push):
     """Document accesses and reach should include teams from ancestors."""
@@ -436,7 +432,7 @@ def test_services_search_indexers_ancestors_teams(mock_push):
     parent = factories.DocumentFactory(parent=grand_parent, teams=["team_p"])
     document = factories.DocumentFactory(parent=parent, teams=["team_d"])
 
-    assert SearchIndexer().index() == 3
+    assert FindDocumentIndexer().index() == 3
 
     results = {doc["id"]: doc for doc in mock_push.call_args[0][0]}
     assert len(results) == 3
@@ -451,9 +447,9 @@ def test_push_uses_correct_url_and_data(mock_post, indexer_settings):
     push() should call requests.post with the correct URL from settings
     the timeout set to 10 seconds and the data as JSON.
     """
-    indexer_settings.SEARCH_INDEXER_URL = "http://example.com/index"
+    indexer_settings.INDEXING_URL = "http://example.com/index"
 
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
     sample_data = [{"id": "123", "title": "Test"}]
 
     mock_response = mock_post.return_value
@@ -464,7 +460,7 @@ def test_push_uses_correct_url_and_data(mock_post, indexer_settings):
     mock_post.assert_called_once()
     args, kwargs = mock_post.call_args
 
-    assert args[0] == indexer_settings.SEARCH_INDEXER_URL
+    assert args[0] == indexer_settings.INDEXING_URL
     assert kwargs.get("json") == sample_data
     assert kwargs.get("timeout") == 10
 
@@ -498,7 +494,7 @@ def test_get_visited_document_ids_of():
     factories.UserDocumentAccessFactory(user=user, document=doc2)
 
     # The second document have an access for the user
-    assert get_visited_document_ids_of(queryset, user) == [str(doc1.pk)]
+    assert get_visited_document_ids_of(queryset, user) == (str(doc1.pk),)
 
 
 @pytest.mark.usefixtures("indexer_settings")
@@ -532,7 +528,7 @@ def test_get_visited_document_ids_of_deleted():
     doc_deleted.soft_delete()
 
     # Only the first document is not deleted
-    assert get_visited_document_ids_of(queryset, user) == [str(doc.pk)]
+    assert get_visited_document_ids_of(queryset, user) == (str(doc.pk),)
 
 
 @responses.activate
@@ -542,9 +538,7 @@ def test_services_search_indexers_search_errors(indexer_settings):
     """
     factories.DocumentFactory()
 
-    indexer_settings.SEARCH_INDEXER_QUERY_URL = (
-        "http://app-find/api/v1.0/documents/search/"
-    )
+    indexer_settings.SEARCH_URL = "http://app-find/api/v1.0/documents/search/"
 
     responses.add(
         responses.POST,
@@ -554,17 +548,17 @@ def test_services_search_indexers_search_errors(indexer_settings):
     )
 
     with pytest.raises(HTTPError):
-        SearchIndexer().search("alpha", token="mytoken")
+        FindDocumentIndexer().search(q="alpha", token="mytoken")
 
 
 @patch("requests.post")
 def test_services_search_indexers_search(mock_post, indexer_settings):
     """
-    search() should call requests.post to SEARCH_INDEXER_QUERY_URL with the
+    search() should call requests.post to SEARCH_URL with the
     document ids from linktraces.
     """
     user = factories.UserFactory()
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     mock_response = mock_post.return_value
     mock_response.raise_for_status.return_value = None  # No error
@@ -578,11 +572,11 @@ def test_services_search_indexers_search(mock_post, indexer_settings):
 
     visited = get_visited_document_ids_of(models.Document.objects.all(), user)
 
-    indexer.search("alpha", visited=visited, token="mytoken")
+    indexer.search(q="alpha", visited=visited, token="mytoken")
 
     args, kwargs = mock_post.call_args
 
-    assert args[0] == indexer_settings.SEARCH_INDEXER_QUERY_URL
+    assert args[0] == indexer_settings.SEARCH_URL
 
     query_data = kwargs.get("json")
     assert query_data["q"] == "alpha"
@@ -605,7 +599,7 @@ def test_services_search_indexers_search_nb_results(mock_post, indexer_settings)
     indexer_settings.SEARCH_INDEXER_QUERY_LIMIT = 25
 
     user = factories.UserFactory()
-    indexer = SearchIndexer()
+    indexer = FindDocumentIndexer()
 
     mock_response = mock_post.return_value
     mock_response.raise_for_status.return_value = None  # No error
@@ -619,17 +613,65 @@ def test_services_search_indexers_search_nb_results(mock_post, indexer_settings)
 
     visited = get_visited_document_ids_of(models.Document.objects.all(), user)
 
-    indexer.search("alpha", visited=visited, token="mytoken")
+    indexer.search(q="alpha", visited=visited, token="mytoken")
 
     args, kwargs = mock_post.call_args
 
-    assert args[0] == indexer_settings.SEARCH_INDEXER_QUERY_URL
+    assert args[0] == indexer_settings.SEARCH_URL
     assert kwargs.get("json")["nb_results"] == 25
 
     # The argument overrides the setting value
-    indexer.search("alpha", visited=visited, token="mytoken", nb_results=109)
+    indexer.search(q="alpha", visited=visited, token="mytoken", nb_results=109)
 
     args, kwargs = mock_post.call_args
 
-    assert args[0] == indexer_settings.SEARCH_INDEXER_QUERY_URL
+    assert args[0] == indexer_settings.SEARCH_URL
     assert kwargs.get("json")["nb_results"] == 109
+
+
+def test_search_indexer_get_title_with_localized_field():
+    """Test extracting title from localized title field."""
+    source = {"title.extension": "Bonjour", "id": 1, "content": "test"}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result == "Bonjour"
+
+
+def test_search_indexer_get_title_with_multiple_localized_fields():
+    """Test that first matching localized title is returned."""
+    source = {"title.extension": "Bonjour", "title.en": "Hello", "id": 1}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result in ["Bonjour", "Hello"]
+
+
+def test_search_indexer_get_title_fallback_to_plain_title():
+    """Test fallback to plain 'title' field when no localized field exists."""
+    source = {"title": "Hello World", "id": 1}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result == "Hello World"
+
+
+def test_search_indexer_get_title_no_title_field():
+    """Test that empty string is returned when no title field exists."""
+    source = {"id": 1, "content": "test"}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result == ""
+
+
+def test_search_indexer_get_title_with_empty_localized_title():
+    """Test that fallback works when localized title is empty."""
+    source = {"title.extension": "", "title": "Fallback Title", "id": 1}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result == "Fallback Title"
+
+
+def test_search_indexer_get_title_with_multiple_extension():
+    """Test extracting title from title field with multiple extensions."""
+    source = {"title.extension_1.extension_2": "Bonjour", "id": 1, "content": "test"}
+    result = FindDocumentIndexer.get_title(source)
+
+    assert result == "Bonjour"

src/backend/core/tests/test_utils.py

@@ -100,3 +100,38 @@ def test_utils_get_ancestor_to_descendants_map_multiple_paths():
         "000100020005": {"000100020005"},
         "00010003": {"00010003"},
     }
+
+
+def test_utils_get_value_by_pattern_matching_key():
+    """Test extracting value from a dictionary with a matching key pattern."""
+    data = {"title.extension": "Bonjour", "id": 1, "content": "test"}
+    result = utils.get_value_by_pattern(data, r"^title\.")
+
+    assert set(result) == {"Bonjour"}
+
+
+def test_utils_get_value_by_pattern_multiple_matches():
+    """Test that all matching keys are returned."""
+    data = {"title.extension_1": "Bonjour", "title.extension_2": "Hello", "id": 1}
+    result = utils.get_value_by_pattern(data, r"^title\.")
+
+    assert set(result) == {
+        "Bonjour",
+        "Hello",
+    }
+
+
+def test_utils_get_value_by_pattern_multiple_extensions():
+    """Test that all matching keys are returned."""
+    data = {"title.extension_1.extension_2": "Bonjour", "id": 1}
+    result = utils.get_value_by_pattern(data, r"^title\.")
+
+    assert set(result) == {"Bonjour"}
+
+
+def test_utils_get_value_by_pattern_no_match():
+    """Test that empty list is returned when no key matches the pattern."""
+    data = {"name": "Test", "id": 1}
+    result = utils.get_value_by_pattern(data, r"^title\.")
+
+    assert result == []

src/backend/core/utils.py

@@ -10,6 +10,27 @@ from bs4 import BeautifulSoup
 from core import enums
 
 
+def get_value_by_pattern(data, pattern):
+    """
+    Get all values from keys matching a regex pattern in a dictionary.
+
+    Args:
+        data (dict): Source dictionary to search
+        pattern (str): Regex pattern to match against keys
+
+    Returns:
+        list: List of values for all matching keys, empty list if no matches
+
+    Example:
+        >>> get_value_by_pattern({"title.fr": "Bonjour", "id": 1}, r"^title\\.")
+        ["Bonjour"]
+        >>> get_value_by_pattern({"title.fr": "Bonjour", "title.en": "Hello"}, r"^title\\.")
+        ["Bonjour", "Hello"]
+    """
+    regex = re.compile(pattern)
+    return [value for key, value in data.items() if regex.match(key)]
+
+
 def get_ancestor_to_descendants_map(paths, steplen):
     """
     Given a list of document paths, return a mapping of ancestor_path -> set of descendant_paths.

src/backend/impress/settings.py

@@ -112,8 +112,8 @@ class Base(Configuration):
     SEARCH_INDEXER_BATCH_SIZE = values.IntegerValue(
         default=100_000, environ_name="SEARCH_INDEXER_BATCH_SIZE", environ_prefix=None
     )
-    SEARCH_INDEXER_URL = values.Value(
-        default=None, environ_name="SEARCH_INDEXER_URL", environ_prefix=None
+    INDEXING_URL = values.Value(
+        default=None, environ_name="INDEXING_URL", environ_prefix=None
     )
     SEARCH_INDEXER_COUNTDOWN = values.IntegerValue(
         default=1, environ_name="SEARCH_INDEXER_COUNTDOWN", environ_prefix=None
@@ -121,8 +121,8 @@ class Base(Configuration):
     SEARCH_INDEXER_SECRET = values.Value(
         default=None, environ_name="SEARCH_INDEXER_SECRET", environ_prefix=None
     )
-    SEARCH_INDEXER_QUERY_URL = values.Value(
-        default=None, environ_name="SEARCH_INDEXER_QUERY_URL", environ_prefix=None
+    SEARCH_URL = values.Value(
+        default=None, environ_name="SEARCH_URL", environ_prefix=None
     )
     SEARCH_INDEXER_QUERY_LIMIT = values.PositiveIntegerValue(
         default=50, environ_name="SEARCH_INDEXER_QUERY_LIMIT", environ_prefix=None
@@ -169,6 +169,11 @@ class Base(Configuration):
         environ_name="AWS_STORAGE_BUCKET_NAME",
         environ_prefix=None,
     )
+    AWS_S3_SIGNATURE_VERSION = values.Value(
+        "s3v4",
+        environ_name="AWS_S3_SIGNATURE_VERSION",
+        environ_prefix=None,
+    )
 
     # Document images
     DOCUMENT_IMAGE_MAX_SIZE = values.IntegerValue(
@@ -324,6 +329,7 @@ class Base(Configuration):
         "django.contrib.messages.middleware.MessageMiddleware",
         "dockerflow.django.middleware.DockerflowMiddleware",
         "csp.middleware.CSPMiddleware",
+        "waffle.middleware.WaffleMiddleware",
     ]
 
     AUTHENTICATION_BACKENDS = [
@@ -345,6 +351,7 @@ class Base(Configuration):
         "parler",
         "treebeard",
         "easy_thumbnails",
+        "waffle",
         # Django
         "django.contrib.admin",
         "django.contrib.auth",

src/backend/pyproject.toml

@@ -42,6 +42,7 @@ dependencies = [
     "django<6.0.0",
     "django-treebeard==4.8.0",
     "djangorestframework==3.16.1",
+    "django-waffle==5.0.0",
     "drf_spectacular==0.29.0",
     "dockerflow==2024.4.2",
     "easy_thumbnails==2.10.1",

src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts

@@ -7,7 +7,12 @@ import {
   mockedDocument,
   verifyDocName,
 } from './utils-common';
-import { mockedAccesses, mockedInvitations } from './utils-share';
+import {
+  connectOtherUserToDoc,
+  mockedAccesses,
+  mockedInvitations,
+  updateShareLink,
+} from './utils-share';
 import { createRootSubPage, getTreeRow } from './utils-sub-pages';
 
 test.beforeEach(async ({ page }) => {
@@ -52,13 +57,54 @@ test.describe('Doc Header', () => {
     ).toBeVisible();
   });
 
-  test('it updates the title doc', async ({ page, browserName }) => {
-    await createDoc(page, 'doc-update', browserName, 1);
-    const docTitle = page.getByRole('textbox', { name: 'Document title' });
-    await expect(docTitle).toBeVisible();
-    await docTitle.fill('Hello World');
-    await docTitle.blur();
+  test('it updates the title doc and check the broadcast', async ({
+    page,
+    browserName,
+  }) => {
+    const [docTitle] = await createDoc(
+      page,
+      'doc-title-update',
+      browserName,
+      1,
+    );
+    await page.getByRole('button', { name: 'Share' }).click();
+    await updateShareLink(page, 'Public', 'Editing');
+
+    const docUrl = page.url();
+
+    const { otherPage, cleanup } = await connectOtherUserToDoc({
+      docUrl,
+      browserName,
+      withoutSignIn: true,
+      docTitle,
+    });
+
+    // Wait for other page to sync
+    await page.waitForTimeout(1000);
+
+    await page.keyboard.press('Escape');
+    const elTitle = page.getByRole('textbox', { name: 'Document title' });
+    await expect(elTitle).toBeVisible();
+    await elTitle.fill('Hello World');
+    await elTitle.blur();
     await verifyDocName(page, 'Hello World');
+
+    // Wait for other page to sync
+    await page.waitForTimeout(1000);
+
+    // Check other user page
+    await verifyDocName(otherPage, 'Hello World');
+
+    const elTitleOther = otherPage.getByRole('textbox', {
+      name: 'Document title',
+    });
+    await elTitleOther.fill('Hello Other World');
+    await elTitleOther.blur();
+
+    // Check first user page
+    await verifyDocName(page, 'Hello Other World');
+
+    await cleanup();
   });
 
   test('it updates the title doc adding a leading emoji', async ({

src/frontend/apps/e2e/__tests__/app-impress/doc-search.spec.ts

@@ -45,7 +45,7 @@ test.describe('Document search', () => {
     const listSearch = page.getByRole('listbox').getByRole('group');
     const rowdoc = listSearch.getByRole('option').first();
     await expect(rowdoc.getByText('keyboard_return')).toBeVisible();
-    await expect(rowdoc.getByText(/seconds? ago/)).toBeVisible();
+    await expect(rowdoc.getByText(/just now/)).toBeVisible();
 
     await expect(
       listSearch.getByRole('option').getByText(doc1Title),

src/frontend/apps/impress/src/features/docs/doc-editor/components/custom-inline-content/Interlinking/SearchPage.tsx

@@ -3,6 +3,7 @@ import {
   StyleSchema,
 } from '@blocknote/core';
 import { useBlockNoteEditor } from '@blocknote/react';
+import { useTreeContext } from '@gouvfr-lasuite/ui-kit';
 import type { KeyboardEvent } from 'react';
 import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -26,12 +27,14 @@ import {
 import FoundPageIcon from '@/docs/doc-editor/assets/doc-found.svg';
 import AddPageIcon from '@/docs/doc-editor/assets/doc-plus.svg';
 import {
+  Doc,
   getEmojiAndTitle,
   useCreateChildDocTree,
   useDocStore,
   useTrans,
 } from '@/docs/doc-management';
-import { DocSearchSubPageContent, DocSearchTarget } from '@/docs/doc-search';
+import { DocSearchTarget } from '@/docs/doc-search';
+import { DocSearchContent } from '@/docs/doc-search/components/DocSearchContent';
 import { useResponsiveStore } from '@/stores';
 
 const inputStyle = css`
@@ -87,7 +90,7 @@ export const SearchPage = ({
   const { isDesktop } = useResponsiveStore();
   const { untitledDocument } = useTrans();
   const isEditable = editor.isEditable;
-
+  const treeContext = useTreeContext<Doc>();
   /**
    * createReactInlineContentSpec add automatically the focus after
    * the inline content, so we need to set the focus on the input
@@ -225,14 +228,14 @@ export const SearchPage = ({
             `}
             $margin={{ top: '0.5rem' }}
           >
-            <DocSearchSubPageContent
+            <DocSearchContent
               search={search}
-              filters={{ target: DocSearchTarget.CURRENT }}
+              target={DocSearchTarget.CURRENT}
+              parentPath={treeContext?.root?.path}
               onSelect={(doc) => {
                 if (!isEditable) {
                   return;
                 }
-
                 updateInlineContent({
                   type: 'interlinkingSearchInline',
                   props: {

src/frontend/apps/impress/src/features/docs/doc-management/api/index.ts

@@ -8,5 +8,5 @@ export * from './useDocs';
 export * from './useDocsFavorite';
 export * from './useDuplicateDoc';
 export * from './useRestoreDoc';
-export * from './useSubDocs';
 export * from './useUpdateDoc';
+export * from './useSearchDocs';

src/frontend/apps/impress/src/features/docs/doc-management/api/useDocs.tsx

@@ -15,7 +15,6 @@ export type DocsParams = {
   page: number;
   ordering?: DocsOrdering;
   is_creator_me?: boolean;
-  title?: string;
   is_favorite?: boolean;
 };
 
@@ -31,9 +30,6 @@ export const constructParams = (params: DocsParams): URLSearchParams => {
   if (params.is_creator_me !== undefined) {
     searchParams.set('is_creator_me', params.is_creator_me.toString());
   }
-  if (params.title && params.title.length > 0) {
-    searchParams.set('title', params.title);
-  }
   if (params.is_favorite !== undefined) {
     searchParams.set('is_favorite', params.is_favorite.toString());
   }

src/frontend/apps/impress/src/features/docs/doc-management/api/useSearchDocs.tsx

@@ -0,0 +1,69 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { APIError, errorCauses, fetchAPI, useAPIInfiniteQuery } from '@/api';
+import { DocSearchTarget } from '@/docs/doc-search';
+
+import { DocsResponse, KEY_LIST_DOC } from './useDocs';
+
+export type SearchDocsParams = {
+  page: number;
+  q: string;
+  target?: DocSearchTarget;
+  parentPath?: string;
+};
+
+const constructParams = ({
+  q,
+  page,
+  target,
+  parentPath,
+}: SearchDocsParams): URLSearchParams => {
+  const searchParams = new URLSearchParams();
+
+  searchParams.set('q', q);
+
+  if (target === DocSearchTarget.CURRENT && parentPath) {
+    searchParams.set('path', parentPath);
+  }
+  if (page) {
+    searchParams.set('page', page.toString());
+  }
+
+  return searchParams;
+};
+
+const searchDocs = async ({
+  q,
+  page,
+  target,
+  parentPath,
+}: SearchDocsParams): Promise<DocsResponse> => {
+  const searchParams = constructParams({ q, page, target, parentPath });
+  const response = await fetchAPI(
+    `documents/search/?${searchParams.toString()}`,
+  );
+
+  if (!response.ok) {
+    throw new APIError('Failed to get the docs', await errorCauses(response));
+  }
+
+  return response.json() as Promise<DocsResponse>;
+};
+
+export const useSearchDocs = (
+  { q, page, target, parentPath }: SearchDocsParams,
+  queryConfig?: { enabled?: boolean },
+) => {
+  return useQuery<DocsResponse, APIError, DocsResponse>({
+    queryKey: [KEY_LIST_DOC, 'search', { q, page, target, parentPath }],
+    queryFn: () => searchDocs({ q, page, target, parentPath }),
+    ...queryConfig,
+  });
+};
+
+export const useInfiniteSearchDocs = (
+  params: SearchDocsParams,
+  queryConfig?: { enabled?: boolean },
+) => {
+  return useAPIInfiniteQuery(KEY_LIST_DOC, searchDocs, params, queryConfig);
+};

src/frontend/apps/impress/src/features/docs/doc-management/api/useSubDocs.tsx

@@ -1,62 +0,0 @@
-import { UseQueryOptions, useQuery } from '@tanstack/react-query';
-
-import {
-  APIError,
-  InfiniteQueryConfig,
-  errorCauses,
-  fetchAPI,
-  useAPIInfiniteQuery,
-} from '@/api';
-
-import { DocsOrdering } from '../types';
-
-import { DocsResponse, constructParams } from './useDocs';
-
-export type SubDocsParams = {
-  page: number;
-  ordering?: DocsOrdering;
-  is_creator_me?: boolean;
-  title?: string;
-  is_favorite?: boolean;
-  parent_id: string;
-};
-
-export const getSubDocs = async (
-  params: SubDocsParams,
-): Promise<DocsResponse> => {
-  const searchParams = constructParams(params);
-  searchParams.set('parent_id', params.parent_id);
-
-  const response: Response = await fetchAPI(
-    `documents/${params.parent_id}/descendants/?${searchParams.toString()}`,
-  );
-
-  if (!response.ok) {
-    throw new APIError(
-      'Failed to get the sub docs',
-      await errorCauses(response),
-    );
-  }
-
-  return response.json() as Promise<DocsResponse>;
-};
-
-export const KEY_LIST_SUB_DOC = 'sub-docs';
-
-export function useSubDocs(
-  params: SubDocsParams,
-  queryConfig?: UseQueryOptions<DocsResponse, APIError, DocsResponse>,
-) {
-  return useQuery<DocsResponse, APIError, DocsResponse>({
-    queryKey: [KEY_LIST_SUB_DOC, params],
-    queryFn: () => getSubDocs(params),
-    ...queryConfig,
-  });
-}
-
-export const useInfiniteSubDocs = (
-  params: SubDocsParams,
-  queryConfig?: InfiniteQueryConfig<DocsResponse>,
-) => {
-  return useAPIInfiniteQuery(KEY_LIST_SUB_DOC, getSubDocs, params, queryConfig);
-};

src/frontend/apps/impress/src/features/docs/doc-management/components/SimpleDocItem.tsx

@@ -1,9 +1,9 @@
-import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
 import { css } from 'styled-components';
 
 import { Box, Text } from '@/components';
 import { useCunninghamTheme } from '@/cunningham';
+import { useDate } from '@/hooks/useDate';
 import { useResponsiveStore } from '@/stores';
 
 import ChildDocument from '../assets/child-document.svg';
@@ -38,6 +38,7 @@ export const SimpleDocItem = ({
   const { isDesktop } = useResponsiveStore();
   const { untitledDocument } = useTrans();
   const { isChild } = useDocUtils(doc);
+  const { relativeDate } = useDate();
 
   return (
     <Box
@@ -100,7 +101,7 @@ export const SimpleDocItem = ({
             aria-hidden="true"
           >
             <Text $size="xs" $variation="tertiary">
-              {DateTime.fromISO(doc.updated_at).toRelative()}
+              {relativeDate(doc.updated_at)}
             </Text>
           </Box>
         )}

src/frontend/apps/impress/src/features/docs/doc-management/hooks/useCollaboration.tsx

@@ -8,7 +8,7 @@ import { Base64 } from '../types';
 
 export const useCollaboration = (room?: string, initialContent?: Base64) => {
   const collaborationUrl = useCollaborationUrl(room);
-  const { setBroadcastProvider } = useBroadcastStore();
+  const { setBroadcastProvider, cleanupBroadcast } = useBroadcastStore();
   const { provider, createProvider, destroyProvider } = useProviderStore();
 
   useEffect(() => {
@@ -33,8 +33,9 @@ export const useCollaboration = (room?: string, initialContent?: Base64) => {
   useEffect(() => {
     return () => {
       if (room) {
+        cleanupBroadcast();
         destroyProvider();
       }
     };
-  }, [destroyProvider, room]);
+  }, [destroyProvider, room, cleanupBroadcast]);
 };

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchContent.tsx

@@ -3,24 +3,31 @@ import { useEffect, useMemo } from 'react';
 import { InView } from 'react-intersection-observer';
 
 import { QuickSearchData, QuickSearchGroup } from '@/components/quick-search';
+import { useInfiniteSearchDocs } from '@/docs/doc-management/api/useSearchDocs';
+import { DocSearchTarget } from '@/docs/doc-search';
 
-import { Doc, useInfiniteDocs } from '../../doc-management';
+import { Doc } from '../../doc-management';
 
-import { DocSearchFiltersValues } from './DocSearchFilters';
 import { DocSearchItem } from './DocSearchItem';
 
 type DocSearchContentProps = {
   search: string;
-  filters: DocSearchFiltersValues;
   onSelect: (doc: Doc) => void;
   onLoadingChange?: (loading: boolean) => void;
+  renderElement?: (doc: Doc) => React.ReactNode;
+  target?: DocSearchTarget;
+  parentPath?: string;
+  emptySearchText?: string;
 };
 
 export const DocSearchContent = ({
   search,
-  filters,
   onSelect,
   onLoadingChange,
+  renderElement = (doc) => <DocSearchItem doc={doc} />,
+  target,
+  parentPath,
+  emptySearchText,
 }: DocSearchContentProps) => {
   const {
     data,
@@ -29,21 +36,29 @@ export const DocSearchContent = ({
     isLoading,
     fetchNextPage,
     hasNextPage,
-  } = useInfiniteDocs({
-    page: 1,
-    title: search,
-    ...filters,
-  });
+  } = useInfiniteSearchDocs(
+    {
+      q: search,
+      page: 1,
+      target,
+      parentPath,
+    },
+    {
+      enabled: target !== DocSearchTarget.CURRENT || !!parentPath,
+    },
+  );
 
   const loading = isFetching || isRefetching || isLoading;
 
   const docsData: QuickSearchData<Doc> = useMemo(() => {
     const docs = data?.pages.flatMap((page) => page.results) || [];
+    const defaultEmptyText = emptySearchText || t('No document found');
+    const emptyText = search ? defaultEmptyText : t('Search by title');
 
     return {
       groupName: docs.length > 0 ? t('Select a document') : '',
       elements: search ? docs : [],
-      emptyString: t('No document found'),
+      emptyString: target ? emptyText : defaultEmptyText,
       endActions: hasNextPage
         ? [
             {
@@ -52,7 +67,14 @@ export const DocSearchContent = ({
           ]
         : [],
     };
-  }, [search, data?.pages, fetchNextPage, hasNextPage]);
+  }, [
+    search,
+    data?.pages,
+    fetchNextPage,
+    hasNextPage,
+    emptySearchText,
+    target,
+  ]);
 
   useEffect(() => {
     onLoadingChange?.(loading);
@@ -62,7 +84,7 @@ export const DocSearchContent = ({
     <QuickSearchGroup
       onSelect={onSelect}
       group={docsData}
-      renderElement={(doc) => <DocSearchItem doc={doc} />}
+      renderElement={renderElement}
     />
   );
 };

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchModal.tsx

@@ -1,4 +1,5 @@
 import { Modal, ModalSize } from '@gouvfr-lasuite/cunningham-react';
+import { TreeContextType, useTreeContext } from '@gouvfr-lasuite/ui-kit';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
@@ -8,45 +9,40 @@ import { useDebouncedCallback } from 'use-debounce';
 import { Box, ButtonCloseModal, Text } from '@/components';
 import { QuickSearch } from '@/components/quick-search';
 import { Doc, useDocUtils } from '@/docs/doc-management';
+import {
+  DocSearchFilters,
+  DocSearchFiltersValues,
+  DocSearchTarget,
+} from '@/docs/doc-search';
 import { useResponsiveStore } from '@/stores';
 
 import EmptySearchIcon from '../assets/illustration-docs-empty.png';
 
 import { DocSearchContent } from './DocSearchContent';
-import {
-  DocSearchFilters,
-  DocSearchFiltersValues,
-  DocSearchTarget,
-} from './DocSearchFilters';
 import { DocSearchItem } from './DocSearchItem';
-import { DocSearchSubPageContent } from './DocSearchSubPageContent';
 
 type DocSearchModalGlobalProps = {
   onClose: () => void;
   isOpen: boolean;
   showFilters?: boolean;
   defaultFilters?: DocSearchFiltersValues;
+  treeContext?: TreeContextType<Doc> | null;
 };
 
 const DocSearchModalGlobal = ({
   showFilters = false,
   defaultFilters,
+  treeContext,
   ...modalProps
 }: DocSearchModalGlobalProps) => {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-
   const router = useRouter();
-  const isDocPage = router.pathname === '/docs/[id]';
-
   const [search, setSearch] = useState('');
   const [filters, setFilters] = useState<DocSearchFiltersValues>(
     defaultFilters ?? {},
   );
-
-  const target = filters.target ?? DocSearchTarget.ALL;
   const { isDesktop } = useResponsiveStore();
-
   const handleInputSearch = useDebouncedCallback(setSearch, 300);
 
   const handleSelect = (doc: Doc) => {
@@ -120,25 +116,22 @@ const DocSearchModalGlobal = ({
               </Box>
             )}
             {search && (
-              <>
-                {target === DocSearchTarget.ALL && (
-                  <DocSearchContent
-                    search={search}
-                    filters={filters}
-                    onSelect={handleSelect}
-                    onLoadingChange={setLoading}
-                  />
-                )}
-                {isDocPage && target === DocSearchTarget.CURRENT && (
-                  <DocSearchSubPageContent
-                    search={search}
-                    filters={filters}
-                    onSelect={handleSelect}
-                    onLoadingChange={setLoading}
-                    renderElement={(doc) => <DocSearchItem doc={doc} />}
-                  />
-                )}
-              </>
+              <DocSearchContent
+                search={search}
+                onSelect={handleSelect}
+                onLoadingChange={setLoading}
+                renderElement={(doc) => <DocSearchItem doc={doc} />}
+                target={
+                  filters.target === DocSearchTarget.CURRENT
+                    ? DocSearchTarget.CURRENT
+                    : DocSearchTarget.ALL
+                }
+                parentPath={
+                  filters.target === DocSearchTarget.CURRENT
+                    ? treeContext?.root?.path
+                    : undefined
+                }
+              />
             )}
           </Box>
         </QuickSearch>
@@ -157,6 +150,7 @@ const DocSearchModalDetail = ({
 }: DocSearchModalDetailProps) => {
   const { hasChildren, isChild } = useDocUtils(doc);
   const isWithChildren = isChild || hasChildren;
+  const treeContext = useTreeContext<Doc>();
 
   let defaultFilters = DocSearchTarget.ALL;
   let showFilters = false;
@@ -170,6 +164,7 @@ const DocSearchModalDetail = ({
       {...modalProps}
       showFilters={showFilters}
       defaultFilters={{ target: defaultFilters }}
+      treeContext={treeContext}
     />
   );
 };

src/frontend/apps/impress/src/features/docs/doc-search/components/DocSearchSubPageContent.tsx

@@ -1,103 +0,0 @@
-import { useTreeContext } from '@gouvfr-lasuite/ui-kit';
-import { t } from 'i18next';
-import React, { useEffect, useState } from 'react';
-import { InView } from 'react-intersection-observer';
-
-import { QuickSearchData, QuickSearchGroup } from '@/components/quick-search';
-import { Doc, useInfiniteSubDocs } from '@/docs/doc-management';
-
-import { DocSearchFiltersValues } from './DocSearchFilters';
-
-type DocSearchSubPageContentProps = {
-  search: string;
-  filters: DocSearchFiltersValues;
-  onSelect: (doc: Doc) => void;
-  onLoadingChange?: (loading: boolean) => void;
-  renderElement: (doc: Doc) => React.ReactNode;
-};
-
-export const DocSearchSubPageContent = ({
-  search,
-  filters,
-  onSelect,
-  onLoadingChange,
-  renderElement,
-}: DocSearchSubPageContentProps) => {
-  const treeContext = useTreeContext<Doc>();
-
-  const {
-    data: subDocsData,
-    isFetching,
-    isRefetching,
-    isLoading,
-    fetchNextPage: subDocsFetchNextPage,
-    hasNextPage: subDocsHasNextPage,
-  } = useInfiniteSubDocs(
-    {
-      page: 1,
-      title: search,
-      ...filters,
-      parent_id: treeContext?.root?.id ?? '',
-    },
-    {
-      enabled: !!treeContext?.root?.id,
-    },
-  );
-  const [docsData, setDocsData] = useState<QuickSearchData<Doc>>({
-    groupName: '',
-    elements: [],
-    emptyString: '',
-  });
-
-  const loading = isFetching || isRefetching || isLoading;
-
-  useEffect(() => {
-    if (loading) {
-      return;
-    }
-
-    const subDocs = subDocsData?.pages.flatMap((page) => page.results) || [];
-
-    if (treeContext?.root) {
-      const isRootTitleIncludeSearch = treeContext.root?.title
-        ?.toLowerCase()
-        .includes(search.toLowerCase());
-
-      if (isRootTitleIncludeSearch) {
-        subDocs.unshift(treeContext.root);
-      }
-    }
-
-    setDocsData({
-      groupName: subDocs.length > 0 ? t('Select a doc') : '',
-      elements: search ? subDocs : [],
-      emptyString: search ? t('No document found') : t('Search by title'),
-      endActions: subDocsHasNextPage
-        ? [
-            {
-              content: <InView onChange={() => void subDocsFetchNextPage()} />,
-            },
-          ]
-        : [],
-    });
-  }, [
-    loading,
-    search,
-    subDocsData?.pages,
-    subDocsFetchNextPage,
-    subDocsHasNextPage,
-    treeContext?.root,
-  ]);
-
-  useEffect(() => {
-    onLoadingChange?.(loading);
-  }, [loading, onLoadingChange]);
-
-  return (
-    <QuickSearchGroup
-      onSelect={onSelect}
-      group={docsData}
-      renderElement={renderElement}
-    />
-  );
-};

src/frontend/apps/impress/src/features/docs/doc-search/components/index.ts

@@ -1,3 +1,2 @@
 export * from './DocSearchModal';
 export * from './DocSearchFilters';
-export * from './DocSearchSubPageContent';

src/frontend/apps/impress/src/features/docs/docs-grid/components/__tests__/DocsGridItemDate.test.tsx

@@ -31,6 +31,10 @@ describe('DocsGridItemDate', () => {
   });
 
   [
+    {
+      updated_at: DateTime.now().minus({ seconds: 1 }).toISO(),
+      rendered: 'just now',
+    },
     {
       updated_at: DateTime.now().minus({ minutes: 1 }).toISO(),
       rendered: '1 minute ago',

src/frontend/apps/impress/src/hooks/useDate.tsx

@@ -10,7 +10,7 @@ const formatDefault: DateTimeFormatOptions = {
 };
 
 export const useDate = () => {
-  const { i18n } = useTranslation();
+  const { i18n, t } = useTranslation();
 
   const formatDate = (
     date: string,
@@ -22,7 +22,19 @@ export const useDate = () => {
   };
 
   const relativeDate = (date: string): string => {
-    return DateTime.fromISO(date).setLocale(i18n.language).toRelative() || '';
+    const dateToCompare = DateTime.fromISO(date);
+
+    if (!dateToCompare.isValid) {
+      return '';
+    }
+
+    const dateNow = DateTime.now();
+
+    const differenceInSeconds = dateNow.diff(dateToCompare).as('seconds');
+
+    return Math.abs(differenceInSeconds) >= 5
+      ? dateToCompare.toRelative({ base: dateNow, locale: i18n.language })
+      : t('just now');
   };
 
   const calculateDaysLeft = (date: string, daysLimit: number): number =>

src/frontend/apps/impress/src/stores/useBroadcastStore.tsx

@@ -5,7 +5,9 @@ import { create } from 'zustand';
 interface BroadcastState {
   addTask: (taskLabel: string, action: () => void) => void;
   broadcast: (taskLabel: string) => void;
+  cleanupBroadcast: () => void;
   getBroadcastProvider: () => HocuspocusProvider | undefined;
+  handleProviderSync: () => void;
   provider?: HocuspocusProvider;
   setBroadcastProvider: (provider: HocuspocusProvider) => void;
   setTask: (
@@ -15,11 +17,12 @@ interface BroadcastState {
   ) => void;
   tasks: {
     [taskLabel: string]: {
-      task: Y.Array<string>;
+      action: () => void;
       observer: (
         event: Y.YArrayEvent<string>,
         transaction: Y.Transaction,
       ) => void;
+      task: Y.Array<string>;
     };
   };
 }
@@ -27,7 +30,22 @@ interface BroadcastState {
 export const useBroadcastStore = create<BroadcastState>((set, get) => ({
   provider: undefined,
   tasks: {},
-  setBroadcastProvider: (provider) => set({ provider }),
+  setBroadcastProvider: (provider) => {
+    // Clean up old provider listeners
+    const oldProvider = get().provider;
+    if (oldProvider) {
+      oldProvider.off('synced', get().handleProviderSync);
+    }
+
+    provider.on('synced', get().handleProviderSync);
+    set({ provider });
+  },
+  handleProviderSync: () => {
+    const tasks = get().tasks;
+    Object.entries(tasks).forEach(([taskLabel, { action }]) => {
+      get().addTask(taskLabel, action);
+    });
+  },
   getBroadcastProvider: () => {
     const provider = get().provider;
     if (!provider) {
@@ -43,20 +61,16 @@ export const useBroadcastStore = create<BroadcastState>((set, get) => ({
       return;
     }
 
-    const existingTask = get().tasks[taskLabel];
-    if (existingTask) {
-      existingTask.task.unobserve(existingTask.observer);
-      get().setTask(taskLabel, existingTask.task, action);
-      return;
-    }
-
     const task = provider.document.getArray<string>(taskLabel);
     get().setTask(taskLabel, task, action);
   },
   setTask: (taskLabel: string, task: Y.Array<string>, action: () => void) => {
     let isInitializing = true;
-    const observer = () => {
-      if (!isInitializing) {
+    const observer = (
+      _event: Y.YArrayEvent<string>,
+      transaction: Y.Transaction,
+    ) => {
+      if (!isInitializing && !transaction.local) {
         action();
       }
     };
@@ -73,16 +87,27 @@ export const useBroadcastStore = create<BroadcastState>((set, get) => ({
         [taskLabel]: {
           task,
           observer,
+          action,
         },
       },
     }));
   },
   broadcast: (taskLabel) => {
+    // Broadcast via Y.js provider (for users on the same document)
     const obTask = get().tasks?.[taskLabel];
-    if (!obTask || !obTask.task) {
-      console.warn(`Task ${taskLabel} is not defined`);
-      return;
+    if (obTask?.task) {
+      obTask.task.push([`broadcast: ${taskLabel}`]);
     }
-    obTask.task.push([`broadcast: ${taskLabel}`]);
+  },
+  cleanupBroadcast: () => {
+    const provider = get().provider;
+    if (provider) {
+      provider.off('synced', get().handleProviderSync);
+    }
+
+    // Unobserve all document-specific tasks
+    Object.values(get().tasks).forEach(({ task, observer }) => {
+      task.unobserve(observer);
+    });
   },
 }));