Skip to content

Commit 7c618e1

Browse files
Issue#116: UI/UX Bug: Registries Configuration Overview
1 parent 64857b4 commit 7c618e1

File tree

5 files changed

+45
-51
lines changed

5 files changed

+45
-51
lines changed

pkg/network/product.ts

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@ export function init($plugin: IPlugin, store: any) {
1010
} = $plugin.DSL(store, productName);
1111

1212
// registering a top-level product
13-
product({
14-
icon: 'pod_security',
15-
inStore: 'cluster',
16-
});
13+
// product({
14+
// icon: 'pod_security',
15+
// inStore: 'cluster',
16+
// });
1717

18-
// => => => creating a custom page
19-
virtualType({
20-
label: 'Overview',
21-
name: 'overview',
22-
namespaced: false,
23-
route: {
24-
name: `c-cluster-${productName}-overview`,
25-
params: {
26-
product: productName
27-
},
28-
meta: { pkg: "network", product: productName }
29-
}
30-
});
18+
// // => => => creating a custom page
19+
// virtualType({
20+
// label: 'Overview',
21+
// name: 'overview',
22+
// namespaced: false,
23+
// route: {
24+
// name: `c-cluster-${productName}-overview`,
25+
// params: {
26+
// product: productName
27+
// },
28+
// meta: { pkg: "network", product: productName }
29+
// }
30+
// });
3131

32-
basicType([
33-
"overview"
34-
]);
32+
// basicType([
33+
// "overview"
34+
// ]);
3535
}

pkg/runtime-process-profile/product.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ export function init($plugin: IPlugin, store: any) {
99
basicType
1010
} = $plugin.DSL(store, productName);
1111

12-
// registering a top-level product
13-
product({
14-
icon: 'pod_security',
15-
inStore: 'cluster',
16-
});
12+
// // registering a top-level product
13+
// product({
14+
// icon: 'pod_security',
15+
// inStore: 'cluster',
16+
// });
1717

18-
// => => => creating a custom page
19-
virtualType({
20-
label: 'Overview',
21-
name: 'overview',
22-
namespaced: false,
23-
route: {
24-
name: `c-cluster-${productName}-overview`,
25-
params: {
26-
product: productName
27-
},
28-
meta: { pkg: "runtime-process-profile", product: productName }
29-
}
30-
});
18+
// // => => => creating a custom page
19+
// virtualType({
20+
// label: 'Overview',
21+
// name: 'overview',
22+
// namespaced: false,
23+
// route: {
24+
// name: `c-cluster-${productName}-overview`,
25+
// params: {
26+
// product: productName
27+
// },
28+
// meta: { pkg: "runtime-process-profile", product: productName }
29+
// }
30+
// });
3131

32-
basicType([
33-
"overview"
34-
]);
32+
// basicType([
33+
// "overview"
34+
// ]);
3535
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ imageScanner:
149149
pending: Pending
150150
scheduled: Scheduled
151151
inprogress: In progress
152-
complete: Complete
152+
complete: Finished
153153
failed: Failed
154154
none: n/a
155155
enabled: Enabled

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
@@ -5,7 +5,7 @@ import { _CREATE } from '@shell/config/query-params';
55
export default class Registry extends SteveModel {
66
get _availableActions() {
77
console.log("Registry _availableActions");
8-
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml'].includes(action.action));
8+
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml', 'showConfiguration'].includes(action.action));
99

1010
// In details page, we don't want to show the scan action
1111
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: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,7 @@ import { template } from "lodash";
9797
rows: [],
9898
registryStatusList: [],
9999
latestUpdateTime: null,
100-
statusSummary: {
101-
scheduled: 0,
102-
pending: 0,
103-
inprogress: 0,
104-
complete: 0,
105-
failed: 0
106-
},
100+
statusSummary: {},
107101
headers: REGISTRY_SCAN_TABLE,
108102
}
109103
},
@@ -208,8 +202,8 @@ import { template } from "lodash";
208202
getRegistryDataset(registriesCRD, scanJobMap) {
209203
let registryStatusList = [];
210204
const statusSummary = {
211-
scheduled: 0,
212205
pending: 0,
206+
scheduled: 0,
213207
inprogress: 0,
214208
complete: 0,
215209
failed: 0

0 commit comments

Comments
 (0)