Skip to content

Commit aa0e698

Browse files
xingzhang-suselsongsuse
authored andcommitted
Modified implementation of column base filters for both client side and server side filtering
1 parent 9d7eabf commit aa0e698

File tree

11 files changed

+863
-162
lines changed

11 files changed

+863
-162
lines changed

pkg/sbombastic-image-vulnerability-scanner/components/InstallView3.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default {
2727
<InstallHelmCharts
2828
style="margin-top: 16px;"
2929
chart-name="sbombastic"
30-
repo-url="https://github.com/rancher-sandbox/sbombastic.git"
30+
repo-url="https://rancher-sandbox.github.io"
3131
repo-name="sbombastic"
3232
target-namespace="sbombastic"
3333
chart-display-name="sbombastic"

pkg/sbombastic-image-vulnerability-scanner/components/common/ScanButton.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ export default {
2020
type: Array,
2121
default: () => []
2222
},
23-
reloadFn: {
24-
type: Function,
25-
default: () => {}
26-
}
2723
},
2824
methods: {
2925
async startScan() {
@@ -54,10 +50,6 @@ export default {
5450
title: this.t('imageScanner.registries.messages.registryScanFailed'),
5551
message: e.message,
5652
});
57-
} finally {
58-
setTimeout(() => {
59-
this.reloadFn(true);
60-
}, 2000);
6153
}
6254
});
6355
},

pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ export function init($plugin: any, store: any) {
3333
route: {
3434
name: `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`,
3535
params: {
36-
product: PRODUCT_NAME
36+
product: PRODUCT_NAME,
37+
resource: RESOURCE.REGISTRY,
3738
},
3839
meta: { pkg: PRODUCT_NAME, product: PRODUCT_NAME }
39-
}
40+
},
4041
});
4142

4243
virtualType({

pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export const REGISTRY_SCAN_TABLE = [
2727
{
2828
name: "scanInterval",
2929
labelKey: "imageScanner.registries.registrytable.header.schedule",
30-
value: (row: any) => `Every ${row.spec.scanInterval}`,
30+
value: "spec.scanInterval",
31+
formatter: "ScanInterval",
3132
sort: "spec.scanInterval",
3233
},
3334
{
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<template>
2+
<div class="scan-interval-cell">
3+
<span v-if="value" class="scan-interval-text">{{ t('imageScanner.general.every') }}&nbsp;{{ value }}</span>
4+
<span v-else class="scan-interval-text text-muted">n/a</span>
5+
</div>
6+
</template>
7+
<script>
8+
export default {
9+
props: {
10+
value: {
11+
type: String,
12+
required: true
13+
}
14+
},
15+
};
16+
</script>
17+
18+
<style lang="scss" scoped>
19+
.scan-interval-cell {
20+
display: flex;
21+
align-items: center;
22+
font-size: 14px;
23+
color: var(--text-secondary);
24+
25+
.scan-interval-text {
26+
margin-left: 8px;
27+
}
28+
}
29+
</style>

pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ imageScanner:
302302
schedule: Every {i}
303303
reload: Reload
304304
any: Any
305+
every: Every
305306

306307
typeLabel:
307308
sbombastic.rancher.io.registry: Registries configuration

0 commit comments

Comments
 (0)