diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue b/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
index 712367a..f625f07 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
@@ -240,7 +240,7 @@
+
+
+
+
+
+
+

+
+
+ {{ t("imageScanner.dashboard.appInstall.title") }}
+
+
+ {{ t("imageScanner.dashboard.appInstall.description") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t("imageScanner.dashboard.prerequisites.repository.title") }}
+
+
+ {{ t("imageScanner.dashboard.prerequisites.repository.description") }}
+
+
+
+
+
+
+
+ {{ t("imageScanner.dashboard.appInstall.title") }}
+
+
+ {{ t("imageScanner.dashboard.appInstall.description") }}
+
+
+
+
+
+
+
+
+ {{ t('imageScanner.dashboard.appInstall.reload' ) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue b/pkg/sbombastic-image-vulnerability-scanner/components/InstallView2.vue
similarity index 86%
rename from pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue
rename to pkg/sbombastic-image-vulnerability-scanner/components/InstallView2.vue
index 5b128ed..5c305cc 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Installation.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/InstallView2.vue
@@ -40,7 +40,7 @@ export default {
await this.$fetchType(CATALOG.CLUSTER_REPO);
- if ( !this.neuvectorRepo || !this.controllerChart ) {
+ if ( !this.sbombasticRepo || !this.controllerChart ) {
this.debouncedRefreshCharts(true);
}
},
@@ -60,9 +60,9 @@ export default {
}),
controllerChart() {
- if ( this.neuvectorRepo ) {
+ if ( this.sbombasticRepo ) {
return this.$store.getters['catalog/chart']({
- repoName: this.neuvectorRepo.id,
+ repoName: this.sbombasticRepo.id,
repoType: 'cluster',
chartName: SBOMBASTIC.CONTROLLER
});
@@ -71,7 +71,7 @@ export default {
return null;
},
- neuvectorRepo() {
+ sbombasticRepo() {
const chart = this.charts?.find(chart => chart.chartName === SBOMBASTIC.CONTROLLER);
return this.repos?.find(repo => repo.id === chart?.repoName);
@@ -94,6 +94,7 @@ export default {
repoType, repoName, chartName, versions
} = this.controllerChart;
const latestStableVersion = getLatestStableVersion(versions);
+ console.log("repoType, repoName, chartName, versions", repoType, repoName, chartName, versions, latestStableVersion);
if ( latestStableVersion ) {
const query = {
@@ -102,6 +103,12 @@ export default {
[CHART]: chartName,
[VERSION]: latestStableVersion.version
};
+ // {
+ // [REPO_TYPE]: 'cluster',//repoType,
+ // [REPO]: 'rancher-charts',//repoName,
+ // [CHART]: 'sbombastic',//chartName,
+ // [VERSION]: '0.4.0',//latestStableVersion.version
+ // };
this.$router.push({
name: 'c-cluster-apps-charts-install',
@@ -127,11 +134,11 @@ export default {
-
+
{{ t("imageScanner.dashboard.appInstall.title") }}
@@ -150,7 +157,7 @@ export default {
-
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/InstallView3.vue b/pkg/sbombastic-image-vulnerability-scanner/components/InstallView3.vue
new file mode 100644
index 0000000..6f400fc
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/InstallView3.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+

+
+
+ {{ t("imageScanner.dashboard.appInstall.title") }}
+
+
+ {{ t("imageScanner.dashboard.appInstall.description") }}
+
+
+
+
+
+
+
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/InstallWizard.vue b/pkg/sbombastic-image-vulnerability-scanner/components/InstallWizard.vue
new file mode 100644
index 0000000..e16dea3
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/InstallWizard.vue
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue b/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
index 538512e..93e1eb4 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
@@ -4,7 +4,7 @@
Most affected images at risk
-
+
{{ image.imageName }}
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 be4567d..8a56d77 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
@@ -44,10 +44,10 @@ export function init($plugin: any, store: any) {
virtualType({
labelKey: 'imageScanner.images.title',
- name: PAGE.IMAGE_OVERVIEW,
+ name: PAGE.IMAGES,
namespaced: false,
route: {
- name: `c-cluster-${PRODUCT_NAME}-${PAGE.IMAGE_OVERVIEW}`,
+ name: `c-cluster-${PRODUCT_NAME}-${PAGE.IMAGES}`,
params: {
product: PRODUCT_NAME
},
@@ -57,10 +57,10 @@ export function init($plugin: any, store: any) {
virtualType({
labelKey: "imageScanner.vulnerabilities.title",
- name: PAGE.VULNERABILITY_OVERVIEW,
+ name: PAGE.VULNERABILITIES,
namespaced: false,
route: {
- name: `c-cluster-${PRODUCT_NAME}-${PAGE.VULNERABILITY_OVERVIEW}`,
+ name: `c-cluster-${PRODUCT_NAME}-${PAGE.VULNERABILITIES}`,
params: {
product: PRODUCT_NAME,
},
@@ -95,14 +95,14 @@ export function init($plugin: any, store: any) {
});
weightType(PAGE.DASHBOARD, 98, true);
- weightType(PAGE.IMAGE_OVERVIEW, 97, true);
- weightType(PAGE.VULNERABILITY_OVERVIEW, 96, true);
+ weightType(PAGE.IMAGES, 97, true);
+ weightType(PAGE.VULNERABILITIES, 96, true);
weightType(PAGE.VEX_MANAGEMENT, 95, true);
basicType([
- PAGE.DASHBOARD,
- PAGE.IMAGE_OVERVIEW,
- PAGE.VULNERABILITY_OVERVIEW,
+ PAGE.DASHBOARD,
+ PAGE.IMAGES,
+ PAGE.VULNERABILITIES,
]);
// Prepend spaces on group name, as Rancher 2.12 render group name algin with sidemenu
basicType([PAGE.REGISTRIES, PAGE.VEX_MANAGEMENT], ' Advanced');
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ImageNameCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ImageNameCell.vue
index da8621c..4acada2 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/ImageNameCell.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ImageNameCell.vue
@@ -1,5 +1,5 @@
-
+
{{ row.metadata.name }}
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
index fbf2fb6..94cfbdb 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
@@ -495,9 +495,9 @@ export default {
.page {
display: flex;
flex-direction: column;
- padding: 24px;
+ // padding: 24px;
min-height: 100vh;
- background: #f8f9fa;
+ // background: #f8f9fa;
}
.header-section {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
index 724fa71..fd9045a 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
@@ -288,7 +288,7 @@ import { filter } from "lodash";
.page {
display: flex;
flex-direction: column;
- padding: 20px;
+ padding: 24px;
min-height: 100%;
}
.header-section {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue
index 6a56d2b..18fa059 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/index.vue
@@ -1,13 +1,13 @@