rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding yet another condition to the CIS Add Schedule button 

This now checks to see if there's and RKE template.
If there is an RKE template and the scheduleScanned is disabled
the button will be disabled unless there's an override available for
the scheduledClusterScan.enabled field.

rancher/rancher#26150
This commit is contained in:
Cody Jackson 2020-03-21 02:09:03 -07:00
parent 987131a917
commit d3c0f5dfe2
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/authenticated/cluster/cis/scan/route.js
View File

@ -19,7 +19,8 @@ export default Route.extend({
return await Promise.all(reportPromises);
})(),
configMaps: this.securityScanConfig.loadAsyncConfigMap(get(this, 'scope.currentCluster'))
configMaps: this.securityScanConfig.loadAsyncConfigMap(get(this, 'scope.currentCluster')),
clusterTemplateRevisions: get(this, 'globalStore').findAll('clustertemplaterevision')
});
},
});

2
app/authenticated/cluster/cis/scan/template.hbs
View File

@ -23,7 +23,7 @@
<td colspan="{{sortable.fullColspan}}" class="text-center text-muted pt-20 pb-20">{{t 'cis.scan.table.empty'}}</td>
</tr>
{{else if (eq kind "right-actions")}}
<button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" {{action "setSchedule"}} disabled={{scope.currentCluster.isClusterScanDown}}>
<button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" {{action "setSchedule"}} disabled={{scope.currentCluster.isAddClusterScanScheduleDisabled}}>
{{t 'cis.scan.actions.addSchedule'}}
</button>
<button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" {{action "setAlert"}} disabled={{scope.currentCluster.isClusterScanDown}}>

18
app/models/cluster.js
View File

@ -12,6 +12,7 @@ import { isEmpty } from '@ember/utils';
import moment from 'moment';
const TRUE = 'True';
const CLUSTER_TEMPLATE_ID_PREFIX = 'cattle-global-data:';
const SCHEDULE_CLUSTER_SCAN_QUESTION_KEY = 'scheduledClusterScan.enabled';
export default Resource.extend(Grafana, ResourceUsage, {
globalStore: service(),
@ -336,6 +337,23 @@ export default Resource.extend(Grafana, ResourceUsage, {
|| get(this, 'isWindows');
}),
isAddClusterScanScheduleDisabled: computed('isClusterScanDown', 'scheduledClusterScan.enabled', 'clusterTemplateRevision', 'clusterTemplateRevision.questions.@each', function() {
if (get(this, 'clusterTemplateRevision') === null) {
return get(this, 'isClusterScanDown');
}
if (get(this, 'isClusterScanDown')) {
return true;
}
if (get(this, 'scheduledClusterScan.enabled')) {
return false;
}
return !get(this, 'clusterTemplateRevision.questions')
|| get(this, 'clusterTemplateRevision.questions').every((question) => question.variable !== SCHEDULE_CLUSTER_SCAN_QUESTION_KEY)
}),
isClusterScanDisabled: computed('runningClusterScans.length', 'isClusterScanDown', function() {
return (get(this, 'runningClusterScans.length') > 0)
|| get(this, 'isClusterScanDown');