Feature/pages api update for theme subtheme - #3343

Draft

manubinary wants to merge 294 commits into

CDD-3451-BE-Make-sure-all-6-permission-fields-get-passed-with-every-charts-API-callfrom

feature/pages-api-update-for-theme-subtheme

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 24, 2026

Commits on Mar 25, 2026

CDD-3175: linting
luketowell
committed
843f340

Commits on Mar 26, 2026

CDD-3175: tests
luketowell
committed
7b91090
CDD-3176: Add initial model
Kathryn Dale
committed
3ee2a70
CDD-3175: Initial Commit

Kathryn Dale
authored and
luketowell
committed
6017395
Create initial permission set

Kathryn Dale
authored and
luketowell
committed
0b2c039
Add conditional sub_theme dropdown

Kathryn Dale
authored and
luketowell
committed
527b15f
Update migration file and tidy up child_theme.js

Kathryn Dale
authored and
luketowell
committed
058e529
pip: (deps): bump python-dotenv from 1.2.1 to 1.2.2

dependabot[bot]
authored and
luketowell
committed
d0041f1
Testing dummy secret with gitleaks

abdihakim92x1
authored and
luketowell
committed
db3eed6
Testing dummy secret with gitleaks

abdihakim92x1
authored and
luketowell
committed
2edb76e
Added secret scan to the existing action.yaml

abdihakim92x1
authored and
luketowell
committed
d818ec1
Reverted to script installation of gitleaks

abdihakim92x1
authored and
luketowell
committed
7082593
Changed job name

abdihakim92x1
authored and
luketowell
committed
1a7b248
Changed ubuntu version

abdihakim92x1
authored and
luketowell
committed
9938b77
Using official gitleaks action

abdihakim92x1
authored and
luketowell
committed
f62bbad
Updated ubuntu version

abdihakim92x1
authored and
luketowell
committed
ea9e6e4
Gitleaks arg removed

abdihakim92x1
authored and
luketowell
committed
f820650
CDD-3175: populate the Topic dropdown
luketowell
committed
ed11e83
Update theme functionality to pull available themes from the db via the metrics interface.
luketowell
committed
d38cc2d
Update to add serializer to handle request and response for subthemes and update to subthemes to handle querying db
luketowell
committed
2b2bfa6
CDD-3175: updated the JS to add wildcard and empty object options
luketowell
committed
a69ab5e
CDD-3175: Updated the topics and metrics endpoints to retrieve data from the DB
luketowell
committed
b09b509
CDD-3085: updated validations and wildcard functionality
luketowell
committed
817dfb8
WIP: Separate model files and create permission set block
Kathryn Dale
committed
c3dec5d
add name back in
Kathryn Dale
committed
d823c58

Commits on Mar 30, 2026

working draft
Kathryn Dale
committed
e47447a
Merge branch 'task/CDD-3175-permission-sets-cms' into task/CDD-3176-add-users-cms
Kathryn Dale
committed
2cb5fc9
Split models into two files
Kathryn Dale
committed
a9032f2
CDD-3175: removed duplicate functionality
luketowell
committed
6b1c4d3
CDD-3175: refactored naming of endpoints
luketowell
committed
2552243
Add unit testing
Kathryn Dale
committed
1f306f6

Commits on Mar 31, 2026

CDD-3175: update to fix wildcard selection
luketowell
committed
59d2dcd
Simplified version
Kathryn Dale
committed
c3436a5
remove old code
Kathryn Dale
committed
a8eb2be
Remove old code
Kathryn Dale
committed
780a5a6
CDD-3175: update for PR comments
luketowell
committed
8b15e75

Commits on Apr 1, 2026

CDD-3175: update for PR comments
luketowell
committed
c05163f
remove old file
Kathryn Dale
committed
beebd08

Commits on Apr 2, 2026

CDD-3175: Update method annotation
luketowell
committed
1c16ace
Merge branch 'main' into task/CDD-3175-permission-sets-cms
luketowell
authored
0b66789
CDD-3175: Update method annotation
luketowell
committed
4a3c3b7
Merge branch 'main' into task/CDD-3175-permission-sets-cms
luketowell
authored
ef470ee
Update checkboxes
Kathryn Dale
committed
4deebb3
Merge branch 'task/CDD-3175-permission-sets-cms' into task/CDD-3176-add-users-cms
Kathryn Dale
committed
dc3724a
Linting fixes
Kathryn Dale
committed
bccf9d8
remove merge issue
Kathryn Dale
committed
8d5787c
linting things
Kathryn Dale
committed
cca3cf3
CDD-3175: Update urls for permission set endpoints
luketowell
committed
e1502f5

