Merge pull request #2014 from maxberger/master

Misc improvements to UI

.github/workflows/test.yml

@@ -198,3 +198,28 @@ jobs:
         run: pip install tox
       - name: Lint
         run: tox -c pyproject.toml -e flake8,mypy,isort
+
+  integ-test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    needs: test-ubuntu-python-newest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Install uv
+        run: pip install uv
+      - name: Install Playwright Browsers
+        run: uv run --extra integ_test playwright install --with-deps
+      - name: Run Integration Tests
+        run: uv run --extra integ_test pytest --junitxml=pytest-results.xml integ_tests
+      - uses: mikepenz/action-junit-report@v6
+        if: ${{ failure() &&  (github.event.pull_request.head.repo.full_name != github.repository) }}
+        with:
+          report_paths: 'pytest-results.xml'
+          annotate_only: true # forked repo cannot write to checks so just do annotations
+      - uses: mikepenz/action-junit-report@v6
+        if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+        with:
+          report_paths: 'pytest-results.xml'

.gitignore

@@ -23,6 +23,6 @@ coverage.xml
 .vscode
 .sass-cache
 Gemfile.lock
-
+pytest-results.xml
 pytestdebug.log
 uv.lock

integ_tests/test_sharing.py

@@ -29,6 +29,7 @@ def test_create_and_delete_share_by_key(page: Page, radicale_server: str) -> Non
     expect(
         page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden) img[alt='RO']")
     ).to_be_visible()
+    page.once("dialog", lambda dialog: dialog.accept())
     page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
     expect(
         page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden)")
@@ -40,6 +41,7 @@ def test_create_and_delete_share_by_key(page: Page, radicale_server: str) -> Non
     expect(
         page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden) img[alt='RW']")
     ).to_be_visible()
+    page.once("dialog", lambda dialog: dialog.accept())
     page.click('tr:not(.hidden) button[data-name="delete"]', strict=True)
     expect(
         page.locator("tr[data-name='sharetokenrowtemplate']:not(.hidden)")

radicale/web/internal_data/DeleteCollectionScene.js

@@ -25,13 +25,13 @@ import { LoadingScene } from "./LoadingScene.js";
 import { delete_collection } from "./api.js";
 
 /**
- * @constructor
  * @implements {Scene}
  * @param {string} user
  * @param {string} password
  * @param {Collection} collection
  */
-export function DeleteCollectionScene(user, password, collection) {
+export class DeleteCollectionScene {
+    constructor(user, password, collection) {
         /** @type {HTMLElement} */ let html_scene = document.getElementById("deletecollectionscene");
         /** @type {HTMLElement} */ let title_form = html_scene.querySelector("[data-name=title]");
         /** @type {HTMLElement} */ let error_form = html_scene.querySelector("[data-name=error]");
@@ -119,3 +119,4 @@ export function DeleteCollectionScene(user, password, collection) {
             }
         };
     }
+}

radicale/web/internal_data/ShareCollectionScene.js

@@ -28,14 +28,6 @@ import { Collection } from "./models.js";
 import { Scene, pop_scene, scene_stack } from "./scene_manager.js";
 
 /**
- * @constructor
- * @implements {Scene}
- * @param {string} user
- * @param {string} password
- * @param {Collection} collection The collection on which to edit sharing setting. Must exist.
- */
-/**
- * @constructor
  * @implements {Scene}
  * @param {string} user
  * @param {string} password
@@ -125,10 +117,10 @@ function add_share_rows(user, password, collection, shares) {
   shares.forEach(function (share) {
     let pathortoken = share["PathOrToken"] || "";
     let pathmapped = share["PathMapped"] || "";
-    if (
+    if ((
       collection.href.includes(pathmapped) ||
       collection.href.includes(pathortoken)
-    ) {
+    ) && (share["ShareType"] === "token")) {
       let node = /** @type {HTMLElement} */ (template.cloneNode(true));
       node.classList.remove("hidden");
       /** @type {HTMLInputElement} */ let pathortoken_form = node.querySelector("[data-name=pathortoken]");
@@ -147,10 +139,13 @@ function add_share_rows(user, password, collection, shares) {
       }
       /** @type {HTMLElement} */ let delete_btn = node.querySelector("[data-name=delete]");
       delete_btn.onclick = function () {
+        if (!confirm("Are you sure you want to delete share " + pathortoken + "?")) {
+          return;
+        }
         delete_share_by_token(
           user,
           password,
-          share["PathOrToken"],
+          pathortoken,
           function () {
             update_share_list(user, password, collection);
           },