From c505eb35e503aad3e2a1956ae2d06f872f0f027d Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Thu, 21 Nov 2024 03:05:28 +0100 Subject: [PATCH 1/9] wip --- .../service/BuildLogEntryService.java | 32 +++++++++++++++++ .../web/localci/BuildLogResource.java | 18 ++++++++++ .../build-queue/build-queue.component.html | 36 +++++++++++++++++-- .../build-queue/build-queue.component.scss | 18 ++++++++++ .../build-queue/build-queue.component.ts | 35 ++++++++++++++---- .../build-queue/build-queue.service.ts | 13 +++++++ src/main/webapp/i18n/de/buildQueue.json | 4 +++ src/main/webapp/i18n/en/buildQueue.json | 4 +++ 8 files changed, 151 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index f6143a43561c..e23fac91a80a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -2,12 +2,15 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; import java.time.ZonedDateTime; +import java.time.format.DateTimeParseException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -490,4 +493,33 @@ public boolean buildJobHasLogFile(String buildJobId, ProgrammingExercise program return Files.exists(logPath); } + public List parseBuildLogEntries(FileSystemResource buildLog) { + try { + List buildLogEntries = new ArrayList<>(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(buildLog.getInputStream()))) { + String line; + while ((line = reader.readLine()) != null) { + String[] parts = line.split("\t", 2); + if (parts.length == 2) { + try { + ZonedDateTime time = ZonedDateTime.parse(parts[0]); + buildLogEntries.add(new BuildLogEntry(time, parts[1])); + } + catch (DateTimeParseException e) { + log.warn("Failed to parse build log entry time: {}", parts[0]); + } + } + else if (parts.length == 1 && !parts[0].isBlank()) { + buildLogEntries.add(new BuildLogEntry(null, parts[0])); + } + } + } + return buildLogEntries; + } + catch (IOException e) { + log.error("Error occurred while trying to parse build log entries", e); + return new ArrayList<>(); + } + } + } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java index c8fd18e69fca..8e8d3e43cc2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java @@ -2,6 +2,8 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) @@ -52,4 +55,19 @@ public ResponseEntity getBuildLogForBuildJob(@PathVariable String buil responseHeaders.setContentDispositionFormData("attachment", "build-" + buildJobId + ".log"); return new ResponseEntity<>(buildLog, responseHeaders, HttpStatus.OK); } + + @GetMapping("build-log/{buildJobId}/entries") + @EnforceAtLeastEditor + public ResponseEntity> getBuildLogEntriesForBuildJob(@PathVariable String buildJobId) { + FileSystemResource buildLog = buildLogEntryService.retrieveBuildLogsFromFileForBuildJob(buildJobId); + if (buildLog == null) { + return ResponseEntity.notFound().build(); + } + + var buildLogEntries = buildLogEntryService.parseBuildLogEntries(buildLog); + if (buildLogEntries == null || buildLogEntries.isEmpty()) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(buildLogEntries); + } } diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.html b/src/main/webapp/app/localci/build-queue/build-queue.component.html index a8f9a582cbf3..7d7145737dc3 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.html +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.html @@ -504,7 +504,7 @@

@@ -617,7 +617,7 @@

- + {{ finishedBuildJob.buildAgentAddress }} @@ -742,7 +742,7 @@

