Skip to content

Fixed bugs and github issue #116 #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 27, 2025
+85 −67
Merged

Fixed bugs and github issue #116 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c618e1
Issue#116: UI/UX Bug: Registries Configuration Overview
xingzhang-suse Aug 26, 2025
dfb5294
Fixed bugs Registries and Image overview page
xingzhang-suse Aug 27, 2025
403b8a4
Fixed some code according to review comment
xingzhang-suse Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions pkg/network/product.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ export function init($plugin: IPlugin, store: any) {
} = $plugin.DSL(store, productName);

// registering a top-level product
product({
icon: 'pod_security',
inStore: 'cluster',
});
// product({
// icon: 'pod_security',
// inStore: 'cluster',
// });

// => => => creating a custom page
virtualType({
label: 'Overview',
name: 'overview',
namespaced: false,
route: {
name: `c-cluster-${productName}-overview`,
params: {
product: productName
},
meta: { pkg: "network", product: productName }
}
});
// // => => => creating a custom page
// virtualType({
// label: 'Overview',
// name: 'overview',
// namespaced: false,
// route: {
// name: `c-cluster-${productName}-overview`,
// params: {
// product: productName
// },
// meta: { pkg: "network", product: productName }
// }
// });

basicType([
"overview"
]);
// basicType([
// "overview"
// ]);
}
42 changes: 21 additions & 21 deletions pkg/runtime-process-profile/product.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ export function init($plugin: IPlugin, store: any) {
basicType
} = $plugin.DSL(store, productName);

// registering a top-level product
product({
icon: 'pod_security',
inStore: 'cluster',
});
// // registering a top-level product
// product({
// icon: 'pod_security',
// inStore: 'cluster',
// });

// => => => creating a custom page
virtualType({
label: 'Overview',
name: 'overview',
namespaced: false,
route: {
name: `c-cluster-${productName}-overview`,
params: {
product: productName
},
meta: { pkg: "runtime-process-profile", product: productName }
}
});
// // => => => creating a custom page
// virtualType({
// label: 'Overview',
// name: 'overview',
// namespaced: false,
// route: {
// name: `c-cluster-${productName}-overview`,
// params: {
// product: productName
// },
// meta: { pkg: "runtime-process-profile", product: productName }
// }
// });

