Skip to content

Commit bfc5c6a

Browse files
syaliounesyalioune
committed
Taking into account PR review comments
Using cadence instead of period and enforcing an absolute minimum for cadence in hours. Signed-off-by: Alioune SY <[email protected]>
1 parent 6878f54 commit bfc5c6a

File tree

3 files changed

+38
-36
lines changed

3 files changed

+38
-36
lines changed

‎src/i18n/locales/en.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
"clone_template": "Clone Template",
556556
"template_cloned": "Template cloned",
557557
"task_scheduler": "Task scheduler",
558-
"task_scheduler_description": "Dependency Track task scheduler perform various background scans at a fixed interval. You can modify the fixed interval for each scans using the form below. A Dependency Track restart is needed to reschedule the tasks with the updated interval.",
558+
"task_scheduler_description": "Dependency Track task scheduler perform various background tasks at a fixed interval. You can modify the fixed interval for each task using the form below. Each interval is expressed in hours. A Dependency Track restart is needed to reschedule the tasks with the updated cadence.",
559559
"task_scheduler_ldap_sync": "LDAP sync",
560560
"task_scheduler_portfolio_metrics_update": "Portfolio metrics",
561561
"task_scheduler_vulnerability_metrics_update": "Vulnerability metrics",
@@ -624,7 +624,8 @@
624624
},
625625
"validation": {
626626
"required": "{_field_} is required",
627-
"confirmed": "{_field_} doesn't match"
627+
"confirmed": "{_field_} doesn't match",
628+
"min_value": "{_field_} value should be above {min}"
628629
},
629630
"404": {
630631
"heading": "Oops! This is awkward",

‎src/validation/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { extend, configure } from 'vee-validate'
2-
import { required, confirmed } from 'vee-validate/dist/rules'
2+
import { required, confirmed, min_value } from 'vee-validate/dist/rules'
33

44
import i18n from '../i18n'
55

@@ -10,3 +10,4 @@ configure({
1010

1111
extend('required', required);
1212
extend('confirmed', confirmed);
13+
extend('min_value', min_value);

‎src/views/administration/configuration/TaskScheduler.vue‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
id="repository_metadata_fetch"
99
:label="$t('admin.task_scheduler_repository_metadata_fetch')"
1010
input-group-size="mb-3"
11-
rules="required"
11+
rules="required|min_value:1"
1212
type="number"
1313
v-model="repositoryMetadataFetch.value"
1414
:tooltip="repositoryMetadataFetch.description"
@@ -17,7 +17,7 @@
1717
id="internal_component_identification"
1818
:label="$t('admin.task_scheduler_internal_component_identification')"
1919
input-group-size="mb-3"
20-
rules="required"
20+
rules="required|min_value:1"
2121
type="number"
2222
v-model="internalComponentIdentification.value"
2323
:tooltip="internalComponentIdentification.description"
@@ -28,7 +28,7 @@
2828
id="ghsa_mirror"
2929
:label="$t('admin.github_advisories')"
3030
input-group-size="mb-3"
31-
rules="required"
31+
rules="required|min_value:1"
3232
type="number"
3333
v-model="ghsaMirror.value"
3434
:tooltip="ghsaMirror.description"
@@ -37,7 +37,7 @@
3737
id="nist_mirror"
3838
:label="$t('admin.nvd')"
3939
input-group-size="mb-3"
40-
rules="required"
40+
rules="required|min_value:1"
4141
type="number"
4242
v-model="nistMirror.value"
4343
:tooltip="nistMirror.description"
@@ -46,7 +46,7 @@
4646
id="vulndb_mirror"
4747
:label="$t('admin.vulndb')"
4848
input-group-size="mb-3"
49-
rules="required"
49+
rules="required|min_value:1"
5050
type="number"
5151
v-model="vulndbMirror.value"
5252
:tooltip="vulndbMirror.description"
@@ -55,7 +55,7 @@
5555
id="osv_mirror"
5656
:label="$t('admin.osv_advisories')"
5757
input-group-size="mb-3"
58-
rules="required"
58+
rules="required|min_value:1"
5959
type="number"
6060
v-model="osvMirror.value"
6161
:tooltip="osvMirror.description"
@@ -66,7 +66,7 @@
6666
id="portfolio_vulnerability_analysis"
6767
:label="$t('admin.task_scheduler_portfolio_vulnerability_analysis')"
6868
input-group-size="mb-3"
69-
rules="required"
69+
rules="required|min_value:1"
7070
type="number"
7171
v-model="portfolioVulnerabilityAnalysis.value"
7272
:tooltip="portfolioVulnerabilityAnalysis.description"
@@ -75,7 +75,7 @@
7575
id="component_analysis_cache_clear"
7676
:label="$t('admin.task_scheduler_component_analysis_cache_clear')"
7777
input-group-size="mb-3"
78-
rules="required"
78+
rules="required|min_value:1"
7979
type="number"
8080
v-model="analysisCacheClear.value"
8181
:tooltip="analysisCacheClear.description"
@@ -86,7 +86,7 @@
8686
id="portfolio_metrics_update"
8787
:label="$t('admin.task_scheduler_portfolio_metrics_update')"
8888
input-group-size="mb-3"
89-
rules="required"
89+
rules="required|min_value:1"
9090
type="number"
9191
v-model="portfolioMetricsUpdate.value"
9292
:tooltip="portfolioMetricsUpdate.description"
@@ -95,7 +95,7 @@
9595
id="vulnerability_metrics_update"
9696
:label="$t('admin.task_scheduler_vulnerability_metrics_update')"
9797
input-group-size="mb-3"
98-
rules="required"
98+
rules="required|min_value:1"
9999
type="number"
100100
v-model="vulnerabilityMetricsUpdate.value"
101101
:tooltip="vulnerabilityMetricsUpdate.description"
@@ -106,7 +106,7 @@
106106
id="ldap_sync"
107107
:label="$t('admin.task_scheduler_ldap_sync')"
108108
input-group-size="mb-3"
109-
rules="required"
109+
rules="required|min_value:1"
110110
type="number"
111111
v-model="ldapSync.value"
112112
:tooltip="ldapSync.description"
@@ -148,17 +148,17 @@
148148
methods: {
149149
saveChanges: function() {
150150
this.updateConfigProperties([
151-
{groupName: 'task-scheduler', propertyName: 'ldap.sync.period', propertyValue: this.ldapSync.value},
152-
{groupName: 'task-scheduler', propertyName: 'ghsa.mirror.period', propertyValue: this.ghsaMirror.value},
153-
{groupName: 'task-scheduler', propertyName: 'osv.mirror.period', propertyValue: this.osvMirror.value},
154-
{groupName: 'task-scheduler', propertyName: 'nist.mirror.period', propertyValue: this.nistMirror.value},
155-
{groupName: 'task-scheduler', propertyName: 'vulndb.mirror.period', propertyValue: this.vulndbMirror.value},
156-
{groupName: 'task-scheduler', propertyName: 'portfolio.metrics.update.period', propertyValue: this.portfolioMetricsUpdate.value},
157-
{groupName: 'task-scheduler', propertyName: 'vulnerability.metrics.update.period', propertyValue: this.vulnerabilityMetricsUpdate.value},
158-
{groupName: 'task-scheduler', propertyName: 'portfolio.vulnerability.analysis.period', propertyValue: this.portfolioVulnerabilityAnalysis.value},
159-
{groupName: 'task-scheduler', propertyName: 'repository.metadata.fetch.period', propertyValue: this.repositoryMetadataFetch.value},
160-
{groupName: 'task-scheduler', propertyName: 'internal.components.identification.period', propertyValue: this.internalComponentIdentification.value},
161-
{groupName: 'task-scheduler', propertyName: 'component.analysis.cache.clear.period', propertyValue: this.analysisCacheClear.value},
151+
{groupName: 'task-scheduler', propertyName: 'ldap.sync.cadence', propertyValue: this.ldapSync.value},
152+
{groupName: 'task-scheduler', propertyName: 'ghsa.mirror.cadence', propertyValue: this.ghsaMirror.value},
153+
{groupName: 'task-scheduler', propertyName: 'osv.mirror.cadence', propertyValue: this.osvMirror.value},
154+
{groupName: 'task-scheduler', propertyName: 'nist.mirror.cadence', propertyValue: this.nistMirror.value},
155+
{groupName: 'task-scheduler', propertyName: 'vulndb.mirror.cadence', propertyValue: this.vulndbMirror.value},
156+
{groupName: 'task-scheduler', propertyName: 'portfolio.metrics.update.cadence', propertyValue: this.portfolioMetricsUpdate.value},
157+
{groupName: 'task-scheduler', propertyName: 'vulnerability.metrics.update.cadence', propertyValue: this.vulnerabilityMetricsUpdate.value},
158+
{groupName: 'task-scheduler', propertyName: 'portfolio.vulnerability.analysis.cadence', propertyValue: this.portfolioVulnerabilityAnalysis.value},
159+
{groupName: 'task-scheduler', propertyName: 'repository.metadata.fetch.cadence', propertyValue: this.repositoryMetadataFetch.value},
160+
{groupName: 'task-scheduler', propertyName: 'internal.components.identification.cadence', propertyValue: this.internalComponentIdentification.value},
161+
{groupName: 'task-scheduler', propertyName: 'component.analysis.cache.clear.cadence', propertyValue: this.analysisCacheClear.value},
162162
]);
163163
}
164164
},
@@ -168,47 +168,47 @@
168168
for (let i=0; i<configItems.length; i++) {
169169
let item = configItems[i];
170170
switch (item.propertyName) {
171-
case "ldap.sync.period":
171+
case "ldap.sync.cadence":
172172
this.ldapSync.value = item.propertyValue;
173173
this.ldapSync.description = item.description;
174174
break;
175-
case "ghsa.mirror.period":
175+
case "ghsa.mirror.cadence":
176176
this.ghsaMirror.value = item.propertyValue;
177177
this.ghsaMirror.description = item.description;
178178
break;
179-
case "osv.mirror.period":
179+
case "osv.mirror.cadence":
180180
this.osvMirror.value = item.propertyValue;
181181
this.osvMirror.description = item.description;
182182
break;
183-
case "nist.mirror.period":
183+
case "nist.mirror.cadence":
184184
this.nistMirror.value = item.propertyValue;
185185
this.nistMirror.description = item.description;
186186
break;
187-
case "vulndb.mirror.period":
187+
case "vulndb.mirror.cadence":
188188
this.vulndbMirror.value = item.propertyValue;
189189
this.vulndbMirror.description = item.description;
190190
break;
191-
case "portfolio.metrics.update.period":
191+
case "portfolio.metrics.update.cadence":
192192
this.portfolioMetricsUpdate.value = item.propertyValue;
193193
this.portfolioMetricsUpdate.description = item.description;
194194
break;
195-
case "vulnerability.metrics.update.period":
195+
case "vulnerability.metrics.update.cadence":
196196
this.vulnerabilityMetricsUpdate.value = item.propertyValue;
197197
this.vulnerabilityMetricsUpdate.description = item.description;
198198
break;
199-
case "portfolio.vulnerability.analysis.period":
199+
case "portfolio.vulnerability.analysis.cadence":
200200
this.portfolioVulnerabilityAnalysis.value = item.propertyValue;
201201
this.portfolioVulnerabilityAnalysis.description = item.description;
202202
break;
203-
case "repository.metadata.fetch.period":
203+
case "repository.metadata.fetch.cadence":
204204
this.repositoryMetadataFetch.value = item.propertyValue;
205205
this.repositoryMetadataFetch.description = item.description;
206206
break;
207-
case "internal.components.identification.period":
207+
case "internal.components.identification.cadence":
208208
this.internalComponentIdentification.value = item.propertyValue;
209209
this.internalComponentIdentification.description = item.description;
210210
break;
211-
case "component.analysis.cache.clear.period":
211+
case "component.analysis.cache.clear.cadence":
212212
this.analysisCacheClear.value = item.propertyValue;
213213
this.analysisCacheClear.description = item.description;
214214
break;

0 commit comments

Comments
 (0)