|
215 | 215 | complete: 0, |
216 | 216 | failed: 0 |
217 | 217 | }; |
218 | | - const rows = registriesCRD.map((rec) => { |
| 218 | + const rows = registriesCRD; |
| 219 | + registriesCRD.forEach((rec, index) => { |
219 | 220 | this.latestUpdateTime = new Date(); |
220 | 221 | let scanjobs = scanJobMap[`${rec.metadata.namespace}/${rec.metadata.name}`] || []; |
221 | 222 | const status = scanjobs[0] ? scanjobs[0].status.statusResult.type.toLowerCase() || "pending" : "none"; |
222 | 223 | const prevStatus = this.getPreviousStatus(scanjobs); |
223 | 224 | const prevScanStatus = scanjobs[1] ? scanjobs[1].status.statusResult.type.toLowerCase() || "pending" : "none"; |
224 | 225 | |
225 | 226 | // 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? |
229 | 230 | 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? |
232 | 233 | 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; |
237 | 238 |
|
238 | 239 | // Summarize the data for Latest status updates panel |
239 | 240 | registryStatusList.push({ |
|
249 | 250 | if (status && statusSummary.hasOwnProperty(status)) { |
250 | 251 | statusSummary[status]++; |
251 | 252 | } |
252 | | - return rec; |
253 | | - }); |
| 253 | + }); |
254 | 254 | // Sort and limit the registryStatusList to 5 most recent updates |
255 | 255 | registryStatusList = registryStatusList.sort((a, b) => new Date(b.lastTransitionTime) - new Date(a.lastTransitionTime)).slice(0, 5); |
256 | 256 | while (registryStatusList.length < 5) { |
|
262 | 262 | lastTransitionTime: new Date().toISOString() |
263 | 263 | }); |
264 | 264 | } |
| 265 | +
|
265 | 266 | console.log("rows", rows) |
266 | 267 | return { |
267 | 268 | rows, |
|
0 commit comments