Commits on Apr 9, 2026

CDD-3175: Update to add ability to get by id and to create initial permission set hierarchy
luketowell
committed
7577419

Commits on Apr 10, 2026

CDD-3175: add group by functionality
luketowell
committed
7848563
CDD-3172: small refactor of permission_hierarchy and users and topics
luketowell
committed
f37ee3e

Commits on Apr 13, 2026

Remove testing changes to truncated_dataset
luketowell
committed
b77e195

Commits on Apr 14, 2026

Remove group by geography
luketowell
committed
5930ec6
refactor permission grouping to group by id rather than name
luketowell
committed
0ac42ee

Commits on Apr 15, 2026

CDD-3172: linting
luketowell
committed
67f8ab6
Merge branch 'main' into task/CDD-3172-permission-hierarchy
luketowell
authored
e460266

Commits on Apr 16, 2026

CDD-3172: tests
luketowell
committed
d9c4998
CDD-3172: tests
luketowell
committed
15627ab

Commits on Apr 20, 2026

CDD-3172: tests and refactoring
luketowell
committed
2ad0df8
Merge branch 'main' into task/CDD-3172-permission-hierarchy
luketowell
committed
cfcd612

Commits on Apr 22, 2026

Commits on Apr 28, 2026

CDD-3171: Update permission set form now it's a page not a snippet
Kathryn Dale
committed
26363e2
Update topic page to include theme/subtheme/topic fields
Kathryn Dale
committed
d0540cb
WIP: filter getPages based on is_public field
Kathryn Dale
committed
e35df35
Move auth content underneath CMS
Kathryn Dale
committed
c8578bc
Expose themes/subthemes/topics on topic and metric doc child pages
Kathryn Dale
committed
654b337

Commits on Apr 29, 2026

Merge branch 'main' into task/CDD-3172-permission-hierarchy
luketowell
authored
0674583
CDD-3172: move class for blocks
luketowell
committed
c1dd464
WIP: Add theme/subtheme/topic to pages
Kathryn Dale
committed
97160a7
linting and permission set url changes
luketowell
committed
372eadd
CDD-3172: refactored naming of geography method and updated the tests based on feedback.
luketowell
committed
710a865
CDD-3172: updated test to better name test and updated permission hierarchy error
luketowell
committed
fb29a38

Commits on Apr 30, 2026

CDD-2172: Add examples for each of the potential responses for get permissions sets hierarchy requests
luketowell
committed
f588ee2
CDD-2172: linting
luketowell
committed
0584f99
Merge branch 'main' into task/CDD-3172-permission-hierarchy
luketowell
authored
5b78d1e
CDD-3147: Update Cognito User for permission sets
mattjreynolds
committed
8bc0bbd
CDD-3147: Improve logging of JWT
mattjreynolds
committed
2a79ee3
CDD-3147: Update readme for using JWT locally
mattjreynolds
committed
2ab8c2e
CDD-3147: Update readme for using JWT locally
mattjreynolds
committed
5f7d315
CDD-3119 Add a new SimpleMenu model.

David Logie
authored and
Kathryn Dale
committed
3f999f1
CDD-3119 Add panels attribute to SimpleMenu model.

David Logie
authored and
Kathryn Dale
committed
685ab94
CDD-3119 Beef up the SimpleMenu serializer tests.

David Logie
authored and
Kathryn Dale
committed
b10c77b
CDD-3232 Update chart response styles.

David Logie
authored and
Kathryn Dale
committed
5fefbfe
pip dev: (deps-dev): bump pre-commit from 4.5.1 to 4.6.0

dependabot[bot]
authored and
Kathryn Dale
committed
f34051e
pip: (deps): bump idna from 3.11 to 3.12

dependabot[bot]
authored and
Kathryn Dale
committed
8a16873
pip dev: (deps-dev): bump gitpython from 3.1.46 to 3.1.47

dependabot[bot]
authored and
Kathryn Dale
committed
a613fbf
pip: (deps): bump click from 8.3.2 to 8.3.3

dependabot[bot]
authored and
Kathryn Dale
committed
f637ec3
pip: (deps): bump psycopg2-binary from 2.9.10 to 2.9.12

dependabot[bot]
authored and
Kathryn Dale
committed
7342f33
pip: (deps): bump pydantic from 2.13.2 to 2.13.3