basicType([
"overview"
]);
// basicType([
// "overview"
// ]);
}
18 changes: 18 additions & 0 deletions pkg/sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export const images = [
{
id: "struts-attacher:1.0",
metadata: {
name: "struts-attacher:1.0",
},
Expand All @@ -16,6 +17,7 @@ export const images = [
},
},
{
id: "imagemagick4.8.5613",
metadata: {
name: "imagemagick4.8.5613",
},
Expand All @@ -32,6 +34,7 @@ export const images = [
},
},
{
id: "centos7.7.1908",
metadata: {
name: "centos7.7.1908",
},
Expand All @@ -48,6 +51,7 @@ export const images = [
},
},
{
id: "nginx1.19.10",
metadata: {
name: "nginx1.19.10",
},
Expand All @@ -64,6 +68,7 @@ export const images = [
},
},
{
id: "docker-compose:1.29.2",
metadata: {
name: "docker-compose:1.29.2",
},
Expand All @@ -80,6 +85,7 @@ export const images = [
},
},
{
id: "python3.9.7",
metadata: {
name: "python3.9.7",
},
Expand All @@ -96,6 +102,7 @@ export const images = [
},
},
{
id: "nodejs14.17.3",
metadata: {
name: "nodejs14.17.3",
},
Expand All @@ -112,6 +119,7 @@ export const images = [
},
},
{
id: "redis5.0.7",
metadata: {
name: "redis5.0.7",
},
Expand All @@ -128,6 +136,7 @@ export const images = [
},
},
{
id: "mongodb4.4.1",
metadata: {
name: "mongodb4.4.1",
},
Expand All @@ -144,6 +153,7 @@ export const images = [
},
},
{
id: "golang1.16.5",
metadata: {
name: "golang1.16.5",
},
Expand All @@ -160,6 +170,7 @@ export const images = [
},
},
{
id: "ruby2.7.3",
metadata: {
name: "ruby2.7.3",
},
Expand All @@ -176,6 +187,7 @@ export const images = [
},
},
{
id: "elasticsearch7.10.0",
metadata: {
name: "elasticsearch7.10.0",
},
Expand All @@ -192,6 +204,7 @@ export const images = [
},
},
{
id: "mysql8.0.25",
metadata: {
name: "mysql8.0.25",
},
Expand All @@ -208,6 +221,7 @@ export const images = [
},
},
{
id: "php8.0.9",
metadata: {
name: "php8.0.9",
},
Expand All @@ -224,6 +238,7 @@ export const images = [
},
},
{
id: "postgresql13.3",
metadata: {
name: "postgresql13.3",
},
Expand All @@ -240,6 +255,7 @@ export const images = [
},
},
{
id: "terraform1.0.0",
metadata: {
name: "terraform1.0.0",
},
Expand All @@ -256,6 +272,7 @@ export const images = [
},
},
{
id: "ansible2.10.5",
metadata: {
name: "ansible2.10.5",
},
Expand All @@ -272,6 +289,7 @@ export const images = [
},
},
{
id: "kafka2.8.0",
metadata: {
name: "kafka2.8.0",
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ imageScanner:
pending: Pending
scheduled: Scheduled
inprogress: In progress
complete: Complete
complete: Finished
failed: Failed
none: n/a
enabled: Enabled
Expand Down
4 changes: 1 addition & 3 deletions pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { RESOURCE } from '@sbombastic-image-vulnerability-scanner/types';
import { _CREATE } from '@shell/config/query-params';
export default class Registry extends SteveModel {
get _availableActions() {
console.log("Registry _availableActions");
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml'].includes(action.action));

// In details page, we don't want to show the scan action
Expand All @@ -17,11 +16,10 @@ export default class Registry extends SteveModel {
label: this.t('imageScanner.registries.button.startScan'),
icon: 'icon-play',
enabled: true,
bulkable: false,
bulkable: true,
invoke: async ({}, res = []) => {
const target = (res && res.length ? res[0] : r);
const model = target._model || target;
console.log("scanRegistry model", model);
const scanjobObj = await this.$dispatch('create', {
type: RESOURCE.SCAN_JOB,
metadata: {
Expand Down
9 changes: 6 additions & 3 deletions ...ability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,28 @@
type="button"
:disabled="disabled"
@click="openAddEditRuleModal()">
<i class="icon icon-download"></i>
{{ t('imageScanner.images.downloadReport') }}
</button>
</div>
</div>
<div class="summary-section">
<TopRiskyImagesChart :topRiskyImages="preprocessedDataset.topRiskyImages"/>
<ImageRiskAssessment :chartData="preprocessedDataset.chartData"/>
<TopRiskyImagesChart v-if="preprocessedDataset.topRiskyImages" :topRiskyImages="preprocessedDataset.topRiskyImages"/>
<ImageRiskAssessment v-if="preprocessedDataset.chartData" :chartData="preprocessedDataset.chartData"/>
</div>
<SortableTable
:has-advanced-filtering="false"
:namespaced="false"
:row-actions="false"
:table-actions="true"
:force-update-live-and-delayed="0"
:use-query-params-for-simple-filtering="true"
:sub-expandable="isGrouped"
:sub-rows="isGrouped"
:sub-expand-column="isGrouped"
:rows="isGrouped ? preprocessedDataset.rowsByRepo : rows"
:headers="isGrouped ? REPO_BASED_TABLE : IMAGE_LIST_TABLE"
:key-field="'id'"
@selection="onSelectionChange"
>
<template #header-left>
Expand Down Expand Up @@ -80,7 +83,6 @@
:search="false"
:row-actions="false"
:table-actions="false"
key-field="id"
/>
</td>
</tr>
Expand All @@ -100,6 +102,7 @@
import { images } from "@sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image";
import { IMAGE_LIST_TABLE, REPO_BASED_TABLE, REPO_BASED_IMAGE_LIST_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
import { Checkbox } from '@components/Form/Checkbox';
import { RESOURCE } from '@sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner';
export default {
name: 'imageOverview',
components: {
Expand Down
Loading