From 00bfedc47f0535f9575395a63109df6ef9afa054 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Wed, 25 Oct 2023 18:36:09 +0300 Subject: [PATCH] support vars in interface --- .../ahriman/templates/build-status.jinja2 | 13 +- .../build-status/key-import-modal.jinja2 | 12 +- .../templates/build-status/login-modal.jinja2 | 8 +- .../build-status/package-add-modal.jinja2 | 94 ++++++-- .../build-status/package-info-modal.jinja2 | 212 +++++++++++++++--- .../build-status/package-rebuild-modal.jinja2 | 10 +- .../templates/build-status/table.jinja2 | 107 ++++----- .../share/ahriman/templates/repo-index.jinja2 | 11 +- .../templates/utils/bootstrap-scripts.jinja2 | 34 ++- src/ahriman/core/status/watcher.py | 35 +++ src/ahriman/models/pkgbuild_patch.py | 13 +- src/ahriman/web/schemas/__init__.py | 7 +- src/ahriman/web/schemas/log_schema.py | 11 +- src/ahriman/web/schemas/logs_schema.py | 18 -- .../web/schemas/package_patch_schema.py | 33 +++ src/ahriman/web/schemas/patch_name_schema.py | 33 +++ src/ahriman/web/schemas/patch_schema.py | 14 +- .../web/schemas/versioned_log_schema.py | 35 +++ src/ahriman/web/views/v1/status/logs.py | 5 +- src/ahriman/web/views/v1/status/patch.py | 103 +++++++++ src/ahriman/web/views/v1/status/patches.py | 108 +++++++++ src/ahriman/web/views/v2/status/logs.py | 23 +- tests/ahriman/core/status/test_watcher.py | 38 ++++ tests/ahriman/models/test_pkgbuild_patch.py | 7 + .../web/schemas/test_package_patch_schema.py | 1 + .../web/schemas/test_patch_name_schema.py | 1 + .../web/schemas/test_versioned_log_schema.py | 1 + .../v1/status/test_view_v1_status_patch.py | 81 +++++++ .../v1/status/test_view_v1_status_patches.py | 75 +++++++ .../v2/status/test_view_v2_status_logs.py | 24 +- 30 files changed, 961 insertions(+), 206 deletions(-) create mode 100644 src/ahriman/web/schemas/package_patch_schema.py create mode 100644 src/ahriman/web/schemas/patch_name_schema.py create mode 100644 src/ahriman/web/schemas/versioned_log_schema.py create mode 100644 src/ahriman/web/views/v1/status/patch.py create mode 100644 src/ahriman/web/views/v1/status/patches.py create mode 100644 tests/ahriman/web/schemas/test_package_patch_schema.py create mode 100644 tests/ahriman/web/schemas/test_patch_name_schema.py create mode 100644 tests/ahriman/web/schemas/test_versioned_log_schema.py create mode 100644 tests/ahriman/web/views/v1/status/test_view_v1_status_patch.py create mode 100644 tests/ahriman/web/views/v1/status/test_view_v1_status_patches.py diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2 index acf10a2b..1841b01b 100644 --- a/package/share/ahriman/templates/build-status.jinja2 +++ b/package/share/ahriman/templates/build-status.jinja2 @@ -51,7 +51,7 @@
  • -
  • @@ -61,7 +61,7 @@
  • -
  • @@ -77,7 +77,8 @@ - - + - - + +
    package baseversionversion packages groups licenses packagerlast updatestatuslast updatestatus
    diff --git a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 index c06e6acc..fb5b4f0f 100644 --- a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 @@ -8,20 +8,20 @@