Skip to content

Commit eccee81

Browse files
Fixed some code according to review comment
1 parent dfb5294 commit eccee81

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RESOURCE } from '@sbombastic-image-vulnerability-scanner/types';
44
import { _CREATE } from '@shell/config/query-params';
55
export default class Registry extends SteveModel {
66
get _availableActions() {
7-
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml', 'showConfiguration'].includes(action.action));
7+
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml'].includes(action.action));
88

99
// In details page, we don't want to show the scan action
1010
if (this.$rootState.targetRoute && 'id' in this.$rootState.targetRoute.params) {

pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
8282
import { findBy } from '@shell/utils/array';
8383
import ScanButton from "@sbombastic-image-vulnerability-scanner/components/common/ScanButton";
84-
import { template } from "lodash";
85-
84+
8685
export default {
8786
name: 'registries',
8887
components: {
@@ -119,10 +118,10 @@ import { template } from "lodash";
119118
120119
//Fetch ScanJob CRD and sort by startTime DESC
121120
let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB).sort((a, b) => {
122-
if (!a.status || !a.status.conditions|| !a.status.conditions[0].lastTransitionTime) {
121+
if (!a.status || !a.status.conditions || !Array.isArray(a.status.conditions) || a.status.conditions.length === 0) {
123122
return 1;
124123
}
125-
if (!b.status || !b.status.conditions|| !b.status.conditions[0].lastTransitionTime) {
124+
if (!b.status || !b.status.conditions || !Array.isArray(b.status.conditions) || b.status.conditions.length > 0) {
126125
return -1;
127126
}
128127
return this.getLastTransitionTime(b.status.conditions) - this.getLastTransitionTime(a.status.conditions);

0 commit comments

Comments
 (0)