dependabot[bot]
authored and
Kathryn Dale
committed
80f8a7e
build: remove simplejson dependency

jrdh
authored and
Kathryn Dale
committed
8e3cef0
CDD-3313: Add topic page link to headline metrics card (#3151)

tushortz
authored and
Kathryn Dale
committed
de89d0b
pip: (deps): bump idna from 3.12 to 3.13

dependabot[bot]
authored and
Kathryn Dale
committed
c53721c
topics: add HIV topic

aidan
authored and
Kathryn Dale
committed
b336a45
CDD-3087: new CMS page for logged-out functionality (#3163)

luketowell
authored and
Kathryn Dale
committed
5f9a0d1
pip: (deps): bump filelock from 3.28.0 to 3.29.0

dependabot[bot]
authored and
Kathryn Dale
committed
f21867e
Merge branch 'task/CDD-3147-update-cognito-user-for-permission-sets' into task/CDD-3171-update-getpages-endpoint-for-non-public
Kathryn Dale
committed
21ec84a
WIP: pseudo code / note form of solution
Kathryn Dale
committed
fc0366c

Commits on May 1, 2026

WIP: filter pages on permission sets
Kathryn Dale
committed
168dd31

Commits on May 5, 2026

Permission check updates and form handling
itsthatianguy
committed
112e4c7

Commits on May 6, 2026

WIP: Fix comparison function
Kathryn Dale
committed
6069ae6
Finish getPages endpoint
Kathryn Dale
committed
7891edf

Commits on May 7, 2026

CDD-3172: Remove permission_sets from CMS API
mattjreynolds
committed
828301a
CDD-3172: Update docstring
mattjreynolds
committed
0152d03
remove redundant code
Kathryn Dale
committed
9d3e9b4
Merge branch 'main' into task/CDD-3172-permission-hierarchy
mattjreynolds
authored
8cf08b2
fixes for existing unit tests
itsthatianguy
committed
230a893
Merge branch 'task/CDD-3172-permission-hierarchy' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
Kathryn Dale
committed
dbbd0fb
Update imports
Kathryn Dale
committed
e0030e5

Commits on May 8, 2026

add endpoint back in for testing
Kathryn Dale
committed
d021645
fix import
Kathryn Dale
committed
8f67ea2
Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
Kathryn Dale
committed
36e5f18
New tests, and fixes and updates to existing tests
itsthatianguy
committed
69afe07
Naming fixes
itsthatianguy
committed
aee34c0

Commits on May 12, 2026

test coverage
itsthatianguy
committed
89025af

Commits on May 19, 2026

Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
Kathryn Dale
committed
2806c50
CDD-3171: Tweaks
Kathryn Dale
committed
ccd0cc1
CDD-3171: Add display name to permission sets
Kathryn Dale
committed
c6ce9c2
remove log file
Kathryn Dale
committed
b186842
Fix js file
Kathryn Dale
committed
4e83f82
Linting
Kathryn Dale
committed
d7883c6
Update migration
Kathryn Dale
committed
376c782
refactor for sonarqube checks
Kathryn Dale
committed
c63e778
Fix constraints on permission sets
Kathryn Dale
committed
27fc8d9
update unit tests
Kathryn Dale
committed
e328d6d

Commits on May 20, 2026

fix allowed_pages overwrite
Kathryn Dale
committed
35802ee
Fix unit test
Kathryn Dale
committed
834cfdc
Fix test
Kathryn Dale
committed
6e130fb
linting
Kathryn Dale
committed
6de2df7

Commits on May 22, 2026

CDD-3171: Move permission_set.js insert to Media class
mattjreynolds
committed
222acd2
CDD-3171: Add ignores for importlint
mattjreynolds
committed
5219d16
Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
mattjreynolds
authored
16540f5
Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
kathryn-dale
authored
5320494
Update architectural constraints
Kathryn Dale
committed
f55076e
linting
Kathryn Dale
committed
39226d0

Commits on May 26, 2026

Commits on May 27, 2026

Update wildcard value in viewsets
Kathryn Dale
committed
084949c
Update test
Kathryn Dale
committed
6b88ea7
remove comment
Kathryn Dale
committed
147916a
Update import
Kathryn Dale
committed
ebc6fcd
fix test name
Kathryn Dale
committed
efb3ff8
Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
kathryn-dale
authored
7a1f09d
linting
mattjreynolds
committed
9d66874
combine imports
mattjreynolds
committed
a23fd65
refactor for simplicity
Kathryn Dale
committed
fd5306e
linting
Kathryn Dale
committed
81e3678
CDD-3173: prototype authorization curl call on /api/downloads/v2
dandammann
committed
8708ada

Commits on May 28, 2026

Commits on May 29, 2026

Commits on May 31, 2026

CDD-3173: lint
dandammann
committed
75a0bf5
CDD-3173: convert permission function arguments into named arguments (safer)
dandammann
committed
2962d89
Merge remote-tracking branch 'origin/CDD-3174' into CDD-3174
dandammann
committed
e503dc5

Commits on Jun 1, 2026

Commits on Jun 2, 2026

Pass permission set array to check permissions
Kathryn Dale
committed
cc9e8cc
CDD-3174: re-added noisy comment
dandammann
committed
9a5dd44
CDD-3174: formalize comment
dandammann
committed
f62690c
CDD-3174: revert rbac_permissions warning fix
dandammann
committed
b903872
CDD-3174: revert every logger.info("Entered function ...)
dandammann
committed
a7b44f4

Commits on Jun 3, 2026

Add logs for permission sets
Kathryn Dale
committed
b02b3e6
CDD-3174: revert SQL printing
dandammann
committed
bd453de
CDD-3174: revert permission set debugging
dandammann
committed
58aaaa0
CDD-3174: add type hints to permission functions & vars
dandammann
committed
9dc72c6
Merge branch 'task/CDD-3171-update-getpages-endpoint-for-non-public-ian' into CDD-3174
dandammann
authored
56b8368
CDD-3174: make permissions disallow empty "" requests
dandammann
committed
3dbd718
Update test mock and linting
Kathryn Dale
committed
c0d0c66
Merge remote-tracking branch 'origin/CDD-3174' into CDD-3174
dandammann
committed
3c1bf03
CDD-3174: centralize WILDCARD_ID_VALUE
dandammann
committed
67febed
Merge branch 'main' into task/CDD-3171-update-getpages-endpoint-for-non-public-ian
kathryn-dale
authored
43c0824
CDD-3174: use MetricsAPIInterface to access data mappers from common folder
dandammann
committed
0df6927
CDD-3174: remove duplicate check_metric_related_permissions() call
dandammann
committed
24d3c0e
CDD-3174: add BaseRequestParams() class that all other request classes inherit from
dandammann
committed
7bc008f
Update log
Kathryn Dale
committed
b154d0b

Commits on Jun 4, 2026

Commits on Jun 5, 2026

CDD-3174: add _get_id_string_or_none() to normalize strings to prevent unintentional "None" == "None" string comparisons
dandammann
committed
bb7be29

Commits on Jun 8, 2026

Commits on Jun 9, 2026

Commits on Jun 10, 2026

Commits on Jun 15, 2026

CDD-3174: fix type hints
dandammann
committed
6f0bb5d
CDD-3174: call log_user_permission_summary() not on every API call anymore
dandammann
committed
ddcd49d
CDD-3174: fix lint
dandammann
committed
8f152db

Commits on Jun 18, 2026

Commits on Jun 19, 2026

CDD-3174: fix geography code bug
dandammann
committed
bdc8073

Commits on Jun 24, 2026

CDD-3174: remove old RBAC @require_authorisation decorator from DownloadsView.post
dandammann
committed
675ad0a

Commits on Jun 30, 2026

Commits on Jul 8, 2026

Merge branch 'CDD-3451-BE-Make-sure-all-6-permission-fields-get-passed-with-every-charts-API-call' of https://github.com/UKHSA-Internal/data-dashboard-api into CDD-3451-BE-Make-sure-all-6-permissio…
manubinary
committed
68b6d72

Commits on Sep 9, 2026

Merge branch 'CDD-3451-BE-Make-sure-all-6-permission-fields-get-passed-with-every-charts-API-call' of https://github.com/UKHSA-Internal/data-dashboard-api into CDD-3451-BE-Make-sure-all-6-permissio…
manubinary
committed
9b52ec8

Commits on Sep 10, 2026

Merge branch 'CDD-3451-BE-Make-sure-all-6-permission-fields-get-passed-with-every-charts-API-call' of https://github.com/UKHSA-Internal/data-dashboard-api into CDD-3451-BE-Make-sure-all-6-permissio…
manubinary
committed
fbb8a3d

Commits on Sep 11, 2026

Pages API updated for theme and subtheme
manubinary
committed
1a04d61