diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/ScanButton.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/ScanButton.vue index 9e7deb9..b65331c 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/components/common/ScanButton.vue +++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/ScanButton.vue @@ -55,7 +55,7 @@ export default { } finally { setTimeout(() => { this.reloadFn(true); - }, 1000); + }, 2000); } }); }, diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/TextWithPopedDetail.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/TextWithPopedDetail.vue new file mode 100644 index 0000000..2dd8eaf --- /dev/null +++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/TextWithPopedDetail.vue @@ -0,0 +1,146 @@ + + + + \ No newline at end of file diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts index 8b30c7b..9ceea83 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts +++ b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts @@ -78,13 +78,12 @@ export function init($plugin: IPlugin, store: any) { }, }); - basicType([ - PAGE.IMAGE_OVERVIEW, - PAGE.VULNERABILITY_OVERVIEW, - PAGE.VEX_MANAGEMENT, - //"demo" - ]); - - basicType([PAGE.REGISTRIES, PAGE.VEX_MANAGEMENT], 'Advanced'); + basicType([ + PAGE.IMAGE_OVERVIEW, + PAGE.VULNERABILITY_OVERVIEW, + //"demo" + ]); + // Prepend spaces on group name, as Rancher 2.12 render group name algin with sidemenu + basicType([PAGE.REGISTRIES, PAGE.VEX_MANAGEMENT], '    Advanced'); } \ No newline at end of file diff --git a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue index 10a13d5..14537c5 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue +++ b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue @@ -49,6 +49,8 @@ export default { return { inStore: this.$store.getters['currentProduct'].inStore, errors: null, + PAGE, + PRODUCT_NAME, }; }, @@ -76,6 +78,9 @@ export default { REGISTRY_TYPE_OPTIONS: function() { return REGISTRY_TYPE_OPTIONS; }, + doneLocationOverride() { + return `/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${this.PAGE.REGISTRIES}`; + }, }, methods: { @@ -99,17 +104,6 @@ export default { }); }, - cancel() { - console.log('cancel done'); - this.done(); - this.$router.push({ - name: `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`, - params: { - cluster: this.$route.params.cluster, - product: PRODUCT_NAME - } - }); - }, doneRoute() { console.log('doneRoute'); return `c-cluster-${PRODUCT_NAME}-${PAGE.REGISTRIES}`; @@ -142,7 +136,7 @@ export default { :cancel-event="true" @error="(e) => (errors = e)" @finish="apply" - @cancel="cancel" + @cancel="done" > import ProgressCell from "@sbombastic-image-vulnerability-scanner/formatters/ProgressCell"; +import TextWithPopedDetail from "@sbombastic-image-vulnerability-scanner/components/common/TextWithPopedDetail"; export default { components: { - ProgressCell + ProgressCell, + TextWithPopedDetail }, name: "PreviousScanCell", props: { @@ -34,10 +36,15 @@ export default {
{{ getStatusText(row) }}
- {{ t("imageScanner.general.at") }} + {{ t("imageScanner.general.at") }}
- |{{ t("imageScanner.general.error") }} + | + +
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/Progress.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/Progress.vue new file mode 100644 index 0000000..15726b7 --- /dev/null +++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/Progress.vue @@ -0,0 +1,34 @@ + + + \ No newline at end of file diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue index 7935c1d..e65de15 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue +++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue @@ -1,22 +1,33 @@ \ No newline at end of file diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanErrorCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanErrorCell.vue index fb3f4d7..72ef579 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanErrorCell.vue +++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanErrorCell.vue @@ -33,7 +33,7 @@ export default {