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

Move isUserStaffWithRestricted at the user context level #11378

Merged
merged 3 commits into from
Nov 11, 2024

Conversation

rcantin-w
Copy link
Contributor

@rcantin-w rcantin-w commented Nov 5, 2024

What does this change?

Makes use of the User Context and adds a check of whether or not the user has the StaffWithRestricted role. We did this check in various places, so I thought it might be good to have it at a higher level. This is very much a suggestion though, as I was going through the files and wondering how we could use Contexts for the item viewer. So we can just close this if it's not wanted!

How to test

Ensure behaviour doesn't change in affected files.

How can we measure success?

No need for repetitive code for the check no more

Have we considered potential risks?

If we QA this and the conditions make sense, risk should be very low.

@rcantin-w rcantin-w changed the title Move isUserStaffWithRestriced at the user context level Move isUserStaffWithRestricted at the user context level Nov 5, 2024
Copy link

github-actions bot commented Nov 5, 2024

Size Change: +40 B (0%)

Total Size: 1.01 MB

Filename Size Change
content/webapp/.next/static/chunks/8168-6772609bb96a161b.js 0 B -16.2 kB (removed) 🏆
content/webapp/.next/static/chunks/8551-04d3d92b3eec2ca3.js 0 B -5.28 kB (removed) 🏆
content/webapp/.next/static/chunks/pages/_app-4872c9db607b1514.js 0 B -108 kB (removed) 🏆
content/webapp/.next/static/chunks/pages/works/[workId]-5f26cdcc17c2d1b7.js 0 B -22.7 kB (removed) 🏆
content/webapp/.next/static/chunks/pages/works/[workId]/items-7f63ef1a8d5f2190.js 0 B -4.86 kB (removed) 🏆
identity/webapp/.next/static/chunks/pages/_app-62d680eb7a806cff.js 0 B -105 kB (removed) 🏆
content/webapp/.next/static/chunks/8168-71b89264865ea44c.js 16.2 kB +16.2 kB (new file) 🆕
content/webapp/.next/static/chunks/8551-bb8b09e56dd31b24.js 5.27 kB +5.27 kB (new file) 🆕
content/webapp/.next/static/chunks/pages/_app-24f30469d555d315.js 108 kB +108 kB (new file) 🆕
content/webapp/.next/static/chunks/pages/works/[workId]-61c47ca6e56d5947.js 22.7 kB +22.7 kB (new file) 🆕
content/webapp/.next/static/chunks/pages/works/[workId]/items-84bedb71ce4c37ce.js 4.85 kB +4.85 kB (new file) 🆕
identity/webapp/.next/static/chunks/pages/_app-76af006456758ac7.js 105 kB +105 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
content/webapp/.next/static/chunks/00a8a139.e66d72e5d4e63786.js 58.7 kB
content/webapp/.next/static/chunks/1042.5e93690fb7f8387e.js 264 B
content/webapp/.next/static/chunks/1091.16812ffd5b0a4e6b.js 356 B
content/webapp/.next/static/chunks/1315.ec3024c1cf22820e.js 4.64 kB
content/webapp/.next/static/chunks/1895-507f9544a4d6b6f5.js 2.28 kB
content/webapp/.next/static/chunks/1922.0f05429c47f3337a.js 3.74 kB
content/webapp/.next/static/chunks/2158.8ef7524eb9789345.js 3.29 kB
content/webapp/.next/static/chunks/23-cf5a7458cbf01e28.js 2.67 kB
content/webapp/.next/static/chunks/2614-b089e3e692ce42a9.js 7.17 kB
content/webapp/.next/static/chunks/286.e6c4fb42dbebd142.js 20.7 kB
content/webapp/.next/static/chunks/2907-89567e45bed030dd.js 3.16 kB
content/webapp/.next/static/chunks/3279.25c8e2abad5d9072.js 2.68 kB
content/webapp/.next/static/chunks/3310.3608c7a584df8db5.js 2.43 kB
content/webapp/.next/static/chunks/3406-9e5904344936d437.js 6.68 kB
content/webapp/.next/static/chunks/3407.8b6dc286e5611abd.js 264 B
content/webapp/.next/static/chunks/3514.b981f295d2d50129.js 4.25 kB
content/webapp/.next/static/chunks/3562.1a682406fccbb2ec.js 371 B
content/webapp/.next/static/chunks/3661-448bee7d2db2b975.js 3.41 kB
content/webapp/.next/static/chunks/3761.5a8f62ff6e7a1f25.js 6 kB
content/webapp/.next/static/chunks/4125.067d1eec1c3eb4af.js 2.19 kB
content/webapp/.next/static/chunks/4137-e8e9ad55565f29c7.js 4.18 kB
content/webapp/.next/static/chunks/4176.e220ce99d4a863cf.js 2.42 kB
content/webapp/.next/static/chunks/4494-9ee08e6cd2d95cc0.js 4.68 kB
content/webapp/.next/static/chunks/4621-a46d5953a009fcb0.js 4.57 kB
content/webapp/.next/static/chunks/4704-7fa9ebb41eea98d6.js 4.34 kB
content/webapp/.next/static/chunks/5041.a2ec4f918c672fc2.js 277 B
content/webapp/.next/static/chunks/5164-28bbd6f9adb5325a.js 7.11 kB
content/webapp/.next/static/chunks/5226.2bd4a87f89f13992.js 3.41 kB
content/webapp/.next/static/chunks/5239-d3cc68cce4a94ba9.js 3.2 kB
content/webapp/.next/static/chunks/5261.d1a6fd28d571ac6d.js 4.63 kB
content/webapp/.next/static/chunks/5314-ae0b25ce9db5390c.js 4.82 kB
content/webapp/.next/static/chunks/5563.cbd3e12b59fa5165.js 5.81 kB
content/webapp/.next/static/chunks/5939-d1a715b0e5867fe7.js 2.92 kB
content/webapp/.next/static/chunks/5946-c038471f11cae135.js 3.69 kB
content/webapp/.next/static/chunks/6153-72f512001264df6c.js 4.42 kB
content/webapp/.next/static/chunks/6157-5e5557418ac92dfd.js 6.08 kB
content/webapp/.next/static/chunks/6170.6df6aff3711292af.js 2.53 kB
content/webapp/.next/static/chunks/628-a14babf3fb2eb9d3.js 4.78 kB
content/webapp/.next/static/chunks/6287.ee607762046728e7.js 1.57 kB
content/webapp/.next/static/chunks/632-b20e17704dd49838.js 3.04 kB
content/webapp/.next/static/chunks/6425-463de300c9e3974e.js 6.66 kB
content/webapp/.next/static/chunks/6577-545b35fa00e662d2.js 3.9 kB
content/webapp/.next/static/chunks/7107-7a0c6bd1411921e2.js 33.8 kB
content/webapp/.next/static/chunks/721-8422ecc6bd9759ae.js 7.55 kB
content/webapp/.next/static/chunks/7267-d9ca9d41f5d22bfd.js 4.45 kB
content/webapp/.next/static/chunks/7339.374c3283d903835f.js 1.64 kB
content/webapp/.next/static/chunks/7425.55403f41901da8aa.js 2.49 kB
content/webapp/.next/static/chunks/7849.1818ba955cf06736.js 5.04 kB
content/webapp/.next/static/chunks/8091.2ba1024cfbb14a7a.js 2.94 kB
content/webapp/.next/static/chunks/8194-9fe6d45e2c5b9530.js 2.96 kB
content/webapp/.next/static/chunks/8630.408947dd96fce642.js 1.67 kB
content/webapp/.next/static/chunks/8952.789161ae05665aa4.js 2.65 kB
content/webapp/.next/static/chunks/8997-afbf62110474f301.js 11.4 kB
content/webapp/.next/static/chunks/9508-0ac3bb8cd3dd6f17.js 3.42 kB
content/webapp/.next/static/chunks/framework-978a6051e6d0c57a.js 44.9 kB
content/webapp/.next/static/chunks/main-16881ae36fd18535.js 36.8 kB
content/webapp/.next/static/chunks/pages/_error-1e8090a460deeefd.js 331 B
content/webapp/.next/static/chunks/pages/[uid]-fa2cdd0f5c689306.js 1.94 kB
content/webapp/.next/static/chunks/pages/404-8b7e615af6ded119.js 259 B
content/webapp/.next/static/chunks/pages/500-4bf99f3036ceb64d.js 258 B
content/webapp/.next/static/chunks/pages/about-us-7bb85c84e66dfedf.js 1.94 kB
content/webapp/.next/static/chunks/pages/about-us/[uid]-aeaa4df33dc90ce2.js 1.94 kB
content/webapp/.next/static/chunks/pages/about-us/cookie-policy-67a5c998efb8f07f.js 5.99 kB
content/webapp/.next/static/chunks/pages/books-23048a0db8697278.js 2.02 kB
content/webapp/.next/static/chunks/pages/books/[bookId]-f33ccdc2bcbe74a0.js 4.08 kB
content/webapp/.next/static/chunks/pages/collections-9dffdc7541409e02.js 2.35 kB
content/webapp/.next/static/chunks/pages/collections/[uid]-8e7548edf26c0b91.js 1.94 kB
content/webapp/.next/static/chunks/pages/concepts/[conceptId]-ff31c55f5003683f.js 3.66 kB
content/webapp/.next/static/chunks/pages/event-series/[eventSeriesId]-7769b553635b02ee.js 2.93 kB
content/webapp/.next/static/chunks/pages/events-d25b26bffa8d4695.js 2.15 kB
content/webapp/.next/static/chunks/pages/events/[eventId]-dfb39aec180f06e5.js 8.88 kB
content/webapp/.next/static/chunks/pages/events/[eventId]/visual-stories-03a175c41aa41fa0.js 302 B
content/webapp/.next/static/chunks/pages/exhibitions-7162e42b4045961c.js 2.39 kB
content/webapp/.next/static/chunks/pages/exhibitions/[exhibitionId]-8e43e25fbcb68547.js 3.98 kB
content/webapp/.next/static/chunks/pages/exhibitions/[exhibitionId]/visual-stories-d58968cacc6e24be.js 303 B
content/webapp/.next/static/chunks/pages/get-involved-339bfd13fbbc462a.js 1.94 kB
content/webapp/.next/static/chunks/pages/get-involved/[uid]-f60172ea77a7c9b7.js 1.95 kB
content/webapp/.next/static/chunks/pages/guides/[guideId]-52c23b3346303ef4.js 2.25 kB
content/webapp/.next/static/chunks/pages/guides/exhibitions-90d3490524bb50bd.js 2.65 kB
content/webapp/.next/static/chunks/pages/guides/exhibitions/[id]-72167d1b1a286f22.js 2.77 kB
content/webapp/.next/static/chunks/pages/guides/exhibitions/[id]/[type]-71a25c874e12297a.js 9.57 kB
content/webapp/.next/static/chunks/pages/guides/exhibitions/[id]/[type]/[stop]-9dcabeefe9ec5add.js 5.97 kB
content/webapp/.next/static/chunks/pages/index-ce67156d118bc2ef.js 3.44 kB
content/webapp/.next/static/chunks/pages/newsletter-8d1c5a82c17792a6.js 2.34 kB
content/webapp/.next/static/chunks/pages/pages/[pageId]-6bc73137b7755296.js 1.91 kB
content/webapp/.next/static/chunks/pages/projects/[projectId]-7dbc71a945825b6c.js 2.23 kB
content/webapp/.next/static/chunks/pages/search-2102c2928dd0788a.js 5.11 kB
content/webapp/.next/static/chunks/pages/search/events-8c5ae29c842eca33.js 2.03 kB
content/webapp/.next/static/chunks/pages/search/images-e4f5e6305482bee9.js 1.58 kB
content/webapp/.next/static/chunks/pages/search/stories-5708c5228a094a88.js 3.1 kB
content/webapp/.next/static/chunks/pages/search/works-7d082ff992b13625.js 2.94 kB
content/webapp/.next/static/chunks/pages/seasons/[seasonId]-33f2c6421d1036f8.js 3.86 kB
content/webapp/.next/static/chunks/pages/series/[seriesId]-ae8bd33f420f82da.js 5 kB
content/webapp/.next/static/chunks/pages/slice-simulator-fc6dd41549457a89.js 967 B
content/webapp/.next/static/chunks/pages/stories-412d365fcb0198df.js 1.71 kB
content/webapp/.next/static/chunks/pages/stories/[articleId]-db0036650c6ee149.js 9.7 kB
content/webapp/.next/static/chunks/pages/visit-us-fde940a572e6744f.js 2.27 kB
content/webapp/.next/static/chunks/pages/visit-us/[uid]-d6cf5bd39f3808c4.js 1.95 kB
content/webapp/.next/static/chunks/pages/visual-stories/[visualStoryId]-40d6594b2e75d3bc.js 236 B
content/webapp/.next/static/chunks/pages/whats-on-a605a6d17da8d964.js 212 B
content/webapp/.next/static/chunks/pages/whats-on/[period]-55abbef03192c9ab.js 283 B
content/webapp/.next/static/chunks/pages/works/[workId]/download-d7d0f47c9c009d0c.js 2.74 kB
content/webapp/.next/static/chunks/pages/works/[workId]/images-dcd5e2de51ef7303.js 697 B
content/webapp/.next/static/chunks/polyfills-78c92fac7aa8fdd8.js 31.1 kB
content/webapp/.next/static/chunks/webpack-6a4f0d8a19bb3272.js 2.31 kB
identity/webapp/.next/static/chunks/286.30e19e68d137a7fe.js 20.7 kB
identity/webapp/.next/static/chunks/442-4b4b512cbce15397.js 9.12 kB
identity/webapp/.next/static/chunks/50.5b4e17f82c3c9a70.js 940 B
identity/webapp/.next/static/chunks/528.b0c7a0dca90cafcc.js 2.71 kB
identity/webapp/.next/static/chunks/644-f0cfb6459ad9993f.js 16.2 kB
identity/webapp/.next/static/chunks/framework-e82a91356956e6c8.js 44.8 kB
identity/webapp/.next/static/chunks/main-9fde6a01d715973d.js 38.9 kB
identity/webapp/.next/static/chunks/pages/_error-f92497dca926c5b1.js 1.45 kB
identity/webapp/.next/static/chunks/pages/delete-requested-aba6285540faf31a.js 3.23 kB
identity/webapp/.next/static/chunks/pages/error-5c81263d2bc0f671.js 1.7 kB
identity/webapp/.next/static/chunks/pages/index-e4ea043acc34600a.js 12 kB
identity/webapp/.next/static/chunks/pages/registration-826df2289f963cc4.js 4.13 kB
identity/webapp/.next/static/chunks/pages/success-bd9f4e9b2f8aef7a.js 3.3 kB
identity/webapp/.next/static/chunks/pages/validated-9d66f88ab86c3ab6.js 3.38 kB
identity/webapp/.next/static/chunks/polyfills-78c92fac7aa8fdd8.js 31.1 kB
identity/webapp/.next/static/chunks/webpack-dd4d49330c88bc7f.js 1.81 kB

compressed-size-action

Base automatically changed from restricted-thumbnails to main November 5, 2024 11:07
@rcantin-w rcantin-w marked this pull request as ready for review November 5, 2024 12:08
@rcantin-w rcantin-w requested a review from a team as a code owner November 5, 2024 12:08
@rcantin-w rcantin-w self-assigned this Nov 5, 2024
@gestchild
Copy link
Contributor

I'm no longer seeing the view item link on the works page for restricted items, when I'm logged in

@rcantin-w
Copy link
Contributor Author

There was a typo in the role name 😄 (StaffWithRestriced). I've now amended, sorry should've caught that myself, I didn't test right!

@gestchild
Copy link
Contributor

sorry should've caught that myself, I didn't test right!

That's what reviews are for 😃

Copy link
Contributor

@gestchild gestchild left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good and is working ok locally. Thanks

@gestchild
Copy link
Contributor

Think you just need to merge in main to fix the broken e2e tests

@rcantin-w rcantin-w merged commit afb083c into main Nov 11, 2024
9 checks passed
@rcantin-w rcantin-w deleted the staff-restricted branch November 11, 2024 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants