🔧(actions) migrate from pip to uv

Migreate usage of pip to uv in github actions. How python is setup is
also changed.

.github/workflows/impress.yml

@@ -96,21 +96,20 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
-      - name: Install Python
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13.3"
-          cache: "pip"
-      - name: Upgrade pip and setuptools
-        run: pip install --upgrade pip setuptools
-      - name: Install development dependencies
-        run: pip install --user .[dev]
+          python-version-file: "src/backend/pyproject.toml"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Install the project
+        run: uv sync --locked --all-extras
       - name: Check code formatting with ruff
-        run: ~/.local/bin/ruff format . --diff
+        run: uv run ruff format . --diff
       - name: Lint code with ruff
-        run: ~/.local/bin/ruff check .
+        run: uv run ruff check .
       - name: Lint code with pylint
-        run: ~/.local/bin/pylint .
+        run: uv run pylint .
 
   test-back:
     runs-on: ubuntu-latest
@@ -192,14 +191,14 @@ jobs:
             mc mb impress/impress-media-storage && \
             mc version enable impress/impress-media-storage"
 
-      - name: Install Python
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13.3"
-          cache: "pip"
-
-      - name: Install development dependencies
-        run: pip install --user .[dev]
+          python-version-file: "src/backend/pyproject.toml"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Install the project
+        run: uv sync --locked --all-extras
 
       - name: Install gettext (required to compile messages) and MIME support
         run: |
@@ -208,7 +207,7 @@ jobs:
           sudo wget https://raw.githubusercontent.com/suitenumerique/django-lasuite/refs/heads/main/assets/conf/mime.types -O /etc/mime.types
 
       - name: Generate a MO file from strings extracted from the project
-        run: python manage.py compilemessages
+        run: uv run python manage.py compilemessages
 
       - name: Run tests
-        run: ~/.local/bin/pytest -n 2
+        run: uv run pytest -n 2

CHANGELOG.md

@@ -9,7 +9,10 @@ and this project adheres to
 ### Added
 
 - ⚡️(frontend) add skeleton on content loading #2254
-- ⚡️(frontend) close websocket connection when user change tab #2264
+
+### Changed
+
+- 🏗️(core) migrate from pip to uv
 
 ### Fixed
 

Dockerfile

@@ -1,24 +1,38 @@
 # Django impress
 
 # ---- base image to inherit from ----
-FROM python:3.13.3-alpine AS base
-
-# Upgrade pip to its latest release to speed up dependencies installation
-RUN python -m pip install --upgrade pip
+FROM python:3.13.13-alpine AS base
 
 # Upgrade system packages to install security updates
 RUN apk update && apk upgrade --no-cache
 
+# Upgrade pip to its latest release to speed up dependencies installation
+# We must do that to avoid having an outdated pip version with security issues
+RUN python -m pip install --upgrade pip
+
 # ---- Back-end builder image ----
 FROM base AS back-builder
 
-WORKDIR /builder
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
 
-# Copy required python dependencies
-COPY ./src/backend /builder
+# Disable Python downloads, because we want to use the system interpreter
+# across both images. If using a managed Python version, it needs to be
+# copied from the build image into the final image;
+ENV UV_PYTHON_DOWNLOADS=0
 
-RUN mkdir /install && \
-  pip install --prefix=/install .
+# install uv
+COPY --from=ghcr.io/astral-sh/uv:0.11.10 /uv /uvx /bin/
+
+WORKDIR /app
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=src/backend/uv.lock,target=uv.lock \
+    --mount=type=bind,source=src/backend/pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project --no-dev
+COPY src/backend /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-dev
 
 
 # ---- mails ----
@@ -41,14 +55,13 @@ RUN apk add --no-cache \
   pango \
   rdfind
 
-# Copy installed python dependencies
-COPY --from=back-builder /install /usr/local
-
-# Copy impress application (see .dockerignore)
-COPY ./src/backend /app/
+# Copy the application from the builder
+COPY --from=back-builder /app /app
 
 WORKDIR /app
 
+ENV PATH="/app/.venv/bin:$PATH"
+
 # collectstatic
 RUN DJANGO_CONFIGURATION=Build \
   python manage.py collectstatic --noinput
@@ -84,8 +97,12 @@ COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
 # docker user (see entrypoint).
 RUN chmod g=u /etc/passwd
 
-# Copy installed python dependencies
-COPY --from=back-builder /install /usr/local
+# Copy the application from the builder
+COPY --from=back-builder /app /app
+
+WORKDIR /app
+
+ENV PATH="/app/.venv/bin:$PATH"
 
 # Link certifi certificate from a static path /cert/cacert.pem to avoid issues
 # when python is upgraded and the path to the certificate changes.
@@ -95,11 +112,6 @@ RUN mkdir /cert && \
   mv $path /cert/ && \
   ln -s /cert/cacert.pem $path
 
-# Copy impress application (see .dockerignore)
-COPY ./src/backend /app/
-
-WORKDIR /app
-
 # Generate compiled translation messages
 RUN DJANGO_CONFIGURATION=Build \
   python manage.py compilemessages
