diff --git a/.codeclimate.yml b/.codeclimate.yml index c81eb7960..9b1220682 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,18 +1,19 @@ version: "2" exclude_patterns: + - components/ - config/ - - "**/db/" - dist/ - features/ - - "**/node_modules/" - script/ + - Tests/ + - "**/*.d.ts" + - "**/*_test.go" + - "**/db/" + - "**/node_modules/" - "**/spec/" - "**/test/" - "**/tests/" - - Tests/ - "**/vendor/" - - "**/*_test.go" - - "**/*.d.ts" plugins: csslint: enabled: true diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ddef99018..b25b4f0aa 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,25 @@ - + # Description - - - + -## Types of changes +## Type of Change - + @@ -18,6 +29,7 @@ + @@ -27,8 +39,10 @@ This is a breaking change because ... ## Checklist - - + - [ ] I have read the [CONTRIBUTING](/bcgov/common-hosted-form-service/blob/main/CONTRIBUTING.md) doc - [ ] I have checked that unit tests pass locally with my changes @@ -39,4 +53,8 @@ This is a breaking change because ... ## Further comments - + diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 9e03ebfea..407a63a58 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -142,5 +142,5 @@ jobs: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} with: coverageLocations: | - ${{ github.workspace }}/**/lcov.info:lcov + ${{ github.workspace }}/**/clover.xml:clover prefix: ${{ github.workplace }} diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json index b471325c8..8c883d704 100644 --- a/app/frontend/package-lock.json +++ b/app/frontend/package-lock.json @@ -1523,11 +1523,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz", + "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } diff --git a/app/frontend/src/components/admin/FormComponentsProactiveHelp.vue b/app/frontend/src/components/admin/FormComponentsProactiveHelp.vue index 844c89b78..e424f2922 100644 --- a/app/frontend/src/components/admin/FormComponentsProactiveHelp.vue +++ b/app/frontend/src/components/admin/FormComponentsProactiveHelp.vue @@ -1,172 +1,80 @@ - diff --git a/app/frontend/src/components/designer/settings/FormScheduleSettings.vue b/app/frontend/src/components/designer/settings/FormScheduleSettings.vue index 872bc187d..68909117f 100644 --- a/app/frontend/src/components/designer/settings/FormScheduleSettings.vue +++ b/app/frontend/src/components/designer/settings/FormScheduleSettings.vue @@ -555,7 +555,7 @@ defineExpose({ cols="12" md="12" > - + {{ $t('trans.formSettings.submissionsOpenDateRange') }} {{ form.schedule.openSubmissionDateTime }} {{ $t('trans.formSettings.to') }} @@ -567,9 +567,7 @@ defineExpose({ AVAILABLE_DATES[0]['closeDate'] && AVAILABLE_DATES[0]['closeDate'].split(' ')[0] : '' - }} - - {{ + }}{{ form.schedule.scheduleType === SCHEDULE_TYPE.CLOSINGDATE ? form.schedule.closeSubmissionDateTime : '' @@ -577,11 +575,13 @@ defineExpose({ - {{ + {{ form.schedule.allowLateSubmissions.enabled && form.schedule.allowLateSubmissions.forNext.intervalType && form.schedule.allowLateSubmissions.forNext.term - ? $t('trans.formSettings.allowLateSubmissnInterval') + + ? ' ' + + $t('trans.formSettings.allowLateSubmissnInterval') + + ' ' + form.schedule.allowLateSubmissions.forNext.term + ' ' + form.schedule.allowLateSubmissions.forNext.intervalType + @@ -599,9 +599,11 @@ defineExpose({ AVAILABLE_DATES[1] " :lang="locale" - >{{ $t('trans.formSettings.scheduleRepetition') }} - {{ form.schedule.repeatSubmission.everyTerm }} - {{ form.schedule.repeatSubmission.everyIntervalType }} + >{{ ' ' + $t('trans.formSettings.scheduleRepetition') }} + + {{ form.schedule.repeatSubmission.everyTerm }} + {{ form.schedule.repeatSubmission.everyIntervalType }} + {{ $t('trans.formSettings.until') }} {{ form.schedule.repeatSubmission.repeatUntil }}. diff --git a/app/frontend/src/components/forms/ExportSubmissions.vue b/app/frontend/src/components/forms/ExportSubmissions.vue index 870a25cb8..fd0f8b1f3 100644 --- a/app/frontend/src/components/forms/ExportSubmissions.vue +++ b/app/frontend/src/components/forms/ExportSubmissions.vue @@ -1,7 +1,8 @@ -