Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webrecorder/browsertrix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.14.1
Choose a base ref
...
head repository: webrecorder/browsertrix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.14.2
Choose a head ref
  • 2 commits
  • 7 files changed
  • 2 contributors

Commits on Feb 27, 2025

  1. Calculate total for crawl QA page endpoint (#2435)

    Fixes #2434 
    
    Patch fix for a regression in Browsertrix 1.4.0-1.4.1 where total was
    not being calculated for QA page list endpoint but still being included
    in response, which led to total always being 0 and pages not loading in
    the frontend review screen as a result.
    tw4l authored Feb 27, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    anthonyfok Anthony Fok
    Copy the full SHA
    45aa0a3 View commit details
  2. version: bump to 1.14.2

    ikreymer committed Feb 27, 2025
    Copy the full SHA
    cb52da6 View commit details
Showing with 8 additions and 6 deletions.
  1. +1 −0 backend/btrixcloud/pages.py
  2. +1 −1 backend/btrixcloud/version.py
  3. +1 −0 backend/test/test_qa.py
  4. +1 −1 chart/Chart.yaml
  5. +2 −2 chart/values.yaml
  6. +1 −1 frontend/package.json
  7. +1 −1 version.txt
1 change: 1 addition & 0 deletions backend/btrixcloud/pages.py
Original file line number Diff line number Diff line change
@@ -1404,6 +1404,7 @@ async def get_pages_list_with_qa(
page=page,
sort_by=sortBy,
sort_direction=sortDirection,
include_total=True,
)
return paginated_format(pages, total, page, pageSize)

2 changes: 1 addition & 1 deletion backend/btrixcloud/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""current version"""

__version__ = "1.14.1"
__version__ = "1.14.2"
1 change: 1 addition & 0 deletions backend/test/test_qa.py
Original file line number Diff line number Diff line change
@@ -254,6 +254,7 @@ def test_qa_page_data(
headers=crawler_auth_headers,
)
data = r.json()
assert data["total"] == 1
assert len(data["items"]) == 1
page = data["items"][0]

2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ type: application
icon: https://webrecorder.net/assets/icon.png

# Browsertrix and Chart Version
version: v1.14.1
version: v1.14.2

dependencies:
- name: btrix-admin-logging
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ replica_deletion_delay_days: 0

# API Image
# =========================================
backend_image: "docker.io/webrecorder/browsertrix-backend:1.14.1"
backend_image: "docker.io/webrecorder/browsertrix-backend:1.14.2"
backend_pull_policy: "Always"

backend_password_secret: "PASSWORD!"
@@ -161,7 +161,7 @@ backend_avg_memory_threshold: 95

# Nginx Image
# =========================================
frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.14.1"
frontend_image: "docker.io/webrecorder/browsertrix-frontend:1.14.2"
frontend_pull_policy: "Always"

frontend_cpu: "10m"
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "browsertrix-frontend",
"version": "1.14.1",
"version": "1.14.2",
"main": "index.ts",
"license": "AGPL-3.0-or-later",
"dependencies": {
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.1
1.14.2