@@ -119,10 +131,9 @@ USER root:root
 # Install psql
 RUN apk add --no-cache postgresql-client
 
-# Uninstall impress and re-install it in editable mode along with development
-# dependencies
-RUN pip uninstall -y impress
-RUN pip install -e .[dev]
+# Install development dependencies
+RUN --mount=from=ghcr.io/astral-sh/uv:0.11.10,source=/uv,target=/bin/uv \
+  uv sync --all-extras --locked
 
 # Restore the un-privileged user running the application
 ARG DOCKER_USER

Makefile

@@ -72,7 +72,7 @@ data/static:
 # -- Project
 
 create-env-local-files: ## create env.local files in env.d/development
-create-env-local-files: 
+create-env-local-files:
 	@touch env.d/development/crowdin.local
 	@touch env.d/development/common.local
 	@touch env.d/development/postgresql.local
@@ -141,7 +141,7 @@ else
 	@echo "$(RESET)"
 	@echo "$(GREEN)Starting bootstrap process...$(RESET)"
 endif
-	@echo "" 
+	@echo ""
 .PHONY: pre-beautiful-bootstrap
 
 post-beautiful-bootstrap: ## Display a success message after bootstrap
@@ -235,7 +235,7 @@ run-backend: ## Start only the backend application and all needed services
 .PHONY: run-backend
 
 run: ## start the wsgi (production) and development server
-run: 
+run:
 	@$(MAKE) run-backend
 	@$(COMPOSE) up --force-recreate -d frontend-development
 .PHONY: run
@@ -322,7 +322,7 @@ superuser: ## Create an admin superuser with password "admin"
 .PHONY: superuser
 
 back-i18n-compile: ## compile the gettext files
-	@$(MANAGE) compilemessages --ignore="venv/**/*"
+	@$(MANAGE) compilemessages --ignore=".venv/**/*"
 .PHONY: back-i18n-compile
 
 back-i18n-generate: ## create the .pot files used for i18n

compose.yml

@@ -80,6 +80,7 @@ services:
     volumes:
       - ./src/backend:/app
       - ./data/static:/data/static
+      - /app/.venv
     depends_on:
       postgresql:
         condition: service_healthy
@@ -108,6 +109,7 @@ services:
     volumes:
       - ./src/backend:/app
       - ./data/static:/data/static
+      - /app/.venv
     depends_on:
       - app-dev
 

docs/env.md

@@ -34,7 +34,6 @@ These are the environment variables you can set for the `impress-backend` contai
 | 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_INACTIVITY_TIMEOUT             | Timeout (in seconds) after which the user is considered inactive when there is no activity. The WebSocket is closed after this inactivity period. `None` means disabled.                         | None                                                                    |
 | COLLABORATION_WS_NOT_CONNECTED_READY_ONLY       | Users not connected to the collaboration server cannot edit                                                                                                                | false                                                                   |
 | COLLABORATION_WS_URL                            | Collaboration websocket url                                                                                                                                                |                                                                         |
 | CONVERSION_API_CONTENT_FIELD                    | Conversion api content field                                                                                                                                               | content                                                                 |

env.d/development/common

@@ -78,7 +78,6 @@ COLLABORATION_SERVER_ORIGIN=http://localhost:3000
 COLLABORATION_SERVER_SECRET=my-secret
 COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=true
 COLLABORATION_WS_URL=ws://localhost:4444/collaboration/ws/
-COLLABORATION_WS_INACTIVITY_TIMEOUT=15 # Seconds
 
 DJANGO_SERVER_TO_SERVER_API_TOKENS=server-api-token
 Y_PROVIDER_API_BASE_URL=http://y-provider-development:4444/api/

src/backend/core/api/viewsets.py

@@ -2831,7 +2831,6 @@ class ConfigView(drf.views.APIView):
             "API_USERS_SEARCH_QUERY_MIN_LENGTH",
             "COLLABORATION_WS_URL",
             "COLLABORATION_WS_NOT_CONNECTED_READY_ONLY",
-            "COLLABORATION_WS_INACTIVITY_TIMEOUT",
             "CONVERSION_FILE_EXTENSIONS_ALLOWED",
             "CONVERSION_FILE_MAX_SIZE",
             "CONVERSION_UPLOAD_ENABLED",

src/backend/core/tests/test_api_config.py

@@ -26,7 +26,6 @@ pytestmark = pytest.mark.django_db
     API_USERS_SEARCH_QUERY_MIN_LENGTH=6,
     COLLABORATION_WS_URL="http://testcollab/",
     COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=True,
-    COLLABORATION_WS_INACTIVITY_TIMEOUT=300,
     CONVERSION_UPLOAD_ENABLED=False,
     CRISP_WEBSITE_ID="123",
     FRONTEND_CSS_URL="http://testcss/",
@@ -56,7 +55,6 @@ def test_api_config(is_authenticated):
         "API_USERS_SEARCH_QUERY_MIN_LENGTH": 6,
         "COLLABORATION_WS_URL": "http://testcollab/",
         "COLLABORATION_WS_NOT_CONNECTED_READY_ONLY": True,
