diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-QueryManagement-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-QueryManagement-nonprod.json new file mode 100644 index 00000000000..52e4eb41e29 --- /dev/null +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-QueryManagement-nonprod.json @@ -0,0 +1,60 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-ONE-UNSPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE", + "RES-SOL-TWO-UNSPEC-PROFILE" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "judge-profile", + "GS_profile", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRespondQuery", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-ONE-UNSPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE", + "RES-SOL-TWO-UNSPEC-PROFILE", + "judge-profile", + "GS_profile" + ], + "CRUD": "R" + } + ] + } +] diff --git a/ccd-definition/AuthorisationCaseField/QueryManagement-nonprod.json b/ccd-definition/AuthorisationCaseField/QueryManagement-nonprod.json new file mode 100644 index 00000000000..d5136ee2a2c --- /dev/null +++ b/ccd-definition/AuthorisationCaseField/QueryManagement-nonprod.json @@ -0,0 +1,142 @@ +[ + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "QueryManagementComponentLauncher", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-ONE-UNSPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE", + "RES-SOL-TWO-UNSPEC-PROFILE", + "judge-profile", + "GS_profile", + "court-officer-order", + "ctsc", + "nbc-team-leader", + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "CRU" + } + ] + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "QueryManagementComponentLauncher", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmApplicantSolicitorQueries", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "CRU" + } + ] + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmApplicantSolicitorQueries", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmRespondentSolicitor1Queries", + "AccessControl": [ + { + "UserRoles": [ + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-ONE-UNSPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "CRU" + } + ] + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmRespondentSolicitor1Queries", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmRespondentSolicitor2Queries", + "AccessControl": [ + { + "UserRoles": [ + "RES-SOL-TWO-SPEC-PROFILE", + "RES-SOL-TWO-UNSPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "CRU" + } + ] + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmRespondentSolicitor2Queries", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmLatestQuery", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-SPEC-PROFILE", + "APP-SOL-UNSPEC-PROFILE", + "RES-SOL-ONE-SPEC-PROFILE", + "RES-SOL-ONE-UNSPEC-PROFILE", + "RES-SOL-TWO-SPEC-PROFILE", + "RES-SOL-TWO-UNSPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff", + "court-officer-order", + "ctsc", + "nbc-team-leader" + ], + "CRUD": "CRU" + } + ] + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "qmLatestQuery", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + } +] diff --git a/ccd-definition/CaseEvent/User/QueryManagement-nonprod.json b/ccd-definition/CaseEvent/User/QueryManagement-nonprod.json new file mode 100644 index 00000000000..9e12c2e8f54 --- /dev/null +++ b/ccd-definition/CaseEvent/User/QueryManagement-nonprod.json @@ -0,0 +1,34 @@ +[ + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "queryManagementRaiseQuery", + "Name": "Raise a new query", + "Description": "Raise a new query", + "DisplayOrder": 1, + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "EndButtonLabel": "Raise Query", + "ShowSummary": "N", + "ShowEventNotes": "N", + "Publish": "Y" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "queryManagementRespondQuery", + "Name": "Respond to a query", + "Description": "Respond to a query", + "DisplayOrder": 2, + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "ShowSummary": "N", + "ShowEventNotes": "N", + "Publish": "Y", + "EndButtonLabel": "Respond to Query" + } +] diff --git a/ccd-definition/CaseEventToFields/QueryManagement-Raise-nonprod.json b/ccd-definition/CaseEventToFields/QueryManagement-Raise-nonprod.json new file mode 100644 index 00000000000..23fec07cc43 --- /dev/null +++ b/ccd-definition/CaseEventToFields/QueryManagement-Raise-nonprod.json @@ -0,0 +1,74 @@ +[ + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "CaseFieldID": "QueryManagementComponentLauncher", + "PageFieldDisplayOrder": 1, + "DisplayContext": "OPTIONAL", + "DisplayContextParameter" : "#ARGUMENT(CREATE,QueryManagement)", + "PageID": "queryManagementRaiseQuery", + "PageLabel": "Raise a new query", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "N" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "CaseFieldID": "qmApplicantSolicitorQueries", + "PageFieldDisplayOrder": 2, + "DisplayContext": "OPTIONAL", + "DisplayContextParameter": "#ARGUMENT(CREATE)", + "PageID": "queryManagementRaiseQuery", + "PageLabel": "Raise a new query", + "Publish": "Y", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DO_NOT_SHOW\"" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "CaseFieldID": "qmRespondentSolicitor1Queries", + "PageFieldDisplayOrder": 3, + "DisplayContext": "OPTIONAL", + "DisplayContextParameter": "#ARGUMENT(CREATE)", + "PageID": "queryManagementRaiseQuery", + "PageLabel": "Raise a new query", + "Publish": "Y", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DO_NOT_SHOW\"" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "CaseFieldID": "qmRespondentSolicitor2Queries", + "PageFieldDisplayOrder": 4, + "DisplayContext": "OPTIONAL", + "DisplayContextParameter": "#ARGUMENT(CREATE)", + "PageID": "queryManagementRaiseQuery", + "PageLabel": "Raise a new query", + "Publish": "Y", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DO_NOT_SHOW\"" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRaiseQuery", + "CaseFieldID": "qmLatestQuery", + "PageFieldDisplayOrder": 5, + "DisplayContext": "READONLY", + "PageID": "queryManagementRaiseQuery", + "PageLabel": "Raise a new query", + "Publish": "Y", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DO_NOT_SHOW\"" + } +] diff --git a/ccd-definition/CaseEventToFields/QueryManagement-Responsd-nonprod.json b/ccd-definition/CaseEventToFields/QueryManagement-Responsd-nonprod.json new file mode 100644 index 00000000000..15da3228c8e --- /dev/null +++ b/ccd-definition/CaseEventToFields/QueryManagement-Responsd-nonprod.json @@ -0,0 +1,53 @@ +[ + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRespondQuery", + "CaseFieldID": "QueryManagementComponentLauncher", + "PageFieldDisplayOrder": 1, + "DisplayContext": "OPTIONAL", + "PageID": "queryManagementRespondQuery", + "PageLabel": "Respond to a query", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "N" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRespondQuery", + "CaseFieldID": "qmApplicantSolicitorQueries", + "PageFieldDisplayOrder": 2, + "DisplayContext": "OPTIONAL", + "PageID": "queryManagementRespondQuery", + "PageLabel": "Respond to a query", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DUMMY_VALUE_TO_HIDE_FIELD\"", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRespondQuery", + "CaseFieldID": "qmRespondentSolicitor1Queries", + "PageFieldDisplayOrder": 3, + "DisplayContext": "OPTIONAL", + "PageID": "queryManagementRespondQuery", + "PageLabel": "Respond to a query", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DUMMY_VALUE_TO_HIDE_FIELD\"" + }, + { + "LiveFrom": "01/01/2018", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "queryManagementRespondQuery", + "CaseFieldID": "qmRespondentSolicitor2Queries", + "PageFieldDisplayOrder": 4, + "DisplayContext": "OPTIONAL", + "PageID": "queryManagementRespondQuery", + "PageLabel": "Respond to a query", + "PageDisplayOrder": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "QueryManagementComponentLauncher=\"DUMMY_VALUE_TO_HIDE_FIELD\"" + } +] diff --git a/ccd-definition/CaseField/QueryManagement-nonprod.json b/ccd-definition/CaseField/QueryManagement-nonprod.json new file mode 100644 index 00000000000..9264164417b --- /dev/null +++ b/ccd-definition/CaseField/QueryManagement-nonprod.json @@ -0,0 +1,51 @@ +[ + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "QueryManagementComponentLauncher", + "FieldType": "ComponentLauncher", + "Label": "Component Launcher", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "qmApplicantSolicitorQueries", + "FieldType": "CaseQueriesCollection", + "Label": "Queries", + "CRUD": "CRUD", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "qmRespondentSolicitor1Queries", + "FieldType": "CaseQueriesCollection", + "Label": " ", + "CRUD": "CRUD", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "qmRespondentSolicitor2Queries", + "FieldType": "CaseQueriesCollection", + "Label": " ", + "CRUD": "CRUD", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "qmLatestQuery", + "FieldType": "LatestQuery", + "Label": " ", + "CRUD": "CRUD", + "SecurityClassification": "Public", + "Searchable": "N" + } +] diff --git a/ccd-definition/CaseTypeTab/QueryManagement-nonprod.json b/ccd-definition/CaseTypeTab/QueryManagement-nonprod.json new file mode 100644 index 00000000000..10772054a7d --- /dev/null +++ b/ccd-definition/CaseTypeTab/QueryManagement-nonprod.json @@ -0,0 +1,48 @@ +[ + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "TabID": "QueryManagement", + "TabLabel": "Queries", + "TabDisplayOrder": 1, + "CaseFieldID": "QueryManagementComponentLauncher", + "DisplayContextParameter" : "#ARGUMENT(QueryManagement)", + "TabFieldDisplayOrder": 1 + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "Channel": "CaseWorker", + "TabID": "QueryManagement", + "TabLabel": "Queries", + "TabDisplayOrder": 1, + "CaseFieldID": "qmApplicantSolicitorQueries", + "DisplayContextParameter" : "#ARGUMENT(QueryManagement)", + "TabFieldDisplayOrder": 2, + "FieldShowCondition": "QueryManagementComponentLauncher!=\"\"" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "Channel": "CaseWorker", + "TabID": "QueryManagement", + "TabLabel": "Queries", + "TabDisplayOrder": 1, + "CaseFieldID": "qmRespondentSolicitor1Queries", + "DisplayContextParameter" : "#ARGUMENT(QueryManagement)", + "TabFieldDisplayOrder": 3, + "FieldShowCondition": "QueryManagementComponentLauncher!=\"\"" + }, + { + "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "Channel": "CaseWorker", + "TabID": "QueryManagement", + "TabLabel": "Queries", + "TabDisplayOrder": 1, + "CaseFieldID": "qmRespondentSolicitor2Queries", + "DisplayContextParameter" : "#ARGUMENT(QueryManagement)", + "TabFieldDisplayOrder": 4, + "FieldShowCondition": "QueryManagementComponentLauncher!=\"\"" + } +] diff --git a/ccd-definition/ComplexTypes/LatestQuery-nonprod.json b/ccd-definition/ComplexTypes/LatestQuery-nonprod.json new file mode 100644 index 00000000000..6ab907c154b --- /dev/null +++ b/ccd-definition/ComplexTypes/LatestQuery-nonprod.json @@ -0,0 +1,18 @@ +[ + { + "ID": "LatestQuery", + "ListElementCode": "queryId", + "FieldType": "Text", + "ElementLabel": " ", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "LatestQuery", + "ListElementCode": "isHearingRelated", + "FieldType": "YesOrNo", + "ElementLabel": " ", + "SecurityClassification": "Public", + "Searchable": "N" + } +] diff --git a/charts/civil-ccd/values.enableHelm.template.yaml b/charts/civil-ccd/values.enableHelm.template.yaml index cd91978852f..a5d555b93f2 100644 --- a/charts/civil-ccd/values.enableHelm.template.yaml +++ b/charts/civil-ccd/values.enableHelm.template.yaml @@ -3,7 +3,6 @@ xui-webapp: nodejs: imagePullPolicy: Always releaseNameOverride: ${SERVICE_NAME}-xui-webapp - image: hmctspublic.azurecr.io/xui/webapp:latest devcpuRequests: 100m devmemoryRequests: 1Gi devcpuLimits: 1 @@ -43,9 +42,9 @@ ccd: CCD_MULTIPARTY_FIX_ENABLED: true CCD_MULTIPARTY_LOG_LEVEL: DEBUG CCD_MULTIPARTY_CASE_TYPES: CIVIL - CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE + CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE,queryManagementRaiseQuery,queryManagementRespondQuery ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal - + ccd-definition-store-api: java: imagePullPolicy: Always diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index d49d7aa2b6e..de16f05e5a1 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -3,7 +3,7 @@ civil-wa: civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-5963' keyVaults: civil: resourceGroup: civil @@ -150,6 +150,8 @@ ccd: DATA_STORE_DEFAULT_LOG_LEVEL: WARN CASE_DATA_ISSUE_LOG_LEVEL: WARN UPLOAD_TIMESTAMP_FEATURED_CASE_TYPES: CIVIL, GENERALAPPLICATION + CCD_MULTIPARTY_CASE_TYPES: CIVIL + CCD_MULTIPARTY_EVENTS: DEFENDANT_RESPONSE,ACKNOWLEDGE_CLAIM,CLAIMANT_RESPONSE,queryManagementRaiseQuery,queryManagementRespondQuery ROLE_ASSIGNMENT_URL: http://${SERVICE_NAME}-am-role-assignment-service ingressHost: ccd-data-store-api-${SERVICE_FQDN} secrets: