Incompatible with diff module

Created on 23 April 2024, 12 months ago

Problem/Motivation

In our site, we use the Diff module β†’ to allow editors to compare revisions of nodes.

This overrides entity.node.version_history with its own revision overview controller.

With wse enabled, this was previously working, but with the changes since 9d0a22fb50e9c736d63bbff6b88a9573d3ee4805 the diff controller is no longer used.

Steps to reproduce

1. Enable diff and wse
2. view the revision history for a node

Proposed resolution

tbc - think about it some more...

Remaining tasks

User interface changes

API changes

Data model changes

πŸ“Œ Task
Status

Active

Version

1.0

Component

Code

Created by

πŸ‡¬πŸ‡§United Kingdom malcomio

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Merge Requests

Comments & Activities

  • Issue created by @malcomio
  • πŸ‡¬πŸ‡§United Kingdom malcomio

    I think that the relevant change is the addition of the route subscriber in https://git.drupalcode.org/project/wse/-/commit/69838e13489891a9995fe8f8...

  • Status changed to Needs work 12 months ago
  • πŸ‡·πŸ‡΄Romania amateescu

    We can do something like this in WSE, but we also need an issue in the Diff module to factor out getting the revision IDs from \Drupal\diff\Form\RevisionOverviewForm::buildForm() into a separate method, because overriding and copying all that code is a bit too much to do in this module.

    Once we have that issue (and patch), we need to extend this patch and override \Drupal\diff\Form\RevisionOverviewForm.

  • heddn Nicaragua

    Ran into this exact issue on a client site today. Did the diff module issue get opened?

  • πŸ‡·πŸ‡΄Romania amateescu

    @heddn, no.. I was hoping someone else could do it and I would finish up the bits needed here.

  • heddn Nicaragua

    ✨ Allow usage of revision comparison inside workspaces Needs work seems like a close issue to this. Going to hijack it. Changes pushed over there.

  • heddn Nicaragua

    ✨ Allow usage of revision comparison inside workspaces Needs work is green if we can get it to RTBC.

  • πŸ‡·πŸ‡΄Romania amateescu

    It's RTBC now :)

  • Status changed to Postponed 5 months ago
  • First commit to issue fork.
  • Pipeline finished with Failed
    5 months ago
    Total: 159s
    #330512
  • πŸ‡ΊπŸ‡ΈUnited States adamzimmermann

    Should this issue be for version 2.0.x-dev? I think that is why the MR I opened had a diff wildly different than what I expected.

    Going to try take two on generating a new patch that adds return types to the methods to make them match the method signatures in the latest diff module.

  • πŸ‡ΊπŸ‡ΈUnited States adamzimmermann

    This takes the work from the patch in comment #3 and adds return types to fix a WSOD issue and removes some debugging code I found in the patch. I'm able to load the diff route now with this module enabled.

    FWIW I based my patch branch off of the 2.0.x branch and the patch in #3 applied cleanly as my starting point for updating it.

  • heddn Nicaragua

    Upstream issue has merged. No tagged release yet.

  • πŸ‡·πŸ‡΄Romania amateescu

    Implemented the additional changes detailed in #3.

  • πŸ‡·πŸ‡΄Romania amateescu

    This is now working nicely with the latest dev version of the Diff module, so I've committed the patch above to 2.0.x and cherry-picked to 1.0.x. Thanks everyone!

  • Pipeline finished with Skipped
    5 months ago
    #343965
  • Automatically closed - issue fixed for 2 weeks with no activity.

  • Pipeline finished with Canceled
    4 months ago
    Total: 30s
    #350110
  • Pipeline finished with Failed
    4 months ago
    Total: 2442s
    #350111
  • Pipeline finished with Skipped
    4 months ago
    #350153
  • Pipeline finished with Failed
    4 months ago
    Total: 273s
    #351193
  • Pipeline finished with Failed
    4 months ago
    Total: 341s
    #351200
  • Pipeline finished with Success
    4 months ago
    #362739
  • Pipeline finished with Success
    4 months ago
    Total: 189s
    #362954
  • Pipeline finished with Success
    4 months ago
    Total: 331s
    #369170
  • Pipeline finished with Success
    4 months ago
    Total: 153s
    #371733
  • Pipeline finished with Success
    3 months ago
    Total: 659s
    #377325
  • Pipeline finished with Success
    3 months ago
    Total: 481s
    #377500
  • Pipeline finished with Success
    3 months ago
    Total: 406s
    #377560
  • Pipeline finished with Success
    3 months ago
    Total: 498s
    #377596
  • Pipeline finished with Success
    3 months ago
    Total: 154s
    #389059
  • Pipeline finished with Success
    3 months ago
    Total: 328s
    #393969
  • Pipeline finished with Success
    3 months ago
    Total: 330s
    #393976
  • Pipeline finished with Success
    3 months ago
    Total: 469s
    #393999
  • Pipeline finished with Failed
    2 months ago
    Total: 475s
    #414706
  • Pipeline finished with Success
    2 months ago
    Total: 641s
    #414727
  • Pipeline finished with Success
    2 months ago
    Total: 332s
    #414748
  • Pipeline finished with Success
    about 2 months ago
    Total: 233s
    #420399
  • Pipeline finished with Failed
    about 2 months ago
    Total: 360s
    #422534
  • Pipeline finished with Success
    about 2 months ago
    Total: 330s
    #422545
  • Pipeline finished with Success
    about 2 months ago
    Total: 357s
    #422549
  • Pipeline finished with Success
    about 1 month ago
    Total: 148s
    #432103
  • Pipeline finished with Success
    29 days ago
    Total: 139s
    #444326
  • Pipeline finished with Success
    27 days ago
    Total: 140s
    #446007
  • Pipeline finished with Success
    26 days ago
    Total: 621s
    #446355
  • Pipeline finished with Success
    21 days ago
    Total: 162s
    #450433
  • Pipeline finished with Skipped
    20 days ago
    #451458
Production build 0.71.5 2024