-        "COLLABORATION_WS_INACTIVITY_TIMEOUT": 300,
         "CONVERSION_FILE_EXTENSIONS_ALLOWED": [".docx", ".md"],
         "CONVERSION_FILE_MAX_SIZE": 20971520,
         "CONVERSION_UPLOAD_ENABLED": False,

src/backend/impress/settings.py

@@ -507,11 +507,6 @@ class Base(Configuration):
         environ_name="COLLABORATION_WS_NOT_CONNECTED_READY_ONLY",
         environ_prefix=None,
     )
-    COLLABORATION_WS_INACTIVITY_TIMEOUT = values.IntegerValue(
-        None,
-        environ_name="COLLABORATION_WS_INACTIVITY_TIMEOUT",
-        environ_prefix=None,
-    )
 
     # Frontend
     FRONTEND_THEME = values.Value(

src/backend/pyproject.toml

@@ -2,8 +2,8 @@
 # impress package
 #
 [build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+requires = ["uv_build>=0.11.9,<0.12"]
+build-backend = "uv_build"
 
 [project]
 name = "impress"
@@ -21,9 +21,8 @@ classifiers = [
 ]
 description = "Docs is a collaborative text editor designed to address common challenges in knowledge building and sharing."
 keywords = ["Django", "Contacts", "Templates", "RBAC"]
-license = { file = "LICENSE" }
-readme = "README.md"
-requires-python = ">=3.12"
+license = "MIT"
+requires-python = "~=3.13.0"
 dependencies = [
     "beautifulsoup4==4.14.3",
     "boto3==1.42.93",
@@ -97,12 +96,13 @@ dev = [
     "types-requests==2.33.0.20260408",
 ]
 
-[tool.setuptools]
-packages = { find = { where = ["."], exclude = ["tests"] } }
-zip-safe = true
-
-[tool.distutils.bdist_wheel]
-universal = true
+[tool.uv.build-backend]
+module-root = ""
+source-exclude = [
+    "**/tests/**",
+    "**/test_*.py",
+    "**/tests.py",
+]
 
 [tool.ruff]
 exclude = [

src/backend/setup.py

@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-"""Setup file for the impress module. All configuration stands in the setup.cfg file."""
-# coding: utf-8
-
-from setuptools import setup
-
-setup()

src/frontend/apps/e2e/.env

@@ -2,6 +2,7 @@ PORT=3000
 BASE_URL=http://localhost:3000
 BASE_API_URL=http://localhost:8071/api/v1.0
 COLLABORATION_WS_URL=ws://localhost:4444/collaboration/ws/
+COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=true
 MEDIA_BASE_URL=http://localhost:8083
 CUSTOM_SIGN_IN=false
 IS_INSTANCE=false

src/frontend/apps/e2e/.env.example

@@ -2,6 +2,7 @@ PORT=3000
 BASE_URL=http://localhost:3000
 BASE_API_URL=http://localhost:8071/api/v1.0
 COLLABORATION_WS_URL=ws://localhost:4444/collaboration/ws/
+COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=true
 MEDIA_BASE_URL=http://localhost:8083
 IS_INSTANCE=false
 CUSTOM_SIGN_IN=false

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

@@ -1,352 +0,0 @@
-import path from 'path';
-
-import { expect, test } from '@playwright/test';
-
-import { createDoc, overrideConfig, verifyDocName } from './utils-common';
-import { writeInEditor } from './utils-editor';
-import { connectOtherUserToDoc, updateShareLink } from './utils-share';
-import { createRootSubPage } from './utils-sub-pages';
-
-test.beforeEach(async ({ page }) => {
-  await page.goto('/');
-});
-
-test.describe('Doc Collaboration', () => {
-  /**
-   * We check:
-   *  - connection to the collaborative server
-   *  - signal of the backend to the collaborative server (connection should close)
-   *  - reconnection to the collaborative server
-   */
-  test('checks the connection with collaborative server', async ({ page }) => {
-    let webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
-      return webSocket
-        .url()
-        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
-    });
-
-    await page
-      .getByRole('button', {
-        name: 'New doc',
-      })
-      .click();
-
-    let webSocket = await webSocketPromise;
-    expect(webSocket.url()).toContain(
-      `${process.env.COLLABORATION_WS_URL}?room=`,
-    );
-
-    // Is connected
-    let framesentPromise = webSocket.waitForEvent('framesent');
-
-    await writeInEditor({ page, text: 'Hello World' });
-
-    let framesent = await framesentPromise;
-    expect(framesent.payload).not.toBeNull();
-
-    await page.getByRole('button', { name: 'Share' }).click();
-
-    const selectVisibility = page.getByTestId('doc-visibility');
-
-    // When the visibility is changed, the ws should close the connection (backend signal)
-    const wsClosePromise = webSocket.waitForEvent('close');
-
-    await selectVisibility.click();
-    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
-
-    // Assert that the doc reconnects to the ws
-    const wsClose = await wsClosePromise;
-    expect(wsClose.isClosed()).toBeTruthy();
-
-    // Check the ws is connected again
-    webSocket = await page.waitForEvent('websocket', (webSocket) => {
-      return webSocket
-        .url()
-        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
-    });
-    framesentPromise = webSocket.waitForEvent('framesent');
-    framesent = await framesentPromise;
-    expect(framesent.payload).not.toBeNull();
-  });
-
-  test('it cannot edit if viewer but see and can get resources', async ({
-    page,
-    browserName,
-  }) => {
-    const [docTitle] = await createDoc(page, 'doc-viewer', browserName, 1);
-    await verifyDocName(page, docTitle);
-
-    await writeInEditor({ page, text: 'Hello World' });
-
-    await page.getByRole('button', { name: 'Share' }).click();
-    await updateShareLink(page, 'Public', 'Reading');
-
-    // Close the modal
-    await page.getByRole('button', { name: 'close' }).first().click();
-
-    const { otherPage, cleanup } = await connectOtherUserToDoc({
-      browserName,
-      docUrl: page.url(),
-      withoutSignIn: true,
-      docTitle,
-    });
-
-    await expect(
-      otherPage.getByLabel('It is the card information').getByText('Reader'),
-    ).toBeVisible();
-
-    // Cannot edit
-    const editor = otherPage.locator('.ProseMirror');
-    await expect(editor).toHaveAttribute('contenteditable', 'false');
-
-    // Owner add a image
-    const fileChooserPromise = page.waitForEvent('filechooser');
-    await page.locator('.bn-block-outer').last().fill('/');
-    await page.getByText('Resizable image with caption').click();
-    await page.getByText('Upload image').click();
-
-    const fileChooser = await fileChooserPromise;
-    await fileChooser.setFiles(
-      path.join(__dirname, 'assets/logo-suite-numerique.png'),
-    );
-
-    // Owner see the image
-    await expect(
-      page.locator('.--docs--editor-container img.bn-visual-media').first(),
-    ).toBeVisible();
-
-    // Viewser see the image
-    const viewerImg = otherPage
-      .locator('.--docs--editor-container img.bn-visual-media')
-      .first();
-    await expect(viewerImg).toBeVisible({
-      timeout: 10000,
-    });
-
-    // Viewer can download the image
-    await viewerImg.click();
-    const downloadPromise = otherPage.waitForEvent('download');
-    await otherPage.getByRole('button', { name: 'Download image' }).click();
-    const download = await downloadPromise;
-    expect(download.suggestedFilename()).toBe('logo-suite-numerique.png');
-
-    await cleanup();
-  });
-
-  test('it checks block editing when not connected to collab server', async ({
-    page,
-    browserName,
-  }) => {
-    test.slow();
-
-    /**
-     * The good port is 4444, but we want to simulate a not connected
-     * collaborative server.
-     * So we use a port that is not used by the collaborative server.
-     * The server will not be able to connect to the collaborative server.
-     */
-    await overrideConfig(page, {
-      COLLABORATION_WS_URL: 'ws://localhost:5555/collaboration/ws/',
-      COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: true,
-    });
-
-    await page.goto('/');
-
-    const [parentTitle] = await createDoc(
-      page,
-      'editing-blocking',
-      browserName,
-      1,
-    );
-
-    const card = page.getByLabel('It is the card information');
-    await expect(
-      card.getByText('Others are editing. Your network prevent changes.'),
-    ).toBeHidden();
-    const editor = page.locator('.ProseMirror');
-
-    await expect(editor).toHaveAttribute('contenteditable', 'true');
-
-    let responseCanEditPromise = page.waitForResponse(
-      (response) =>
-        response.url().includes(`/can-edit/`) && response.status() === 200,
-    );
-
-    await page.getByRole('button', { name: 'Share' }).click();
-
-    await updateShareLink(page, 'Public', 'Editing');
-
-    // Close the modal
-    await page.getByRole('button', { name: 'close' }).first().click();
-
-    const urlParentDoc = page.url();
-
-    const { name: childTitle } = await createRootSubPage(
-      page,
-      browserName,
-      'editing-blocking - child',
-    );
-
-    let responseCanEdit = await responseCanEditPromise;
-    expect(responseCanEdit.ok()).toBeTruthy();
-    let jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };
-    expect(jsonCanEdit.can_edit).toBeTruthy();
-
-    const urlChildDoc = page.url();
-
-    /**
-     * We open another browser that will connect to the collaborative server
-     * and will block the current browser to edit the doc.
-     */
-    const { otherPage, cleanup } = await connectOtherUserToDoc({
-      browserName,
-      docUrl: urlChildDoc,
-      docTitle: childTitle,
-      withoutSignIn: true,
-    });
-
-    const webSocketPromise = otherPage.waitForEvent(
-      'websocket',
-      (webSocket) => {
-        return webSocket
-          .url()
-          .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
-      },
-    );
-
-    await otherPage.goto(urlChildDoc);
-
-    const webSocket = await webSocketPromise;
-    expect(webSocket.url()).toContain(
-      `${process.env.COLLABORATION_WS_URL}?room=`,
-    );
-
-    await verifyDocName(otherPage, childTitle);
-
-    await page.reload();
-
-    responseCanEdit = await page.waitForResponse(
-      (response) =>
-        response.url().includes(`/can-edit/`) && response.status() === 200,
-    );
-    expect(responseCanEdit.ok()).toBeTruthy();
-
-    jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };
-    expect(jsonCanEdit.can_edit).toBeFalsy();
-
-    await expect(
-      card.getByText('Others are editing. Your network prevent changes.'),
-    ).toBeVisible({
-      timeout: 10000,
-    });
-
-    await expect(editor).toHaveAttribute('contenteditable', 'false');
-
-    await expect(
-      page.getByRole('textbox', { name: 'Document title' }),
-    ).toBeHidden();
-    await expect(page.getByRole('heading', { name: childTitle })).toBeVisible();
-
-    await page.goto(urlParentDoc);
-
-    await verifyDocName(page, parentTitle);
-
-    await page.getByRole('button', { name: 'Share' }).click();
-
-    await page.getByTestId('doc-access-mode').click();
-    await page.getByRole('menuitemradio', { name: 'Reading' }).click();
-
-    // Close the modal
-    await page.getByRole('button', { name: 'close' }).first().click();
-
-    await page.goto(urlChildDoc);
-
-    await expect(editor).toHaveAttribute('contenteditable', 'true');
-
-    await expect(
-      page.getByRole('textbox', { name: 'Document title' }),
-    ).toContainText(childTitle);
-    await expect(page.getByRole('heading', { name: childTitle })).toBeHidden();
-
-    await expect(
-      card.getByText('Others are editing. Your network prevent changes.'),
-    ).toBeHidden();
-
-    await cleanup();
-  });
-
-  test('checks disconnection and reconnection when changing tab visibility', async ({
-    page,
-  }) => {
-    await overrideConfig(page, {
-      COLLABORATION_WS_INACTIVITY_TIMEOUT: 2, // 2 seconds for the test to be faster
-    });
-
-    await page.goto('/');
-
-    let webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
-      return webSocket
-        .url()
-        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
-    });
-
-    await page
-      .getByRole('button', {
-        name: 'New doc',
-      })
-      .click();
-
-    let webSocket = await webSocketPromise;
-    expect(webSocket.url()).toContain(
-      `${process.env.COLLABORATION_WS_URL}?room=`,
-    );
-
-    // Is connected
-    let framesentPromise = webSocket.waitForEvent('framesent');
-
-    await writeInEditor({ page, text: 'Hello World' });
-
-    let framesent = await framesentPromise;
-    expect(framesent.payload).not.toBeNull();
-
-    // When the visibility is changed, the ws should close the connection
-    const wsClosePromise = webSocket.waitForEvent('close');
-
-    // Simulate the tab being hidden
-    await page.evaluate(() => {
-      Object.defineProperty(document, 'hidden', {
-        value: true,
-        writable: true,
-        configurable: true,
-      });
-      document.dispatchEvent(new Event('visibilitychange'));
-    });
-
-    // Assert the ws connection is closed after inactivity timeout
-    const wsClose = await wsClosePromise;
-    expect(wsClose.isClosed()).toBeTruthy();
-
-    // Check the ws is connected again
-    webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
-      return webSocket
-        .url()
-        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
-    });
-
-    // Simulate the tab becoming visible again
-    await page.evaluate(() => {
-      Object.defineProperty(document, 'hidden', {
-        value: false,
-        writable: true,
-        configurable: true,
-      });
-      document.dispatchEvent(new Event('visibilitychange'));
-    });
-
-    webSocket = await webSocketPromise;
-    framesentPromise = webSocket.waitForEvent('framesent');
-    framesent = await framesentPromise;
-    // Assert the ws connection is working again
-    expect(framesent.payload).not.toBeNull();
-  });
-});

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

