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

New: [AEA-4518] - Set tab and contents #366

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

New: [AEA-4518] - Set tab and contents #366

wants to merge 9 commits into from
+300 −1,190

Conversation

wildjames
Copy link
Contributor

Summary

  • ✨ New Feature

Details

I've squashed and signed all the commits on the old branch, here. Hopefully, this allows it to pass the quality gates!

UI for Prescription Search Tab functionality. Tabs content areas to display relevant components, though these components themselves will contain only placeholder content.

@wildjames
Squashed commit of the following:
be3e16d 
commit 648e99a
Author: Jim Wild <[email protected]>
Date:   Tue Jan 21 11:15:42 2025 +0000

    Minor formatting preferences

commit 7dabd2e
Author: Jim Wild <[email protected]>
Date:   Tue Jan 21 11:07:12 2025 +0000

    Use path imports

commit f06c3eb
Author: Jim Wild <[email protected]>
Date:   Tue Jan 21 11:06:00 2025 +0000

    Remove duplicate import

commit 44c17eb
Merge: 27be2ce 99e5714
Author: Jim Wild <[email protected]>
Date:   Tue Jan 21 11:04:59 2025 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 27be2ce
Author: Jim Wild <[email protected]>
Date:   Tue Jan 21 11:01:43 2025 +0000

    Minor reverts

commit 389b4f6
Merge: e54142a a431093
Author: Jim Wild <[email protected]>
Date:   Fri Jan 17 14:29:10 2025 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit e54142a
Merge: a5f45be 145b1f1
Author: Jim Wild <[email protected]>
Date:   Fri Jan 17 13:33:36 2025 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit a5f45be
Merge: f45b343 6f2e13b
Author: tobytobytoby74 <[email protected]>
Date:   Fri Jan 17 09:21:02 2025 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit f45b343
Merge: 44eed95 f5f3d40
Author: tobytobytoby74 <[email protected]>
Date:   Wed Jan 15 15:10:49 2025 +0000

    fixes package lock conflict

commit 44eed95
Merge: 6f7f5ee 92d2cc7
Author: tobytobytoby74 <[email protected]>
Date:   Wed Jan 15 14:24:40 2025 +0000

    CONFLICTS RESOLVED

commit 6f7f5ee
Merge: 403a1fd f4dbe8e
Author: Toby Lawrence <[email protected]>
Date:   Tue Jan 14 12:11:00 2025 +0000

    pre-regression test fix

commit 403a1fd
Merge: 648a33a 18814e3
Author: Toby Lawrence <[email protected]>
Date:   Thu Jan 9 14:49:41 2025 +0000

    RESOLVES CONFLICT WITH PLACEHOLDER SEARCH FOR A PRESCRIPTION PAGE

commit 648a33a
Merge: 9c209c0 07d0ea1
Author: Toby Lawrence <[email protected]>
Date:   Thu Jan 9 09:21:56 2025 +0000

    RESOLVE REGRESSION TEST MERGE CONFLICTS

commit 9c209c0
Author: tobytobytoby74 <[email protected]>
Date:   Fri Dec 20 08:21:16 2024 +0000

    test commit check verified

commit d02b758
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 19 13:50:10 2024 +0000

    test commit

commit e4ffb4d
Merge: de38044 72e855c
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 19 13:35:34 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit de38044
Merge: ac5410d 65e7734
Author: Jim Wild <[email protected]>
Date:   Wed Dec 18 14:56:13 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit ac5410d
Author: tobytobytoby74 <[email protected]>
Date:   Mon Dec 16 11:17:41 2024 +0000

    POST REVIEW AMMENDS

commit b27a2f0
Author: SeanSteberis <[email protected]>
Date:   Fri Dec 13 12:23:46 2024 +0000

    Set regression tests to point at v2.0.9

commit 1c22979
Merge: 6d04600 35fbb96
Author: tobytobytoby74 <[email protected]>
Date:   Fri Dec 13 09:08:16 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 6d04600
Merge: 6e0933c 86bfae3
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 12 13:50:38 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 6e0933c
Merge: 86fe1db 5381e13
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 12 09:47:20 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 86fe1db
Merge: 1067fbe 55b597e
Author: tobytobytoby74 <[email protected]>
Date:   Wed Dec 11 08:42:42 2024 +0000

    resolves conflicts

commit 1067fbe
Author: tobytobytoby74 <[email protected]>
Date:   Tue Dec 10 13:55:09 2024 +0000

    COMBINES SEARCHFORAPRESCRIPTION TICKETS aea-4516 AND aea-4518

commit 6ea53aa
Author: SeanSteberis <[email protected]>
Date:   Fri Dec 6 10:54:13 2024 +0000

    Set regression tests to point at chore/AEA-4518-Set-up-the-Tab-and-Content-Area

commit 132fade
Author: tobytobytoby74 <[email protected]>
Date:   Fri Dec 6 09:12:14 2024 +0000

    REMOVES PLACEHOLDER DUPE CODE

commit 06f22fe
Author: tobytobytoby74 <[email protected]>
Date:   Fri Dec 6 08:58:21 2024 +0000

    CSS FOR RESPONSIVE AND NON-JS

commit 59c5331
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 5 12:52:11 2024 +0000

    REMOVES DUPLICATE CODE

commit 03f9c57
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 5 10:55:38 2024 +0000

    UPDATES NEW UPDATED PACKAGELOCK

commit 7b46505
Author: tobytobytoby74 <[email protected]>
Date:   Thu Dec 5 10:15:57 2024 +0000

    UPDATES PACKAGE>LOCK

commit 4b142db
Merge: 9e6fdb9 7effdac
Author: tobytobytoby74 <[email protected]>
Date:   Wed Dec 4 16:29:12 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 9e6fdb9
Author: tobytobytoby74 <[email protected]>
Date:   Wed Dec 4 16:18:16 2024 +0000

    FIXES OBSELETE SNAPSHOT

commit a99dae9
Author: tobytobytoby74 <[email protected]>
Date:   Wed Dec 4 15:15:11 2024 +0000

    ADDS SEARCH COMPONENTS TO TABCONTENT

commit 66dbe1e
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 13:53:51 2024 +0000

    test update

commit 1c3ed13
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 13:44:16 2024 +0000

    update header link

commit 41a7d26
Merge: be7f68d 3b576f0
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 13:08:07 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit be7f68d
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 12:41:53 2024 +0000

    trimming test code

commit b19664b
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 12:35:24 2024 +0000

    code tidying

commit e00d810
Merge: 5f7da34 b096e09
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 12:11:13 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit 5f7da34
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 11:53:21 2024 +0000

    adds unit testing

commit e58aae2
Merge: a99bfa2 0295a38
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 09:14:17 2024 +0000

    Merge branch 'main' into AEA-4518_Set_Tab_and_Content_Area

commit a99bfa2
Author: tobytobytoby74 <[email protected]>
Date:   Fri Nov 29 08:51:50 2024 +0000

    AEA-4518_first_commit
@github-actions GitHub Actions
Copy link

This branch is work on a ticket in the NHS Digital APM JIRA Project. Here's a handy link to the ticket:

@github-actions GitHub Actions
Copy link

Deployed URL: https://cpt-ui-pr-366.dev.eps.national.nhs.uk/site

@wildjames wildjames mentioned this pull request Jan 21, 2025
Closed
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Feb 6, 2025

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
96.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

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.
2 participants
@wildjames @seansteberisal