Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b24f28d
DTSCCI 3469/3470/3471/3482 - adding new claim type (#6195)
sbagga-moj Dec 22, 2025
f62dfd9
DTSCCI-3575: Summary Tab and Claim Details tab changes (#6198)
sbagga-moj Dec 30, 2025
3da8e71
DTSCCI-3544 - SDO SC & FT - Additional directions options (#6208)
sbagga-moj Dec 30, 2025
f4bb51e
DTSCCI-3484 Script to generate and load local ccd definition to previ…
anirudha-deshpande Dec 31, 2025
9784348
DTSCCI-3484 Other Remedy Claim Issue Additional fee (#6199)
anirudha-deshpande Jan 2, 2026
7a10a7a
Merge branch 'master' into feature/DTSCCI-3468
rajakm Jan 5, 2026
3570f0b
Merge branch 'master' into feature/DTSCCI-3468
rajakm Jan 6, 2026
f05b1c6
DTSCCI-3500 - SDO SC & FT - Penal Notice (#6215)
sbagga-moj Jan 7, 2026
4102dd6
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 7, 2026
ffd8289
Merge branch 'master' into feature/DTSCCI-3468
rajakm Jan 8, 2026
812055b
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 8, 2026
8308fe1
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 8, 2026
e0e6ee4
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 8, 2026
56fd099
DTSCCI-3489 Fix Field ordering
sbagga-moj Jan 9, 2026
3c64e3c
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 12, 2026
4804df5
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 15, 2026
9bb593e
DTSCCI-3484 changes
anirudha-deshpande Jan 15, 2026
a7ac551
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 15, 2026
d42c7bd
DTSCCI-3484 Other remedy changes as per updated AC. Fix for disappear…
anirudha-deshpande Jan 16, 2026
52c69f3
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 16, 2026
b47b809
DTSCCI-3484 Fix smoke test
anirudha-deshpande Jan 16, 2026
3e6cc1e
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 16, 2026
b74d8ba
DTSCCI-3550 Added Functionality related to FT (#6239)
sbagga-moj Jan 19, 2026
6c03afe
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 19, 2026
1ca0c2c
updating civil service reference
sbagga-moj Jan 19, 2026
9c24de4
DTSCCI-3468 changes
anirudha-deshpande Jan 20, 2026
ab53c91
Merge branch 'master' into feature/DTSCCI-3489
rajakm Jan 22, 2026
8940a01
Merge branch 'master' into feature/DTSCCI-3468
rajakm Jan 22, 2026
38bb827
Label changes as per new requirements
sbagga-moj Jan 22, 2026
5af5482
Merge branch 'master' into feature/DTSCCI-3468
anirudha-deshpande Jan 23, 2026
c63bd9d
Merge branch 'master' into feature/DTSCCI-3468
rajakm Jan 26, 2026
46f2274
Merge branch 'master' into feature/DTSCCI-3489
rajakm Jan 26, 2026
64b7d5f
DTSCCI-3561-3573 - SDO SC & FT - Wording for additional directions se…
sbagga-moj Jan 28, 2026
2cc1040
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 29, 2026
c43cf3e
Merge branch 'master' into feature/DTSCCI-3468
sbagga-moj Jan 29, 2026
2178651
Merge branch 'master' into feature/DTSCCI-3489
sbagga-moj Jan 29, 2026
105f645
pointing to new civil service pr 7381
sbagga-moj Jan 29, 2026
e20ebae
Merge branch 'master' into feature/DTSCCI-3489-new
sbagga-moj Feb 2, 2026
943023b
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 3, 2026
0881abb
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 4, 2026
686b8b3
Merge branch 'master' into feature/DTSCCI-3468
sbagga-moj Feb 4, 2026
87615e2
Merge branch 'feature/DTSCCI-3468' into feature/DTSCCI-3489-new
sbagga-moj Feb 4, 2026
cb19c79
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 5, 2026
36788b6
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 9, 2026
eaa67a1
DTSCCI-000 Disable WA Test (#6289)
kdaHMCTS Feb 9, 2026
cf5df72
Dtscci 3589 - Automate Documentation of API/UI Functional Test Groups…
kdaHMCTS Feb 9, 2026
192f344
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 10, 2026
61b36e9
Merge branch 'master' into feature/DTSCCI-3489-new
rajakm Feb 11, 2026
ea5d219
Merge branch 'master' into feature/DTSCCI-3489-new
sbagga-moj Feb 17, 2026
ec3d197
Merge branch 'master' into feature/DTSCCI-3489-new
sbagga-moj Feb 19, 2026
bc1c62e
DTSCCI-3546-3574 - SDO SC & FT - Wording for additional directions se…
sbagga-moj Feb 20, 2026
f67a9f3
Merge branch 'master' into feature/DTSCCI-3489-new
sbagga-moj Feb 20, 2026
4d5f5e5
reverting temp changes
sbagga-moj Feb 20, 2026
4bc8dd7
addiding temp change and refering to civil-service
sbagga-moj Feb 20, 2026
e4e92fb
adding note in penal service
sbagga-moj Feb 23, 2026
4c8c5a4
Merge branch 'master' into feature/DTSCCI-3489-new
sbagga-moj Feb 26, 2026
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: 20 additions & 0 deletions .env.ccd.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
PR_NUMBER=${1}

AAC_MANAGE_CASE_ASSIGNMENT_URL=https://manage-case-assignment-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
AM_ROLE_ASSIGNMENT_SERVICE_URL=https://am-role-assignment-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CAMUNDA_URL=https://camunda-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_API_GW_URL=https://gateway-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DATA_STORE_API_URL=https://ccd-data-store-api-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DEFINITION_STORE_API_URL=https://ccd-definition-store-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CDAM_URL=https://ccd-case-document-am-api-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CIVIL_SERVICE_URL=https://civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
EM_CCDORC_URL=https://em-ccdorc-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
EM_STITCHING_URL=https://em-stitching-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
GENERAL_APPLICATIONS_URL=https://ga-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
TEST_URL=https://civil-citizen-ui-anirudha-pr-1.preview.platform.hmcts.net
XUI_WEBAPP_URL=https://xui-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
JAVA_URL=https://civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
GA_URL=https://ga-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DEF_CASE_SERVICE_BASE_URL=https://civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DEF_GEN_APP_SERVICE_BASE_URL=https://ga-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-ccd-pr-${PR_NUMBER}.preview.platform.hmcts.net
20 changes: 20 additions & 0 deletions .env.cui.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
PR_NUMBER=${1}

AAC_MANAGE_CASE_ASSIGNMENT_URL=https://manage-case-assignment-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
AM_ROLE_ASSIGNMENT_SERVICE_URL=https://am-role-assignment-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CAMUNDA_URL=https://camunda-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_API_GW_URL=https://gateway-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DATA_STORE_API_URL=https://ccd-data-store-api-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CCD_DEFINITION_STORE_API_URL=https://ccd-definition-store-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CDAM_URL=https://ccd-case-document-am-api-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
CIVIL_SERVICE_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-civil-service.preview.platform.hmcts.net
EM_CCDORC_URL=https://em-ccdorc-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
EM_STITCHING_URL=https://em-stitching-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
GENERAL_APPLICATIONS_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-general-applications.preview.platform.hmcts.net
TEST_URL=https://civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
XUI_WEBAPP_URL=https://xui-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
JAVA_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-civil-service.preview.platform.hmcts.net
GA_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-general-applications.preview.platform.hmcts.net
CCD_DEF_CASE_SERVICE_BASE_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-civil-service.preview.platform.hmcts.net
CCD_DEF_GEN_APP_SERVICE_BASE_URL=https://civil-citizen-ui-pr-${PR_NUMBER}-general-applications.preview.platform.hmcts.net
CCD_DEF_AAC_URL=https://manage-case-assignment-civil-citizen-ui-pr-${PR_NUMBER}.preview.platform.hmcts.net
4 changes: 2 additions & 2 deletions Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ def uploadCoreCaseDataDefinitions(env) {
def getCivilServiceImage() {
def githubApi = new GithubAPI(this)
for (label in githubApi.getLabelsbyPattern(env.BRANCH_NAME, "civilServicePr:") ) {
return "pr-" + label.minus("civilServicePr:").trim()
return "pr-7399"
}
return "latest"
return "pr-7399"
}

withPipeline(type, product, component) {
Expand Down
33 changes: 33 additions & 0 deletions bin/import-local-definition-to-preview.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env bash

set -eu
repoType=${1:-ccd}
prNumber=${2:-'6199'}


# Ensure dependencies have execution permissions
chmod +x ./bin/variables/load-dev-user-preview-environment-variables.sh
chmod +x ./bin/utils/ccd-import-definition.sh
chmod +x ./bin/utils/idam-lease-user-token.sh
chmod +x ./bin/utils/idam-lease-service-token.sh

if [[ "${repoType}" == 'ccd' ]]; then
echo "Loading environment variables repoType : (${repoType}) prNumber: ${prNumber}";
source .env.ccd.local "${prNumber}"
fi

if [[ "${repoType}" == 'cui' ]]; then
echo "Loading environment variables repoType : (${repoType}) prNumber: ${prNumber}";
source .env.cui.local "${prNumber}"
fi

# Load environment variables for the preview environment
source ./bin/variables/load-dev-user-local-environment-variables.sh

export CCD_DEF_VERSION=""

# Generate local CCD definition
source ./bin/build-release-ccd-definition.sh local

# Import the local CCD definition
./bin/utils/ccd-import-definition.sh build/ccd-release-config/civil-ccd-local.xlsx
29 changes: 29 additions & 0 deletions bin/variables/load-dev-user-local-environment-variables.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env bash

set -eu
user=$(whoami)
echo "User directory: /Users/$user"

export ENVIRONMENT=preview
# urls
export URL=$XUI_WEBAPP_URL
export CIVIL_SERVICE_URL=$JAVA_URL
export SERVICE_AUTH_PROVIDER_API_BASE_URL="http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
export IDAM_API_BASE_URL="https://idam-api.aat.platform.hmcts.net"
export IDAM_API_URL="https://idam-api.aat.platform.hmcts.net"
export CCD_IDAM_REDIRECT_URL="https://ccd-case-management-web-aat.service.core-compute-aat.internal/oauth2redirect"
export CCD_DEFINITION_STORE_API_BASE_URL=${CCD_DEFINITION_STORE_API_URL:-"http://ccd-definition-store-api-aat.service.core-compute-aat.internal"}
export CAMUNDA_BASE_URL=$CAMUNDA_URL
export DEFINITION_IMPORTER_USERNAME=$(az keyvault secret show --vault-name civil-aat --name ccd-importer-username --query value -o tsv)
export DEFINITION_IMPORTER_PASSWORD=$(az keyvault secret show --vault-name civil-aat --name ccd-importer-password --query value -o tsv)
export CCD_CONFIGURER_IMPORTER_USERNAME=$DEFINITION_IMPORTER_USERNAME
export CCD_CONFIGURER_IMPORTER_PASSWORD=$DEFINITION_IMPORTER_PASSWORD
export CCD_API_GATEWAY_IDAM_CLIENT_SECRET=$(az keyvault secret show --vault-name ccd-aat --name ccd-api-gateway-oauth2-client-secret --query value -o tsv)
export CCD_API_GATEWAY_S2S_SECRET=$(az keyvault secret show --vault-name s2s-aat --name microservicekey-ccd-gw --query value -o tsv)
export S2S_SECRET=$(az keyvault secret show --vault-name civil-aat --name microservicekey-civil-service --query value -o tsv)
export HEALTH_WORK_ALLOCATION_TASK_API=TBD
# definition placeholders
export CCD_DEF_CASE_SERVICE_BASE_URL=$JAVA_URL
export CCD_DEF_GEN_APP_SERVICE_BASE_URL=$GA_URL
export CCD_DEF_VERSION="-${user}-1"
export ROLE_ASSIGNMENT_URL=$AM_ROLE_ASSIGNMENT_SERVICE_URL
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "isClaimDeclarationAdded",
"AccessControl": [
{
"UserRoles": [
"wlu-admin"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "claimDeclarationDescription",
"AccessControl": [
{
"UserRoles": [
"wlu-admin"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "isHumanRightsActIssues",
"AccessControl": [
{
"UserRoles": [
"wlu-admin"
],
"CRUD": "R"
}
]
}
]

Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
[
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "isClaimDeclarationAdded",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-solicitor",
"CITIZEN-CLAIMANT-PROFILE",
"caseworker-caa"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"judge-profile",
"legal-adviser",
"caseworker-civil-admin",
"caseworker-civil-staff",
"caseworker-civil-systemupdate",
"CITIZEN-DEFENDANT-PROFILE",
"citizen-profile"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "claimDeclarationDescription",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-solicitor",
"CITIZEN-CLAIMANT-PROFILE",
"caseworker-caa"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"judge-profile",
"legal-adviser",
"caseworker-civil-admin",
"caseworker-civil-staff",
"caseworker-civil-systemupdate",
"CITIZEN-DEFENDANT-PROFILE",
"citizen-profile"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "isHumanRightsActIssues",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-solicitor",
"CITIZEN-CLAIMANT-PROFILE",
"caseworker-caa"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"judge-profile",
"legal-adviser",
"caseworker-civil-admin",
"caseworker-civil-staff",
"caseworker-civil-systemupdate",
"CITIZEN-DEFENDANT-PROFILE",
"citizen-profile"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "otherRemedyFee",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-solicitor",
"CITIZEN-DEFENDANT-PROFILE"
],
"CRUD": "CRU"
},
{
"UserRoles": [
"caseworker-civil-admin",
"judge-profile",
"legal-adviser"
],
"CRUD": "R"
}
]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
[
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "smallClaimsPenalNoticeTitle",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "smallClaimsPenalNoticeToggle",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "smallClaimsPenalNotice",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "fastTrackPenalNoticeTitle",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "R"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "fastTrackPenalNoticeToggle",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "fastTrackPenalNotice",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "smallClaimsPPI",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "fastTrackPPI",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "smallClaimsHousingDisrepair",
"AccessControl": [
{
"UserRoles": [
"judge-profile",
"legal-adviser"
],
"CRUD": "CRU"
}
]
}
]
Loading