TP2000-1092 reference documents v1 1 #1290

…into TP2000-1186_ref_doc_data_model # Conflicts: # reference_documents/models.py # reference_documents/urls.py # reference_documents/views.py

…sion views, refactored the checks and ran the checks several times against reference document versions.

… review tabs (#1133) * Add sub-quotas nested review tab * Add quota blocking periods nested review tab * Add quota suspension periods nested review tab * Use tab title instead of model verbose name * Add blocking period and suspension period SID to table

…reports with multiple tabs (#1134)

* Add MAINTENANCE_MODE setting and middleware * Fix middleware removal and recursive redirect * Add template view and url * Add tests * Update contact us form link for other pages * Update text wording * Remove database route during maintenance * Update maintenance page template/url name --------- Co-authored-by: Dale Cannon <[email protected]>

* record seq number & message id fix * fix taricXMLRenderer, pass in value of counter

…#1123) * Update User model references * Use custom User model * TP2000-1152-handling-invalid-workbaskets (#1113) * Update middleware to check for workbasket changing state * Update to use decorator rather than middleware, add pytest fixtures * Update tests that require a session workbasket to run * Move views and urls to workbasket app and update template * Add tests for when workbasket status changes * Tidy up following Pauls comments * Update models and templates to find workbasket in user model * Update test fixtures for workbasket being in user model * Tidy up and test updates * Update referencing to User model * Updating bdd tests for new user model * Add and update view and model unit tests * Update require_current_workbasket decorator docstring * Add docstring, move template for NoActiveWorkBasket view * Amend current workbasket id retrieval in template * Amend custom User model migration * Remake migration adding current_workbasket field to User model * Remove unused ValidateSessionWorkBasketMiddleware * Make current_workbasket optional * Add User model to admin * Use historical models to fix migration tests * Move ContentType data migration so it may be applied * Rename function to remove a users current workbasket * Amend docstrings * Remove reference to session middleware that is no longer used * Update workbaskets models following Pauls review * Bring back user workbasket middleware as extra security * Move User model from workbaskets app to common app * Add forgotten content type data migration * Remove setup_content_type fixture following patch to migrator fixture * Amend middleware util method name * Remove uneeded DoesNotExist try except block --------- Co-authored-by: Dale Cannon <[email protected]>

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.9.1...v3.9.2) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update importer model matching to account for end dated objects. * update importer model matching to account for end dated objects.

* update govuk dependency since its been deleted at source * update govuk dependency since its been deleted at source

Bumps [django](https://github.com/django/django) from 3.2.23 to 3.2.24. - [Commits](django/django@3.2.23...3.2.24) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* added a check that if tracked models have been updated since the last checks business rules need run again * data migration to add timestamps to tracked models and transaction checks * tests for real edits * tests for data migrations

* Remove authbroker middleware when in maintenance mode * Skip applying migrations in init script * Prevent maintenance mode template attempts to access user attribute on request object * Update privacy policy link

* Add react * Start to build origins form in react * Build quota origin form with initial data * Enable adding/removing of origins * Repopulate form initial in case of error on submit * Pass errors from django to react * Create origins * Add aria attribute * Reinstate geo area descriptions in form * Organise JS, code comments * Add key for react list * Simplify if statement * Add exclusions formset * Add jest for react testing * Amend gitignore * Fix error re-rendering component after submit fail * Move state management into top level component * Pass origin index to exclusions formset * Submit origin pk * Update constants.py * Test form cleaned_data * Update quota origins to use with_latest_description * Use description from annotated query * Update origins and add test * Update origin exclusions * Don't remove empty data * Fix exclusions not pre-populating * Add jest snapshot tests * Add react tests * Add jest tests to github actions * Fix query not returning origin exclusions * Fix disabled widget error * Fix origins no longer being linked to quota when order number updated * Update tests for workbasket change * Add tests for add_extra_error form method * Fix incorrect exclusion being removed * Clean up babel config * Remove unused field * Create exclusions for updated and new origins * Make sure exclusions are updated/deleted * Move current() queryset into init * Fix geographical area invalid choice error in test

…sion views, refactored the checks and ran the checks several times against reference document versions.

* TP2000-1168 Add sub-quota, blocking period & suspension period nested review tabs (#1133) * Add sub-quotas nested review tab * Add quota blocking periods nested review tab * Add quota suspension periods nested review tab * Use tab title instead of model verbose name * Add blocking period and suspension period SID to table * Feat: expand expiring quotas report to include tabs (#1131) * feat: invoke UI changes to reports and create new URL path to handle reports with multiple tabs (#1134) * feat: Add both CSV and excel types for charts exporting (#1136) * TP2000-1185 Add maintenance mode (#1137) * Add MAINTENANCE_MODE setting and middleware * Fix middleware removal and recursive redirect * Add template view and url * Add tests * Update contact us form link for other pages * Update text wording * Remove database route during maintenance * Update maintenance page template/url name --------- Co-authored-by: Dale Cannon <[email protected]> * Increment message id & record sequence number correctly (#1083) * record seq number & message id fix * fix taricXMLRenderer, pass in value of counter * feat: implement URLs for quota reports to ease navigation (#1135) * Update readme with maintenance mode instructions. (#1140) * TP2000-1130 Move current workbasket from Session to custom User model (#1123) * Update User model references * Use custom User model * TP2000-1152-handling-invalid-workbaskets (#1113) * Update middleware to check for workbasket changing state * Update to use decorator rather than middleware, add pytest fixtures * Update tests that require a session workbasket to run * Move views and urls to workbasket app and update template * Add tests for when workbasket status changes * Tidy up following Pauls comments * Update models and templates to find workbasket in user model * Update test fixtures for workbasket being in user model * Tidy up and test updates * Update referencing to User model * Updating bdd tests for new user model * Add and update view and model unit tests * Update require_current_workbasket decorator docstring * Add docstring, move template for NoActiveWorkBasket view * Amend current workbasket id retrieval in template * Amend custom User model migration * Remake migration adding current_workbasket field to User model * Remove unused ValidateSessionWorkBasketMiddleware * Make current_workbasket optional * Add User model to admin * Use historical models to fix migration tests * Move ContentType data migration so it may be applied * Rename function to remove a users current workbasket * Amend docstrings * Remove reference to session middleware that is no longer used * Update workbaskets models following Pauls review * Bring back user workbasket middleware as extra security * Move User model from workbaskets app to common app * Add forgotten content type data migration * Remove setup_content_type fixture following patch to migrator fixture * Amend middleware util method name * Remove uneeded DoesNotExist try except block --------- Co-authored-by: Dale Cannon <[email protected]> * Bump aiohttp from 3.9.1 to 3.9.2 (#1142) Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.9.1...v3.9.2) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * initial commit - ref doc data model * update importer model matching to account for end dated objects. (#1146) * update importer model matching to account for end dated objects. * update importer model matching to account for end dated objects. * Tp2000 1211 (#1148) * update govuk dependency since its been deleted at source * update govuk dependency since its been deleted at source * initial commit - ref doc data model * wip commit * Bump django from 3.2.23 to 3.2.24 (#1150) Bumps [django](https://github.com/django/django) from 3.2.23 to 3.2.24. - [Commits](django/django@3.2.23...3.2.24) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Tp2000 652 force rule check after real edit (#1130) * added a check that if tracked models have been updated since the last checks business rules need run again * data migration to add timestamps to tracked models and transaction checks * tests for real edits * tests for data migrations * TP2000-1219 Prevent maintenance mode errors (#1152) * Remove authbroker middleware when in maintenance mode * Skip applying migrations in init script * Prevent maintenance mode template attempts to access user attribute on request object * Update privacy policy link * initial commit - ref doc data model * wip commit * initial commit - ref doc data model * wip commit * wip commit * wip commit * added alignment report, reference document and reference document version views, refactored the checks and ran the checks several times against reference document versions. * TP2000-1168 Add sub-quota, blocking period & suspension period nested review tabs (#1133) * Add sub-quotas nested review tab * Add quota blocking periods nested review tab * Add quota suspension periods nested review tab * Use tab title instead of model verbose name * Add blocking period and suspension period SID to table * Feat: expand expiring quotas report to include tabs (#1131) * feat: invoke UI changes to reports and create new URL path to handle reports with multiple tabs (#1134) * feat: Add both CSV and excel types for charts exporting (#1136) * TP2000-1185 Add maintenance mode (#1137) * Add MAINTENANCE_MODE setting and middleware * Fix middleware removal and recursive redirect * Add template view and url * Add tests * Update contact us form link for other pages * Update text wording * Remove database route during maintenance * Update maintenance page template/url name --------- Co-authored-by: Dale Cannon <[email protected]> * Increment message id & record sequence number correctly (#1083) * record seq number & message id fix * fix taricXMLRenderer, pass in value of counter * feat: implement URLs for quota reports to ease navigation (#1135) * Update readme with maintenance mode instructions. (#1140) * TP2000-1130 Move current workbasket from Session to custom User model (#1123) * Update User model references * Use custom User model * TP2000-1152-handling-invalid-workbaskets (#1113) * Update middleware to check for workbasket changing state * Update to use decorator rather than middleware, add pytest fixtures * Update tests that require a session workbasket to run * Move views and urls to workbasket app and update template * Add tests for when workbasket status changes * Tidy up following Pauls comments * Update models and templates to find workbasket in user model * Update test fixtures for workbasket being in user model * Tidy up and test updates * Update referencing to User model * Updating bdd tests for new user model * Add and update view and model unit tests * Update require_current_workbasket decorator docstring * Add docstring, move template for NoActiveWorkBasket view * Amend current workbasket id retrieval in template * Amend custom User model migration * Remake migration adding current_workbasket field to User model * Remove unused ValidateSessionWorkBasketMiddleware * Make current_workbasket optional * Add User model to admin * Use historical models to fix migration tests * Move ContentType data migration so it may be applied * Rename function to remove a users current workbasket * Amend docstrings * Remove reference to session middleware that is no longer used * Update workbaskets models following Pauls review * Bring back user workbasket middleware as extra security * Move User model from workbaskets app to common app * Add forgotten content type data migration * Remove setup_content_type fixture following patch to migrator fixture * Amend middleware util method name * Remove uneeded DoesNotExist try except block --------- Co-authored-by: Dale Cannon <[email protected]> * Bump aiohttp from 3.9.1 to 3.9.2 (#1142) Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.9.1...v3.9.2) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update importer model matching to account for end dated objects. (#1146) * update importer model matching to account for end dated objects. * update importer model matching to account for end dated objects. * Tp2000 1211 (#1148) * update govuk dependency since its been deleted at source * update govuk dependency since its been deleted at source * Bump django from 3.2.23 to 3.2.24 (#1150) Bumps [django](https://github.com/django/django) from 3.2.23 to 3.2.24. - [Commits](django/django@3.2.23...3.2.24) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Tp2000 652 force rule check after real edit (#1130) * added a check that if tracked models have been updated since the last checks business rules need run again * data migration to add timestamps to tracked models and transaction checks * tests for real edits * tests for data migrations * TP2000-1219 Prevent maintenance mode errors (#1152) * Remove authbroker middleware when in maintenance mode * Skip applying migrations in init script * Prevent maintenance mode template attempts to access user attribute on request object * Update privacy policy link * Formatting updates and adding end date field to footnote create (#1154) * TP2000-1114: React enhanced forms proof of concept (#1091) * Add react * Start to build origins form in react * Build quota origin form with initial data * Enable adding/removing of origins * Repopulate form initial in case of error on submit * Pass errors from django to react * Create origins * Add aria attribute * Reinstate geo area descriptions in form * Organise JS, code comments * Add key for react list * Simplify if statement * Add exclusions formset * Add jest for react testing * Amend gitignore * Fix error re-rendering component after submit fail * Move state management into top level component * Pass origin index to exclusions formset * Submit origin pk * Update constants.py * Test form cleaned_data * Update quota origins to use with_latest_description * Use description from annotated query * Update origins and add test * Update origin exclusions * Don't remove empty data * Fix exclusions not pre-populating * Add jest snapshot tests * Add react tests * Add jest tests to github actions * Fix query not returning origin exclusions * Fix disabled widget error * Fix origins no longer being linked to quota when order number updated * Update tests for workbasket change * Add tests for add_extra_error form method * Fix incorrect exclusion being removed * Clean up babel config * Remove unused field * Create exclusions for updated and new origins * Make sure exclusions are updated/deleted * Move current() queryset into init * Fix geographical area invalid choice error in test * Move babel packages out of dev deps (#1155) * initial commit - ref doc data model * wip commit * initial commit - ref doc data model * wip commit * wip commit * initial commit - ref doc data model * wip commit * initial commit - ref doc data model * wip commit * added alignment report, reference document and reference document version views, refactored the checks and ran the checks several times against reference document versions. * added alignment report, reference document and reference document version views, refactored the checks and ran the checks several times against reference document versions. * prep for merge to mega branch * prep for merge to mega branch * prep for merge to mega branch --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Dale Cannon <[email protected]> Co-authored-by: Tash Boyse <[email protected]> Co-authored-by: Matthew McKenzie <[email protected]> Co-authored-by: Dale Cannon <[email protected]> Co-authored-by: A Gleeson <[email protected]> Co-authored-by: Paul Pepper <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edie Pearce <[email protected]>

…megabranch' into TP2000-1129-reference-documents-megabranch # Conflicts: # reference_documents/migrations/0001_initial.py # reference_documents/models.py

…r failing

* Functionality to edit reference documents * CRUD templates * Reference Doc CRUD