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.

Sign up for GitHub

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

Jump to bottom

Release/11.0 #453

Closed
wants to merge 95 commits into from
Closed

Release/11.0 #453

wants to merge 95 commits into from

Conversation

dominicwest
Copy link
Contributor

Description

Ticket # and link

Summary of the changes and the related issue. List any dependencies that are required for this change:

Type of change

Please check the relevant options.

  • Bug fix (non-breaking change which fixes an issue).
  • New feature (non-breaking change which adds functionality).
  • Breaking change (fix or feature that would cause existing functionality to not work as expected).
  • This change requires a documentation update.

How Has This Been Tested?

Please describe the tests that you ran to verify your changes:

  • Unit Test

  • Integration Test (if applicable)

  • End to End Test (if applicable)

Screenshots (if appropriate):

Please attach screenshots of the change if it is a UI change:

Checklist:

  • If I have listed dependencies above, I have ensured that they are present in the target branch.
  • I have performed a self-review of my code.
  • I have commented my code in hard-to-understand areas.
  • I have made corresponding changes to the documentation where applicable.
  • I have ran cypress tests and they all pass locally.

john-tco and others added 30 commits February 27, 2024 16:47
@john-tco @dominicwest
GAP-2140: UI for view & manage editors (#349)
423294f 
* initial

* push content

* add view-editors page

* blank commit to trigger build

* fix linting

* fix unnamed test component

* update routes

* amend error redirect

* rm

* shift to editor service

* use colour helper

* add editors mock

* fix editors gssp

* Update packages/admin/src/pages/scheme/[schemeId]/manage-editors/index.page.tsx

Co-authored-by: dominicwest <[email protected]>
Signed-off-by: john-tco <[email protected]>

* fix url

* misc

* refactor

* update import

* Update packages/admin/src/pages/scheme/[schemeId]/view-editors/index.page.tsx

Co-authored-by: dominicwest <[email protected]>
Signed-off-by: john-tco <[email protected]>

---------

Signed-off-by: john-tco <[email protected]>
Co-authored-by: dominicwest <[email protected]>
@kiramarstonTCO
TMI2-689 - removed unnecessary styling from div (#357)
8adc5db
@dominicwest
Fixing un-needed QuestionPageServerSideProps prop (#347)
9c96e19
@ryan-tco
GAP-2137 Add a new editor (#338)
8b6c680
@jimpurvisTCO @jpurvis-and
@iaincooper-tco @IlyasBaqqari-CabinetOffice @kiramarstonTCO
TMI2-600: Download all applications / Error in export (#353)
e56047f 
* TMI2-602, TMI2-603, TMI2-604, TMI2-617: Download all applications  (#323)

* TMI2-602 - Initial commit of updated page

* TMI2-602 - Adding unit tests

* TMI2-602 - Restructuring page to accommodate for all journeys

* TMI2-603, TMI-604 - Adding error banner and placeholders for pagination

* TMI2-603 - Tidying up

---------

Co-authored-by: Jim Purvis <[email protected]>

* TMI2-633: Functional 'Download all' button (#340)

* TMI2-602 - Initial commit of updated page

* TMI2-602 - Adding unit tests

* TMI2-602 - Restructuring page to accommodate for all journeys

* TMI2-603, TMI-604 - Adding error banner and placeholders for pagination

* TMI2-603 - Tidying up

* TMI2-633 - Adding functionality to Download All button

* TMI2-633 - Removing console.log

---------

Co-authored-by: Jim Purvis <[email protected]>

* TMI2-603-download-individual-applications-success-path (#346)

* TMI2-602 - Initial commit of updated page

* TMI2-602 - Adding unit tests

* TMI2-602 - Restructuring page to accommodate for all journeys

* TMI2-603, TMI-604 - Adding error banner and placeholders for pagination

* TMI2-603 - Tidying up

* Add individual download page

* Update pagination component

* Add back button url

---------

Co-authored-by: Jim Purvis <[email protected]>
Co-authored-by: jimpurvisTCO <[email protected]>

* TMI2-600 restructure (#351)

* TMI2-600 - Restructuring and moving 'Download all submissions' page to meet new API spec

* TMI2-600 - Connecting up to new export details API

* TMI2-600 - Adding pagination (still to be linked to view page)

---------

Co-authored-by: Jim Purvis <[email protected]>

* TMI2-600 - Only requesting necessary exports for each

* TMI2-600 - Unit tests

* TMI2-603: Update download-individual page

* Integrate API to get submissions
* Implement pagination
* Remove redundant code

* TMI2-603: Add unit tests for download-individual page

* TMI2-605 -  View submission summary (error path) (#352)

* TMI2-605 - View read-only summary of application that could not be downloaded

* TMI2-605 - Added link to view individual read-only submissions

* TMI2-605 - Linking frontend to new failed export details endpoint

---------

Co-authored-by: Jim Purvis <[email protected]>

* TMI2-600 - fix for use of an 'any' in submissions list

* Visual tweaks

* TMI2-600 - typo fix

* Clean up code

* TMI2-669 - download attachments error path (#356)

* TMI2-669 - Added conditional logic for rendering option to download attachments

* TMI2-669 - Added tests

* Update DownloadMessage component

* Component now refers to plural applications if there is more than 1

* Update download-individual page

* Pagination now only displays margin when there is more than 1 page
* Item type is now set to applications

* TMI2-600 - PR comments re: view application

* TMI2-600 - Unit test update

* Update index.page.tsx and download-individual.page.tsx

* Replace DownloadMessage banner with ImportantBanner
* Align text with Figma designs
* Make pagination more readable
* Remove unnecessary components

---------

Co-authored-by: Jim Purvis <[email protected]>
Co-authored-by: Iain Cooper <[email protected]>
Co-authored-by: IlyasBaqqari-CabinetOffice <[email protected]>
Co-authored-by: IlyasBaqqari-CabinetOffice <[email protected]>
Co-authored-by: kiramarstonTCO <[email protected]>
@john-tco
fix copy (#359)
202bb5e
@dominicwest
GAP-2138: Remove editor (#344)
915fdd3 
* Triggerring pipelines on PRs to feature branches

* Triggerring pipelines on PRs to feature branches

* GAP-2138: WIP remove page UI complete

* Removing unneeded prop

* GAP-2138: Unit tests start

* GAP-2138: Finish unit tests
@john-tco
GAP-2432: add ui to display last updated by on a grant advert (#358)
550d794 
* initial

* refactor

* fix tets

* refactor buildadvert

* fix type

* amend tests

* fix test

* amend copy
@ryan-tco
GAP-2137: Fix banner width
1b8fc01
@rachelswart
doesn't show buttons if no submissions to download (#364)
49604b8
@rachelswart
if application is not published send to external application (#360)
5e39889
@john-tco
Handle last updated edge cases (#367)
09ea8db 
* initial

* add tests

* fix dates

* mock timezone

* mr feedback

* use correct scheduled date
@john-tco
Fix case on am/pm string (#369)
d3a648d 
* fix case on am/pm string

* fix tests
@john-tco
use 12 hour time (#370)
5ab167c
@ryan-tco
GAP-2433: View last updated by (Applications) (#365)
ec90ab2
@kiramarstonTCO
TMI2-689 - Admin satisfaction survey better fix (#371)
13b667f 
* TMI2-689 - removed unnecessary styling from div

* TMI2-689 - Fixed alignment issues on satisfaction survey
@ryan-tco
GAP:2433 Fix bad reassignment of email (#372)
54dbdc4
@paul-lawlor-tco @ConorFayleTCO
GAP-2452: Add delete to multiple choice and multiple select options (#…
2620c98 
…363)

* Added delete button to mutliple choice/select questions (as seen when editing a question.

* Added unit tests (exact same format as the ones for editing the questions) to cover the delete button rendering.

* Fixed unit tests by adding correct post action along with options

* Refactored callServiceMethod by extracting code out to functions, making it more readable

* make label more sensible

Co-authored-by: Conor Fayle <[email protected]>
Signed-off-by: paul-lawlor-tco <[email protected]>

* PR requested chagnes

---------

Signed-off-by: paul-lawlor-tco <[email protected]>
Co-authored-by: Conor Fayle <[email protected]>
@john-tco
update scheduled advert copy (#373)
e607981
@kiramarstonTCO
TMI2-689 - adds missing css to div (#375)
70ab9ae
@rachelswart
checks if application is published (#376)
87c2a11
@GavCookCO
GAP 2443: Updates to admin dashboard (#366)
5c05773 
* First pass at changes. Tests currently broken.

* updates to admin dash

* fixing tests

* adding a - when updated by is null

* PR feedback

* further PR feedback

* PR feedback III
@jgunnCO
remove 'open in new tab' option for links in rich text editor (#377)
450b060 
* remove new tab link option from rich text editor

* remove link target option from rich text editor
@rachelswart
checks application form status before editing (#379)
8a2fd2e
@kiramarstonTCO
TMI2-715 - Added UploadFile component to admin question preview, adde…
4ecd87e 
…d disabled functionality (#380)
@jimpurvisTCO @jpurvis-and
TMI2-717: 2 options on multiple select application answers (#378)
3cc31ed 
* TMI2-717 - Default to two options rather than one on questions

* TMI2-717 - Typo fix

---------

Co-authored-by: Jim Purvis <[email protected]>
@ConorFayleTCO @ConorFayleAND
GAP-2454/GAP-2457: multiple editors - edit section title (#374)
c065566 
* GAP-2454 / GAP-2457 | get multiple editors working for section title with no email

* GAP-2454 | display email of user that last updated on error page

* GAP-2454 | small refactor

* GAP-2454 | readd lastPublished

* GAP-2454 | fix test

* GAP-2454 | add tests

* GAP-2454 | add ui test for error page

* GAP-2454 | add tests

* GAP-2454 | rename revision back to version

---------

Co-authored-by: conor <[email protected]>
@paul-lawlor-tco
GAP-2450: Don't allow an admin to be demoted if they have a scheme (#368
fdcbe3c 
)

* Added copies for deleting user with grants

* Add variable to determin if the admin owns any grants.

* Pushing to change branch - current issue w/ function to check owner. It's based on session ID so always checks the Super admin schemes (not the admin being viewed).

* passed query param that determines if a user owns a scheme.

* Added unit tests - will fail while in draft due to checkbox behaviour being a WIP.

* Conditionally render copy

* Checkbox is disabled conditionally. However issues with roles occur when the user is an owner. Still a WIP.

* modified checbox component to have disab;ed options built in. Handled case of admin role not being selected when the user OWNS a grant.

* removed comments

* Fix unit tests and add cases for 'Change' button URL when a SA views a users details.

* change identifier for disabled element

* implemented PR changes for Checkbox component and updated relevant tests/stories.

* Made role ids a constant object to improve readability
@rachelswart
TMI2-702: error assigning department to user (#386)
1828e28 
* passes new user roles through query

* fixed test
@ConorFayleTCO @ConorFayleAND
GAP-2460 | implement multiple editors error for deleting section (#383)
11fd560 
* GAP-2460 | implement multiple editors error for deleting section

* GAP-2460 | use query param for version instead of path

* GAP-2460 | fix test

---------

Co-authored-by: conor <[email protected]>
john-tco and others added 26 commits April 8, 2024 10:19
@john-tco @dominicwest
Refresh user-service jwt in admin middleware (#417)
ef25be8 
* Refresh user-service jwt in admin middleware

* bump expiry timer

* update env.example

* extract parseJwt

* add tests

* rm

* update log

* add comment to jwtExpiry declaration

* fix typo

* GAP-2489: Refactor middleware to be clean

* GAP-2489: Fixing tests

* GAP-2489: Adding additional log

* GAP-2489: Sort env.example alphabetically

* GAP-2489: Refactor to recreate after jwt expires

* GAP-2489: Removing unneeded comment

---------

Co-authored-by: dominicwest <[email protected]>
@IlyasBaqqari-CabinetOffice
TMI2-733: Advert preview (#426)
4c61149 
* Add search-result preview page
* Rename existing preview pages, components, methods etc. to advert-details
* Create PreviewSearchCard component
* Read advert data from backend
* Add tests and update existing tests
@IlyasBaqqari-CabinetOffice @IlyasBaqqari
FIX TMI2-773: Advert Preview (#430)
8d5a5d1 
Co-authored-by: IlyasBaqqari <[email protected]>
@IlyasBaqqari-CabinetOffice
FIX TMI2-773: Advert Preview (#431)
ffcdb10
@jgunnCO
Feat/gap 2420 admin (#429)
d34b9b4 
* add request/response logging to applicant package

* expand response log message

* amend error logs

* fix tests

* fix middleware tests

* rm logs

* minor additions

* extract ternary

* amend next-logger import

* add request/response logging to admin

* update middleware tests

* minor test refactor

* fix tests

* fix build error

* fix tests

* fix build error
@jgunnCO
only call csrf middleware once (#436)
9c2fc2b 
* only call csrf middleware once

* fix tests
@jgunnCO
Feat/gap 2420 console (#433)
f70b6a0 
* add request/response logging to applicant package

* expand response log message

* amend error logs

* fix tests

* fix middleware tests

* rm logs

* minor additions

* extract ternary

* amend next-logger import

* add request/response logging to admin

* update middleware tests

* minor test refactor

* fix tests

* fix build error

* fix tests

* fix build error

* replace console invocations
@jgunnCO
print csrf token on validation failure (#438)
c0934d2
@dominicwest
GAP-2596: Refresh JWT via a 307 to preserve POSTs (#437)
e50e5ab
@GavCookCO
fixing daylight savings issue (#434)
dcc244c
@jgunnCO
rm more console logs (#441)
38d73e9
@a-lor-cab @ConorFayleTCO @jgunnCO
Gap 2587/redirect to404when not allowed on a page (#440)
3b2b3ae 
* GAP-2587: adds logic to handle redirection to 404 page

* GAP-2587 | Apply suggestions from code review

Signed-off-by: Conor Fayle <[email protected]>

* fix build and rm duplicate csrfMiddleware invocation

---------

Signed-off-by: Conor Fayle <[email protected]>
Co-authored-by: Conor Fayle <[email protected]>
Co-authored-by: JamieGunnCO <[email protected]>
@paul-lawlor-tco
Adds small check to give Super Admin the Admin role if they weren't a…
da14773 
…ssigned (#439)
@a-lor-cab
add logic to handle mandatory questions for internal removed applicat…
392e8f4 
…ion forms (#432)
@jgunnCO
add api request/response logging to admin package (#435)
f60ec55 
* add axios file to admin

* add api request/reponse logging to admin
@ConnorTCO
Adding validation to patch requests so that updated question response…
d3e38a9 
… types will have the correct validation (#442)

* Adding validation to patch requests so that updated question response types will have the correct validation

* Handling string value of boolean in patch method for question options

---------

Signed-off-by: Connor Macqueen <[email protected]>
@ConnorTCO @a-lor-cab
@ConorFayleTCO @jgunnCO
GAP-2537:fix logic to handle applications with no adverts (#445)
01333ac 
* GAP-2537:fix logic to handle applications with no adverts

* remove unwanted import

* Update packages/applicant/src/pages/api/create-submission.page.tsx

Co-authored-by: jgunnCO <[email protected]>
Signed-off-by: Conor Fayle <[email protected]>

---------

Signed-off-by: Conor Fayle <[email protected]>
Co-authored-by: a-lor-cab <[email protected]>
Co-authored-by: Conor Fayle <[email protected]>
Co-authored-by: jgunnCO <[email protected]>
@paul-lawlor-tco @ConorFayleAND
@tco-olivergodby @jgunnCO @ConorFayleTCO
GAP-2528: Fix role logic for previously blocked users (#444)
0ba5baf 
* Adds small check to give Super Admin the Admin role if they weren't assigned

* GAP-2528 Fix unblock issue

* GAP-2528 | fix implementation and add tests

* GAP-2528 | improve comments

* Update packages/admin/src/pages/super-admin-dashboard/user/[id]/change-roles.test.tsx

Co-authored-by: jgunnCO <[email protected]>
Signed-off-by: tco-olivergodby <[email protected]>

---------

Signed-off-by: tco-olivergodby <[email protected]>
Co-authored-by: conor <[email protected]>
Co-authored-by: tco-olivergodby <[email protected]>
Co-authored-by: jgunnCO <[email protected]>
Co-authored-by: Conor Fayle <[email protected]>
@ConorFayleTCO @ConorFayleAND
GAP-2350 | fix invalid date in safari by changing hyphens to slashes.…
c8fdb0f 
… add tests (#446)

Co-authored-by: conor <[email protected]>
@jgunnCO
fetch csrf secret from secrets manager (#443)
094d617 
* fetch csrf secret from secrets manager

* fix catch statement

* add log

* edit comment

* convert csrfSecret to class

* add IS_PRODUCTION var to constants

* add note on running in production mode to readme
@jgunnCO
temporarily fix middleware (#448)
acfd351
@jgunnCO
fix binary conversion (#449)
af9c234
@jgunnCO
fetch csrf secret from endpoint (#450)
9a8aafa
@jgunnCO
remove https from host domain (#451)
df24ea8
@ConorFayleTCO @ConorFayleAND
GAP-2521: bump out of date dependencies (#447)
63a155c 
* GAP-2521 | upgrade patch and minor versions for all packages

* GAP-2521 | remove react-moment from PreviewSearchResultCard due to dep issue

* GAP-2521 | upgrade more minor versions

* GAP-2521 | remove some applicant minor upgrades

* GAP-2521 | upgrade more deps

* GAP-2521 | remove no-server-import-in-page eslint rule

---------

Co-authored-by: conor <[email protected]>
@jgunnCO
add explanatory comments and improve security (#452)
40bf6bc 
* add explanatory comments and improve security

* add tests
@dominicwest dominicwest deleted the branch main April 29, 2024 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.