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

COT-462 ET: Enable Hearing Tab in EXUI #3215

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
96548b3
Update custom-environment-variables.json
mwaheedanjum Aug 14, 2023
042c1c5
Update default.json
mwaheedanjum Aug 14, 2023
cc8ed26
Update default.json
mwaheedanjum Aug 14, 2023
574a780
COT-462: Setting Preview Deployment ID
sanjayparekh-hmcts Aug 29, 2023
18da839
Update custom-environment-variables.json
mwaheedanjum Aug 30, 2023
22e602f
COT-462: corrected setup
sanjayparekh-hmcts Aug 31, 2023
b469e6f
COT-462: trying yarn audit
sanjayparekh-hmcts Aug 31, 2023
8cd35cb
COT-462: trying yarn audit2
sanjayparekh-hmcts Aug 31, 2023
d8d46d6
COT-462: add to default.son
sanjayparekh-hmcts Aug 31, 2023
f6b0a91
COT-462: update yarn fixes
sanjayparekh-hmcts Sep 1, 2023
d5f568c
COT-462: update yarn fixes2
sanjayparekh-hmcts Sep 1, 2023
3eaf954
COT-462: Setting Preview Deployment ID
mwaheedanjum Sep 12, 2023
084c278
EXUI-383-change
RiteshHMCTS Sep 12, 2023
621b2ca
cve
RiteshHMCTS Sep 12, 2023
87ab786
Fixing broken api test.
kasi-subramaniam Sep 12, 2023
38ed69b
Typo fix
kasi-subramaniam Sep 12, 2023
c878579
Added 'Civil'
kasi-subramaniam Sep 12, 2023
bfc6728
Added jurisdictionsNames.
kasi-subramaniam Sep 13, 2023
921a580
only 3 jurisdictions
kasi-subramaniam Sep 13, 2023
f6b72ce
jurisdictions removed from values.preview.template.yaml
kasi-subramaniam Sep 13, 2023
2827e5a
Update config.ts
mwaheedanjum Sep 14, 2023
c093166
Test UN-commented. removed console.log() used for debugging.
kasi-subramaniam Sep 14, 2023
44684d3
updated to use var from cnp-flux-config
mwaheedanjum Sep 15, 2023
f2fba1a
Update serviceCourtType.mapping.ts
mwaheedanjum Sep 20, 2023
28484b3
resolve security issues
dharmendrak Sep 28, 2023
6f660fe
Merge branch 'master' into COT-462
mwaheedanjum Oct 3, 2023
d0117dd
Update yarn-audit-known-issues
mwaheedanjum Oct 4, 2023
53a1244
Merge branch 'master' into COT-462
mwaheedanjum Oct 4, 2023
ea2d596
Update yarn-audit-known-issues
mwaheedanjum Oct 4, 2023
e17945b
Update default.json
mwaheedanjum Oct 10, 2023
dcd3f6f
9
mwaheedanjum Oct 10, 2023
4269312
Merge branch 'master' into COT-462
mwaheedanjum Oct 12, 2023
367da03
Merge branch 'master' into COT-462
mwaheedanjum Oct 12, 2023
e54b2f7
Update TCSearchCaseandCaseList.feature
mwaheedanjum Oct 12, 2023
c86b1ff
Merge branch 'COT-462' of https://github.com/hmcts/rpx-xui-webapp int…
mwaheedanjum Oct 12, 2023
417cc83
Update TCSearchCaseandCaseList.feature
mwaheedanjum Oct 13, 2023
1f98ea8
Merge branch 'master' into COT-462
mwaheedanjum Oct 13, 2023
4dde910
Merge branch 'master' into COT-462
dharmendrak Oct 17, 2023
54a8a42
COT-462: fix vulnerabilities
sanjayparekh-hmcts Oct 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion api/locations/data/serviceCourtType.mapping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,23 @@ export const SERVICES_COURT_TYPE_MAPPINGS = {
SSCS: ['31'], // 31: Social Security and Child Support Tribunal
CIVIL: ['10'],
PRIVATELAW: ['18'],
PUBLICLAW: ['18']
PUBLICLAW: ['18'],
BHA1: ['17'], // Employment Claims
BFA1: ['4', '23'], // 4: Asylum Support Appeals, 23: Immigration and Asylum Tribunal
BBA1: ['4'], // Asylum Support
BBA2: ['14'], // Criminal Injuries Compensation
BBA3: ['31'], // Social Security and Child Support Tribunal
ABA1: ['18'], // Divorce,
ABA2: ['18'], // Financial Remedy
ABA3: ['18'], // Public Law,
ABA4: ['18'], // Adoption
ABA5: ['18'], // Private Law
ABA6: ['18'], // Probate
AAA1: ['10'], // Civil
AAA2: ['10'], // Civil
AAA3: ['10'], // Civil
AAA4: ['10'], // Civil
AAA5: ['10'], // Civil
AAA6: ['10'], // Civil
AAA7: ['10'] // Civil
};
6 changes: 5 additions & 1 deletion config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"caseAssignmentApi": "SERVICES_CCD_CASE_ASSIGNMENT_API"
},
"hearings": {
"hearingsJurisdictions": "SSCS,PRIVATELAW,CIVIL,IA",
"hearingsJurisdictions": "HEARINGS_JURISDICTIONS",
"sscs": {
"serviceApi": "SERVICES_HEARINGS_COMPONENT_API_SSCS",
"caseTypes": "SERVICES_HEARINGS_CASETYPES_SSCS"
Expand All @@ -59,6 +59,10 @@
"serviceApi": "SERVICES_HEARINGS_COMPONENT_API_ET",
"caseTypes": "SERVICES_HEARINGS_CASETYPES_ET"
},
"employment": {
"serviceApi": "SERVICES_HEARINGS_COMPONENT_API_EMPLOYMENT",
"caseTypes": "ET_EnglandWales,ET_Scotland"
},
"hmcApi": "SERVICES_HMC_HEARINGS_COMPONENT_API"
},
"documents": {
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/appTestConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,22 @@ const data = {
key: 'Welcome01'
},
{
idamId: 'ba02568f-6a46-478d-9f1a-1ce4dea496aa',
email: 'test@mailnesia.com',
idamId: 'ae28c49a-ad0f-467a-a480-15fcaa66165d',
email: "exuigsuser@mailinator.com",
release: 'general', userIdentifier: 'CASEWORKER_GLOBALSEARCH',
key: 'Welcome01'
},

{
idamId: '4beb7bbe-5cc9-4f92-9c4d-620bd705dc8a',
email: 'test@mailnesia.com',
idamId: 'ae28c49a-ad0f-467a-a480-15fcaa66165d',
email: "exuigsuser@mailinator.com",
release: 'general', userIdentifier: 'WA2',
key: 'Welcome01'
},

{
idamId: '810b5601-4a8a-4c82-9294-34f087f2e67f',
email: 'test@mailnesia.com',
idamId: 'ae28c49a-ad0f-467a-a480-15fcaa66165d',
email: "exuigsuser@mailinator.com",
release: 'general', userIdentifier: 'WA2_GLOBAL-SEARCH',
key: 'Welcome01'
},
Expand Down
11 changes: 9 additions & 2 deletions test/integration/tests/ccd_endpoints.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ describe('CCD Endpoints', () => {

beforeEach(function () {
this.timeout(120000);

setTestContext(this);
Request.clearSession();
});

it('Jurisdictions for user role', async function() {

await Request.withSession(userName, password);
const response = await Request.get('aggregated/caseworkers/:uid/jurisdictions?access=read', null, 200);
const xsrfToken = await getXSRFToken(userName, password);
const headers = {
experimental: true,
'X-XSRF-TOKEN': xsrfToken
};

const response = await Request.get('aggregated/caseworkers/:uid/jurisdictions?access=read', headers, 200);
//console.log(' Response array is .... ' + JSON.stringify(response.data));
expect(response.data).to.be.an('array');
expect(response.data.map((e) => e.name)).to.include.members(config.jurisdcitionNames[config.testEnv]);
});
Expand Down
5 changes: 3 additions & 2 deletions test/integration/tests/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ export const config = {
}
]
},

jurisdcitionNames: {
aat: ['Family Divorce', 'Public Law', 'Immigration & Asylum', 'Manage probate application'],
demo: ['Family Divorce - v104-26.1', 'Public Law', 'Immigration & Asylum']
aat: ['Family Divorce', 'Public Law', 'Immigration & Asylum','Civil','Manage probate application','Money Claims','Employment'],
demo: ['Family Divorce - v104-26.1', 'Public Law', 'Immigration & Asylum']
},
em: {
aat: {
Expand Down
2 changes: 1 addition & 1 deletion test_codecept/integration/tests/ccd_endpoints.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe('CCD Endpoints', () => {
expect(response.status).to.equal(200);
});



function getSolicitorCreateUrl(caseType: string, event: string) {
return `data/internal/case-types/${caseType}/event-triggers/${event}?ignore-warning=false`;
Expand Down
2 changes: 1 addition & 1 deletion yarn-audit-known-issues

Large diffs are not rendered by default.