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

EXUI-766-corrected wrong field name #3235

Merged
merged 12 commits into from
Sep 7, 2023
Merged

EXUI-766-corrected wrong field name #3235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
292329a
EXUI-766-corrected wrong field name
RiteshHMCTS Aug 22, 2023
9fab64c
fixed unit tests
RiteshHMCTS Aug 23, 2023
2107540
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Aug 24, 2023
1a42c96
EXUI-766-hearing-wrong-field-name: Setting Preview Deployment ID
RiteshHMCTS Aug 24, 2023
854df30
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Aug 31, 2023
46330bb
cve suppress
RiteshHMCTS Aug 31, 2023
312876f
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Aug 31, 2023
bb2997e
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Sep 5, 2023
4d171a3
fix for EXUI-703
RiteshHMCTS Sep 5, 2023
5092791
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Sep 6, 2023
75ed69a
Merge branch 'master' into EXUI-766-hearing-wrong-field-name
RiteshHMCTS Sep 6, 2023
30b8a9c
cve suppress
RiteshHMCTS Sep 7, 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
26 changes: 13 additions & 13 deletions api/hearings/data/hearingRequests.mock.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -234,7 +234,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -454,7 +454,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -663,7 +663,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -872,7 +872,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -1081,7 +1081,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -1291,7 +1291,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -1500,7 +1500,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -1709,7 +1709,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -1918,7 +1918,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -2055,7 +2055,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -2192,7 +2192,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
},
{
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -2396,7 +2396,7 @@ export const HEARING_REQUEST_RESULTS: HearingRequestMainModel[] = [
}
}, {
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000+0000',
timestamp: '2022-02-23T09:00:00.000+0000',
versionNumber: 1
},
hearingDetails: {
Expand Down
2 changes: 1 addition & 1 deletion api/hearings/models/requestDetails.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export interface ResponseDetailsModel {
hearingRequestID?: string;
status?: string;
timeStamp: string;
timestamp: string;
versionNumber: number;
}

Expand Down
2 changes: 1 addition & 1 deletion charts/xui-webapp/values.preview.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nodejs:
SERVICES_CASE_JUDICIAL_API: http://rd-judicial-api-aat.service.core-compute-aat.internal
SERVICES_LOCATION_REF_API_URL: http://rd-location-ref-api-aat.service.core-compute-aat.internal
FEATURE_ACCESS_MANAGEMENT_ENABLED: true
PREVIEW_DEPLOYMENT_ID: exui-preview-deployment-3258
PREVIEW_DEPLOYMENT_ID: exui-preview-deployment-3235
keyVaults:
rpx:
secrets:
Expand Down
5 changes: 2 additions & 3 deletions src/app/app-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,10 @@ export class AppUtils {
return UserRole.Judicial;
} else if (userRoles.some((userRole) => ADMIN_ROLE_LIST.some((role) => userRole.includes(role)))) {
return UserRole.Admin;
} else if (userRoles.some((userRole) => LEGAL_OPS_ROLE_LIST.some((role) => userRole.includes(role)))) {
return UserRole.LegalOps;
// TODO: Use actual admin and cts roles within respective role lists
} else if (userRoles.some((userRole) => CTSC_ROLE_LIST.some((role) => userRole.includes(role)))) {
return UserRole.Ctsc;
} else if (userRoles.some((userRole) => LEGAL_OPS_ROLE_LIST.some((role) => userRole.includes(role)))) {
return UserRole.LegalOps;
}
return null;
}
Expand Down
8 changes: 4 additions & 4 deletions src/app/app.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ export class AppConstants {

export const LD_FLAG_REMOVE_USER_FROM_CASE_MC: string = 'remove-user-from-case-mc';
export const LD_FLAG_MC_APPLICATION_THEMES: string = 'mc-application-themes';
export const LEGAL_OPS_ROLE_LIST: string[] = ['caseworker-ia-caseofficer', 'caseworker-ia', 'caseworker-ia-admofficer', 'task-supervisor', 'caseworker-civil', 'caseworker-privatelaw'];
export const JUDICIAL_ROLE_LIST: string[] = ['caseworker-ia-iacjudge', 'caseworker-privatelaw-judge', 'judge'];
export const ADMIN_ROLE_LIST: string[] = ['admin'];
export const CTSC_ROLE_LIST: string[] = ['ctsc'];
export const LEGAL_OPS_ROLE_LIST: string[] = ['caseworker-ia-caseofficer', 'caseworker-ia', 'caseworker-ia-admofficer', 'task-supervisor', 'caseworker-civil', 'caseworker-privatelaw', 'hmcts-legal-operations'];
export const JUDICIAL_ROLE_LIST: string[] = ['caseworker-ia-iacjudge', 'caseworker-privatelaw-judge', 'judge', 'hmcts-judiciary', 'judiciary', 'panelmember'];
export const ADMIN_ROLE_LIST: string[] = ['hmcts-admin'];
export const CTSC_ROLE_LIST: string[] = ['hmcts-ctsc'];
export const SERVICE_OPTIONS_LIST = [{ key: 'IA', label: 'Immigration and Asylum' }, { key: 'SSCS', label: 'Social security and child support' }];
export const PUI_CASE_MANAGER = 'pui-case-manager';
4 changes: 2 additions & 2 deletions ...gs/containers/request-hearing/hearing-requirements/hearing-requirements.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ describe('HearingRequirementsComponent', () => {
hearingRequestToCompare: {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -672,7 +672,7 @@ describe('HearingRequirementsComponent', () => {
requestDetails: {
hearingRequestID: '1000000',
status: 'LISTED',
timeStamp: '2021-11-30T09:00:00.000Z',
timestamp: '2021-11-30T09:00:00.000Z',
versionNumber: 1,
cancellationReasonCodes: ['withdraw', 'struck']
},
Expand Down
4 changes: 2 additions & 2 deletions src/hearings/converters/additional-security.amended.converter.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('AdditionalSecurityAmendedConverter', () => {
hearingRequestToCompare: {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -178,7 +178,7 @@ describe('AdditionalSecurityAmendedConverter', () => {
requestDetails: {
hearingRequestID: '1000000',
status: 'LISTED',
timeStamp: '2021-11-30T09:00:00.000Z',
timestamp: '2021-11-30T09:00:00.000Z',
versionNumber: 1,
cancellationReasonCodes: ['withdraw', 'struck']
},
Expand Down
2 changes: 1 addition & 1 deletion src/hearings/converters/date-request-submitted.answer.converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class DateRequestSubmittedAnswerConverter implements AnswerConverter {
map((state) => {
if (state.hearingRequest.hearingRequestMainModel && state.hearingRequest.hearingRequestMainModel.requestDetails) {
const requestDetails = state.hearingRequest.hearingRequestMainModel.requestDetails;
return moment(requestDetails.timeStamp).format(HearingDateEnum.DisplayMonth);
return moment(requestDetails.timestamp).format(HearingDateEnum.DisplayMonth);
}
return '';
})
Expand Down
10 changes: 5 additions & 5 deletions src/hearings/hearing.test.data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ export const serviceHearingValuesModel: ServiceHearingValuesModel = {

export const hearingRequestMainModel: HearingRequestMainModel = {
requestDetails: {
timeStamp: '2022-02-23T09:00:00.000Z',
timestamp: '2022-02-23T09:00:00.000Z',
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -2263,7 +2263,7 @@ export const initialState = {
hearingRequestToCompare: {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -2403,7 +2403,7 @@ export const initialState = {
requestDetails: {
hearingRequestID: '1000000',
status: 'LISTED',
timeStamp: '2021-11-30T09:00:00.000Z',
timestamp: '2021-11-30T09:00:00.000Z',
versionNumber: 1,
cancellationReasonCodes: ['withdraw', 'struck']
},
Expand Down Expand Up @@ -2916,7 +2916,7 @@ export const initialStateImmutable = {
hearingRequestToCompare: {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -3056,7 +3056,7 @@ export const initialStateImmutable = {
requestDetails: {
hearingRequestID: '1000000',
status: 'LISTED',
timeStamp: '2021-11-30T09:00:00.000Z',
timestamp: '2021-11-30T09:00:00.000Z',
versionNumber: 1,
cancellationReasonCodes: ['withdraw', 'struck']
},
Expand Down
2 changes: 1 addition & 1 deletion src/hearings/models/requestDetails.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export interface ResponseDetailsModel {
hearingRequestID?: string;
status?: string;
timeStamp: string;
timestamp: string;
versionNumber: number;
}

Expand Down
2 changes: 1 addition & 1 deletion src/hearings/store/reducers/hearing-request-to-compare.reducer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Hearing Request To Compare Reducer', () => {
const initialHearingRequestState: HearingRequestStateData = {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down
4 changes: 2 additions & 2 deletions src/hearings/store/reducers/hearing-request.reducer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Hearing Request Reducer', () => {
const initialHearingRequestState: HearingRequestStateData = {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down Expand Up @@ -81,7 +81,7 @@ describe('Hearing Request Reducer', () => {
const initialHearingRequestState: HearingRequestStateData = {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 1
},
hearingDetails: {
Expand Down
2 changes: 1 addition & 1 deletion src/hearings/store/reducers/hearing-request.reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as fromActions from '../actions';
export const initialHearingRequestState: HearingRequestStateData = {
hearingRequestMainModel: {
requestDetails: {
timeStamp: null,
timestamp: null,
versionNumber: 0
},
hearingDetails: {
Expand Down
2 changes: 1 addition & 1 deletion yarn-audit-known-issues
View file
Open in desktop

Large diffs are not rendered by default.