@@ -879,3 +879,33 @@
+ + +
+
+ + {{ this.displayedBuildJobId }} +
+ +
+
+ + + @for (logEntry of rawBuildLogs; track logEntry) { + + + + + } + +
{{ logEntry.time | artemisDate: 'short' : true }}{{ logEntry.log }}
+
+
+ + +
+ diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.scss b/src/main/webapp/app/localci/build-queue/build-queue.component.scss index b67b0520fbb5..1989ed2fb6d9 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.scss +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.scss @@ -34,3 +34,21 @@ .finish-jobs-column-strings { max-width: 180px; } + +.build-output { + height: inherit; + &__entry { + &-date { + width: 200px; + margin-right: 10px; + color: var(--secondary); + font-weight: normal; + float: left; + clear: left; + } + &-text { + margin-bottom: 0; + color: var(--body-color); + } + } +} diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.ts b/src/main/webapp/app/localci/build-queue/build-queue.component.ts index 79ca4931786c..c610c7e42013 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.ts @@ -19,6 +19,7 @@ import { NgbModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; import { LocalStorageService } from 'ngx-webstorage'; import { Observable, OperatorFunction, Subject, Subscription, merge } from 'rxjs'; import { UI_RELOAD_TIME } from 'app/shared/constants/exercise-exam-constants'; +import { BuildLogEntry } from 'app/entities/programming/build-log.model'; export class FinishedBuildJobFilter { status?: string = undefined; @@ -159,6 +160,9 @@ export class BuildQueueComponent implements OnInit, OnDestroy { searchSubscription: Subscription; searchTerm?: string = undefined; + rawBuildLogs: BuildLogEntry[] = []; + displayedBuildJobId?: string; + constructor( private route: ActivatedRoute, private websocketService: JhiWebsocketService, @@ -386,11 +390,30 @@ export class BuildQueueComponent implements OnInit, OnDestroy { /** * View the build logs of a specific build job - * @param resultId The id of the build job + * @param modal The modal to open + * @param buildJobId The id of the build job + */ + viewBuildLogs(modal: any, buildJobId: string | undefined): void { + if (buildJobId) { + this.openModal(modal, 'xl'); + this.displayedBuildJobId = buildJobId; + this.buildQueueService.getBuildJobLogs(buildJobId).subscribe({ + next: (buildLogs: BuildLogEntry[]) => { + this.rawBuildLogs = buildLogs; + }, + error: (res: HttpErrorResponse) => { + onError(this.alertService, res); + }, + }); + } + } + + /** + * Download the build logs of a specific build job */ - viewBuildLogs(resultId: string | undefined): void { - if (resultId) { - const url = `/api/build-log/${resultId}`; + downloadBuildLogs(): void { + if (this.displayedBuildJobId) { + const url = `/api/build-log/${this.displayedBuildJobId}`; window.open(url, '_blank'); } } @@ -443,8 +466,8 @@ export class BuildQueueComponent implements OnInit, OnDestroy { /** * Opens the modal. */ - open(content: any) { - this.modalService.open(content); + openModal(modal: any, size?: 'sm' | 'lg' | 'xl', scrollable = true, keyboard = true) { + this.modalService.open(modal, { size, keyboard, scrollable }); } /** diff --git a/src/main/webapp/app/localci/build-queue/build-queue.service.ts b/src/main/webapp/app/localci/build-queue/build-queue.service.ts index fdc9bec66e2f..e62d554aacdd 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.service.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.service.ts @@ -7,6 +7,7 @@ import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/en import { createNestedRequestOption } from 'app/shared/util/request.util'; import { HttpResponse } from '@angular/common/http'; import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component'; +import { BuildLogEntry } from 'app/entities/programming/build-log.model'; @Injectable({ providedIn: 'root' }) export class BuildQueueService { @@ -188,4 +189,16 @@ export class BuildQueueService { }), ); } + + /** + * Get all build jobs of a course in the queue + * @param buildJobId + */ + getBuildJobLogs(buildJobId: string): Observable { + return this.http.get(`${this.resourceUrl}/build-log/${buildJobId}/entries`).pipe( + catchError((err) => { + return throwError(() => new Error(`Failed to get build logs for build job ${buildJobId}\n${err.message}`)); + }), + ); + } } diff --git a/src/main/webapp/i18n/de/buildQueue.json b/src/main/webapp/i18n/de/buildQueue.json index faa60fc5c108..641774184538 100644 --- a/src/main/webapp/i18n/de/buildQueue.json +++ b/src/main/webapp/i18n/de/buildQueue.json @@ -74,6 +74,10 @@ "daySpan": "1 Tag", "weekSpan": "7 Tage", "monthSpan": "30 Tage" + }, + "logs": { + "title": "Build Logs für Job", + "download": "Herunterladen" } } } diff --git a/src/main/webapp/i18n/en/buildQueue.json b/src/main/webapp/i18n/en/buildQueue.json index aa065f3617df..fe174aea25c2 100644 --- a/src/main/webapp/i18n/en/buildQueue.json +++ b/src/main/webapp/i18n/en/buildQueue.json @@ -74,6 +74,10 @@ "daySpan": "1 day", "weekSpan": "7 days", "monthSpan": "30 days" + }, + "logs": { + "title": "Build Logs for Job", + "download": "Download" } } } From 28132d7b3731abd10548e3d3e552d16901a5f310 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Tue, 10 Dec 2024 03:24:42 +0100 Subject: [PATCH 2/9] wip --- .../service/BuildLogEntryService.java | 3 - .../build-queue/build-queue.service.ts | 2 +- .../icl/LocalCIResourceIntegrationTest.java | 25 +++++++++ .../build-queue/build-queue.component.spec.ts | 29 ++++++++++ .../build-queue/build-queue.service.spec.ts | 55 +++++++++++++++++++ 5 files changed, 110 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index e23fac91a80a..46706b4393dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -509,9 +509,6 @@ public List parseBuildLogEntries(FileSystemResource buildLog) { log.warn("Failed to parse build log entry time: {}", parts[0]); } } - else if (parts.length == 1 && !parts[0].isBlank()) { - buildLogEntries.add(new BuildLogEntry(null, parts[0])); - } } } return buildLogEntries; diff --git a/src/main/webapp/app/localci/build-queue/build-queue.service.ts b/src/main/webapp/app/localci/build-queue/build-queue.service.ts index e62d554aacdd..9f1a2c820191 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.service.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.service.ts @@ -197,7 +197,7 @@ export class BuildQueueService { getBuildJobLogs(buildJobId: string): Observable { return this.http.get(`${this.resourceUrl}/build-log/${buildJobId}/entries`).pipe( catchError((err) => { - return throwError(() => new Error(`Failed to get build logs for build job ${buildJobId}\n${err.message}`)); + return throwError(() => new Error(`Failed to get build log entries for build job ${buildJobId}\n${err.message}`)); }), ); } diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java index a4d157d1a690..9c02c4c43dc1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java @@ -9,6 +9,7 @@ import java.nio.file.Path; import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import org.junit.jupiter.api.AfterEach; @@ -344,6 +345,30 @@ void testGetBuildLogsForResult() throws Exception { } } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetBuildLogsEntriesForResult() throws Exception { + try { + buildJobRepository.save(finishedJobForLogs); + BuildLogEntry buildLogEntry = new BuildLogEntry(ZonedDateTime.now(), "Dummy log"); + buildLogEntryService.saveBuildLogsToFile(List.of(buildLogEntry), "6", programmingExercise); + var response = request.get("/api/build-log/6/entries", HttpStatus.OK, List.class); + + LinkedHashMap responseMap = ((LinkedHashMap) response.getFirst()); + String log = responseMap.get("log").toString(); + String time = responseMap.get("time").toString(); + assertThat(response).hasSize(1); + assertThat(buildLogEntry.getLog()).isEqualTo(log); + assertThat(buildLogEntry.getTime().toString()).contains(time); + + } + finally { + Path buildLogFile = Path.of("build-logs").resolve(programmingExercise.getCourseViaExerciseGroupOrCourseMember().getShortName()) + .resolve(programmingExercise.getShortName()).resolve("6.log"); + Files.deleteIfExists(buildLogFile); + } + } + @Test @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN") void testGetBuildJobStatistics() throws Exception { diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts index 4c53661e99d4..7d3d0b1e8f0c 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts @@ -19,6 +19,7 @@ import { LocalStorageService } from 'ngx-webstorage'; import { MockLocalStorageService } from '../../../helpers/mocks/service/mock-local-storage.service'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { PieChartModule } from '@swimlane/ngx-charts'; +import { BuildLogEntry } from '../../../../../../main/webapp/app/entities/programming/build-log.model'; describe('BuildQueueComponent', () => { let component: BuildQueueComponent; @@ -40,6 +41,7 @@ describe('BuildQueueComponent', () => { getFinishedBuildJobs: jest.fn(), getBuildJobStatistics: jest.fn(), getBuildJobStatisticsForCourse: jest.fn(), + getBuildJobLogs: jest.fn(), }; const mockLocalStorageService = new MockLocalStorageService(); @@ -271,6 +273,17 @@ describe('BuildQueueComponent', () => { numberOfAppliedFilters: 0, }; + const buildLogEntries: BuildLogEntry[] = [ + { + time: dayjs('2024-01-01'), + log: 'log1', + }, + { + time: dayjs('2024-01-02'), + log: 'log2', + }, + ]; + beforeEach(waitForAsync(() => { mockActivatedRoute = { params: of({ courseId: testCourseId }) }; @@ -665,4 +678,20 @@ describe('BuildQueueComponent', () => { expect(component.finishedBuildJobFilter.areDatesValid).toBeFalsy(); expect(component.finishedBuildJobFilter.areDurationFiltersValid).toBeFalsy(); }); + + it('should download build logs', () => { + const buildJobId = '1'; + jest.spyOn(window, 'open').mockImplementation(); + + mockBuildQueueService.getBuildJobLogs = jest.fn().mockReturnValue(of(buildLogEntries)); + + component.viewBuildLogs(undefined, buildJobId); + + expect(mockBuildQueueService.getBuildJobLogs).toHaveBeenCalledWith(buildJobId); + expect(component.rawBuildLogs).toEqual(buildLogEntries); + + component.downloadBuildLogs(); + + expect(window.open).toHaveBeenCalledWith(`/api/build-log/${component.displayedBuildJobId}`, '_blank'); + }); }); diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts index 73b4ac460f63..8c64559f674f 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts @@ -15,6 +15,7 @@ import { JobTimingInfo } from 'app/entities/job-timing-info.model'; import { BuildConfig } from 'app/entities/programming/build-config.model'; import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component'; import { provideHttpClient } from '@angular/common/http'; +import { BuildLogEntry } from '../../../../../../main/webapp/app/entities/programming/build-log.model'; describe('BuildQueueService', () => { let service: BuildQueueService; @@ -32,6 +33,17 @@ describe('BuildQueueService', () => { filterOptions.buildStartDateFilterTo = dayjs('2024-01-02'); filterOptions.status = 'SUCCESSFUL'; + const buildLogEntries: BuildLogEntry[] = [ + { + time: dayjs('2024-01-01'), + log: 'log1', + }, + { + time: dayjs('2024-01-02'), + log: 'log2', + }, + ]; + const expectFilterParams = (req: TestRequest, filterOptions: FinishedBuildJobFilter) => { expect(req.request.params.get('buildAgentAddress')).toBe(filterOptions.buildAgentAddress); expect(req.request.params.get('buildDurationLower')).toBe(filterOptions.buildDurationFilterLowerBound?.toString()); @@ -590,6 +602,49 @@ describe('BuildQueueService', () => { expect(errorOccurred).toBeTrue(); })); + it('should return build log entries for a specific build job', () => { + const buildJobId = '1'; + const expectedResponse = buildLogEntries; + + service.getBuildJobLogs(buildJobId).subscribe((data) => { + expect(data).toEqual(expectedResponse); + }); + + const req = httpMock.expectOne(`${service.resourceUrl}/build-log/${buildJobId}/entries`); + expect(req.request.method).toBe('GET'); + req.flush(expectedResponse); + }); + + it('should handle errors when getting build log entries for a specific build job', fakeAsync(() => { + const buildJobId = '1'; + + let errorOccurred = false; + + service.getBuildJobLogs(buildJobId).subscribe({ + error: (err) => { + expect(err.message).toBe( + 'Failed to get build log entries for build job ' + + buildJobId + + '\nHttp failure response for ' + + service.resourceUrl + + '/build-log/' + + buildJobId + + '/entries: 500 Internal Server Error', + ); + errorOccurred = true; + }, + }); + + const req = httpMock.expectOne(`${service.resourceUrl}/build-log/${buildJobId}/entries`); + expect(req.request.method).toBe('GET'); + + req.flush(null, { status: 500, statusText: 'Internal Server Error' }); + + tick(); + + expect(errorOccurred).toBeTrue(); + })); + afterEach(() => { httpMock.verify(); // Verify that there are no outstanding requests. }); From 97bc0fd71dd4fad75a845ed221a8a69207ae1205 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Tue, 10 Dec 2024 18:28:29 +0100 Subject: [PATCH 3/9] wip --- .../service/BuildLogEntryService.java | 17 +++++++++++++---- .../web/localci/BuildLogResource.java | 4 ++-- .../app/entities/programming/build-log.model.ts | 5 +++++ .../build-queue/build-queue.component.html | 9 +++++++-- .../build-queue/build-queue.component.ts | 15 +++++++++------ .../app/shared/pipes/artemis-date.pipe.ts | 17 +++++++++++------ .../icl/LocalCIResourceIntegrationTest.java | 6 +++--- .../build-queue/build-queue.component.spec.ts | 8 ++++++-- 8 files changed, 56 insertions(+), 25 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index 779e12958a98..48a82fd74778 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -494,9 +494,9 @@ public boolean buildJobHasLogFile(String buildJobId, ProgrammingExercise program return Files.exists(logPath); } - public List parseBuildLogEntries(FileSystemResource buildLog) { + public List parseBuildLogEntries(FileSystemResource buildLog) { try { - List buildLogEntries = new ArrayList<>(); + List buildLogEntries = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new InputStreamReader(buildLog.getInputStream()))) { String line; while ((line = reader.readLine()) != null) { @@ -504,12 +504,21 @@ public List parseBuildLogEntries(FileSystemResource buildLog) { if (parts.length == 2) { try { ZonedDateTime time = ZonedDateTime.parse(parts[0]); - buildLogEntries.add(new BuildLogEntry(time, parts[1])); + buildLogEntries.add(new BuildLogDTO(time, parts[1])); } catch (DateTimeParseException e) { - log.warn("Failed to parse build log entry time: {}", parts[0]); + // If the time cannot be parsed, append the line to the last entry + if (!buildLogEntries.isEmpty()) { + BuildLogDTO lastEntry = buildLogEntries.getLast(); + buildLogEntries.set(buildLogEntries.size() - 1, new BuildLogDTO(lastEntry.time(), lastEntry.log() + "\n\t" + line)); + } } } + else { + // If the line does not contain a tab, add it to in a new entry + BuildLogDTO lastEntry = buildLogEntries.getLast(); + buildLogEntries.add(new BuildLogDTO(lastEntry.time(), line)); + } } } return buildLogEntries; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java index 8e8d3e43cc2e..7a2ecf902ef3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.buildagent.dto.BuildLogDTO; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) @@ -58,7 +58,7 @@ public ResponseEntity getBuildLogForBuildJob(@PathVariable String buil @GetMapping("build-log/{buildJobId}/entries") @EnforceAtLeastEditor - public ResponseEntity> getBuildLogEntriesForBuildJob(@PathVariable String buildJobId) { + public ResponseEntity> getBuildLogEntriesForBuildJob(@PathVariable String buildJobId) { FileSystemResource buildLog = buildLogEntryService.retrieveBuildLogsFromFileForBuildJob(buildJobId); if (buildLog == null) { return ResponseEntity.notFound().build(); diff --git a/src/main/webapp/app/entities/programming/build-log.model.ts b/src/main/webapp/app/entities/programming/build-log.model.ts index fd4135a005cd..18e951c737a6 100644 --- a/src/main/webapp/app/entities/programming/build-log.model.ts +++ b/src/main/webapp/app/entities/programming/build-log.model.ts @@ -8,6 +8,11 @@ export enum BuildLogType { OTHER = 'OTHER', } +export type BuildLogLines = { + time: any; + logLines: string[]; +}; + export type BuildLogEntry = { time: any; log: string; diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.html b/src/main/webapp/app/localci/build-queue/build-queue.component.html index 7d7145737dc3..7ce5af03fe2e 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.html +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.html @@ -893,8 +893,13 @@
@for (logEntry of rawBuildLogs; track logEntry) { - {{ logEntry.time | artemisDate: 'short' : true }} - {{ logEntry.log }} + {{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} + + @for (line of logEntry.log; track line) { + {{ line }} +
+ } + } diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.ts b/src/main/webapp/app/localci/build-queue/build-queue.component.ts index c610c7e42013..df3a0e55b41d 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.ts @@ -19,7 +19,7 @@ import { NgbModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; import { LocalStorageService } from 'ngx-webstorage'; import { Observable, OperatorFunction, Subject, Subscription, merge } from 'rxjs'; import { UI_RELOAD_TIME } from 'app/shared/constants/exercise-exam-constants'; -import { BuildLogEntry } from 'app/entities/programming/build-log.model'; +import { BuildLogEntry, BuildLogLines } from 'app/entities/programming/build-log.model'; export class FinishedBuildJobFilter { status?: string = undefined; @@ -160,7 +160,7 @@ export class BuildQueueComponent implements OnInit, OnDestroy { searchSubscription: Subscription; searchTerm?: string = undefined; - rawBuildLogs: BuildLogEntry[] = []; + rawBuildLogs: BuildLogLines[] = []; displayedBuildJobId?: string; constructor( @@ -395,11 +395,14 @@ export class BuildQueueComponent implements OnInit, OnDestroy { */ viewBuildLogs(modal: any, buildJobId: string | undefined): void { if (buildJobId) { - this.openModal(modal, 'xl'); + this.openModal(modal, true); this.displayedBuildJobId = buildJobId; this.buildQueueService.getBuildJobLogs(buildJobId).subscribe({ next: (buildLogs: BuildLogEntry[]) => { - this.rawBuildLogs = buildLogs; + this.rawBuildLogs = buildLogs.map((entry) => { + const logLines = entry.log ? entry.log.split('\n') : []; + return { time: entry.time, logLines: logLines }; + }); }, error: (res: HttpErrorResponse) => { onError(this.alertService, res); @@ -466,8 +469,8 @@ export class BuildQueueComponent implements OnInit, OnDestroy { /** * Opens the modal. */ - openModal(modal: any, size?: 'sm' | 'lg' | 'xl', scrollable = true, keyboard = true) { - this.modalService.open(modal, { size, keyboard, scrollable }); + openModal(modal: any, fullscreen?: boolean, size?: 'sm' | 'lg' | 'xl', scrollable = true, keyboard = true) { + this.modalService.open(modal, { size, keyboard, scrollable, fullscreen }); } /** diff --git a/src/main/webapp/app/shared/pipes/artemis-date.pipe.ts b/src/main/webapp/app/shared/pipes/artemis-date.pipe.ts index 36d88d6474f7..cd3749e9ede0 100644 --- a/src/main/webapp/app/shared/pipes/artemis-date.pipe.ts +++ b/src/main/webapp/app/shared/pipes/artemis-date.pipe.ts @@ -36,6 +36,7 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { private showTime = true; private showSeconds = false; private showWeekday = false; + private showMilliSeconds = false; private static mobileDeviceSize = 768; constructor(private translateService: TranslateService) {} @@ -47,8 +48,9 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { * @param seconds Should seconds be displayed? Defaults to false. * @param timeZone Explicit time zone that should be used instead of the local time zone. * @param weekday Should the weekday be displayed? Defaults to false. + * @param milliSeconds Should milliseconds be displayed? Defaults to false. */ - transform(dateTime: DateType, format: DateFormat = 'long', seconds = false, timeZone: string | undefined = undefined, weekday = false): string { + transform(dateTime: DateType, format: DateFormat = 'long', seconds = false, timeZone: string | undefined = undefined, weekday = false, milliSeconds = false): string { // Return empty string if given dateTime equals null or is not convertible to dayjs. if (!dateTime || !dayjs(dateTime).isValid()) { return ''; @@ -59,6 +61,7 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { this.showTime = format !== 'short-date' && format !== 'long-date'; this.showSeconds = seconds; this.showWeekday = weekday; + this.showMilliSeconds = milliSeconds; // Evaluate the format length based on the current window width. this.formatLengthBasedOnWindowWidth(window.innerWidth); @@ -88,12 +91,12 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { * @param format Format of the localized date time. Defaults to 'long'. * @param seconds Should seconds be displayed? Defaults to false. */ - static format(locale = 'en', format: DateFormat = 'long', seconds = false): string { + static format(locale = 'en', format: DateFormat = 'long', seconds = false, showMilliSeconds = false): string { const long = format === 'long' || format === 'long-date'; const showDate = format !== 'time'; const showTime = format !== 'short-date' && format !== 'long-date'; const dateFormat = ArtemisDatePipe.dateFormat(long, showDate, locale); - const timeFormat = ArtemisDatePipe.timeFormat(showTime, seconds); + const timeFormat = ArtemisDatePipe.timeFormat(showTime, seconds, showMilliSeconds); return dateFormat + (dateFormat && timeFormat ? ' ' : '') + timeFormat; } @@ -123,7 +126,7 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { private format(): string { const dateFormat = ArtemisDatePipe.dateFormat(this.long, this.showDate, this.locale); - const timeFormat = ArtemisDatePipe.timeFormat(this.showTime, this.showSeconds); + const timeFormat = ArtemisDatePipe.timeFormat(this.showTime, this.showSeconds, this.showMilliSeconds); return dateFormat + (dateFormat && timeFormat ? ' ' : '') + timeFormat; } @@ -144,12 +147,14 @@ export class ArtemisDatePipe implements PipeTransform, OnDestroy { return format; } - private static timeFormat(showTime: boolean, showSeconds: boolean): string { + private static timeFormat(showTime: boolean, showSeconds: boolean, showMilliSeconds: boolean): string { if (!showTime) { return ''; } let format = 'HH:mm'; - if (showSeconds) { + if (showMilliSeconds) { + format = 'HH:mm:ss.SSS'; + } else if (showSeconds) { format = 'HH:mm:ss'; } return format; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java index f5b30fa5ebb7..1001ba7060e5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java @@ -350,7 +350,7 @@ void testGetBuildLogsForResult() throws Exception { void testGetBuildLogsEntriesForResult() throws Exception { try { buildJobRepository.save(finishedJobForLogs); - BuildLogEntry buildLogEntry = new BuildLogEntry(ZonedDateTime.now(), "Dummy log"); + BuildLogDTO buildLogEntry = new BuildLogDTO(ZonedDateTime.now(), "Dummy log"); buildLogEntryService.saveBuildLogsToFile(List.of(buildLogEntry), "6", programmingExercise); var response = request.get("/api/build-log/6/entries", HttpStatus.OK, List.class); @@ -358,8 +358,8 @@ void testGetBuildLogsEntriesForResult() throws Exception { String log = responseMap.get("log").toString(); String time = responseMap.get("time").toString(); assertThat(response).hasSize(1); - assertThat(buildLogEntry.getLog()).isEqualTo(log); - assertThat(buildLogEntry.getTime().toString()).contains(time); + assertThat(buildLogEntry.log()).isEqualTo(log); + assertThat(buildLogEntry.time().toString()).contains(time); } finally { diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts index 7d3d0b1e8f0c..238ceff1d851 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts @@ -19,7 +19,7 @@ import { LocalStorageService } from 'ngx-webstorage'; import { MockLocalStorageService } from '../../../helpers/mocks/service/mock-local-storage.service'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { PieChartModule } from '@swimlane/ngx-charts'; -import { BuildLogEntry } from '../../../../../../main/webapp/app/entities/programming/build-log.model'; +import { BuildLogEntry, BuildLogLines } from '../../../../../../main/webapp/app/entities/programming/build-log.model'; describe('BuildQueueComponent', () => { let component: BuildQueueComponent; @@ -685,10 +685,14 @@ describe('BuildQueueComponent', () => { mockBuildQueueService.getBuildJobLogs = jest.fn().mockReturnValue(of(buildLogEntries)); + const buildLogsMultiLines: BuildLogLines[] = buildLogEntries.map((entry) => { + return { time: entry.time, logLines: entry.log.split('\n') }; + }); + component.viewBuildLogs(undefined, buildJobId); expect(mockBuildQueueService.getBuildJobLogs).toHaveBeenCalledWith(buildJobId); - expect(component.rawBuildLogs).toEqual(buildLogEntries); + expect(component.rawBuildLogs).toEqual(buildLogsMultiLines); component.downloadBuildLogs(); From cf2027e108e8f086f00b94d08e82e815f56e1ed5 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Tue, 10 Dec 2024 18:39:45 +0100 Subject: [PATCH 4/9] wip --- .../webapp/app/localci/build-queue/build-queue.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.html b/src/main/webapp/app/localci/build-queue/build-queue.component.html index 7ce5af03fe2e..4136b6d01b33 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.html +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.html @@ -895,7 +895,7 @@
{{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} - @for (line of logEntry.log; track line) { + @for (line of logEntry.logLines; track line) { {{ line }}
} From 0f70ef7a52f34fcf54121bb3aa1d29b7aa75de2d Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Tue, 10 Dec 2024 19:10:55 +0100 Subject: [PATCH 5/9] style --- .../programming/service/BuildLogEntryService.java | 12 ++++++++++++ .../programming/web/localci/BuildLogResource.java | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index 48a82fd74778..5dc02b259620 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -494,6 +494,18 @@ public boolean buildJobHasLogFile(String buildJobId, ProgrammingExercise program return Files.exists(logPath); } + /** + * Parses the build log entries from a given file and returns them as a list of {@link BuildLogDTO} objects. + * + *

+ * The method reads the file line by line and splits each line into a timestamp and a log message. + * The timestamp is expected to be separated from the log message by a tab character. + * If the timestamp cannot be parsed, the log message is appended to the previous entry. + *

+ * + * @param buildLog The {@link FileSystemResource} representing the build log file. + * @return A list of {@link BuildLogDTO} objects containing the parsed build log entries. + */ public List parseBuildLogEntries(FileSystemResource buildLog) { try { List buildLogEntries = new ArrayList<>(); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java index 7a2ecf902ef3..ca33dd04d34e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java @@ -56,6 +56,12 @@ public ResponseEntity getBuildLogForBuildJob(@PathVariable String buil return new ResponseEntity<>(buildLog, responseHeaders, HttpStatus.OK); } + /** + * GET /build-log/{buildJobId}/entries : get the build log entries for a given result + * + * @param buildJobId the id of the build job for which to retrieve the build log entries + * @return the ResponseEntity with status 200 (OK) and the build log entries in the body, or with status 404 (Not Found) if the build log entries could not be found + */ @GetMapping("build-log/{buildJobId}/entries") @EnforceAtLeastEditor public ResponseEntity> getBuildLogEntriesForBuildJob(@PathVariable String buildJobId) { From 851f144676edd42f4d3684d68e10e0f9ce811ee3 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Wed, 11 Dec 2024 13:57:36 +0100 Subject: [PATCH 6/9] fix test --- .../programming/icl/LocalCIResourceIntegrationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java index 1001ba7060e5..5550050b4b32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalCIResourceIntegrationTest.java @@ -356,10 +356,10 @@ void testGetBuildLogsEntriesForResult() throws Exception { LinkedHashMap responseMap = ((LinkedHashMap) response.getFirst()); String log = responseMap.get("log").toString(); - String time = responseMap.get("time").toString(); + ZonedDateTime time = ZonedDateTime.parse(responseMap.get("time").toString()); assertThat(response).hasSize(1); assertThat(buildLogEntry.log()).isEqualTo(log); - assertThat(buildLogEntry.time().toString()).contains(time); + assertThat(buildLogEntry.time()).isEqualTo(time); } finally { From 679b4a6c8ad1d06ebf1419acbdc5b26e3f2b701a Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Fri, 20 Dec 2024 01:08:44 +0100 Subject: [PATCH 7/9] feedback --- .../service/BuildLogEntryService.java | 6 ++++-- .../build-queue/build-queue.component.html | 20 +++++++++++++------ .../build-queue/build-queue.component.ts | 2 +- .../build-queue/build-queue.service.ts | 4 ++-- .../webapp/app/shared/util/global.utils.ts | 5 +++-- src/main/webapp/i18n/de/buildQueue.json | 4 +++- src/main/webapp/i18n/en/buildQueue.json | 4 +++- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index 5dc02b259620..c6ce45a9d8c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -512,8 +512,10 @@ public List parseBuildLogEntries(FileSystemResource buildLog) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(buildLog.getInputStream()))) { String line; while ((line = reader.readLine()) != null) { - String[] parts = line.split("\t", 2); - if (parts.length == 2) { + // split into timestamp and log message + int logMessageParts = 2; + String[] parts = line.split("\t", logMessageParts); + if (parts.length == logMessageParts) { try { ZonedDateTime time = ZonedDateTime.parse(parts[0]); buildLogEntries.add(new BuildLogDTO(time, parts[1])); diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.html b/src/main/webapp/app/localci/build-queue/build-queue.component.html index 4136b6d01b33..7b34416b8163 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.html +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.html @@ -891,16 +891,24 @@
- @for (logEntry of rawBuildLogs; track logEntry) { + @if (rawBuildLogs.length === 0) { - + } @else { + @for (logEntry of rawBuildLogs; track logEntry) { + + + + + } }
{{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} - @for (line of logEntry.logLines; track line) { - {{ line }} -
- } +
{{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} + @for (line of logEntry.logLines; track line) { + {{ line }} +
+ } +
diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.ts b/src/main/webapp/app/localci/build-queue/build-queue.component.ts index df3a0e55b41d..45b337ba1bd1 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.ts @@ -405,7 +405,7 @@ export class BuildQueueComponent implements OnInit, OnDestroy { }); }, error: (res: HttpErrorResponse) => { - onError(this.alertService, res); + onError(this.alertService, res, false); }, }); } diff --git a/src/main/webapp/app/localci/build-queue/build-queue.service.ts b/src/main/webapp/app/localci/build-queue/build-queue.service.ts index 9f1a2c820191..a004acb9eaa8 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.service.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.service.ts @@ -196,8 +196,8 @@ export class BuildQueueService { */ getBuildJobLogs(buildJobId: string): Observable { return this.http.get(`${this.resourceUrl}/build-log/${buildJobId}/entries`).pipe( - catchError((err) => { - return throwError(() => new Error(`Failed to get build log entries for build job ${buildJobId}\n${err.message}`)); + catchError(() => { + return throwError(() => new Error('artemisApp.buildQueue.logs.errorFetchingLogs')); }), ); } diff --git a/src/main/webapp/app/shared/util/global.utils.ts b/src/main/webapp/app/shared/util/global.utils.ts index 78948d8c3340..3261878a8ef4 100644 --- a/src/main/webapp/app/shared/util/global.utils.ts +++ b/src/main/webapp/app/shared/util/global.utils.ts @@ -77,8 +77,9 @@ export const matchRegexWithLineNumbers = (multiLineText: string, regex: RegExp): * Use alert service to show the error message from the error response * @param alertService the service used to show the exception messages to the user * @param error the error response that's status is used to determine the error message + * @param disableTranslation whether the error message should be translated */ -export const onError = (alertService: AlertService, error: HttpErrorResponse) => { +export const onError = (alertService: AlertService, error: HttpErrorResponse, disableTranslation: boolean = true) => { switch (error.status) { case 400: alertService.error('error.http.400'); @@ -100,7 +101,7 @@ export const onError = (alertService: AlertService, error: HttpErrorResponse) => alertService.addAlert({ type: AlertType.DANGER, message: error.message, - disableTranslation: true, + disableTranslation: disableTranslation, }); break; } diff --git a/src/main/webapp/i18n/de/buildQueue.json b/src/main/webapp/i18n/de/buildQueue.json index 641774184538..7d56dc944003 100644 --- a/src/main/webapp/i18n/de/buildQueue.json +++ b/src/main/webapp/i18n/de/buildQueue.json @@ -77,7 +77,9 @@ }, "logs": { "title": "Build Logs für Job", - "download": "Herunterladen" + "download": "Herunterladen", + "noLogs": "Keine Logs verfügbar", + "errorFetchingLogs": "Fehler beim Abrufen von Build-Log-Einträgen für Build-Job" } } } diff --git a/src/main/webapp/i18n/en/buildQueue.json b/src/main/webapp/i18n/en/buildQueue.json index fe174aea25c2..63a258d407d1 100644 --- a/src/main/webapp/i18n/en/buildQueue.json +++ b/src/main/webapp/i18n/en/buildQueue.json @@ -77,7 +77,9 @@ }, "logs": { "title": "Build Logs for Job", - "download": "Download" + "download": "Download", + "noLogs": "No logs available", + "errorFetchingLogs": "Failed to get build log entries for build job" } } } From e6d67d7c82abf49cb5f96c9f0ffe33ace06b4df3 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Fri, 20 Dec 2024 10:22:59 +0100 Subject: [PATCH 8/9] fix client tests --- .../localci/build-queue/build-queue.service.spec.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts index 8c64559f674f..645513e506bc 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts @@ -622,15 +622,7 @@ describe('BuildQueueService', () => { service.getBuildJobLogs(buildJobId).subscribe({ error: (err) => { - expect(err.message).toBe( - 'Failed to get build log entries for build job ' + - buildJobId + - '\nHttp failure response for ' + - service.resourceUrl + - '/build-log/' + - buildJobId + - '/entries: 500 Internal Server Error', - ); + expect(err.message).toBe('artemisApp.buildQueue.logs.errorFetchingLogs'); errorOccurred = true; }, }); From aca0745e7b6926c861cdb1b8930b41576e961ca0 Mon Sep 17 00:00:00 2001 From: Mohamed Bilel Besrour Date: Fri, 27 Dec 2024 17:29:49 +0100 Subject: [PATCH 9/9] feedback --- .../build-queue/build-queue.component.html | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.html b/src/main/webapp/app/localci/build-queue/build-queue.component.html index 7b34416b8163..bc447c21135d 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.html +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.html @@ -891,24 +891,22 @@
- @if (rawBuildLogs.length === 0) { + @for (logEntry of rawBuildLogs; track logEntry) { + + + + + } @empty { - } @else { - @for (logEntry of rawBuildLogs; track logEntry) { - - - - - } }
{{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} + @for (line of logEntry.logLines; track line) { + {{ line }} +
+ } +
{{ logEntry.time | artemisDate: 'long' : true : undefined : false : true }} - @for (line of logEntry.logLines; track line) { - {{ line }} -
- } -