@@ -3,9 +3,14 @@ import path from 'path';
 import { expect, test } from '@playwright/test';
 import cs from 'convert-stream';
 
-import { createDoc, goToGridDoc, verifyDocName } from './utils-common';
+import {
+  createDoc,
+  goToGridDoc,
+  overrideConfig,
+  verifyDocName,
+} from './utils-common';
 import { getEditor, openSuggestionMenu, writeInEditor } from './utils-editor';
-import { updateShareLink } from './utils-share';
+import { connectOtherUserToDoc, updateShareLink } from './utils-share';
 import {
   createRootSubPage,
   getTreeRow,
@@ -106,6 +111,63 @@ test.describe('Doc Editor', () => {
     ).toBeVisible();
   });
 
+  /**
+   * We check:
+   *  - connection to the collaborative server
+   *  - signal of the backend to the collaborative server (connection should close)
+   *  - reconnection to the collaborative server
+   */
+  test('checks the connection with collaborative server', async ({ page }) => {
+    let webSocketPromise = page.waitForEvent('websocket', (webSocket) => {
+      return webSocket
+        .url()
+        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
+    });
+
+    await page
+      .getByRole('button', {
+        name: 'New doc',
+      })
+      .click();
+
+    let webSocket = await webSocketPromise;
+    expect(webSocket.url()).toContain(
+      `${process.env.COLLABORATION_WS_URL}?room=`,
+    );
+
+    // Is connected
+    let framesentPromise = webSocket.waitForEvent('framesent');
+
+    await writeInEditor({ page, text: 'Hello World' });
+
+    let framesent = await framesentPromise;
+    expect(framesent.payload).not.toBeNull();
+
+    await page.getByRole('button', { name: 'Share' }).click();
+
+    const selectVisibility = page.getByTestId('doc-visibility');
+
+    // When the visibility is changed, the ws should close the connection (backend signal)
+    const wsClosePromise = webSocket.waitForEvent('close');
+
+    await selectVisibility.click();
+    await page.getByRole('menuitemradio', { name: 'Connected' }).click();
+
+    // Assert that the doc reconnects to the ws
+    const wsClose = await wsClosePromise;
+    expect(wsClose.isClosed()).toBeTruthy();
+
+    // Check the ws is connected again
+    webSocket = await page.waitForEvent('websocket', (webSocket) => {
+      return webSocket
+        .url()
+        .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
+    });
+    framesentPromise = webSocket.waitForEvent('framesent');
+    framesent = await framesentPromise;
+    expect(framesent.payload).not.toBeNull();
+  });
+
   test('markdown button converts from markdown to the editor syntax json', async ({
     page,
     browserName,
@@ -223,6 +285,70 @@ test.describe('Doc Editor', () => {
     await expect(editor.getByText('Hello World Doc persisted 2')).toBeVisible();
   });
 
+  test('it cannot edit if viewer but see and can get resources', async ({
+    page,
+    browserName,
+  }) => {
+    const [docTitle] = await createDoc(page, 'doc-viewer', browserName, 1);
+    await verifyDocName(page, docTitle);
+
+    await writeInEditor({ page, text: 'Hello World' });
+
+    await page.getByRole('button', { name: 'Share' }).click();
+    await updateShareLink(page, 'Public', 'Reading');
+
+    // Close the modal
+    await page.getByRole('button', { name: 'close' }).first().click();
+
+    const { otherPage, cleanup } = await connectOtherUserToDoc({
+      browserName,
+      docUrl: page.url(),
+      withoutSignIn: true,
+      docTitle,
+    });
+
+    await expect(
+      otherPage.getByLabel('It is the card information').getByText('Reader'),
+    ).toBeVisible();
+
+    // Cannot edit
+    const editor = otherPage.locator('.ProseMirror');
+    await expect(editor).toHaveAttribute('contenteditable', 'false');
+
+    // Owner add a image
+    const fileChooserPromise = page.waitForEvent('filechooser');
+    await page.locator('.bn-block-outer').last().fill('/');
+    await page.getByText('Resizable image with caption').click();
+    await page.getByText('Upload image').click();
+
+    const fileChooser = await fileChooserPromise;
+    await fileChooser.setFiles(
+      path.join(__dirname, 'assets/logo-suite-numerique.png'),
+    );
+
+    // Owner see the image
+    await expect(
+      page.locator('.--docs--editor-container img.bn-visual-media').first(),
+    ).toBeVisible();
+
+    // Viewser see the image
+    const viewerImg = otherPage
+      .locator('.--docs--editor-container img.bn-visual-media')
+      .first();
+    await expect(viewerImg).toBeVisible({
+      timeout: 10000,
+    });
+
+    // Viewer can download the image
+    await viewerImg.click();
+    const downloadPromise = otherPage.waitForEvent('download');
+    await otherPage.getByRole('button', { name: 'Download image' }).click();
+    const download = await downloadPromise;
+    expect(download.suggestedFilename()).toBe('logo-suite-numerique.png');
+
+    await cleanup();
+  });
+
   test('it adds an image to the doc editor', async ({ page, browserName }) => {
     await createDoc(page, 'doc-image', browserName, 1);
 
@@ -367,6 +493,151 @@ test.describe('Doc Editor', () => {
     await expect(editor.getByText('Analyzing file...')).toBeHidden();
   });
 
+  if (process.env.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY === 'true') {
+    test('it checks block editing when not connected to collab server', async ({
+      page,
+      browserName,
+    }) => {
+      test.slow();
+
+      /**
+       * The good port is 4444, but we want to simulate a not connected
+       * collaborative server.
+       * So we use a port that is not used by the collaborative server.
+       * The server will not be able to connect to the collaborative server.
+       */
+      await overrideConfig(page, {
+        COLLABORATION_WS_URL: 'ws://localhost:5555/collaboration/ws/',
+      });
+
+      await page.goto('/');
+
+      const [parentTitle] = await createDoc(
+        page,
+        'editing-blocking',
+        browserName,
+        1,
+      );
+
+      const card = page.getByLabel('It is the card information');
+      await expect(
+        card.getByText('Others are editing. Your network prevent changes.'),
+      ).toBeHidden();
+      const editor = page.locator('.ProseMirror');
+
+      await expect(editor).toHaveAttribute('contenteditable', 'true');
+
+      let responseCanEditPromise = page.waitForResponse(
+        (response) =>
+          response.url().includes(`/can-edit/`) && response.status() === 200,
+      );
+
+      await page.getByRole('button', { name: 'Share' }).click();
+
+      await updateShareLink(page, 'Public', 'Editing');
+
+      // Close the modal
+      await page.getByRole('button', { name: 'close' }).first().click();
+
+      const urlParentDoc = page.url();
+
+      const { name: childTitle } = await createRootSubPage(
+        page,
+        browserName,
+        'editing-blocking - child',
+      );
+
+      let responseCanEdit = await responseCanEditPromise;
+      expect(responseCanEdit.ok()).toBeTruthy();
+      let jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };
+      expect(jsonCanEdit.can_edit).toBeTruthy();
+
+      const urlChildDoc = page.url();
+
+      /**
+       * We open another browser that will connect to the collaborative server
+       * and will block the current browser to edit the doc.
+       */
+      const { otherPage } = await connectOtherUserToDoc({
+        browserName,
+        docUrl: urlChildDoc,
+        docTitle: childTitle,
+        withoutSignIn: true,
+      });
+
+      const webSocketPromise = otherPage.waitForEvent(
+        'websocket',
+        (webSocket) => {
+          return webSocket
+            .url()
+            .includes(`${process.env.COLLABORATION_WS_URL}?room=`);
+        },
+      );
+
+      await otherPage.goto(urlChildDoc);
+
+      const webSocket = await webSocketPromise;
+      expect(webSocket.url()).toContain(
+        `${process.env.COLLABORATION_WS_URL}?room=`,
+      );
+
+      await verifyDocName(otherPage, childTitle);
+
+      await page.reload();
+
+      responseCanEdit = await page.waitForResponse(
+        (response) =>
+          response.url().includes(`/can-edit/`) && response.status() === 200,
+      );
+      expect(responseCanEdit.ok()).toBeTruthy();
+
+      jsonCanEdit = (await responseCanEdit.json()) as { can_edit: boolean };
+      expect(jsonCanEdit.can_edit).toBeFalsy();
+
+      await expect(
+        card.getByText('Others are editing. Your network prevent changes.'),
+      ).toBeVisible({
+        timeout: 10000,
+      });
+
+      await expect(editor).toHaveAttribute('contenteditable', 'false');
+
+      await expect(
+        page.getByRole('textbox', { name: 'Document title' }),
+      ).toBeHidden();
+      await expect(
+        page.getByRole('heading', { name: childTitle }),
+      ).toBeVisible();
+
+      await page.goto(urlParentDoc);
+
+      await verifyDocName(page, parentTitle);
+
+      await page.getByRole('button', { name: 'Share' }).click();
+
+      await page.getByTestId('doc-access-mode').click();
+      await page.getByRole('menuitemradio', { name: 'Reading' }).click();
+
+      // Close the modal
+      await page.getByRole('button', { name: 'close' }).first().click();
+
+      await page.goto(urlChildDoc);
+
+      await expect(editor).toHaveAttribute('contenteditable', 'true');
+
+      await expect(
+        page.getByRole('textbox', { name: 'Document title' }),
+      ).toContainText(childTitle);
+      await expect(
+        page.getByRole('heading', { name: childTitle }),
+      ).toBeHidden();
+
+      await expect(
+        card.getByText('Others are editing. Your network prevent changes.'),
+      ).toBeHidden();
+    });
+  }
+
   test('it checks if callout custom block', async ({ page, browserName }) => {
     await createDoc(page, 'doc-toolbar', browserName, 1);
 

src/frontend/apps/e2e/__tests__/app-impress/utils-common.ts

@@ -18,7 +18,6 @@ export const CONFIG = {
   AI_FEATURE_LEGACY_ENABLED: true,
   API_USERS_SEARCH_QUERY_MIN_LENGTH: 3,
   CRISP_WEBSITE_ID: null,
-  COLLABORATION_WS_INACTIVITY_TIMEOUT: 15,
   COLLABORATION_WS_URL: process.env.COLLABORATION_WS_URL,
   COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: true,
   CONVERSION_UPLOAD_ENABLED: true,

src/frontend/apps/impress/src/core/config/api/useConfig.tsx

@@ -42,7 +42,6 @@ export interface ConfigResponse {
   API_USERS_SEARCH_QUERY_MIN_LENGTH?: number;
   COLLABORATION_WS_URL?: string;
   COLLABORATION_WS_NOT_CONNECTED_READY_ONLY?: boolean;
-  COLLABORATION_WS_INACTIVITY_TIMEOUT?: number | null;
   CONVERSION_FILE_EXTENSIONS_ALLOWED: string[];
   CONVERSION_FILE_MAX_SIZE: number;
   CONVERSION_UPLOAD_ENABLED?: boolean;

src/frontend/apps/impress/src/features/docs/doc-editor/hook/useCollaboration.tsx

@@ -1,7 +1,7 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { useEffect } from 'react';
 
-import { useCollaborationUrl, useConfig } from '@/core/config';
+import { useCollaborationUrl } from '@/core/config';
 import { KEY_DOC } from '@/docs/doc-management/api/useDoc';
 import {
   KEY_DOC_CONTENT,
@@ -15,7 +15,6 @@ export const useCollaboration = (room: string) => {
   const collaborationUrl = useCollaborationUrl(room);
   const { addTask } = useBroadcastStore();
   const queryClient = useQueryClient();
-  const { data: config } = useConfig();
   const {
     setBroadcastProvider,
     cleanupBroadcast,
@@ -29,8 +28,6 @@ export const useCollaboration = (room: string) => {
     isReady,
     hasLostConnection,
     resetLostConnection,
-    pauseForInactivity,
-    resumeFromInactivity,
   } = useProviderStore();
   const isOffline = useIsOffline((state) => state.isOffline);
   const { data: docContent } = useDocContent(
@@ -112,43 +109,4 @@ export const useCollaboration = (room: string) => {
       }
     };
   }, [destroyProvider, room, cleanupBroadcast]);
-
-  useEffect(() => {
-    if (!provider || !config?.COLLABORATION_WS_INACTIVITY_TIMEOUT) {
-      return;
-    }
-
-    const timeoutMs = config.COLLABORATION_WS_INACTIVITY_TIMEOUT * 1000;
-    let inactivityTimeout: ReturnType<typeof setTimeout> | undefined;
-
-    const startInactivityTimer = () => {
-      clearTimeout(inactivityTimeout);
-      inactivityTimeout = setTimeout(pauseForInactivity, timeoutMs);
-    };
-
-    if (document.hidden) {
-      startInactivityTimer();
-    }
-
-    const visibilityChangeHandler = () => {
-      if (document.hidden) {
-        startInactivityTimer();
-      } else {
-        clearTimeout(inactivityTimeout);
-        resumeFromInactivity();
-      }
-    };
-
-    document.addEventListener('visibilitychange', visibilityChangeHandler);
-
-    return () => {
-      document.removeEventListener('visibilitychange', visibilityChangeHandler);
-      clearTimeout(inactivityTimeout);
-    };
-  }, [
-    pauseForInactivity,
-    provider,
-    resumeFromInactivity,
-    config?.COLLABORATION_WS_INACTIVITY_TIMEOUT,
-  ]);
 };

src/frontend/apps/impress/src/features/docs/doc-management/stores/useProviderStore.tsx

@@ -13,14 +13,11 @@ export interface UseCollaborationStore {
   ) => HocuspocusProvider;
   destroyProvider: () => void;
   setReady: (value: boolean) => void;
-  pauseForInactivity: () => void;
-  resumeFromInactivity: () => void;
   provider: HocuspocusProvider | undefined;
   isConnected: boolean;
   isReady: boolean;
   isSynced: boolean;
   hasLostConnection: boolean;
-  isPausedForInactivity: boolean;
   resetLostConnection: () => void;
 }
 
@@ -30,7 +27,6 @@ const defaultValues = {
   isReady: false,
   isSynced: false,
   hasLostConnection: false,
-  isPausedForInactivity: false,
 };
 
 type ExtendedCloseEvent = CloseEvent & { wasClean: boolean };
@@ -63,12 +59,6 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
       name: storeId,
       document: doc,
       onDisconnect(data) {
-        // Skip reconnect when the disconnect was triggered by inactivity:
-        // reconnection only happens once the user becomes active again.
-        if (get().isPausedForInactivity) {
-          return;
-        }
-
         // Attempt to reconnect if the disconnection was clean (initiated by the client or server)
         if ((data.event as ExtendedCloseEvent).wasClean) {
           if (data.event.reason === 'No cookies' && data.event.code === 4001) {
@@ -109,7 +99,7 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
         }
         // If we were previously connected and now we're not,
         // we might have lost the connection
-        else if (wasConnected && !get().isPausedForInactivity) {
+        else if (wasConnected) {
           clearTimeout(lostConnectionTimeout);
           // Jitter spreading for reconnection attempts
           // Math.random() generates a random delay to avoid all clients
@@ -173,22 +163,5 @@ export const useProviderStore = create<UseCollaborationStore>((set, get) => ({
     set(defaultValues);
   },
   setReady: (value: boolean) => set({ isReady: value }),
-  pauseForInactivity: () => {
-    if (get().isPausedForInactivity) {
-      return;
-    }
-    clearTimeout(reconnectTimeout);
-    clearTimeout(lostConnectionTimeout);
-    set({ isPausedForInactivity: true, hasLostConnection: false });
-    get().provider?.disconnect();
-  },
-  resumeFromInactivity: () => {
-    if (!get().isPausedForInactivity) {
-      return;
-    }
-    clearTimeout(lostConnectionTimeout);
-    set({ isPausedForInactivity: false });
-    void get().provider?.connect();
-  },
   resetLostConnection: () => set({ hasLostConnection: false }),
 }));