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.

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

Merge latest Guardian changes as of 18-04-2024 #270

Merged
merged 37 commits into from
Apr 18, 2024

Commits on Mar 1, 2024

  1. Configuration menu
    Copy the full SHA
    45af0d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Configuration menu
    Copy the full SHA
    afbb983 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    799a821 View commit details
    Browse the repository at this point in the history
  3. Add to simple fields...

    ...and fix byline I broke in previous commit, yeah, I dont know how to pretend I haven't
    paperboyo committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    24cb6e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Configuration menu
    Copy the full SHA
    ddb931d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Add to all pills in Info panel…

    …this UGLY repetition of js bits will need to be removed
    paperboyo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    53e8cfb View commit details
    Browse the repository at this point in the history
  2. Add to Label pills on thumbnails…

    …I don’t like the hardcoding of 'label', but elementName is missing (bug?)
    paperboyo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bdfd175 View commit details
    Browse the repository at this point in the history
  3. Add to Collections…

    …yet another repetition, will remove once I know how
    paperboyo committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    ce1d636 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. IMAGEDAM-1593 - WIP Changes to syndication request and usage metadata…

    … to support a send to capture syndication.
    
    Still need to make changes to the syndication endpoint itself and test via postman
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    31fd2f6 View commit details
    Browse the repository at this point in the history
  2. IMAGEDAM-1593 - Further changes to syndication functionality

    Added syndicated parameter to syndication metadata in the SyndicationUsageRequest.
    
    Builders in UsageGroup and UsageIdBuilder were amended to include new syndicatedBy parameter
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    e81f68d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5ec545f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    abe709f View commit details
    Browse the repository at this point in the history
  5. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP

    Currently, the usage status update successfully updates dynamoDB but not ElasticSearch.
    
    In order for ElasticSearch to be updated, the correct message, containing an updated UsageNotice must be published to Thrall, via kinesis. Thrall will then process this message and run a script that will update ElasticSearch.
    
    The 'plumbing' for flow has been added, all that is left is to implement the functionality to update ElasticSearch
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7b77fe5 View commit details
    Browse the repository at this point in the history
  6. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP pt2

    Further additions to the ElasticSearch file, specifically the UpdateSingleUsageMessage function.
    
    Attempted to pass usageId and usageParameters in as two tuples as 'prepareUpdateRequest' suggests that the 'params' input can have variable arguments, but was getting a syntax error. Instead choosing to just pass in usageParameters and accessing the usageId from there (if this works can remove usageId from previous functions).
    
    Some modification to the script still required I think, tested with current changes and usage status is still not updating.
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    2db29fb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    53c8c32 View commit details
    Browse the repository at this point in the history
  8. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP pt2.2

    It seems like the painless script is very particular with how it is written, but currently this works without an error.
    
    The script is not complete though as the parameters are being sent as Options, which painless doesn't know how to handle, so it doesn't work as expected
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    df28a03 View commit details
    Browse the repository at this point in the history
  9. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP pt2.3

    Params are still being sent through as Options, some difficulty in fixing this.
    
    Seems that root cause is that the play framework doesn't know how to serialise/deserialise a 'UsageNotice' as Read/Write implicits have not been defined for it. There are a few potential options to fix this.
    
    1. Add the required implicits to UsageNotice (perhaps not desirable as would be repeated code from Usages class)
    2. Refactor ThrallMessageSender to make use of Usage (or potentially MediaUsage so that we use a class it knows how to handle)
    3. Copy the pattern used for the 'updateUsage' existing method, clearly can handle params properly there as they are used in that function
    4. Least desirable, get the update working for the status only case which involves just two parameters, which can be unwrapped from options fairly easily, but wouldn't be applicable for generic case
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0ef5271 View commit details
    Browse the repository at this point in the history
  10. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP pt2.4

    Completed the work that allows for an individual usage status to be updated. The issue with Options being passed into the painless script turned out to not be the source of my problems, I was actually accessing the parameters incorrectly, with this resolved the script worked without any issues.
    
    Also cleaned up the code changes, renaming functions and parameters, so they are accurate and removing various print statements added for debugging.
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    adb1930 View commit details
    Browse the repository at this point in the history
  11. IMAGEDAM-1593 - Updating ElasticSearch with new usage status WIP pt2.5

    Added 'lastModified' update to the update usage status painless script
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    7c499d1 View commit details
    Browse the repository at this point in the history
  12. IMAGEDAM-1593 - Amending updateUsageStatus endpoint to be asynchronous

    Use of 'queryByUsage' meant that a Future[Status] was returned by this endpoint instead of the 'Result' type, required 'Authentication.request'. A placeholder return status was originally included so that this wouldn't block development, but once the desired functionality was achieved a permanent solution was desired.
    
    This solution was to make the endpoint explicitly asynchronous, by using 'async.auth', by default this corrected the success case and the failure case was solved by wrapping the output in a Future[]
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fa8bca4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f2f627d View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f0427e8 View commit details
    Browse the repository at this point in the history
  15. IMAGEDAM-1593 - Changing from nonDynamicObjectField to dynamicObj to …

    …resolve 'strict_dynamic_mapping_exception'
    Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6ac8096 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    73ebd2e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    890d671 View commit details
    Browse the repository at this point in the history
  18. reverting to original commit

    AndyKilmory authored and Conalb97 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ae77a5f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    3c73176 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    cd0a5cd View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge pull request guardian#4244 from bbc/conal/IMAGEDAM-1593-sendToC…

    …aptureSyndication
    
    Conal/imagedam 1593 send to capture syndication
    twrichards authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c291bfd View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. trigger CI for pr* branches

    The `push-pr` workflow (added in guardian#4240) hasn't been triggering CI as it was created to do, this should fix it...
    twrichards committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ce5c127 View commit details
    Browse the repository at this point in the history
  2. Merge pull request guardian#4260 from guardian/trigger-CI-for-pr-bran…

    …ches
    
    trigger CI for `pr*` branches
    twrichards authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    20db9e4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0e63b27 View commit details
    Browse the repository at this point in the history
  4. Merge pull request guardian#4262 from guardian/gha/improve_run_name_f…

    …or_push-pr
    
    improve 'run name' for `push-pr` GHA workflow runs
    twrichards authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b3319ab View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Configuration menu
    Copy the full SHA
    e618211 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    768ad9e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Configuration menu
    Copy the full SHA
    0dd3917 View commit details
    Browse the repository at this point in the history
  2. Merge pull request guardian#4252 from guardian/an/include-exclude-met…

    …adata
    
    [feature] Hold Alt to exclude, Shift to include when clicking search links
    paperboyo authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    95cdbd9 View commit details
    Browse the repository at this point in the history