Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trashless Wagtail #8310

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Trashless Wagtail #8310

wants to merge 19 commits into from

Commits on Sep 25, 2024

  1. Restore deletion

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    bd8b88a View commit details
    Browse the repository at this point in the history

  2. Prevent deletion of locked pages

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    26f12b0 View commit details
    Browse the repository at this point in the history

  3. Write out JSON archives on deletion

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    31ffced View commit details
    Browse the repository at this point in the history

  4. Make EmailSignUp disclaimer_page null on deletion

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    b8beb56 View commit details
    Browse the repository at this point in the history

  5. Update comments 

    Co-authored-by: Andy Chosak <[email protected]>
    @willbarton @chosak
    willbarton and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    3d39222 View commit details
    Browse the repository at this point in the history

  6. Use ARCHIVE_PATH as the env var

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    cb2e432 View commit details
    Browse the repository at this point in the history

  7. Add Apache configuration to serve archive path

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    782ac78 View commit details
    Browse the repository at this point in the history

  8. Remove unused type hint import

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    5be8efa View commit details
    Browse the repository at this point in the history

  9. Remove migration gating

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f2a5e04 View commit details
    Browse the repository at this point in the history

  10. Use page.relative_url

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    5a96d45 View commit details
    Browse the repository at this point in the history

  11. Remove unnecessary logging

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    e79f489 View commit details
    Browse the repository at this point in the history

  12. Fix relative_url call

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    d1405a0 View commit details
    Browse the repository at this point in the history

  13. Provide the user with an error if import fails

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    acf5d3c View commit details
    Browse the repository at this point in the history

  14. Rename archival to wagtail_deletion_archival

    @willbarton @chosak
    willbarton authored and chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    687372f View commit details
    Browse the repository at this point in the history

  15. Renumber v1 migration

    @chosak
    chosak committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    41e462f View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Use Django storage for Wagtail deletion archive 

    These code changes propose using Django storage to store and serve
the Wagtail deletion archive from PR 8310 [0], instead of using Apache
to serve those files.

This simplifies the configuration and makes it easier to test locally
and easier to port in future to other webserver approaches.

With these changes, the deletion archive is now only available behind
the Wagtail admin login, at the URL /admin/__deleted/. This URL provides
a nicely formatted Wagtail report view where archives can be downloaded
(instead of the current PR approach that uses Apache directory serving).

With this change, Django storage configuration has been migrated to
settings.STORAGES from settings.STATICFILES_STORAGE, which was
deprecated in Django 4.2 and removed in Django 5.1.

Additionally, with this change, cf.gov deployments that have not defined
the WAGTAIL_DELETION_ARCHIVE_PATH environment variable still support
importing archives; the archive-on-delete and archive download
functionality is still disabled in those cases.

This commit also includes a minor bugfix to the archive import template
which doesn't currently properly display the destination page title.

[0] #8310
    @chosak
    chosak committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1b8aa6c View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Add tests, and a few minor fixups

    @chosak
    chosak committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    957a3fb View commit details
    Browse the repository at this point in the history

  2. Fix production staticfiles storage

    @chosak
    chosak committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    a9a1c09 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8599 from cfpb/wagtail-deletion-archive-storage 

    Use Django storage for Wagtail deletion archive
    @chosak
    chosak authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    2b935c3 View commit details
    Browse the repository at this point in the history