Skip to content

Commit 30c4a08

Browse files
xingzhang-suseNickChungSUSE
authored andcommitted
Fixed table data refresh issue after data removal
1 parent f59c072 commit 30c4a08

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,25 +215,26 @@
215215
complete: 0,
216216
failed: 0
217217
};
218-
const rows = registriesCRD.map((rec) => {
218+
const rows = registriesCRD;
219+
registriesCRD.forEach((rec, index) => {
219220
this.latestUpdateTime = new Date();
220221
let scanjobs = scanJobMap[`${rec.metadata.namespace}/${rec.metadata.name}`] || [];
221222
const status = scanjobs[0] ? scanjobs[0].status.statusResult.type.toLowerCase() || "pending" : "none";
222223
const prevStatus = this.getPreviousStatus(scanjobs);
223224
const prevScanStatus = scanjobs[1] ? scanjobs[1].status.statusResult.type.toLowerCase() || "pending" : "none";
224225
225226
// Reform the record for the table
226-
rec.currStatus = status;
227-
rec.prevScanStatus = prevScanStatus;
228-
rec.progress = scanjobs[0] && scanjobs[0].status.imagesCount && scanjobs[0].status.scannedImagesCount?
227+
rows[index].currStatus = status;
228+
rows[index].prevScanStatus = prevScanStatus;
229+
rows[index].progress = scanjobs[0] && scanjobs[0].status.imagesCount && scanjobs[0].status.scannedImagesCount?
229230
Math.ceil(scanjobs[0].status.scannedImagesCount / scanjobs[0].status.imagesCount * 100) : 0;
230-
rec.progressDetail = `${this.t("imageScanner.registries.configuration.scanTable.header.imagesScanned")}: ${scanjobs[0] ? scanjobs[0].status.scannedImagesCount : 0} / ${this.t("imageScanner.registries.configuration.scanTable.header.imagesFound")}: ${scanjobs[0] ? scanjobs[0].status.imagesCount : 0}`;
231-
rec.prevProgress = scanjobs[1] && scanjobs[1].status.imagesCount && scanjobs[1].status.scannedImagesCount?
231+
rows[index].progressDetail = `${this.t("imageScanner.registries.configuration.scanTable.header.imagesScanned")}: ${scanjobs[0] ? scanjobs[0].status.scannedImagesCount : 0} / ${this.t("imageScanner.registries.configuration.scanTable.header.imagesFound")}: ${scanjobs[0] ? scanjobs[0].status.imagesCount : 0}`;
232+
rows[index].prevProgress = scanjobs[1] && scanjobs[1].status.imagesCount && scanjobs[1].status.scannedImagesCount?
232233
Math.ceil(scanjobs[1].status.scannedImagesCount / scanjobs[1].status.imagesCount * 100) : 0;
233-
rec.prevProgressDetail = `${this.t("imageScanner.registries.configuration.scanTable.header.imagesScanned")}: ${scanjobs[1] ? scanjobs[1].status.scannedImagesCount : 0} / ${this.t("imageScanner.registries.configuration.scanTable.header.imagesFound")}: ${scanjobs[1] ? scanjobs[1].status.imagesCount : 0}`;
234-
rec.error = scanjobs[0] && scanjobs[0].status.statusResult.type.toLowerCase() === "failed" ? scanjobs[0].status.statusResult.message : "";
235-
rec.PrevError = scanjobs[1] && scanjobs[1].status.statusResult.type.toLowerCase() === "failed" ? scanjobs[1].status.statusResult.message : "";
236-
rec.refreshFn = this.refresh;
234+
rows[index].prevProgressDetail = `${this.t("imageScanner.registries.configuration.scanTable.header.imagesScanned")}: ${scanjobs[1] ? scanjobs[1].status.scannedImagesCount : 0} / ${this.t("imageScanner.registries.configuration.scanTable.header.imagesFound")}: ${scanjobs[1] ? scanjobs[1].status.imagesCount : 0}`;
235+
rows[index].error = scanjobs[0] && scanjobs[0].status.statusResult.type.toLowerCase() === "failed" ? scanjobs[0].status.statusResult.message : "";
236+
rows[index].prevError = scanjobs[1] && scanjobs[1].status.statusResult.type.toLowerCase() === "failed" ? scanjobs[1].status.statusResult.message : "";
237+
rows[index].refreshFn = this.refresh;
237238
238239
// Summarize the data for Latest status updates panel
239240
registryStatusList.push({
@@ -249,8 +250,7 @@
249250
if (status && statusSummary.hasOwnProperty(status)) {
250251
statusSummary[status]++;
251252
}
252-
return rec;
253-
});
253+
});
254254
// Sort and limit the registryStatusList to 5 most recent updates
255255
registryStatusList = registryStatusList.sort((a, b) => new Date(b.lastTransitionTime) - new Date(a.lastTransitionTime)).slice(0, 5);
256256
while (registryStatusList.length < 5) {
@@ -262,6 +262,7 @@
262262
lastTransitionTime: new Date().toISOString()
263263
});
264264
}
265+
265266
console.log("rows", rows)
266267
return {
267268
rows,

0 commit comments

Comments
 (0)