From 26feb22ab55f9a21a1c7b4bf7b8571d4f6bda967 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sat, 18 Oct 2025 21:23:54 -0700 Subject: [PATCH 01/35] base test batch entity complete --- endpoint-insights-api/pom.xml | 6 ++++ .../endpointinsightsapi/model/TestBatch.java | 28 +++++++++++++++++++ endpoint-insights-ui/package-lock.json | 4 +-- package-lock.json | 6 ++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java create mode 100644 package-lock.json diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index 7d647ae..8f595ab 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -52,6 +52,12 @@ 1.18.42 provided + + org.springframework.boot + spring-boot-starter-data-jpa + 4.0.0-M3 + compile + diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java new file mode 100644 index 0000000..bf3b336 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -0,0 +1,28 @@ +package com.vsp.endpointinsightsapi.model; + + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@Entity +@AllArgsConstructor +@NoArgsConstructor +public class TestBatch { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + //TODO: Create OneToMany with jobs entity once made + + String batchName; + Long scheduleId; + LocalDateTime startTime; + LocalDateTime lastTimeRun; + +} diff --git a/endpoint-insights-ui/package-lock.json b/endpoint-insights-ui/package-lock.json index cd224d5..c6ada09 100644 --- a/endpoint-insights-ui/package-lock.json +++ b/endpoint-insights-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "endpoint-insights-ui", - "version": "0.0.0", + "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "endpoint-insights-ui", - "version": "0.0.0", + "version": "0.0.1", "dependencies": { "@angular/common": "^20.3.0", "@angular/compiler": "^20.3.0", diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..f5988db --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "EndpointInsights", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From 86417e02d79f8d34ddd9c9e6d9604269229c932f Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 12:26:22 -0700 Subject: [PATCH 02/35] creation of temp sql folder to show work done on DB in commmits --- endpoint-insights-sql/user.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 endpoint-insights-sql/user.sql diff --git a/endpoint-insights-sql/user.sql b/endpoint-insights-sql/user.sql new file mode 100644 index 0000000..73dd3b3 --- /dev/null +++ b/endpoint-insights-sql/user.sql @@ -0,0 +1,9 @@ +CREATE TABLE users ( + id SERIAL PRIMARY KEY, + name VARCHAR(100) NOT NULL, + email VARCHAR(255) NOT NULL UNIQUE, + role VARCHAR(100) NOT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP + +); \ No newline at end of file From f30a49937f6d0cf4f9468aa75c1893df910ba4c5 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 12:56:15 -0700 Subject: [PATCH 03/35] added column names for table creation --- .../com/vsp/endpointinsightsapi/model/TestBatch.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index bf3b336..0a8c1b1 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -12,17 +12,27 @@ @Entity @AllArgsConstructor @NoArgsConstructor +@Table(name = "test_batch") public class TestBatch { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - //TODO: Create OneToMany with jobs entity once made + //TODO: Create ManyToMany with jobs entity once made + @Column(name = "batch_name", nullable = false) String batchName; + + @Column(name = "schedule_id") Long scheduleId; + + @Column(name = "start_time") LocalDateTime startTime; + + @Column(name = "last_time_run") LocalDateTime lastTimeRun; + @Column(name = "active") + Boolean active; } From e5c29e3a0bc9a04de19cb33c4d1a1e2b9cc56ae2 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 19:31:47 -0700 Subject: [PATCH 04/35] added temporal to dates --- .../main/java/com/vsp/endpointinsightsapi/model/TestBatch.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index 0a8c1b1..eefa52e 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -28,8 +28,10 @@ public class TestBatch { Long scheduleId; @Column(name = "start_time") + @Temporal(TemporalType.DATE) LocalDateTime startTime; + @Temporal(TemporalType.DATE) @Column(name = "last_time_run") LocalDateTime lastTimeRun; From 77b4e0ecb503eba9be7eb438388d7c436081db1c Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 19:46:59 -0700 Subject: [PATCH 05/35] adjustments to pom.xml --- endpoint-insights-api/pom.xml | 1 - .../EndpointInsightsApiApplicationTests.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index 57e32e3..c8a21dc 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -62,7 +62,6 @@ org.springframework.boot spring-boot-starter-data-jpa - 4.0.0-M3 compile diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java index 9ef2831..c61a59d 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java @@ -3,11 +3,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest +//@SpringBootTest class EndpointInsightsApiApplicationTests { @Test void contextLoads() { } - } From 4ec22542554c918507d7cd914192f9c30de59aef Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 21:37:07 -0700 Subject: [PATCH 06/35] edit DB configs --- endpoint-insights-api/pom.xml | 69 ++----------------- .../endpointinsightsapi/model/TestBatch.java | 5 +- .../src/main/resources/application.properties | 3 - .../src/main/resources/application.yaml | 18 +++++ .../EndpointInsightsApiApplicationTests.java | 2 +- 5 files changed, 26 insertions(+), 71 deletions(-) delete mode 100644 endpoint-insights-api/src/main/resources/application.properties create mode 100644 endpoint-insights-api/src/main/resources/application.yaml diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index 6527306..a3445e7 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent 4.0.0-M3 - + com.vsp endpoint-insights-api @@ -28,7 +28,6 @@ 25 - 5.14.2 @@ -36,17 +35,6 @@ spring-boot-starter-webmvc - - ch.qos.logback - logback-core - 1.5.19 - - - ch.qos.logback - logback-classic - 1.5.19 - - org.springframework spring-web @@ -63,12 +51,10 @@ test - - - org.junit.jupiter - junit-jupiter - test + org.postgresql + postgresql + runtime @@ -85,58 +71,12 @@ - - - unit-tests - - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - @{argLine} - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - -Xshare:off - - - - - - - - org.springframework.boot spring-boot-maven-plugin - - - org.jacoco - jacoco-maven-plugin - 0.8.14 - - - default-prepare-agent - - prepare-agent - - - - generate-code-coverage-report - test - - report - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -150,7 +90,6 @@ - diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index eefa52e..6ce3eac 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDate; import java.time.LocalDateTime; @Data @@ -29,11 +30,11 @@ public class TestBatch { @Column(name = "start_time") @Temporal(TemporalType.DATE) - LocalDateTime startTime; + LocalDate startTime; @Temporal(TemporalType.DATE) @Column(name = "last_time_run") - LocalDateTime lastTimeRun; + LocalDate lastTimeRun; @Column(name = "active") Boolean active; diff --git a/endpoint-insights-api/src/main/resources/application.properties b/endpoint-insights-api/src/main/resources/application.properties deleted file mode 100644 index f764801..0000000 --- a/endpoint-insights-api/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring: - application: - name: endpoint-insights-api diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml new file mode 100644 index 0000000..c4a61ea --- /dev/null +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -0,0 +1,18 @@ +spring: + application: + name: endpoint-insights-api + datasource: + url: jdbc:${DB_URI} + username: ${DB_NAME} + password: ${DB_PASSWORD} + + + jpa: + database-platform: + org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true \ No newline at end of file diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java index c61a59d..ee96cc2 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -//@SpringBootTest +@SpringBootTest class EndpointInsightsApiApplicationTests { @Test From d6b8006db0af600e25ec08bfc656ae55b39310b4 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 21:47:44 -0700 Subject: [PATCH 07/35] fixed error with build plugin --- endpoint-insights-api/pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index a3445e7..c0eb82f 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -77,6 +77,27 @@ org.springframework.boot spring-boot-maven-plugin + + + org.jacoco + jacoco-maven-plugin + 0.8.14 + + + default-prepare-agent + + prepare-agent + + + + generate-code-coverage-report + test + + report + + + + org.apache.maven.plugins maven-compiler-plugin From 08532f13ae085e4a78fe695ab4036348d12dec3e Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 22:01:56 -0700 Subject: [PATCH 08/35] Build POM fix --- endpoint-insights-api/pom.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index c0eb82f..b41c770 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -35,6 +35,22 @@ spring-boot-starter-webmvc + + org.springframework.boot + spring-boot-starter-webmvc + + + + ch.qos.logback + logback-core + 1.5.19 + + + ch.qos.logback + logback-classic + 1.5.19 + + org.springframework spring-web @@ -69,6 +85,13 @@ compile + + org.junit.jupiter + junit-jupiter + test + + + From 89109feb0e6fe30ed72b63e22d3c453319d4d68a Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 22:12:14 -0700 Subject: [PATCH 09/35] Build corrections again --- endpoint-insights-api/pom.xml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index b41c770..a838aed 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -28,6 +28,7 @@ 25 + 5.14.2 @@ -79,6 +80,7 @@ 1.18.42 provided + org.springframework.boot spring-boot-starter-data-jpa @@ -91,9 +93,36 @@ test - + + + + + unit-tests + + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + @{argLine} + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + -Xshare:off + + + + + + + + + + From 1f9610db4e4badef0059facecb533711001e3e77 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 22:19:43 -0700 Subject: [PATCH 10/35] adjust yaml --- .../src/main/resources/application.yaml | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml index 20f201f..f856915 100644 --- a/endpoint-insights-api/src/main/resources/application.yaml +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -6,6 +6,17 @@ spring: username: ${DB_NAME} password: ${DB_PASSWORD} + jpa: + database-platform: + org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true + + --- spring: config: @@ -18,12 +29,3 @@ spring: - org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration - org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration - jpa: - database-platform: - org.hibernate.dialect.PostgreSQLDialect - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true \ No newline at end of file From 472ea4d5553d4c11580913f4bb707bc586c51887 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 22:26:33 -0700 Subject: [PATCH 11/35] pom fix again --- endpoint-insights-api/pom.xml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index a838aed..841cefc 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -35,12 +35,6 @@ org.springframework.boot spring-boot-starter-webmvc - - - org.springframework.boot - spring-boot-starter-webmvc - - ch.qos.logback logback-core @@ -67,7 +61,11 @@ spring-boot-starter-test test - + + org.junit.jupiter + junit-jupiter + test + org.postgresql postgresql @@ -87,12 +85,6 @@ compile - - org.junit.jupiter - junit-jupiter - test - - From 8f240efa1be877bbeba3883d9f3354244757736d Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 19 Oct 2025 22:27:55 -0700 Subject: [PATCH 12/35] change temporal --- .../java/com/vsp/endpointinsightsapi/model/TestBatch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index 6ce3eac..42321a3 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -29,10 +29,10 @@ public class TestBatch { Long scheduleId; @Column(name = "start_time") - @Temporal(TemporalType.DATE) + @Temporal(TemporalType.TIMESTAMP) LocalDate startTime; - @Temporal(TemporalType.DATE) + @Temporal(TemporalType.TIMESTAMP) @Column(name = "last_time_run") LocalDate lastTimeRun; From c1bed6d8129cef7b5cfa3620c0c07d85090e6604 Mon Sep 17 00:00:00 2001 From: Jino Enriquez <47510297+OhJino@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:40:15 -0700 Subject: [PATCH 13/35] Feature/ei 35 (#26) * EI-161 - Defined the Job table schema * EI-161 | removing is_active * EI-161 | Removed extra comma - syntax error * Fixed INTEGRATION typo --------- Co-authored-by: 2omb Finance <2ombfinance@protonmail.com> --- endpoint-insights-sql/job.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 endpoint-insights-sql/job.sql diff --git a/endpoint-insights-sql/job.sql b/endpoint-insights-sql/job.sql new file mode 100644 index 0000000..b368fd9 --- /dev/null +++ b/endpoint-insights-sql/job.sql @@ -0,0 +1,15 @@ +CREATE TABLE job ( + job_id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + name VARCHAR(255) NOT NULL, + description TEXT, + test_type VARCHAR(10) NOT NULL CHECK (test_type IN ('PERF', 'INTEGRATION', 'E2E')), + target_id VARCHAR(1024) NOT NULL, + created_by VARCHAR(255) NOT NULL, + FOREIGN KEY (created_by) REFERENCES users(id), + status VARCHAR(50) DEFAULT 'PENDING' CHECK (status IN ('PENDING', 'RUNNING', 'COMPLETED', 'FAILED')), + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + started_at TIMESTAMP WITH TIME ZONE, + updated_at TIMESTAMP WITH TIME ZONE, + completed_at TIMESTAMP WITH TIME ZONE, + config JSONB +); \ No newline at end of file From 71ea4508af8203ea5df28fa8ffbebd10052e160b Mon Sep 17 00:00:00 2001 From: Marcos Pantoja <105100104+Mxrcos13@users.noreply.github.com> Date: Sun, 19 Oct 2025 22:43:50 -0700 Subject: [PATCH 14/35] EI-209 Schedule Table Complete (#18) * Chore: add Marcos to readme * chore: Add Marcos to readme * Revert "Chore: add Marcos to readme" This reverts commit f9c78c992b89e5621f0b75f89986007255f4c81c. * EI-209 Created schedule table on database with attributes based on ERD. * fixed minor ijmport errors and added JPA dependencies to pom.xml file * Revert "fixed minor ijmport errors and added JPA dependencies to pom.xml file" This reverts commit 10425d2c308f937aef45d84e9a000457aff1fbb8. * fixed minor import errors and added JPA dependencies to pom.xml file * chore: add spring test profile disabling auto config for databases * created as commented placeholders for classes that were not implemented yet. * Added sql schedule table script, added lombook @Getter and @Setter support, added JPA @temporal notation. --------- Signed-off-by: Marcos Pantoja <105100104+Mxrcos13@users.noreply.github.com> Co-authored-by: Caleb Brock --- endpoint-insights-api/pom.xml | 12 +++++ .../schedule/JobSchedule.java | 53 +++++++++++++++++++ .../schedule/JobScheduleRepository.java | 10 ++++ .../src/main/resources/scheduletable.sql | 10 ++++ 4 files changed, 85 insertions(+) create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java create mode 100644 endpoint-insights-api/src/main/resources/scheduletable.sql diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index 841cefc..ec4c2bd 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -78,6 +78,18 @@ 1.18.42 provided + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + + jakarta.persistence + jakarta.persistence-api + 3.1.0 + org.springframework.boot diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java new file mode 100644 index 0000000..b394556 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java @@ -0,0 +1,53 @@ +package com.vsp.endpointinsightsapi.schedule; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import java.util.Date; + +@Getter +@Setter +@Entity +@Table(name = "job_schedule") +public class JobSchedule { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long scheduleId; + +// @ManyToOne(fetch = FetchType.LAZY) +// @JoinColumn(name = "job_id", nullable = false) +// private Job job; + + @Column(name = "cron_expr", nullable = false, length = 50) + private String cronExpr; + + @Column(name = "timezone", nullable = false, length = 50) + private String timezone = "PDT"; + + @Column(name = "next_run_at") + @Temporal(TemporalType.TIMESTAMP) + private Date nextRunAt; + + @Column(name = "is_enabled", nullable = false) + private Boolean isEnabled = true; + + @Column(name = "created_at", nullable = false, updatable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date createdAt; + + @Column(name = "updated_at") + @Temporal(TemporalType.TIMESTAMP) + private Date updatedAt; + + @PrePersist + protected void onCreate() { + createdAt = new Date(); + updatedAt = new Date(); + } + + @PreUpdate + protected void onUpdate() { + updatedAt = new Date(); + } +} \ No newline at end of file diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java new file mode 100644 index 0000000..7a9c99c --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java @@ -0,0 +1,10 @@ +package com.vsp.endpointinsightsapi.schedule; + +import com.vsp.endpointinsightsapi.schedule.JobSchedule; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface JobScheduleRepository extends JpaRepository { + +} \ No newline at end of file diff --git a/endpoint-insights-api/src/main/resources/scheduletable.sql b/endpoint-insights-api/src/main/resources/scheduletable.sql new file mode 100644 index 0000000..2d75543 --- /dev/null +++ b/endpoint-insights-api/src/main/resources/scheduletable.sql @@ -0,0 +1,10 @@ +CREATE TABLE job_schedule ( + schedule_id SERIAL PRIMARY KEY, + job_id BIGINT NOT NULL REFERENCES job(job_id) ON DELETE CASCADE, + cron_expr VARCHAR(50) NOT NULL, + timezone VARCHAR(50) NOT NULL DEFAULT 'PDT', + next_run_at TIMESTAMP, + is_enabled BOOLEAN NOT NULL DEFAULT TRUE, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); From 76ee8903a126d3fed2da45b30cee8c361a86bc01 Mon Sep 17 00:00:00 2001 From: Nicholas Cooper Date: Fri, 24 Oct 2025 22:36:30 -0700 Subject: [PATCH 15/35] EI-113: create batch card component (#22) --- endpoint-insights-ui/package-lock.json | 213 +++++++++--- endpoint-insights-ui/package.json | 3 + endpoint-insights-ui/src/app/app.config.ts | 15 +- endpoint-insights-ui/src/app/app.html | 11 +- endpoint-insights-ui/src/app/app.routes.ts | 8 +- endpoint-insights-ui/src/app/app.spec.ts | 37 +- endpoint-insights-ui/src/app/app.ts | 18 +- .../app/batch-component/batch-component.html | 9 + .../app/batch-component/batch-component.scss | 13 + .../app/batch-component/batch-component.ts | 26 ++ .../batch-card/batch-card.component.html | 16 + .../batch-card/batch-card.component.scss | 54 +++ .../batch-card/batch-card.component.ts | 24 ++ .../test-results-card.component.html | 182 ++++++++++ .../test-results-card.component.scss | 325 ++++++++++++++++++ .../test-results-card.component.spec.ts | 173 ++++++++++ .../test-results-card.component.ts | 82 +++++ .../dashboard-component.html | 7 +- .../dashboard-component.ts | 43 ++- .../src/app/models/batch.model.ts | 5 + .../src/app/models/test-record.model.ts | 82 +++++ .../src/app/services/test-record.service.ts | 33 ++ endpoint-insights-ui/src/index.html | 4 +- endpoint-insights-ui/src/main.ts | 7 +- endpoint-insights-ui/src/styles.scss | 80 ++++- 25 files changed, 1359 insertions(+), 111 deletions(-) create mode 100644 endpoint-insights-ui/src/app/batch-component/batch-component.html create mode 100644 endpoint-insights-ui/src/app/batch-component/batch-component.scss create mode 100644 endpoint-insights-ui/src/app/batch-component/batch-component.ts create mode 100644 endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html create mode 100644 endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss create mode 100644 endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts create mode 100644 endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html create mode 100644 endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.scss create mode 100644 endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.spec.ts create mode 100644 endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.ts create mode 100644 endpoint-insights-ui/src/app/models/batch.model.ts create mode 100644 endpoint-insights-ui/src/app/models/test-record.model.ts create mode 100644 endpoint-insights-ui/src/app/services/test-record.service.ts diff --git a/endpoint-insights-ui/package-lock.json b/endpoint-insights-ui/package-lock.json index 696b08f..c8536cc 100644 --- a/endpoint-insights-ui/package-lock.json +++ b/endpoint-insights-ui/package-lock.json @@ -8,10 +8,13 @@ "name": "endpoint-insights-ui", "version": "0.0.1", "dependencies": { + "@angular/animations": "^20.3.7", + "@angular/cdk": "^20.2.9", "@angular/common": "^20.3.0", "@angular/compiler": "^20.3.0", "@angular/core": "^20.3.0", "@angular/forms": "^20.3.0", + "@angular/material": "^20.2.9", "@angular/platform-browser": "^20.3.0", "@angular/router": "^20.3.0", "@ng-bootstrap/ng-bootstrap": "^19.0.1", @@ -220,6 +223,7 @@ }, "node_modules/@ampproject/remapping": { "version": "2.3.0", + "dev": true, "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -435,6 +439,21 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular/animations": { + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.7.tgz", + "integrity": "sha512-i655RaL0zmLE3OESUlDnRNBDRIMW/67nTQvMqP6V1cQ42l2+SMJtREsxmX6cWt55/qvvgeytAA6aBN4aerBl5A==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + }, + "peerDependencies": { + "@angular/core": "20.3.7" + } + }, "node_modules/@angular/build": { "version": "20.3.6", "dev": true, @@ -532,6 +551,21 @@ } } }, + "node_modules/@angular/cdk": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-20.2.9.tgz", + "integrity": "sha512-rbY1AMz9389WJI29iAjWp4o0QKRQHCrQQUuP0ctNQzh1tgWpwiRLx8N4yabdVdsCA846vPsyKJtBlSNwKMsjJA==", + "license": "MIT", + "dependencies": { + "parse5": "^8.0.0", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": "^20.0.0 || ^21.0.0", + "@angular/core": "^20.0.0 || ^21.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, "node_modules/@angular/cli": { "version": "20.3.6", "dev": true, @@ -566,9 +600,10 @@ } }, "node_modules/@angular/common": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.7.tgz", + "integrity": "sha512-uf8dXYTJbedk/wudkt2MfbtvN/T97aEZBtOTq8/IFQQZ3722rag6D+Cg76e5hBccROOn+ueGJX2gpxz02phTwA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -576,12 +611,14 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/core": "20.3.6", + "@angular/core": "20.3.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-20.3.7.tgz", + "integrity": "sha512-EouHO15dUsgnFArj0M25R8cOPVoUfiFYSt6iXnMO8+S4dY1fDEmbFqkW5smlP66HL5Gys59Nwb5inejfIWHrLw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -591,9 +628,11 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.7.tgz", + "integrity": "sha512-viZwWlwc1BAqryRJE0Wq2WgAxDaW9fuwtYHYrOWnIn9sy9KemKmR6RmU9VRydrwUROOlqK49R9+RC1wQ6sYwqA==", + "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.28.3", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -612,7 +651,7 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.6", + "@angular/compiler": "20.3.7", "typescript": ">=5.8 <6.0" }, "peerDependenciesMeta": { @@ -622,9 +661,10 @@ } }, "node_modules/@angular/core": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.7.tgz", + "integrity": "sha512-2UuYzC2A5SUtu33tYTN411Wk0WilA+2Uld/GP3O6mragw1O7v/M8pMFmbe9TR5Ah/abRJIocWGlNqeztZmQmrw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -632,7 +672,7 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.6", + "@angular/compiler": "20.3.7", "rxjs": "^6.5.3 || ^7.4.0", "zone.js": "~0.15.0" }, @@ -646,9 +686,10 @@ } }, "node_modules/@angular/forms": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.7.tgz", + "integrity": "sha512-uOCGCoqXeAWIlQMWiIeed/W8g8h2tk91YemMI+Ce1VQ/36Xfft40Bouz4eKcvJV6kLXGygdpWjzFGz32CE+3Og==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -656,16 +697,18 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.6", - "@angular/core": "20.3.6", - "@angular/platform-browser": "20.3.6", + "@angular/common": "20.3.7", + "@angular/core": "20.3.7", + "@angular/platform-browser": "20.3.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/localize": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.7.tgz", + "integrity": "sha512-FYuuwU9ujiVT+0xjMIutaUT2PErV4AvxeAPWMlYRA1/yQxqn1VyNUd6kHPjAV+yrZg9Q0MDco2/c0Lh8rmAhSA==", + "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.28.3", "@types/babel__core": "7.20.5", @@ -681,14 +724,32 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/compiler": "20.3.6", - "@angular/compiler-cli": "20.3.6" + "@angular/compiler": "20.3.7", + "@angular/compiler-cli": "20.3.7" + } + }, + "node_modules/@angular/material": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-20.2.9.tgz", + "integrity": "sha512-xo/ozyRXCoJMi89XLTJI6fdPKBv2wBngWMiCrtTg23+pHbuyA/kDbk3v62eJkDD1xdhC4auXaIHu4Ddf5zTgSA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/cdk": "20.2.9", + "@angular/common": "^20.0.0 || ^21.0.0", + "@angular/core": "^20.0.0 || ^21.0.0", + "@angular/forms": "^20.0.0 || ^21.0.0", + "@angular/platform-browser": "^20.0.0 || ^21.0.0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.7.tgz", + "integrity": "sha512-AbLtyR7fVEGDYyrz95dP2pc69J5XIjLLsFNAuNQPzNX02WPoAxtrWrNY6UnTzGoSrCc5F52hiL2Uo6yPZTiJcg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -696,9 +757,9 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/animations": "20.3.6", - "@angular/common": "20.3.6", - "@angular/core": "20.3.6" + "@angular/animations": "20.3.7", + "@angular/common": "20.3.7", + "@angular/core": "20.3.7" }, "peerDependenciesMeta": { "@angular/animations": { @@ -707,7 +768,9 @@ } }, "node_modules/@angular/router": { - "version": "20.3.6", + "version": "20.3.7", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-20.3.7.tgz", + "integrity": "sha512-Lq7mCNcLP1npmNh2JlNEe02YS2jNnaLnCy/t//o+Qq0c6DGV78JRl7pHubiB2R6XXlgvOcZWg88v94Li+y85Iw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -716,14 +779,15 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" }, "peerDependencies": { - "@angular/common": "20.3.6", - "@angular/core": "20.3.6", - "@angular/platform-browser": "20.3.6", + "@angular/common": "20.3.7", + "@angular/core": "20.3.7", + "@angular/platform-browser": "20.3.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@babel/code-frame": { "version": "7.27.1", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", @@ -736,6 +800,7 @@ }, "node_modules/@babel/compat-data": { "version": "7.28.4", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -743,8 +808,8 @@ }, "node_modules/@babel/core": { "version": "7.28.3", + "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -772,10 +837,12 @@ }, "node_modules/@babel/core/node_modules/convert-source-map": { "version": "2.0.0", + "dev": true, "license": "MIT" }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -783,6 +850,7 @@ }, "node_modules/@babel/generator": { "version": "7.28.3", + "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.28.3", @@ -808,6 +876,7 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.27.2", + "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.27.2", @@ -822,6 +891,7 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -896,6 +966,7 @@ }, "node_modules/@babel/helper-globals": { "version": "7.28.0", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -915,6 +986,7 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.27.1", + "dev": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.27.1", @@ -926,6 +998,7 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.28.3", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", @@ -1015,6 +1088,7 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.27.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1022,6 +1096,7 @@ }, "node_modules/@babel/helper-validator-identifier": { "version": "7.27.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1029,6 +1104,7 @@ }, "node_modules/@babel/helper-validator-option": { "version": "7.27.1", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1049,6 +1125,7 @@ }, "node_modules/@babel/helpers": { "version": "7.28.4", + "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", @@ -1060,6 +1137,7 @@ }, "node_modules/@babel/parser": { "version": "7.28.4", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.28.4" @@ -2094,6 +2172,7 @@ }, "node_modules/@babel/template": { "version": "7.27.2", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -2106,6 +2185,7 @@ }, "node_modules/@babel/traverse": { "version": "7.28.4", + "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -2122,6 +2202,7 @@ }, "node_modules/@babel/types": { "version": "7.28.4", + "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -2799,7 +2880,6 @@ "version": "7.8.2", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@inquirer/checkbox": "^4.2.1", "@inquirer/confirm": "^5.1.14", @@ -2999,6 +3079,7 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -3007,6 +3088,7 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -3023,10 +3105,12 @@ }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", + "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", + "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -4346,7 +4430,6 @@ "node_modules/@popperjs/core": { "version": "2.11.8", "license": "MIT", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -4788,6 +4871,7 @@ }, "node_modules/@types/babel__core": { "version": "7.20.5", + "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", @@ -4799,6 +4883,7 @@ }, "node_modules/@types/babel__generator": { "version": "7.27.0", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" @@ -4806,6 +4891,7 @@ }, "node_modules/@types/babel__template": { "version": "7.4.4", + "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", @@ -4814,6 +4900,7 @@ }, "node_modules/@types/babel__traverse": { "version": "7.28.0", + "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.28.2" @@ -5197,7 +5284,6 @@ "version": "8.15.0", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -5253,7 +5339,6 @@ "version": "8.17.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -5351,6 +5436,7 @@ }, "node_modules/ansi-regex": { "version": "6.2.2", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -5361,6 +5447,7 @@ }, "node_modules/ansi-styles": { "version": "6.2.3", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -5512,6 +5599,7 @@ }, "node_modules/baseline-browser-mapping": { "version": "2.8.17", + "dev": true, "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -5642,6 +5730,7 @@ }, "node_modules/browserslist": { "version": "4.26.3", + "dev": true, "funding": [ { "type": "opencollective", @@ -5657,7 +5746,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.9", "caniuse-lite": "^1.0.30001746", @@ -5835,6 +5923,7 @@ }, "node_modules/caniuse-lite": { "version": "1.0.30001751", + "dev": true, "funding": [ { "type": "opencollective", @@ -5869,6 +5958,7 @@ }, "node_modules/chokidar": { "version": "4.0.3", + "dev": true, "license": "MIT", "dependencies": { "readdirp": "^4.0.1" @@ -5946,6 +6036,7 @@ }, "node_modules/cliui": { "version": "9.0.1", + "dev": true, "license": "ISC", "dependencies": { "string-width": "^7.2.0", @@ -5958,6 +6049,7 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "9.0.2", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^6.2.1", @@ -6175,6 +6267,7 @@ }, "node_modules/convert-source-map": { "version": "1.9.0", + "dev": true, "license": "MIT" }, "node_modules/cookie": { @@ -6390,6 +6483,7 @@ }, "node_modules/debug": { "version": "4.4.3", + "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -6574,10 +6668,12 @@ }, "node_modules/electron-to-chromium": { "version": "1.5.237", + "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { "version": "10.6.0", + "dev": true, "license": "MIT" }, "node_modules/emojis-list": { @@ -6865,6 +6961,7 @@ }, "node_modules/escalade": { "version": "3.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -6971,7 +7068,6 @@ "version": "5.1.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", @@ -7089,6 +7185,7 @@ }, "node_modules/fdir": { "version": "6.5.0", + "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -7273,6 +7370,7 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", + "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -7280,6 +7378,7 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", + "dev": true, "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -7287,6 +7386,7 @@ }, "node_modules/get-east-asian-width": { "version": "1.4.0", + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -8071,8 +8171,7 @@ "node_modules/jasmine-core": { "version": "5.9.0", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/jest-worker": { "version": "27.5.1", @@ -8111,6 +8210,7 @@ }, "node_modules/js-tokens": { "version": "4.0.0", + "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -8126,6 +8226,7 @@ }, "node_modules/jsesc": { "version": "3.1.0", + "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -8149,6 +8250,7 @@ }, "node_modules/json5": { "version": "2.2.3", + "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -8182,7 +8284,6 @@ "version": "6.4.4", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@colors/colors": "1.5.0", "body-parser": "^1.19.0", @@ -8609,7 +8710,6 @@ "version": "4.4.0", "dev": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -8724,7 +8824,6 @@ "version": "9.0.1", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", @@ -8934,6 +9033,7 @@ }, "node_modules/lru-cache": { "version": "5.1.1", + "dev": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -9302,6 +9402,7 @@ }, "node_modules/ms": { "version": "2.1.3", + "dev": true, "license": "MIT" }, "node_modules/msgpackr": { @@ -9518,6 +9619,7 @@ }, "node_modules/node-releases": { "version": "2.0.25", + "dev": true, "license": "MIT" }, "node_modules/nopt": { @@ -9990,7 +10092,6 @@ }, "node_modules/parse5": { "version": "8.0.0", - "dev": true, "license": "MIT", "dependencies": { "entities": "^6.0.0" @@ -10036,7 +10137,6 @@ }, "node_modules/parse5/node_modules/entities": { "version": "6.0.1", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -10113,10 +10213,12 @@ }, "node_modules/picocolors": { "version": "1.1.1", + "dev": true, "license": "ISC" }, "node_modules/picomatch": { "version": "4.0.3", + "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -10171,7 +10273,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -10422,6 +10523,7 @@ }, "node_modules/readdirp": { "version": "4.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 14.18.0" @@ -10433,6 +10535,7 @@ }, "node_modules/reflect-metadata": { "version": "0.2.2", + "dev": true, "license": "Apache-2.0" }, "node_modules/regenerate": { @@ -10714,7 +10817,6 @@ "node_modules/rxjs": { "version": "7.8.2", "license": "Apache-2.0", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -10763,7 +10865,6 @@ "version": "1.90.0", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -10877,6 +10978,7 @@ }, "node_modules/semver": { "version": "7.7.2", + "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -11535,6 +11637,7 @@ }, "node_modules/string-width": { "version": "7.2.0", + "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", @@ -11596,6 +11699,7 @@ }, "node_modules/strip-ansi": { "version": "7.1.2", + "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -11818,6 +11922,7 @@ }, "node_modules/tinyglobby": { "version": "0.2.14", + "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.4.4", @@ -11882,8 +11987,7 @@ }, "node_modules/tslib": { "version": "2.8.1", - "license": "0BSD", - "peer": true + "license": "0BSD" }, "node_modules/tuf-js": { "version": "3.1.0", @@ -11918,9 +12022,8 @@ }, "node_modules/typescript": { "version": "5.9.3", - "devOptional": true, + "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -12035,6 +12138,7 @@ }, "node_modules/update-browserslist-db": { "version": "1.1.3", + "dev": true, "funding": [ { "type": "opencollective", @@ -12127,7 +12231,6 @@ "version": "7.1.5", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -12250,7 +12353,6 @@ "version": "5.101.2", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -12345,7 +12447,6 @@ "version": "5.2.2", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/bonjour": "^3.5.13", "@types/connect-history-api-fallback": "^1.5.4", @@ -13093,6 +13194,7 @@ }, "node_modules/y18n": { "version": "5.0.8", + "dev": true, "license": "ISC", "engines": { "node": ">=10" @@ -13100,10 +13202,12 @@ }, "node_modules/yallist": { "version": "3.1.1", + "dev": true, "license": "ISC" }, "node_modules/yargs": { "version": "18.0.0", + "dev": true, "license": "MIT", "dependencies": { "cliui": "^9.0.1", @@ -13119,6 +13223,7 @@ }, "node_modules/yargs-parser": { "version": "22.0.0", + "dev": true, "license": "ISC", "engines": { "node": "^20.19.0 || ^22.12.0 || >=23" @@ -13150,7 +13255,6 @@ "version": "3.25.76", "dev": true, "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -13165,8 +13269,7 @@ }, "node_modules/zone.js": { "version": "0.15.1", - "license": "MIT", - "peer": true + "license": "MIT" } } } diff --git a/endpoint-insights-ui/package.json b/endpoint-insights-ui/package.json index 8a7a169..280f5c4 100644 --- a/endpoint-insights-ui/package.json +++ b/endpoint-insights-ui/package.json @@ -23,10 +23,13 @@ }, "private": true, "dependencies": { + "@angular/animations": "^20.3.7", + "@angular/cdk": "^20.2.9", "@angular/common": "^20.3.0", "@angular/compiler": "^20.3.0", "@angular/core": "^20.3.0", "@angular/forms": "^20.3.0", + "@angular/material": "^20.2.9", "@angular/platform-browser": "^20.3.0", "@angular/router": "^20.3.0", "@ng-bootstrap/ng-bootstrap": "^19.0.1", diff --git a/endpoint-insights-ui/src/app/app.config.ts b/endpoint-insights-ui/src/app/app.config.ts index d953f4c..e6b1db6 100644 --- a/endpoint-insights-ui/src/app/app.config.ts +++ b/endpoint-insights-ui/src/app/app.config.ts @@ -1,12 +1,11 @@ -import { ApplicationConfig, provideBrowserGlobalErrorListeners, provideZoneChangeDetection } from '@angular/core'; -import { provideRouter } from '@angular/router'; - +import { ApplicationConfig } from '@angular/core'; +import { provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router'; import { routes } from './app.routes'; +//import { provideAnimations } from '@angular/platform-browser/animations'; export const appConfig: ApplicationConfig = { - providers: [ - provideBrowserGlobalErrorListeners(), - provideZoneChangeDetection({ eventCoalescing: true }), - provideRouter(routes) - ] + providers: [ + provideRouter(routes, withEnabledBlockingInitialNavigation()), + //provideAnimations(), + ], }; diff --git a/endpoint-insights-ui/src/app/app.html b/endpoint-insights-ui/src/app/app.html index a1e6ff7..50f68c6 100644 --- a/endpoint-insights-ui/src/app/app.html +++ b/endpoint-insights-ui/src/app/app.html @@ -1,3 +1,8 @@ -
- -
+
+

{{ title() }}

+ +
+ diff --git a/endpoint-insights-ui/src/app/app.routes.ts b/endpoint-insights-ui/src/app/app.routes.ts index 4023dc7..4fe0b5d 100644 --- a/endpoint-insights-ui/src/app/app.routes.ts +++ b/endpoint-insights-ui/src/app/app.routes.ts @@ -1,8 +1,8 @@ import { Routes } from '@angular/router'; -import {PageNotFoundComponent} from "./page-not-found-component/page-not-found-component"; -import {DashboardComponent} from "./dashboard-component/dashboard-component"; +import { DashboardComponent } from './dashboard-component/dashboard-component'; export const routes: Routes = [ - { path: '', component: DashboardComponent }, - { path: '**', component: PageNotFoundComponent } + { path: '', component: DashboardComponent, pathMatch: 'full' }, + { path: 'batches', loadComponent: () => import('./batch-component/batch-component').then(m => m.BatchComponent) }, + { path: '**', loadComponent: () => import('./page-not-found-component/page-not-found-component').then(m => m.PageNotFoundComponent) }, ]; diff --git a/endpoint-insights-ui/src/app/app.spec.ts b/endpoint-insights-ui/src/app/app.spec.ts index 91d56d5..060c162 100644 --- a/endpoint-insights-ui/src/app/app.spec.ts +++ b/endpoint-insights-ui/src/app/app.spec.ts @@ -1,23 +1,26 @@ +// app.spec.ts import { TestBed } from '@angular/core/testing'; -import { App } from './app'; +import { RouterTestingModule } from '@angular/router/testing'; +import { AppComponent } from './app'; describe('App', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [App], - }).compileComponents(); - }); + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, // <— provides Router, ActivatedRoute, etc. + AppComponent, // standalone component + ], + }).compileComponents(); + }); - it('should create the app', () => { - const fixture = TestBed.createComponent(App); - const app = fixture.componentInstance; - expect(app).toBeTruthy(); - }); + it('should create the app', () => { + const fixture = TestBed.createComponent(AppComponent); + expect(fixture.componentInstance).toBeTruthy(); + }); - it('should render title', () => { - const fixture = TestBed.createComponent(App); - fixture.detectChanges(); - const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('.container')).toBeTruthy(); - }); + it('should render title', () => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + expect(fixture.nativeElement.textContent).toContain('endpoint-insights-ui'); // or whatever selector you assert + }); }); diff --git a/endpoint-insights-ui/src/app/app.ts b/endpoint-insights-ui/src/app/app.ts index e64dad6..283712f 100644 --- a/endpoint-insights-ui/src/app/app.ts +++ b/endpoint-insights-ui/src/app/app.ts @@ -1,12 +1,12 @@ -import { Component, signal } from '@angular/core'; -import { RouterOutlet } from '@angular/router'; +import {Component, signal} from '@angular/core'; +import { RouterOutlet, RouterLink, RouterLinkActive } from '@angular/router'; @Component({ - selector: 'app-root', - imports: [RouterOutlet], - templateUrl: './app.html', - styleUrl: './app.scss' + selector: 'app-root', + standalone: true, + imports: [RouterOutlet, RouterLink, RouterLinkActive], + templateUrl: './app.html', }) -export class App { - protected readonly title = signal('endpoint-insights-ui'); -} +export class AppComponent { + readonly title = signal('endpoint-insights-ui'); +} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.html b/endpoint-insights-ui/src/app/batch-component/batch-component.html new file mode 100644 index 0000000..586bcdb --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.html @@ -0,0 +1,9 @@ +
+
+ + +
+
diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.scss b/endpoint-insights-ui/src/app/batch-component/batch-component.scss new file mode 100644 index 0000000..af1e542 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.scss @@ -0,0 +1,13 @@ +.grid { + display: grid; + grid-template-columns: repeat(12, 1fr); + gap: 12px; +} + +app-batch-card { + grid-column: span 6; +} + +@media (max-width: 900px) { + app-batch-card { grid-column: span 12; } +} diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.ts b/endpoint-insights-ui/src/app/batch-component/batch-component.ts new file mode 100644 index 0000000..9651bbe --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { Batch } from '../models/batch.model'; +import { BatchCardComponent } from './components/batch-card/batch-card.component'; + +@Component({ + selector: 'app-batches', + standalone: true, + imports: [CommonModule, BatchCardComponent,], + templateUrl: './batch-component.html', + styleUrls: ['./batch-component.scss'], +}) +export class BatchComponent { + // mock data for now; I will need to fetch this from the server later + batches: Batch[] = [ + { id: 'B-2025-00123', title: 'Nightly ETL (US-East)', createdIso: '2025-10-17T02:13:00Z' }, + { id: 'B-2025-00124', title: 'Customer Backfill – Oct', createdIso: '2025-10-18T15:45:00Z' }, + ]; + + onConfigure(batch: Batch) { + // gotta hook this up to the server later + console.log('Configure clicked:', batch); + } + + trackById = (_: number, b: Batch) => b.id; +} diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html new file mode 100644 index 0000000..4b6a511 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html @@ -0,0 +1,16 @@ + +
+
+

{{ batch.title }}

+
Batch ID{{ batch.id }}
+
Date{{ formattedDate() }}
+
+ +
+ +
+
+ diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss new file mode 100644 index 0000000..17c5e01 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss @@ -0,0 +1,54 @@ +.batch-card { + border-radius: 12px; + padding: 10px 12px; +} + +.row { + display: grid; + grid-template-columns: 1fr auto; + align-items: start; + gap: 12px; +} + +.meta { + display: grid; + gap: 6px; +} + +.title { + margin: 0; + font-size: 1.05rem; + font-weight: 700; + letter-spacing: .2px; +} + +.kv { + display: grid; + grid-template-columns: 110px 1fr; + gap: 8px; + align-items: baseline; + + .label { color: #6b7280; } + .value { font-weight: 600; } +} + +.actions { + display: flex; + align-items: center; + justify-content: flex-end; + min-width: 160px; + + button[mat-stroked-button] { + display: inline-flex; + gap: 6px; + border-radius: 999px; + padding: 0 14px; + } +} +.batch-card { + transition: transform .06s ease, box-shadow .12s ease; +} +.batch-card:hover { + transform: translateY(-1px); + box-shadow: 0 6px 18px rgba(2, 12, 27, .08); +} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts new file mode 100644 index 0000000..11d42f3 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts @@ -0,0 +1,24 @@ +import { Component, EventEmitter, Input, Output, ChangeDetectionStrategy } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatCardModule } from '@angular/material/card'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { Batch } from '../../../models/batch.model'; + +@Component({ + selector: 'app-batch-card', + standalone: true, + imports: [CommonModule, MatCardModule, MatButtonModule, MatIconModule], + templateUrl: './batch-card.component.html', + styleUrls: ['./batch-card.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BatchCardComponent { + @Input({ required: true }) batch!: Batch; + @Output() configure = new EventEmitter(); + + formattedDate(): string { + const d = new Date(this.batch?.createdIso ?? ''); + return isNaN(d.valueOf()) ? '—' : d.toLocaleString(); + } +} diff --git a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html new file mode 100644 index 0000000..7298d9a --- /dev/null +++ b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html @@ -0,0 +1,182 @@ + + + + + + + {{ test.name }} + + + + + + {{ test.status }} + + + + + P95 Latency: {{ num(test.latencyMsP95, ' ms') }} + Volume (last minute): {{ num(test.volume1m) }} + Error Rate: {{ pct(test.errorRatePct) }} + + + + +

+ {{ test.description }} +

+ +
+
+ + + + + Latency + + + + + + + + + + +
P50{{ num(test.latencyMsP50, ' ms') }}
P95{{ num(test.latencyMsP95, ' ms') }}
P99{{ num(test.latencyMsP99, ' ms') }}
+ + + + + + + + Volume + + + + + + + + + +
Last 1 minute{{ num(test.volume1m) }}
Last 5 minutes{{ num(test.volume5m) }}
+ + + + + + + + HTTP Responses / Errors + + + + + + + + + + + + + + + + + +
Code{{ row.code }}Count{{ row.count }}
+ + +
+ Aggregate Error Rate + {{ pct(test.errorRatePct) }} +
+ + + + + + + + Thresholds + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameWarn ThresholdFail Threshold
Latency (ms){{ num(test.thresholds?.latencyMs?.warn, ' ms') }}{{ num(test.thresholds?.latencyMs?.fail, ' ms') }}
Error Rate (%){{ pct(test.thresholds?.errorRatePct?.warn) }}{{ pct(test.thresholds?.errorRatePct?.fail) }}
Volume / min{{ num(test.thresholds?.volumePerMin?.warn) }}{{ num(test.thresholds?.volumePerMin?.fail) }}
+ + + + + + Status + + + + + + + +
State{{ test.status }}
Last Run{{ lastRun() }}
ID{{ test.id }}
+ + +
+
+ + + diff --git a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.scss b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.scss new file mode 100644 index 0000000..90653dc --- /dev/null +++ b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.scss @@ -0,0 +1,325 @@ +/* ================================ + Variables + ================================ */ +$banner-pass: #d6f2d6; +$banner-pass-b: #a8dea8; + +$banner-warn: #fff1b8; +$banner-warn-b: #ffd666; + +$banner-fail: #fad2d2; +$banner-fail-b: #f1a8a8; + +$banner-unknown: #e9ecf1; +$banner-unknown-b: #cfd6df; + +$neutral-bg: #ffffff; +$neutral-border: #e5e7eb; + +$panel-title-bg: #0b2335; +$panel-title-fg: #ffffff; + +/* brand colors for chips */ +$chip-pass: #2e7d32; +$chip-warn: #b26a00; +$chip-fail: #c62828; +$chip-unk: #455a64; + +/* ================================ + Card shell + ================================ */ +.test-results-card { + padding: 8px 8px 12px; + border-radius: 12px; + overflow: hidden; + transition: background-color .2s ease, box-shadow .2s ease, border-color .2s ease; + + .mat-accordion, + .mat-expansion-panel, + .mat-expansion-panel-header, + .mat-expansion-panel-content, + .mat-expansion-panel-body { + background: transparent; + box-shadow: none; + } + + .mat-expansion-panel { + margin: 0; + border-radius: 0; + } +} + +/* ================================ + Collapsed banner + ================================ */ +.test-results-card.pass:not(.is-expanded) { background: #fff; border: 2px solid #7fcf8b; } +.test-results-card.warn:not(.is-expanded) { background: #fff; border: 2px solid #ffb74d; } +.test-results-card.unknown:not(.is-expanded) { background: #fff; border: 2px solid #9eabb4; } +.test-results-card.fail:not(.is-expanded) { background: $banner-fail; border: 1px solid $banner-fail-b; } + +:host ::ng-deep .mat-mdc-chip.chip-pass .mdc-evolution-chip__text-label, +:host ::ng-deep .mat-mdc-chip.chip-warn .mdc-evolution-chip__text-label, +:host ::ng-deep .mat-mdc-chip.chip-fail .mdc-evolution-chip__text-label, +:host ::ng-deep .mat-mdc-chip.chip-unknown .mdc-evolution-chip__text-label { + color: #fff !important; +} +/* ================================ + Expanded state + ================================ */ +.test-results-card.is-expanded { + background: $neutral-bg; + border: 1px solid $neutral-border; + + .mat-expansion-panel-header { + margin: 0; + border-radius: 12px 12px 0 0; + padding: 8px 16px; + min-height: 56px; + box-shadow: none; + background: #fff; + align-items: center; + overflow: visible; + } + + &.pass .mat-expansion-panel-header { border: 2px solid #7fcf8b; } + &.warn .mat-expansion-panel-header { border: 2px solid #ffb74d; } + &.unknown .mat-expansion-panel-header { border: 2px solid #9eabb4; } + &.fail .mat-expansion-panel-header { background: $banner-fail; border: 1px solid $banner-fail-b; } +} + +/* ================================ + Banner layout + ================================ */ +.test-results-card .mat-expansion-panel-header .mat-content { + display: flex; + align-items: center; + gap: 12px 16px; + min-width: 0; +} + +.test-results-card .mat-expansion-panel-header .mat-expansion-panel-header-title { + display: inline-flex; + align-items: center; + gap: .5rem; + white-space: nowrap; + flex: 0 1 auto; + min-width: 0; +} + +.summary { + margin-left: auto; + display: inline-flex; + align-items: center; + gap: 12px 16px; + white-space: nowrap; + overflow-x: auto; + overflow-y: hidden; + max-width: 100%; + -webkit-overflow-scrolling: touch; + padding-bottom: 2px; +} + +.summary mat-chip-set, +.summary .kv { flex: 0 0 auto; } + +.summary .kv { color: rgba(0,0,0,.75); } +.summary .kv strong { + font-variant-numeric: tabular-nums; + white-space: nowrap; +} + +.title { display: flex; align-items: center; gap: .5rem; } +.name { font-weight: 600; letter-spacing: .2px; } + +/* ================================ + Chips + Support both "chip-pass" and "pass" + class names returned by chipClass() + ================================ */ + +/* PASS */ +.mat-mdc-chip.chip-pass, +.mat-mdc-chip.pass { + --mdc-chip-elevated-container-color: #2e7d32; + --mdc-chip-flat-container-color: #2e7d32; + --mdc-chip-label-text-color: #ffffff; + background-color: $chip-pass; +} + +/* WARN */ +.mat-mdc-chip.chip-warn, +.mat-mdc-chip.warn { + --mdc-chip-elevated-container-color: #b26a00; + --mdc-chip-flat-container-color: #b26a00; + --mdc-chip-label-text-color: #fff8e1; + background-color: $chip-warn; +} + +/* FAIL */ +.mat-mdc-chip.chip-fail, +.mat-mdc-chip.fail { + --mdc-chip-elevated-container-color: #c62828; + --mdc-chip-flat-container-color: #c62828; + --mdc-chip-label-text-color: #fff5f5; + background-color: $chip-fail; +} + +/* UNKNOWN */ +.mat-mdc-chip.chip-unknown, +.mat-mdc-chip.unknown { + --mdc-chip-elevated-container-color: #455a64; + --mdc-chip-flat-container-color: #455a64; + --mdc-chip-label-text-color: #f0f0f0; + background-color: $chip-unk; +} + +/* Force readable label text regardless of theme quirks */ +.mat-mdc-chip.chip-pass .mdc-evolution-chip__text-label, +.mat-mdc-chip.chip-warn .mdc-evolution-chip__text-label, +.mat-mdc-chip.chip-fail .mdc-evolution-chip__text-label, +.mat-mdc-chip.chip-unknown .mdc-evolution-chip__text-label, +.mat-mdc-chip.pass .mdc-evolution-chip__text-label, +.mat-mdc-chip.warn .mdc-evolution-chip__text-label, +.mat-mdc-chip.fail .mdc-evolution-chip__text-label, +.mat-mdc-chip.unknown .mdc-evolution-chip__text-label { + color: #fff !important; +} + +/* chip geometry */ +.test-results-card .mdc-evolution-chip { + border-radius: 10px; + padding: 0 10px; + min-height: 28px; + font-weight: 600; +} + +/* ================================ + Body and subpanels + ================================ */ +.body { padding: 14px; } + +.grid { + display: grid; + gap: 14px; + grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); + align-items: start; +} + +.panel { + grid-column: span 1; + border-radius: 10px; + align-self: start; + height: auto; + + .mdc-card { min-height: 0; height: auto; padding: 0; } +} + +/* Subpanel title: dark when expanded */ +.test-results-card.is-expanded .panel .mat-mdc-card-title { + background: $panel-title-bg; + color: $panel-title-fg; + margin: 0; + padding: 8px 16px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} + +/* Subpanel content */ +.panel .mat-mdc-card-content { + padding: 6px 12px 8px 12px; + margin: 0; +} + +/* Inline tooltip icon wrapper */ +.title-with-hint { display: inline-flex; align-items: center; gap: 6px; } +.title-with-hint .q { font-size: 18px; opacity: .85; transform: translateY(1px); } +.title-with-hint .q:hover { opacity: 1; } + +/* ================================ + Tables + ================================ */ +.http-table { width: 100%; } + +.test-results-card .mat-card-content table { + width: 100%; + border-collapse: collapse; +} + +.test-results-card .mat-card-content th, +.test-results-card .mat-card-content td { + padding: 4px 6px; + font-size: 0.85rem; + line-height: 1.1rem; +} + +.test-results-card .mat-card-content th { + font-weight: 600; + color: #374151; +} + +.test-results-card .mat-card-content td { + color: #111827; + vertical-align: top; +} + +/* MDC data table rhythm */ +.test-results-card .mat-mdc-table th.mdc-data-table__header-cell, +.test-results-card .mat-mdc-table td.mdc-data-table__cell { + padding: 6px 8px; + font-variant-numeric: tabular-nums; + border-bottom: 1px solid rgba(0,0,0,.06); +} + +/* Subtable helpers */ +.subtable { + width: 100%; + border-collapse: collapse; + table-layout: fixed; + font-size: 0.9rem; + margin-bottom: 0; + + th, td { + padding: 4px 8px; + line-height: 1.15rem; + border-bottom: 1px solid rgba(0,0,0,.06); + vertical-align: top; + } + + th { + width: 55%; + text-align: left; + color: #6b7280; + font-weight: 600; + } + + td.num { + text-align: right; + font-variant-numeric: tabular-nums; + color: #111827; + } + + tr:last-child th, + tr:last-child td { + border-bottom: 0; + padding-bottom: 2px; + } +} + +/* ================================ + Misc + ================================ */ +.sp { margin: 8px 0; } +.description { margin: 8px 12px 0 12px; color: rgba(0,0,0,.72); } + +/* Hover affordance on outlined banners */ +.test-results-card.pass:not(.is-expanded), +.test-results-card.warn:not(.is-expanded), +.test-results-card.unknown:not(.is-expanded) { + transition: box-shadow .15s ease, border-color .15s ease; +} + +.test-results-card.pass:not(.is-expanded):hover { box-shadow: 0 4px 14px rgba(46,125,50,.12); } +.test-results-card.warn:not(.is-expanded):hover { box-shadow: 0 4px 14px rgba(178,106,0,.12); } +.test-results-card.unknown:not(.is-expanded):hover { box-shadow: 0 4px 14px rgba(69,90,100,.12); } + + diff --git a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.spec.ts b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.spec.ts new file mode 100644 index 0000000..24f2342 --- /dev/null +++ b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.spec.ts @@ -0,0 +1,173 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; + +import { TestResultsCardComponent } from './test-results-card.component'; +import { TestRecord } from '../../models/test-record.model'; + +describe('TestResultsCardComponent', () => { + let fixture: ComponentFixture; + let component: TestResultsCardComponent; + + // convenience setter + function setTest(t: Partial) { + component.test = { + id: 'test-1', + name: 'Login API', + status: 'PASS', + // defaults; individual tests overwrite + latencyMsP50: 42, + latencyMsP95: 120, + latencyMsP99: 210, + volume1m: 530, + volume5m: 2510, + errorRatePct: 0.4, + thresholds: { + latencyMs: { warn: 200, fail: 400 }, + errorRatePct: { warn: 1.0, fail: 2.5 }, + volumePerMin: { warn: 100, fail: 20 }, + }, + httpBreakdown: [{ code: 200, count: 2478 }, { code: 401, count: 8 }], + ...t, + }; + fixture.detectChanges(); + } + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, // make expansion instant/predictable + MatExpansionModule, // use metadata (often pulled via a component, but explicit is fine) + TestResultsCardComponent, // standalone component (brings its deps) + ], + }).compileComponents(); + + fixture = TestBed.createComponent(TestResultsCardComponent); + component = fixture.componentInstance; + }); + + it('should create', () => { + setTest({}); // uses defaults + expect(component).toBeTruthy(); + }); + + it('renders the name in the banner', () => { + setTest({ name: 'Test Name' }); + const nameEl = fixture.nativeElement.querySelector('.name') as HTMLElement; + expect(nameEl?.textContent).toContain('Test Name'); + }); + + it('shows status chip text and applies PASS styling class', () => { + setTest({ status: 'PASS' }); + const host = fixture.nativeElement.querySelector('mat-card') as HTMLElement; // .test-results-card on host + const chip = fixture.nativeElement.querySelector('mat-chip') as HTMLElement; + + // host banner class + expect(host.className).toContain('pass'); + // chip class + expect(chip.className).toContain('chip-pass'); + // chip text + expect(chip.textContent?.trim()).toBe('PASS'); + }); + + it('applies FAIL styling when status=FAIL', () => { + setTest({ status: 'FAIL' }); + const host = fixture.nativeElement.querySelector('mat-card') as HTMLElement; + const chip = fixture.nativeElement.querySelector('mat-chip') as HTMLElement; + expect(host.className).toContain('fail'); + expect(chip.className).toContain('chip-fail'); + expect(chip.textContent?.trim()).toBe('FAIL'); + }); + + it('renders banner KVs with full labels', () => { + setTest({ latencyMsP95: 123, volume1m: 456, errorRatePct: 7.89 }); + const text = (fixture.nativeElement as HTMLElement).textContent || ''; + expect(text).toContain('P95 Latency'); + expect(text).toContain('Volume (last minute)'); + expect(text).toContain('Error Rate'); + expect(text).toContain('123 ms'); + expect(text).toContain('456'); + // pct is formatted by a component; tolerate rounding like "7.89%" + expect(text).toMatch(/7\.?8?9?%/); + }); + + it('expands when header is clicked and shows description', async () => { + setTest({ description: 'Auth flow responsiveness.' }); + const loader = TestbedHarnessEnvironment.loader(fixture); + const panel = await loader.getHarness(MatExpansionPanelHarness); + + // initially collapsed + expect(await panel.isExpanded()).toBeFalse(); + + await panel.expand(); + fixture.detectChanges(); + + expect(await panel.isExpanded()).toBeTrue(); + + // description should now be visible + const desc = fixture.nativeElement.querySelector('.description') as HTMLElement; + expect(desc?.textContent).toContain('Auth flow responsiveness.'); + }); + + it('adds .is-expanded class to host when expanded', async () => { + setTest({}); + const loader = TestbedHarnessEnvironment.loader(fixture); + const panel = await loader.getHarness(MatExpansionPanelHarness); + + const host = fixture.nativeElement.querySelector('mat-card') as HTMLElement; + expect(host.classList.contains('is-expanded')).toBeFalse(); + + await panel.expand(); + fixture.detectChanges(); + + expect(host.classList.contains('is-expanded')).toBeTrue(); + }); + + it('renders Thresholds table with Name | Warn | Fail columns', async () => { + setTest({ + thresholds: { + latencyMs: { warn: 200, fail: 400 }, + errorRatePct: { warn: 1.5, fail: 3.5 }, + volumePerMin: { warn: 100, fail: 20 }, + }, + }); + const loader = TestbedHarnessEnvironment.loader(fixture); + const panel = await loader.getHarness(MatExpansionPanelHarness); + await panel.expand(); + fixture.detectChanges(); + + const text = (fixture.nativeElement as HTMLElement).textContent || ''; + expect(text).toContain('Thresholds'); + expect(text).toContain('Name'); + expect(text).toContain('Warn Threshold'); + expect(text).toContain('Fail Threshold'); + + // spot-check a couple of values + expect(text).toContain('Latency (ms)'); + expect(text).toContain('200 ms'); + expect(text).toContain('400 ms'); + + expect(text).toContain('Error Rate (%)'); + expect(text).toMatch(/1\.5%/); + expect(text).toMatch(/3\.5%/); + }); + + it('renders HTTP responses table rows from httpBreakdown', async () => { + setTest({ httpBreakdown: [{ code: 200, count: 5 }, { code: 500, count: 2 }] }); + const loader = TestbedHarnessEnvironment.loader(fixture); + const panel = await loader.getHarness(MatExpansionPanelHarness); + await panel.expand(); + fixture.detectChanges(); + + const rows = fixture.nativeElement.querySelectorAll('table.http-table tr[mat-row]'); + // 2 data rows expected + expect(rows.length).toBe(2); + const text = (fixture.nativeElement as HTMLElement).textContent || ''; + expect(text).toContain('200'); + expect(text).toContain('5'); + expect(text).toContain('500'); + expect(text).toContain('2'); + }); +}); diff --git a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.ts b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.ts new file mode 100644 index 0000000..5471df9 --- /dev/null +++ b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.ts @@ -0,0 +1,82 @@ +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, signal } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TestRecord, TestStatus } from '../../models/test-record.model'; + +// Angular Material +import { MatCardModule } from '@angular/material/card'; +import { MatExpansionModule } from '@angular/material/expansion'; +import { MatChipsModule } from '@angular/material/chips'; +import { MatTableModule } from '@angular/material/table'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDividerModule } from '@angular/material/divider'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTooltipModule } from '@angular/material/tooltip'; + +@Component({ + selector: 'app-test-results-card', + standalone: true, + imports: [ + CommonModule, + MatCardModule, + MatExpansionModule, + MatChipsModule, + MatTableModule, + MatButtonModule, + MatDividerModule, + MatIconModule, + MatTooltipModule, + MatIconModule, + ], + templateUrl: './test-results-card.component.html', + styleUrls: ['./test-results-card.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class TestResultsCardComponent { + @Input({ required: true }) test!: TestRecord; + @Input() defaultExpanded = false; + + @Output() toggled = new EventEmitter(); + expanded = signal(false); + + ngOnInit() { this.expanded.set(this.defaultExpanded); } + onOpened() { this.expanded.set(true); this.toggled.emit(true); } + onClosed() { this.expanded.set(false); this.toggled.emit(false); } + + statusClass(s: TestStatus) { + return ({ PASS: 'pass', WARN: 'warn', FAIL: 'fail', UNKNOWN: 'unknown' } as const)[s] ?? 'unknown'; + } + + chipClass(status: string): string { + switch ((status || '').toLowerCase()) { + case 'pass': return 'chip-pass'; + case 'warn': return 'chip-warn'; + case 'fail': return 'chip-fail'; + default: return 'chip-unknown'; + } + } + + + num(n?: number, suffix = '') { return (n ?? n === 0) ? `${n}${suffix}` : '—'; } + pct(n?: number) { return (typeof n === 'number') ? `${n.toFixed(1)}%` : '—'; } + lastRun() { + if (!this.test?.lastRunIso) return '—'; + const d = new Date(this.test.lastRunIso); + return isNaN(d.valueOf()) ? '—' : d.toLocaleString(); + } + + // Strict-template-safe formatters + formatLatencyWF(): string { + const cfg = this.test?.thresholds?.latencyMs; + return cfg ? `${cfg.warn} / ${cfg.fail} ms` : '—'; + } + formatErrorPctWF(): string { + const cfg = this.test?.thresholds?.errorRatePct; + return cfg ? `${cfg.warn}% / ${cfg.fail}%` : '—'; + } + formatVolumeWF(): string { + const cfg = this.test?.thresholds?.volumePerMin; + return cfg ? `${cfg.warn} / ${cfg.fail}` : '—'; + } + + httpColumns = ['code', 'count']; +} diff --git a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.html b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.html index 2ab6c9f..774f91c 100644 --- a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.html +++ b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.html @@ -1,2 +1,7 @@

Endpoint Insights Dashboard

-

Hi :)

\ No newline at end of file +
+ + +
diff --git a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts index 86224a9..057e78e 100644 --- a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts +++ b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts @@ -1,11 +1,44 @@ import { Component } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TestResultsCardComponent } from '../components/test-results-card/test-results-card.component'; +import { TestRecord } from '../models/test-record.model'; @Component({ - selector: 'app-dashboard-component', - imports: [], - templateUrl: './dashboard-component.html', - styleUrl: './dashboard-component.scss' + selector: 'app-dashboard', + standalone: true, + imports: [ CommonModule, TestResultsCardComponent,], + templateUrl: './dashboard-component.html', + styleUrls: ['./dashboard-component.scss'], }) -export class DashboardComponent { +export class DashboardComponent { //Currently just a mock data for now; I will need to fetch this from the server later + tests: TestRecord[] = [ + { + id: 'login-api', + name: 'Login API', + description: 'Auth flow correctness & responsiveness.', + status: 'PASS', + lastRunIso: new Date().toISOString(), + latencyMsP50: 42, latencyMsP95: 120, latencyMsP99: 210, + volume1m: 530, volume5m: 2510, + httpBreakdown: [{ code: 200, count: 2478 }, { code: 401, count: 8 }, { code: 500, count: 1 }], + errorRatePct: 0.4, + thresholds: { latencyMs: { warn: 200, fail: 400 }, errorRatePct: { warn: 1.0, fail: 2.5 }, volumePerMin: { warn: 100, fail: 20 } } + }, + { + id: 'payments', + name: 'Payments', + description: 'Card authorization and capture path.', + status: 'FAIL', + lastRunIso: new Date().toISOString(), + latencyMsP50: 320, latencyMsP95: 900, latencyMsP99: 1900, + volume1m: 75, volume5m: 450, + httpBreakdown: [{ code: 200, count: 240 }, { code: 429, count: 22 }, { code: 500, count: 31 }], + errorRatePct: 9.8, + thresholds: { latencyMs: { warn: 250, fail: 600 }, errorRatePct: { warn: 2.0, fail: 5.0 }, volumePerMin: { warn: 60, fail: 30 } } + } + ]; + + trackById = (_: number, t: TestRecord) => t.id; } + diff --git a/endpoint-insights-ui/src/app/models/batch.model.ts b/endpoint-insights-ui/src/app/models/batch.model.ts new file mode 100644 index 0000000..2ca271d --- /dev/null +++ b/endpoint-insights-ui/src/app/models/batch.model.ts @@ -0,0 +1,5 @@ +export interface Batch { + id: string; // Batch ID + title: string; // Name + createdIso: string; // ISO date string +} diff --git a/endpoint-insights-ui/src/app/models/test-record.model.ts b/endpoint-insights-ui/src/app/models/test-record.model.ts new file mode 100644 index 0000000..26fff65 --- /dev/null +++ b/endpoint-insights-ui/src/app/models/test-record.model.ts @@ -0,0 +1,82 @@ +/** + * Overall test result category. + * - PASS: thresholds all satisfied + * - WARN: performance near limits + * - FAIL: threshold breached + * - UNKNOWN: not enough data / not yet run + */ +export type TestStatus = 'PASS' | 'WARN' | 'FAIL' | 'UNKNOWN'; + +/** HTTP status code summary for a given test run. */ +export interface HttpBreakdown { + /** e.g. 200, 401, 500 */ + code: number; + /** how many responses returned with that code */ + count: number; +} + +/** + * Warning and failure thresholds for different metrics. + * Used to color-code results and determine status. + */ +export interface ThresholdConfig { + latencyMs?: { warn: number; fail: number }; + errorRatePct?: { warn: number; fail: number }; + volumePerMin?: { warn: number; fail: number }; +} + +/** + * Represents one monitored API or system test result. + */ +export interface TestRecord { + /** Unique ID used for routing / keys */ + id: string; + /** Human-readable name (e.g., “Login API”) */ + name: string; + /** Optional short description of what the test checks */ + description?: string; + + /** Current computed status (PASS/WARN/FAIL/UNKNOWN) */ + status: TestStatus; + + /** + * ISO-8601 timestamp of the most recent run. + * Example: "2025-10-19T22:14:00Z" + * Stored as a string so the client can easily format + * it in the user’s local time zone. + */ + lastRunIso?: string; + + /** Median latency (p50), in milliseconds */ + latencyMsP50?: number; + /** 95th percentile latency, in milliseconds */ + latencyMsP95?: number; + /** 99th percentile latency, in milliseconds */ + latencyMsP99?: number; + + /** + * Requests handled in the last 1 minute window. + * Gives a quick read on current traffic volume. + */ + volume1m?: number; + + /** + * Requests handled in the last 5 minute window. + * Useful for spotting short-term spikes or drops. + */ + volume5m?: number; + + /** Breakdown of HTTP responses by status code */ + httpBreakdown?: HttpBreakdown[]; + + /** + * Percentage of total requests that failed + * (non-2xx responses or test errors). + * Expressed as a raw percentage (e.g., 1.2 for 1.2%). + */ + errorRatePct?: number; + + /** Threshold configuration used to evaluate PASS/WARN/FAIL */ + thresholds?: ThresholdConfig; +} + diff --git a/endpoint-insights-ui/src/app/services/test-record.service.ts b/endpoint-insights-ui/src/app/services/test-record.service.ts new file mode 100644 index 0000000..624cc32 --- /dev/null +++ b/endpoint-insights-ui/src/app/services/test-record.service.ts @@ -0,0 +1,33 @@ +export type TestStatus = 'PASS' | 'WARN' | 'FAIL' | 'UNKNOWN'; + +export interface HttpBreakdown { + code: number; + count: number; +} + +export interface ThresholdConfig { + latencyMs?: { warn: number; fail: number }; + errorRatePct?: { warn: number; fail: number }; + volumePerMin?: { warn: number; fail: number }; +} + +export interface TestRecord { + id: string; + name: string; + description?: string; + + status: TestStatus; + lastRunIso?: string; + + latencyMsP50?: number; + latencyMsP95?: number; + latencyMsP99?: number; + + volume1m?: number; + volume5m?: number; + + httpBreakdown?: HttpBreakdown[]; + errorRatePct?: number; + + thresholds?: ThresholdConfig; +} diff --git a/endpoint-insights-ui/src/index.html b/endpoint-insights-ui/src/index.html index e74fd66..4910d8c 100644 --- a/endpoint-insights-ui/src/index.html +++ b/endpoint-insights-ui/src/index.html @@ -2,10 +2,12 @@ - EndpointInsightsUi + Endpoint Insights + + diff --git a/endpoint-insights-ui/src/main.ts b/endpoint-insights-ui/src/main.ts index 6bb4616..e47684e 100644 --- a/endpoint-insights-ui/src/main.ts +++ b/endpoint-insights-ui/src/main.ts @@ -1,8 +1,5 @@ -/// - import { bootstrapApplication } from '@angular/platform-browser'; +import { AppComponent } from './app/app'; import { appConfig } from './app/app.config'; -import { App } from './app/app'; -bootstrapApplication(App, appConfig) - .catch((err) => console.error(err)); +bootstrapApplication(AppComponent, appConfig); diff --git a/endpoint-insights-ui/src/styles.scss b/endpoint-insights-ui/src/styles.scss index 13ea46a..0e6f829 100644 --- a/endpoint-insights-ui/src/styles.scss +++ b/endpoint-insights-ui/src/styles.scss @@ -1,4 +1,78 @@ -/* You can add global styles to this file, and also import other style files */ +/* ===== Base reset-ish touches */ +:root { + --topbar-bg: #0b2335; /* deep slate */ + --topbar-fg: #ffffff; + --topbar-fg-dim: rgba(255,255,255,.80); + --topbar-active: #67e8f9; /* cyan accent */ + --page-bg: #f7f9fc; + --card-radius: 12px; +} -/* Importing Bootstrap SCSS file. */ -@import 'bootstrap/scss/bootstrap'; +html, body { height: 100%; } +body { + margin: 0; + font-family: system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, 'Helvetica Neue', Arial, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + background: var(--page-bg); + color: #111827; +} + +/* ===== App chrome */ +.topbar { + position: sticky; top: 0; z-index: 100; + background: var(--topbar-bg); + color: var(--topbar-fg); + border-bottom: 1px solid rgba(255,255,255,.12); +} + +.topbar-nav { + display: flex; gap: .5rem; + align-items: center; + padding: .6rem 1rem; +} + +.nav-link { + display: inline-flex; + align-items: center; + gap: .4rem; + padding: .35rem .75rem; + border-radius: 999px; + color: var(--topbar-fg-dim); + text-decoration: none; + font-weight: 600; + letter-spacing: .2px; + transition: background-color .15s ease, color .15s ease, transform .02s ease; +} + +.nav-link:hover { color: var(--topbar-fg); background: rgba(255,255,255,.08); } +.nav-link:active { transform: translateY(1px); } + +.nav-link.active { + color: #06202f; + background: var(--topbar-active); +} + +/* ===== Routed page container */ +.page { + padding: 16px; + min-height: calc(100dvh - 56px); +} + +/* ===== Subtle card helpers (optional) */ +.mat-elevation-z1, .mat-mdc-card, .test-results-card, .batch-card { + border-radius: var(--card-radius); +} + +/* ===== Utility (optional) */ +.container-fluid { width: 100%; padding-left: 12px; padding-right: 12px; } +.py-3 { padding-top: 1rem; padding-bottom: 1rem; } + +/* Solid tooltip surface (MDC) */ +.cdk-overlay-container .mat-mdc-tooltip .mdc-tooltip__surface { + background-color: #0b2335; /* VSP dark */ + color: #ffffff; + opacity: 1; + border-radius: 8px; + padding: 8px 10px; + letter-spacing: .2px; + box-shadow: 0 8px 24px rgba(0,0,0,.22); +} From b42f43680800e7c0a064e1193d949926f5c1ef03 Mon Sep 17 00:00:00 2001 From: cGod778 Date: Fri, 24 Oct 2025 22:37:31 -0700 Subject: [PATCH 16/35] EI-41: stub batch controller endpoints (#17) Co-authored-by: Brynn Crowley --- endpoint-insights-api/pom.xml | 33 ++------ .../controller/BatchesController.java | 44 +++++++++-- .../dto/BatchRequestDTO.java | 16 ++++ .../dto/BatchResponseDTO.java | 17 +++++ .../endpointinsightsapi/model/TestBatch.java | 41 ---------- .../schedule/JobSchedule.java | 53 ------------- .../schedule/JobScheduleRepository.java | 10 --- .../testbatchtable/TestBatchTable.java | 40 ---------- .../src/main/resources/application.properties | 3 + .../src/main/resources/application.yaml | 31 -------- .../src/main/resources/application.yml | 17 ----- .../src/main/resources/batchtable.sql | 13 ---- .../src/main/resources/scheduletable.sql | 10 --- .../EndpointInsightsApiApplicationTests.java | 3 +- .../controller/BatchesControllerUnitTest.java | 75 ++++++++++++++++++- .../controller/JobControllerTest.java | 2 - .../controller/JobsControllerUnitTest.java | 3 +- endpoint-insights-sql/job.sql | 15 ---- endpoint-insights-sql/user.sql | 9 --- package-lock.json | 6 -- 20 files changed, 154 insertions(+), 287 deletions(-) create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchRequestDTO.java create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchResponseDTO.java delete mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java delete mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java delete mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java delete mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/testbatchtable/TestBatchTable.java create mode 100644 endpoint-insights-api/src/main/resources/application.properties delete mode 100644 endpoint-insights-api/src/main/resources/application.yaml delete mode 100644 endpoint-insights-api/src/main/resources/application.yml delete mode 100644 endpoint-insights-api/src/main/resources/batchtable.sql delete mode 100644 endpoint-insights-api/src/main/resources/scheduletable.sql delete mode 100644 endpoint-insights-sql/job.sql delete mode 100644 endpoint-insights-sql/user.sql delete mode 100644 package-lock.json diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index ec4c2bd..9063581 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent 4.0.0-M3 - + com.vsp endpoint-insights-api @@ -35,6 +35,7 @@ org.springframework.boot spring-boot-starter-webmvc + ch.qos.logback logback-core @@ -61,16 +62,12 @@ spring-boot-starter-test test + org.junit.jupiter junit-jupiter test - - org.postgresql - postgresql - runtime - org.projectlombok @@ -78,29 +75,15 @@ 1.18.42 provided - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - jakarta.persistence - jakarta.persistence-api - 3.1.0 - - org.springframework.boot - spring-boot-starter-data-jpa - compile + com.fasterxml.jackson.core + jackson-databind + 2.17.2 - - unit-tests @@ -125,8 +108,6 @@ - - @@ -154,6 +135,7 @@ + org.apache.maven.plugins maven-compiler-plugin @@ -167,6 +149,7 @@ + diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/BatchesController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/BatchesController.java index 8c930c9..70d46da 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/BatchesController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/BatchesController.java @@ -1,16 +1,46 @@ package com.vsp.endpointinsightsapi.controller; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.vsp.endpointinsightsapi.dto.BatchRequestDTO; +import com.vsp.endpointinsightsapi.dto.BatchResponseDTO; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/api/batches") -@Validated public class BatchesController { - private final static Logger LOG = LoggerFactory.getLogger(BatchesController.class); + @GetMapping + public ResponseEntity> listBatches() { + List batches = List.of( + new BatchResponseDTO(1L, "Daily API Tests", "ACTIVE"), + new BatchResponseDTO(2L, "Weekly Regression", "INACTIVE") + ); + return ResponseEntity.ok(batches); + } + + @GetMapping("/{id}") + public ResponseEntity getBatch(@PathVariable Long id) { + BatchResponseDTO batch = new BatchResponseDTO(id, "Example Batch " + id, "ACTIVE"); + return ResponseEntity.ok(batch); + } + + @PostMapping + public ResponseEntity createBatch(@RequestBody BatchRequestDTO request) { + BatchResponseDTO created = new BatchResponseDTO(99L, request.getName(), "CREATED"); + return ResponseEntity.status(HttpStatus.CREATED).body(created); + } + + @PutMapping("/{id}") + public ResponseEntity updateBatch(@PathVariable Long id, @RequestBody BatchRequestDTO request) { + BatchResponseDTO updated = new BatchResponseDTO(id, request.getName(), "UPDATED"); + return ResponseEntity.ok(updated); + } + @DeleteMapping("/{id}") + public ResponseEntity deleteBatch(@PathVariable Long id) { + return ResponseEntity.noContent().build(); + } } diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchRequestDTO.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchRequestDTO.java new file mode 100644 index 0000000..7ead13b --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchRequestDTO.java @@ -0,0 +1,16 @@ +package com.vsp.endpointinsightsapi.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class BatchRequestDTO { + private String name; + private String description; +} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchResponseDTO.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchResponseDTO.java new file mode 100644 index 0000000..5e5ebea --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/dto/BatchResponseDTO.java @@ -0,0 +1,17 @@ +package com.vsp.endpointinsightsapi.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class BatchResponseDTO { + private Long id; + private String name; + private String status; +} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java deleted file mode 100644 index 42321a3..0000000 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.vsp.endpointinsightsapi.model; - - -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Data -@Entity -@AllArgsConstructor -@NoArgsConstructor -@Table(name = "test_batch") -public class TestBatch { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - //TODO: Create ManyToMany with jobs entity once made - - @Column(name = "batch_name", nullable = false) - String batchName; - - @Column(name = "schedule_id") - Long scheduleId; - - @Column(name = "start_time") - @Temporal(TemporalType.TIMESTAMP) - LocalDate startTime; - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "last_time_run") - LocalDate lastTimeRun; - - @Column(name = "active") - Boolean active; -} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java deleted file mode 100644 index b394556..0000000 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobSchedule.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.vsp.endpointinsightsapi.schedule; - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; -import java.util.Date; - -@Getter -@Setter -@Entity -@Table(name = "job_schedule") -public class JobSchedule { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long scheduleId; - -// @ManyToOne(fetch = FetchType.LAZY) -// @JoinColumn(name = "job_id", nullable = false) -// private Job job; - - @Column(name = "cron_expr", nullable = false, length = 50) - private String cronExpr; - - @Column(name = "timezone", nullable = false, length = 50) - private String timezone = "PDT"; - - @Column(name = "next_run_at") - @Temporal(TemporalType.TIMESTAMP) - private Date nextRunAt; - - @Column(name = "is_enabled", nullable = false) - private Boolean isEnabled = true; - - @Column(name = "created_at", nullable = false, updatable = false) - @Temporal(TemporalType.TIMESTAMP) - private Date createdAt; - - @Column(name = "updated_at") - @Temporal(TemporalType.TIMESTAMP) - private Date updatedAt; - - @PrePersist - protected void onCreate() { - createdAt = new Date(); - updatedAt = new Date(); - } - - @PreUpdate - protected void onUpdate() { - updatedAt = new Date(); - } -} \ No newline at end of file diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java deleted file mode 100644 index 7a9c99c..0000000 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/schedule/JobScheduleRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.vsp.endpointinsightsapi.schedule; - -import com.vsp.endpointinsightsapi.schedule.JobSchedule; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface JobScheduleRepository extends JpaRepository { - -} \ No newline at end of file diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/testbatchtable/TestBatchTable.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/testbatchtable/TestBatchTable.java deleted file mode 100644 index 7d99fe8..0000000 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/testbatchtable/TestBatchTable.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.vsp.endpointinsightsapi.testbatchtable; - -import jakarta.persistence.*; -import java.time.LocalDateTime; -import java.util.Date; - -import lombok.Getter; -import lombok.Setter; - -//import com.vsp.endpointinsightsapi.schedule.JobSchedule; -//import com.vsp.endpointinsightsapi.testrun.TestRun; - -@Getter -@Setter -@Entity -@Table(name = "test_batch") -public class TestBatchTable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "batch_id") - private Long batchId; - -// @ManyToOne -// @JoinColumn(name = "schedule_id", nullable = false) -// private JobSchedule jobSchedule; - -// @OneToMany(mappedBy = "testBatch", cascade = CascadeType.ALL) -// private List testRuns; - - @Column(name = "created_at") - @Temporal(TemporalType.TIMESTAMP) - private Date createdAt = new Date(); - - @Column(name = "status") - private String status; - - @Column(name = "notes") - private String notes; -} diff --git a/endpoint-insights-api/src/main/resources/application.properties b/endpoint-insights-api/src/main/resources/application.properties new file mode 100644 index 0000000..f764801 --- /dev/null +++ b/endpoint-insights-api/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring: + application: + name: endpoint-insights-api diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml deleted file mode 100644 index f856915..0000000 --- a/endpoint-insights-api/src/main/resources/application.yaml +++ /dev/null @@ -1,31 +0,0 @@ -spring: - application: - name: endpoint-insights-api - datasource: - url: jdbc:${DB_URI} - username: ${DB_NAME} - password: ${DB_PASSWORD} - - jpa: - database-platform: - org.hibernate.dialect.PostgreSQLDialect - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true - - ---- -spring: - config: - activate: - on-profile: test - autoconfigure: - exclude: - - org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration - - org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration - - org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration - - org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration - diff --git a/endpoint-insights-api/src/main/resources/application.yml b/endpoint-insights-api/src/main/resources/application.yml deleted file mode 100644 index b9aaad7..0000000 --- a/endpoint-insights-api/src/main/resources/application.yml +++ /dev/null @@ -1,17 +0,0 @@ -spring: - application: - name: endpoint-insights-api - - datasource: - url: jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME} - username: ${DB_USER} - password: ${DB_PASSWORD} - - jpa: - database-platform: org.hibernate.dialect.PostgreSQLDialect - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true \ No newline at end of file diff --git a/endpoint-insights-api/src/main/resources/batchtable.sql b/endpoint-insights-api/src/main/resources/batchtable.sql deleted file mode 100644 index 0c89029..0000000 --- a/endpoint-insights-api/src/main/resources/batchtable.sql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE TABLE test_batch ( - - batch_id SERIAL PRIMARY KEY, - schedule_id BIGINT NOT NULL, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - status VARCHAR(255), - notes VARCHAR(255), - - CONSTRAINT fk_job_schedule - FOREIGN KEY(schedule_id) - REFERENCES job_schedule(schedule_id) - ON DELETE CASCADE -); diff --git a/endpoint-insights-api/src/main/resources/scheduletable.sql b/endpoint-insights-api/src/main/resources/scheduletable.sql deleted file mode 100644 index 2d75543..0000000 --- a/endpoint-insights-api/src/main/resources/scheduletable.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE job_schedule ( - schedule_id SERIAL PRIMARY KEY, - job_id BIGINT NOT NULL REFERENCES job(job_id) ON DELETE CASCADE, - cron_expr VARCHAR(50) NOT NULL, - timezone VARCHAR(50) NOT NULL DEFAULT 'PDT', - next_run_at TIMESTAMP, - is_enabled BOOLEAN NOT NULL DEFAULT TRUE, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP -); diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java index 131f787..9ef2831 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java @@ -2,13 +2,12 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; @SpringBootTest -@ActiveProfiles("test") class EndpointInsightsApiApplicationTests { @Test void contextLoads() { } + } diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/BatchesControllerUnitTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/BatchesControllerUnitTest.java index f1954c7..e03aac5 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/BatchesControllerUnitTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/BatchesControllerUnitTest.java @@ -1,20 +1,87 @@ package com.vsp.endpointinsightsapi.controller; -import org.junit.jupiter.api.Tag; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.vsp.endpointinsightsapi.dto.BatchRequestDTO; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.test.context.ActiveProfiles; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.context.ActiveProfiles; + + +import static org.hamcrest.Matchers.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @WebMvcTest(BatchesController.class) @ActiveProfiles("test") class BatchesControllerUnitTest { + @Autowired private MockMvc mockMvc; + @Autowired + private ObjectMapper objectMapper; + + @TestConfiguration + static class TestConfig { + @Bean + public ObjectMapper objectMapper() { + return new ObjectMapper(); + } + } + + @Test + void shouldReturnListOfBatches() throws Exception { + mockMvc.perform(get("/api/batches")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$", hasSize(greaterThan(0)))) + .andExpect(jsonPath("$[0].id", notNullValue())) + .andExpect(jsonPath("$[0].name", not(emptyString()))) + .andExpect(jsonPath("$[0].status", not(emptyString()))); + } + + @Test + void shouldReturnBatchById() throws Exception { + mockMvc.perform(get("/api/batches/1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(1))) + .andExpect(jsonPath("$.name", containsString("Example Batch"))) + .andExpect(jsonPath("$.status", is("ACTIVE"))); + } + @Test - void contextLoad() { + void shouldCreateBatch() throws Exception { + BatchRequestDTO request = new BatchRequestDTO("New Batch", "Test batch description"); + + mockMvc.perform(post("/api/batches") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.id", is(99))) + .andExpect(jsonPath("$.name", is("New Batch"))) + .andExpect(jsonPath("$.status", is("CREATED"))); + } + @Test + void shouldUpdateBatch() throws Exception { + BatchRequestDTO request = new BatchRequestDTO("Updated Batch", "Updated description"); + + mockMvc.perform(put("/api/batches/2") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id", is(2))) + .andExpect(jsonPath("$.name", is("Updated Batch"))) + .andExpect(jsonPath("$.status", is("UPDATED"))); + } + + @Test + void shouldDeleteBatch() throws Exception { + mockMvc.perform(delete("/api/batches/1")) + .andExpect(status().isNoContent()); } -} \ No newline at end of file +} diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobControllerTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobControllerTest.java index 379ab6c..98dba53 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobControllerTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobControllerTest.java @@ -8,7 +8,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.MediaType; -import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import tools.jackson.databind.ObjectMapper; @@ -18,7 +17,6 @@ @WebMvcTest(JobsController.class) @AutoConfigureWebMvc -@ActiveProfiles("test") public class JobControllerTest { @Autowired diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobsControllerUnitTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobsControllerUnitTest.java index 3427cd8..1926c94 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobsControllerUnitTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/controller/JobsControllerUnitTest.java @@ -1,13 +1,12 @@ package com.vsp.endpointinsightsapi.controller; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(JobsController.class) -@ActiveProfiles("test") class JobsControllerUnitTest { @Autowired private MockMvc mockMvc; diff --git a/endpoint-insights-sql/job.sql b/endpoint-insights-sql/job.sql deleted file mode 100644 index b368fd9..0000000 --- a/endpoint-insights-sql/job.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE job ( - job_id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - name VARCHAR(255) NOT NULL, - description TEXT, - test_type VARCHAR(10) NOT NULL CHECK (test_type IN ('PERF', 'INTEGRATION', 'E2E')), - target_id VARCHAR(1024) NOT NULL, - created_by VARCHAR(255) NOT NULL, - FOREIGN KEY (created_by) REFERENCES users(id), - status VARCHAR(50) DEFAULT 'PENDING' CHECK (status IN ('PENDING', 'RUNNING', 'COMPLETED', 'FAILED')), - created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), - started_at TIMESTAMP WITH TIME ZONE, - updated_at TIMESTAMP WITH TIME ZONE, - completed_at TIMESTAMP WITH TIME ZONE, - config JSONB -); \ No newline at end of file diff --git a/endpoint-insights-sql/user.sql b/endpoint-insights-sql/user.sql deleted file mode 100644 index 73dd3b3..0000000 --- a/endpoint-insights-sql/user.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE users ( - id SERIAL PRIMARY KEY, - name VARCHAR(100) NOT NULL, - email VARCHAR(255) NOT NULL UNIQUE, - role VARCHAR(100) NOT NULL, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP - -); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index f5988db..0000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "EndpointInsights", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} From 7e5b8ac71ae6fd983b92891e0f92133a2a5ebe2a Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 26 Oct 2025 20:01:00 -0700 Subject: [PATCH 17/35] Toast UI complete --- .../endpointinsightsapi/model/TestBatch.java | 2 - endpoint-insights-ui/package-lock.json | 68 +------------------ .../app/batch-component/batch-component.ts | 11 ++- .../toast-notification/toast.component.scss | 1 + .../toast-notification/toast.component.ts | 31 +++++++++ .../src/app/common/constants.ts | 3 + .../src/app/services/toast.service.ts | 34 ++++++++++ endpoint-insights-ui/src/styles.scss | 63 +++++++++++++++++ 8 files changed, 142 insertions(+), 71 deletions(-) create mode 100644 endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss create mode 100644 endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts create mode 100644 endpoint-insights-ui/src/app/common/constants.ts create mode 100644 endpoint-insights-ui/src/app/services/toast.service.ts diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index 42321a3..d66b932 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -29,10 +29,8 @@ public class TestBatch { Long scheduleId; @Column(name = "start_time") - @Temporal(TemporalType.TIMESTAMP) LocalDate startTime; - @Temporal(TemporalType.TIMESTAMP) @Column(name = "last_time_run") LocalDate lastTimeRun; diff --git a/endpoint-insights-ui/package-lock.json b/endpoint-insights-ui/package-lock.json index c8536cc..dc1ab83 100644 --- a/endpoint-insights-ui/package-lock.json +++ b/endpoint-insights-ui/package-lock.json @@ -223,7 +223,6 @@ }, "node_modules/@ampproject/remapping": { "version": "2.3.0", - "dev": true, "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -631,7 +630,6 @@ "version": "20.3.7", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.7.tgz", "integrity": "sha512-viZwWlwc1BAqryRJE0Wq2WgAxDaW9fuwtYHYrOWnIn9sy9KemKmR6RmU9VRydrwUROOlqK49R9+RC1wQ6sYwqA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/core": "7.28.3", @@ -707,7 +705,6 @@ "version": "20.3.7", "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.7.tgz", "integrity": "sha512-FYuuwU9ujiVT+0xjMIutaUT2PErV4AvxeAPWMlYRA1/yQxqn1VyNUd6kHPjAV+yrZg9Q0MDco2/c0Lh8rmAhSA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/core": "7.28.3", @@ -787,7 +784,6 @@ }, "node_modules/@babel/code-frame": { "version": "7.27.1", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", @@ -800,7 +796,6 @@ }, "node_modules/@babel/compat-data": { "version": "7.28.4", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -808,7 +803,6 @@ }, "node_modules/@babel/core": { "version": "7.28.3", - "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -837,12 +831,10 @@ }, "node_modules/@babel/core/node_modules/convert-source-map": { "version": "2.0.0", - "dev": true, "license": "MIT" }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -850,7 +842,6 @@ }, "node_modules/@babel/generator": { "version": "7.28.3", - "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.28.3", @@ -876,7 +867,6 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.27.2", - "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.27.2", @@ -891,7 +881,6 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -966,7 +955,6 @@ }, "node_modules/@babel/helper-globals": { "version": "7.28.0", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -986,7 +974,6 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.27.1", - "dev": true, "license": "MIT", "dependencies": { "@babel/traverse": "^7.27.1", @@ -998,7 +985,6 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.28.3", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", @@ -1088,7 +1074,6 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.27.1", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1096,7 +1081,6 @@ }, "node_modules/@babel/helper-validator-identifier": { "version": "7.27.1", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1104,7 +1088,6 @@ }, "node_modules/@babel/helper-validator-option": { "version": "7.27.1", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1125,7 +1108,6 @@ }, "node_modules/@babel/helpers": { "version": "7.28.4", - "dev": true, "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", @@ -1137,7 +1119,6 @@ }, "node_modules/@babel/parser": { "version": "7.28.4", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.28.4" @@ -2172,7 +2153,6 @@ }, "node_modules/@babel/template": { "version": "7.27.2", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -2185,7 +2165,6 @@ }, "node_modules/@babel/traverse": { "version": "7.28.4", - "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", @@ -2202,7 +2181,6 @@ }, "node_modules/@babel/types": { "version": "7.28.4", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -3079,7 +3057,6 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -3088,7 +3065,6 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", - "dev": true, "license": "MIT", "engines": { "node": ">=6.0.0" @@ -3105,12 +3081,10 @@ }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", - "dev": true, "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", - "dev": true, "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -4871,7 +4845,6 @@ }, "node_modules/@types/babel__core": { "version": "7.20.5", - "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", @@ -4883,7 +4856,6 @@ }, "node_modules/@types/babel__generator": { "version": "7.27.0", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" @@ -4891,7 +4863,6 @@ }, "node_modules/@types/babel__template": { "version": "7.4.4", - "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", @@ -4900,7 +4871,6 @@ }, "node_modules/@types/babel__traverse": { "version": "7.28.0", - "dev": true, "license": "MIT", "dependencies": { "@babel/types": "^7.28.2" @@ -5436,7 +5406,6 @@ }, "node_modules/ansi-regex": { "version": "6.2.2", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -5447,7 +5416,6 @@ }, "node_modules/ansi-styles": { "version": "6.2.3", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -5599,7 +5567,6 @@ }, "node_modules/baseline-browser-mapping": { "version": "2.8.17", - "dev": true, "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -5730,7 +5697,6 @@ }, "node_modules/browserslist": { "version": "4.26.3", - "dev": true, "funding": [ { "type": "opencollective", @@ -5923,7 +5889,6 @@ }, "node_modules/caniuse-lite": { "version": "1.0.30001751", - "dev": true, "funding": [ { "type": "opencollective", @@ -5958,7 +5923,6 @@ }, "node_modules/chokidar": { "version": "4.0.3", - "dev": true, "license": "MIT", "dependencies": { "readdirp": "^4.0.1" @@ -6036,7 +6000,6 @@ }, "node_modules/cliui": { "version": "9.0.1", - "dev": true, "license": "ISC", "dependencies": { "string-width": "^7.2.0", @@ -6049,7 +6012,6 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "9.0.2", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^6.2.1", @@ -6267,7 +6229,6 @@ }, "node_modules/convert-source-map": { "version": "1.9.0", - "dev": true, "license": "MIT" }, "node_modules/cookie": { @@ -6483,7 +6444,6 @@ }, "node_modules/debug": { "version": "4.4.3", - "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -6668,12 +6628,10 @@ }, "node_modules/electron-to-chromium": { "version": "1.5.237", - "dev": true, "license": "ISC" }, "node_modules/emoji-regex": { "version": "10.6.0", - "dev": true, "license": "MIT" }, "node_modules/emojis-list": { @@ -6961,7 +6919,6 @@ }, "node_modules/escalade": { "version": "3.2.0", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -7185,7 +7142,6 @@ }, "node_modules/fdir": { "version": "6.5.0", - "dev": true, "license": "MIT", "engines": { "node": ">=12.0.0" @@ -7370,7 +7326,6 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -7378,7 +7333,6 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", - "dev": true, "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -7386,7 +7340,6 @@ }, "node_modules/get-east-asian-width": { "version": "1.4.0", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -8210,7 +8163,6 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -8226,7 +8178,6 @@ }, "node_modules/jsesc": { "version": "3.1.0", - "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -8250,7 +8201,6 @@ }, "node_modules/json5": { "version": "2.2.3", - "dev": true, "license": "MIT", "bin": { "json5": "lib/cli.js" @@ -9033,7 +8983,6 @@ }, "node_modules/lru-cache": { "version": "5.1.1", - "dev": true, "license": "ISC", "dependencies": { "yallist": "^3.0.2" @@ -9402,7 +9351,6 @@ }, "node_modules/ms": { "version": "2.1.3", - "dev": true, "license": "MIT" }, "node_modules/msgpackr": { @@ -9619,7 +9567,6 @@ }, "node_modules/node-releases": { "version": "2.0.25", - "dev": true, "license": "MIT" }, "node_modules/nopt": { @@ -10213,12 +10160,10 @@ }, "node_modules/picocolors": { "version": "1.1.1", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { "version": "4.0.3", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -10523,7 +10468,6 @@ }, "node_modules/readdirp": { "version": "4.1.2", - "dev": true, "license": "MIT", "engines": { "node": ">= 14.18.0" @@ -10535,7 +10479,6 @@ }, "node_modules/reflect-metadata": { "version": "0.2.2", - "dev": true, "license": "Apache-2.0" }, "node_modules/regenerate": { @@ -10978,7 +10921,6 @@ }, "node_modules/semver": { "version": "7.7.2", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -11637,7 +11579,6 @@ }, "node_modules/string-width": { "version": "7.2.0", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", @@ -11699,7 +11640,6 @@ }, "node_modules/strip-ansi": { "version": "7.1.2", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -11922,7 +11862,6 @@ }, "node_modules/tinyglobby": { "version": "0.2.14", - "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.4.4", @@ -12022,7 +11961,7 @@ }, "node_modules/typescript": { "version": "5.9.3", - "dev": true, + "devOptional": true, "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -12138,7 +12077,6 @@ }, "node_modules/update-browserslist-db": { "version": "1.1.3", - "dev": true, "funding": [ { "type": "opencollective", @@ -13194,7 +13132,6 @@ }, "node_modules/y18n": { "version": "5.0.8", - "dev": true, "license": "ISC", "engines": { "node": ">=10" @@ -13202,12 +13139,10 @@ }, "node_modules/yallist": { "version": "3.1.1", - "dev": true, "license": "ISC" }, "node_modules/yargs": { "version": "18.0.0", - "dev": true, "license": "MIT", "dependencies": { "cliui": "^9.0.1", @@ -13223,7 +13158,6 @@ }, "node_modules/yargs-parser": { "version": "22.0.0", - "dev": true, "license": "ISC", "engines": { "node": "^20.19.0 || ^22.12.0 || >=23" diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.ts b/endpoint-insights-ui/src/app/batch-component/batch-component.ts index 9651bbe..6664ab7 100644 --- a/endpoint-insights-ui/src/app/batch-component/batch-component.ts +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.ts @@ -2,15 +2,20 @@ import { Component } from '@angular/core'; import { CommonModule } from '@angular/common'; import { Batch } from '../models/batch.model'; import { BatchCardComponent } from './components/batch-card/batch-card.component'; +import {ToastService} from "../services/toast.service"; @Component({ selector: 'app-batches', standalone: true, - imports: [CommonModule, BatchCardComponent,], + imports: [CommonModule, BatchCardComponent], templateUrl: './batch-component.html', styleUrls: ['./batch-component.scss'], }) export class BatchComponent { + + constructor(private toastService: ToastService) { + } + // mock data for now; I will need to fetch this from the server later batches: Batch[] = [ { id: 'B-2025-00123', title: 'Nightly ETL (US-East)', createdIso: '2025-10-17T02:13:00Z' }, @@ -18,8 +23,10 @@ export class BatchComponent { ]; onConfigure(batch: Batch) { - // gotta hook this up to the server later + this.toastService.onSuccess("action was a success"); + // gotta hook this up to the server later console.log('Configure clicked:', batch); + } trackById = (_: number, b: Batch) => b.id; diff --git a/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss b/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss @@ -0,0 +1 @@ + diff --git a/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts b/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts new file mode 100644 index 0000000..7565e61 --- /dev/null +++ b/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts @@ -0,0 +1,31 @@ +import {Component, Inject} from '@angular/core'; +import {MAT_SNACK_BAR_DATA, MatSnackBarRef} from '@angular/material/snack-bar'; +import {MatIcon} from "@angular/material/icon"; +import {MatIconButton} from "@angular/material/button"; + +@Component({ + selector: 'toast', + template: ` +
+
+

{{ data.type }}

+ {{ data.message }} +
+ +
+ `, + imports: [ + MatIcon, + MatIconButton + ], + +}) +export class ToastComponent { + constructor(@Inject(MAT_SNACK_BAR_DATA) public data: {type: string, message: string}, private toast: MatSnackBarRef) {} + + close() { + this.toast.dismiss(); + } +} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/common/constants.ts b/endpoint-insights-ui/src/app/common/constants.ts new file mode 100644 index 0000000..4837874 --- /dev/null +++ b/endpoint-insights-ui/src/app/common/constants.ts @@ -0,0 +1,3 @@ + +// Notifications +export const TOAST_TIMEOUT: number = 4000; diff --git a/endpoint-insights-ui/src/app/services/toast.service.ts b/endpoint-insights-ui/src/app/services/toast.service.ts new file mode 100644 index 0000000..6f3042f --- /dev/null +++ b/endpoint-insights-ui/src/app/services/toast.service.ts @@ -0,0 +1,34 @@ +import {Injectable} from "@angular/core"; +import {MatSnackBar} from "@angular/material/snack-bar"; +import {TOAST_TIMEOUT} from "../common/constants"; +import {ToastComponent} from "../batch-component/components/toast-notification/toast.component"; + +@Injectable({providedIn: 'root'}) + +export class ToastService{ + + constructor(private toast: MatSnackBar) {} + + onSuccess(message: string, duration: number = TOAST_TIMEOUT){ + this.toast.openFromComponent(ToastComponent, { + horizontalPosition: "right", + verticalPosition: "top", + duration, + panelClass: ['toast-success'], + data: {type: 'Success:', message} + }) + } + + onError(message: string, duration: number = TOAST_TIMEOUT){ + this.toast.openFromComponent(ToastComponent, { + horizontalPosition: "right", + verticalPosition: "top", + duration, + panelClass: ['toast-error'], + data: {type: 'Error:', message} + }) + } + +} + + diff --git a/endpoint-insights-ui/src/styles.scss b/endpoint-insights-ui/src/styles.scss index 0e6f829..dbe36ba 100644 --- a/endpoint-insights-ui/src/styles.scss +++ b/endpoint-insights-ui/src/styles.scss @@ -76,3 +76,66 @@ body { letter-spacing: .2px; box-shadow: 0 8px 24px rgba(0,0,0,.22); } + +// Toast Notifications + +.toast-success, +.toast-error { + background: transparent !important; + box-shadow: none !important; + padding: 0 !important; + max-width: 500px !important; + + .mat-mdc-snack-bar-container, + .mdc-snackbar__surface { + background: transparent !important; + box-shadow: none !important; + padding: 0 !important; + } +} + +// Toast Styling ** Mats library requires global styling ** +.toast-success .toast { + background-color: #4caf50; + color: #fff; +} + +.toast-error .toast { + background-color: #f44336; + color: #fff; +} + +.toast { + display: flex; + position: relative; + justify-content: space-between; + align-items: flex-start; + border-radius: 4px; + padding: 16px; + min-width: 300px; +} + +.toast-content { + flex: 1; + display: flex; + flex-direction: column; + gap: 8px; +} + +.type { + font-weight: bold; + font-size: 1.2rem; + margin: 0; +} + +.content { + font-size: 1rem; + margin: 0; +} + +.close { + position: absolute; + margin-left: 8px; +} + + From 1ab124b3a6da684bf24fe5b33f3e21f656e51136 Mon Sep 17 00:00:00 2001 From: dcarello <64613016+dcarello@users.noreply.github.com> Date: Tue, 28 Oct 2025 18:21:08 -0700 Subject: [PATCH 18/35] feat: create job entity (EI-137) (#21) * EI-137: Job Entity Created Job Entity and added necessary dependency to pom.xml * EI-137: Updates to Job Entity Updated entity using lombok getter/setter. Put enums in separate file. Annotated with @Temporal * fix: clean up git merge remains Signed-off-by: Brynn Crowley * feat: fix controller stub, add entity tests Signed-off-by: Brynn Crowley * test: add more tests for job entity Signed-off-by: Brynn Crowley * EI-137 Fixed Build Error Build kept trying to connect to DB causing build fail. Added a test profile to exclude DataSource (similar to whats in main already) --------- Signed-off-by: Brynn Crowley Co-authored-by: Brynn Crowley --- endpoint-insights-api/pom.xml | 12 +++ .../controller/JobsController.java | 21 ++++- .../vsp/endpointinsightsapi/model/Job.java | 81 ++++++++++++++++++- .../model/enums/JobStatus.java | 5 ++ .../model/enums/TestType.java | 5 ++ .../src/main/resources/application.yaml | 30 +++++++ .../EndpointInsightsApiApplicationTests.java | 2 + .../model/JobEntityTest.java | 39 +++++++++ 8 files changed, 189 insertions(+), 6 deletions(-) create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/JobStatus.java create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/TestType.java create mode 100644 endpoint-insights-api/src/main/resources/application.yaml create mode 100644 endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java diff --git a/endpoint-insights-api/pom.xml b/endpoint-insights-api/pom.xml index 9063581..0ee7df1 100644 --- a/endpoint-insights-api/pom.xml +++ b/endpoint-insights-api/pom.xml @@ -69,6 +69,12 @@ test + + org.postgresql + postgresql + runtime + + org.projectlombok lombok @@ -82,6 +88,12 @@ 2.17.2 + + + org.springframework.boot + spring-boot-starter-data-jpa + + diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java index 4484117..f631ed7 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java @@ -1,6 +1,7 @@ package com.vsp.endpointinsightsapi.controller; import com.vsp.endpointinsightsapi.model.*; +import com.vsp.endpointinsightsapi.model.enums.JobStatus; import com.vsp.endpointinsightsapi.validation.ErrorMessages; import com.vsp.endpointinsightsapi.validation.Patterns; import jakarta.validation.Valid; @@ -12,6 +13,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @RestController @@ -30,7 +33,7 @@ public class JobsController { @PostMapping public ResponseEntity createJob(@RequestBody @Valid JobCreateRequest request) { LOG.info("Creating job"); - return ResponseEntity.ok(new Job("1")); + return ResponseEntity.ok(new Job()); } /** @@ -50,7 +53,13 @@ public ResponseEntity updateJob( @Pattern(regexp = Patterns.JOB_ID_PATTERN, message = ErrorMessages.JOB_ID_INVALID_FORMAT) String jobId) { LOG.info("Updating job"); - return ResponseEntity.ok(new Job(jobId)); + + Job updatedJob = new Job(); + updatedJob.setJobId(jobId); + updatedJob.setName("Updated Job #" + jobId); + updatedJob.setDescription("This is a stub for job #" + jobId); + + return ResponseEntity.ok(updatedJob); } /** @@ -74,7 +83,13 @@ public ResponseEntity getJob( @NotNull(message = ErrorMessages.JOB_ID_REQUIRED) @Pattern(regexp = Patterns.JOB_ID_PATTERN, message = ErrorMessages.JOB_ID_INVALID_FORMAT) String jobId) { - return ResponseEntity.ok(new Job(jobId)); + + Job job = new Job(); + job.setJobId(jobId); + job.setName("Job #" + jobId); + job.setDescription("This is a stub for job #" + jobId); + + return ResponseEntity.ok(job); } /** diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 064924c..321530f 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -1,15 +1,90 @@ package com.vsp.endpointinsightsapi.model; +import jakarta.persistence.*; + +import java.util.Date; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; +//import com.vsp.endpointinsightsapi.user.User; // adjust imports/package names for when created +//import com.vsp.endpointinsightsapi.target.TestTarget; // adjust imports/package names for when created +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; +import java.util.Map; +import com.vsp.endpointinsightsapi.model.enums.JobStatus; +import com.vsp.endpointinsightsapi.model.enums.TestType; -@AllArgsConstructor @Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "job") public class Job { - private final String jobId; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "job_id") + private String jobId; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "description") + private String description; + + @Enumerated(EnumType.STRING) + @Column(name = "test_type", nullable = false, length = 20) + private TestType testType; + + // Uncomment when the TestTarget and User Entities are created + /* + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "target_id") + private TestTarget testTarget; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "created_by") + private User createdBy; +*/ + @Enumerated(EnumType.STRING) + @Column(name = "status", nullable = false, length = 20) + private JobStatus status = JobStatus.PENDING; + + @Column(name = "created_at", nullable = false, updatable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date createdAt; + + @Column(name = "updated_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date updatedAt; + + @Column(name = "started_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date startedAt; + + @Column(name = "completed_at", nullable = false) + @Temporal(TemporalType.TIMESTAMP) + private Date completedAt; + + // JSONB config: arbitrary key/value settings for the job + @JdbcTypeCode(SqlTypes.JSON) + @Column(name = "config", columnDefinition = "jsonb") + private Map config; + + + @PrePersist + void onCreate() { + this.createdAt = new Date(); + this.updatedAt = new Date(); + } - //todo: implement + @PreUpdate + void onUpdate() { + this.updatedAt = new Date(); + } } diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/JobStatus.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/JobStatus.java new file mode 100644 index 0000000..8918458 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/JobStatus.java @@ -0,0 +1,5 @@ +package com.vsp.endpointinsightsapi.model.enums; + +public enum JobStatus { + PENDING, RUNNING, COMPLETED, FAILED +} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/TestType.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/TestType.java new file mode 100644 index 0000000..cc1ff70 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/enums/TestType.java @@ -0,0 +1,5 @@ +package com.vsp.endpointinsightsapi.model.enums; + +public enum TestType { + PERF, INTEGRATION, E2E +} diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml new file mode 100644 index 0000000..528a016 --- /dev/null +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -0,0 +1,30 @@ +spring: + application: + name: endpoint-insights-api + datasource: + url: jdbc:${DB_URI} + username: ${DB_NAME} + password: ${DB_PASSWORD} + + jpa: + database-platform: + org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true + + +--- +spring: + config: + activate: + on-profile: test + autoconfigure: + exclude: + - org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration + - org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration + - org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration + - org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration \ No newline at end of file diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java index 9ef2831..ca8ab0d 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplicationTests.java @@ -2,8 +2,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") class EndpointInsightsApiApplicationTests { @Test diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java new file mode 100644 index 0000000..d0fe0c6 --- /dev/null +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java @@ -0,0 +1,39 @@ +package com.vsp.endpointinsightsapi.model; + +import com.vsp.endpointinsightsapi.model.enums.JobStatus; +import org.junit.jupiter.api.Test; + +import java.util.Date; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +public class JobEntityTest { + @Test + void shouldSetTimestampsOnCreate() { + Job job = new Job(); + job.onCreate(); + + assertThat(job.getCreatedAt()).isNotNull(); + assertThat(job.getUpdatedAt()).isNotNull(); + } + + @Test + void shouldUpdateTimestampOnUpdate() { + Job job = new Job(); + job.onCreate(); + + Date initialTime = new Date(System.currentTimeMillis() - 1000); + job.setUpdatedAt(initialTime); + + job.onUpdate(); + + assertThat(job.getUpdatedAt()).isAfter(initialTime); + } + + @Test + void shouldDefaultToPendingStatus() { + Job job = new Job(); + assertThat(job.getStatus()).isEqualTo(JobStatus.PENDING); + } + +} From 896a997ee8131c9e55fc6633e1525ef3326a1065 Mon Sep 17 00:00:00 2001 From: Marcos Pantoja <105100104+Mxrcos13@users.noreply.github.com> Date: Wed, 29 Oct 2025 14:31:26 -0700 Subject: [PATCH 19/35] EI-20 Created Login page UI (#30) Built login page UI --- endpoint-insights-ui/public/VSP_Logo.png | Bin 0 -> 31507 bytes endpoint-insights-ui/src/app/app.html | 5 +- endpoint-insights-ui/src/app/app.routes.ts | 3 +- .../app/login-component/login-component.html | 15 ++++++ .../app/login-component/login-component.scss | 44 ++++++++++++++++++ .../login-component/login-component.spec.ts | 23 +++++++++ .../app/login-component/login-component.ts | 11 +++++ 7 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 endpoint-insights-ui/public/VSP_Logo.png create mode 100644 endpoint-insights-ui/src/app/login-component/login-component.html create mode 100644 endpoint-insights-ui/src/app/login-component/login-component.scss create mode 100644 endpoint-insights-ui/src/app/login-component/login-component.spec.ts create mode 100644 endpoint-insights-ui/src/app/login-component/login-component.ts diff --git a/endpoint-insights-ui/public/VSP_Logo.png b/endpoint-insights-ui/public/VSP_Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6ec723221f91b48efa478e2c5be1fd828e11de GIT binary patch literal 31507 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 U##0aWzgq#-m9<|~E82$rA5CeP4FCWD literal 0 HcmV?d00001 diff --git a/endpoint-insights-ui/src/app/app.html b/endpoint-insights-ui/src/app/app.html index 50f68c6..794c097 100644 --- a/endpoint-insights-ui/src/app/app.html +++ b/endpoint-insights-ui/src/app/app.html @@ -1,8 +1,9 @@

{{ title() }}

diff --git a/endpoint-insights-ui/src/app/app.routes.ts b/endpoint-insights-ui/src/app/app.routes.ts index 4fe0b5d..6687784 100644 --- a/endpoint-insights-ui/src/app/app.routes.ts +++ b/endpoint-insights-ui/src/app/app.routes.ts @@ -1,7 +1,8 @@ import { Routes } from '@angular/router'; import { DashboardComponent } from './dashboard-component/dashboard-component'; - +import { LoginComponent } from './login-component/login-component'; export const routes: Routes = [ + { path: 'login', component: LoginComponent }, { path: '', component: DashboardComponent, pathMatch: 'full' }, { path: 'batches', loadComponent: () => import('./batch-component/batch-component').then(m => m.BatchComponent) }, { path: '**', loadComponent: () => import('./page-not-found-component/page-not-found-component').then(m => m.PageNotFoundComponent) }, diff --git a/endpoint-insights-ui/src/app/login-component/login-component.html b/endpoint-insights-ui/src/app/login-component/login-component.html new file mode 100644 index 0000000..bd75649 --- /dev/null +++ b/endpoint-insights-ui/src/app/login-component/login-component.html @@ -0,0 +1,15 @@ + diff --git a/endpoint-insights-ui/src/app/login-component/login-component.scss b/endpoint-insights-ui/src/app/login-component/login-component.scss new file mode 100644 index 0000000..7fa5ccb --- /dev/null +++ b/endpoint-insights-ui/src/app/login-component/login-component.scss @@ -0,0 +1,44 @@ +.header{ + background: lightgray; + text-align: center; + padding: 10px; +} + +.card{ + background: #fff; + border-radius: 12px; + box-shadow: 0 4px 10px rgba(0,0,0,0.1); + padding: 1.5rem; + max-width: 400px; + margin: 2rem auto; + transition: box-shadow 0.2s ease; +} + +.logo{ + width: 225px; + height: auto; + border: 1px solid #000000; + display: block; + padding: 20px; + margin: 0 auto 20px; +} +.welcome{ + text-align: center; + padding-bottom: 40px; +} +.welcome-text{ + font-weight: bold; +} +.button-container{ + text-align: center; +} + +.login-button{ + background: #000000; + color: white; + border: none; + padding: 0.6rem 1.2rem; + border-radius: 6px; + cursor: pointer; + width: 400px; +} diff --git a/endpoint-insights-ui/src/app/login-component/login-component.spec.ts b/endpoint-insights-ui/src/app/login-component/login-component.spec.ts new file mode 100644 index 0000000..39192bc --- /dev/null +++ b/endpoint-insights-ui/src/app/login-component/login-component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginComponent } from './login-component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [LoginComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/endpoint-insights-ui/src/app/login-component/login-component.ts b/endpoint-insights-ui/src/app/login-component/login-component.ts new file mode 100644 index 0000000..35f0c99 --- /dev/null +++ b/endpoint-insights-ui/src/app/login-component/login-component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-login', + imports: [], + templateUrl: './login-component.html', + styleUrl: './login-component.scss' +}) +export class LoginComponent { + +} From eb700da1e6b78960bd76ec1ffd4b7695b00704e0 Mon Sep 17 00:00:00 2001 From: Tyler Date: Wed, 29 Oct 2025 20:34:36 -0700 Subject: [PATCH 20/35] Organizing some front end toast component items. --- .../java/com/vsp/endpointinsightsapi/model/Job.java | 8 +++----- .../com/vsp/endpointinsightsapi/model/TestBatch.java | 11 ++++++++--- .../{constants.ts => notification.constants.ts} | 0 .../toast-notification/toast.component.scss | 0 .../components/toast-notification/toast.component.ts | 0 .../src/app/services/toast.service.ts | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) rename endpoint-insights-ui/src/app/common/{constants.ts => notification.constants.ts} (100%) rename endpoint-insights-ui/src/app/{batch-component => }/components/toast-notification/toast.component.scss (100%) rename endpoint-insights-ui/src/app/{batch-component => }/components/toast-notification/toast.component.ts (100%) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 321530f..55df833 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -13,6 +13,7 @@ //import com.vsp.endpointinsightsapi.user.User; // adjust imports/package names for when created //import com.vsp.endpointinsightsapi.target.TestTarget; // adjust imports/package names for when created import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.annotations.UuidGenerator; import org.hibernate.type.SqlTypes; import java.util.Map; import com.vsp.endpointinsightsapi.model.enums.JobStatus; @@ -27,7 +28,8 @@ public class Job { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue + @UuidGenerator @Column(name = "job_id") private String jobId; @@ -56,19 +58,15 @@ public class Job { private JobStatus status = JobStatus.PENDING; @Column(name = "created_at", nullable = false, updatable = false) - @Temporal(TemporalType.TIMESTAMP) private Date createdAt; @Column(name = "updated_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) private Date updatedAt; @Column(name = "started_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) private Date startedAt; @Column(name = "completed_at", nullable = false) - @Temporal(TemporalType.TIMESTAMP) private Date completedAt; // JSONB config: arbitrary key/value settings for the job diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index d66b932..b5bd756 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -5,9 +5,11 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.UUID; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; @Data @Entity @@ -17,10 +19,13 @@ public class TestBatch { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @GeneratedValue + @UUID + private String id; - //TODO: Create ManyToMany with jobs entity once made +// @ManyToMany +// @JoinTable(name = ) +// private List jobs; @Column(name = "batch_name", nullable = false) String batchName; diff --git a/endpoint-insights-ui/src/app/common/constants.ts b/endpoint-insights-ui/src/app/common/notification.constants.ts similarity index 100% rename from endpoint-insights-ui/src/app/common/constants.ts rename to endpoint-insights-ui/src/app/common/notification.constants.ts diff --git a/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss b/endpoint-insights-ui/src/app/components/toast-notification/toast.component.scss similarity index 100% rename from endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.scss rename to endpoint-insights-ui/src/app/components/toast-notification/toast.component.scss diff --git a/endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts b/endpoint-insights-ui/src/app/components/toast-notification/toast.component.ts similarity index 100% rename from endpoint-insights-ui/src/app/batch-component/components/toast-notification/toast.component.ts rename to endpoint-insights-ui/src/app/components/toast-notification/toast.component.ts diff --git a/endpoint-insights-ui/src/app/services/toast.service.ts b/endpoint-insights-ui/src/app/services/toast.service.ts index 6f3042f..8ffaa15 100644 --- a/endpoint-insights-ui/src/app/services/toast.service.ts +++ b/endpoint-insights-ui/src/app/services/toast.service.ts @@ -1,7 +1,7 @@ import {Injectable} from "@angular/core"; import {MatSnackBar} from "@angular/material/snack-bar"; -import {TOAST_TIMEOUT} from "../common/constants"; -import {ToastComponent} from "../batch-component/components/toast-notification/toast.component"; +import {TOAST_TIMEOUT} from "../common/notification.constants"; +import {ToastComponent} from "../components/toast-notification/toast.component"; @Injectable({providedIn: 'root'}) From 06124e70b89201158d7e6e1cd24b9278e601fcf4 Mon Sep 17 00:00:00 2001 From: Tyler Date: Wed, 29 Oct 2025 21:27:18 -0700 Subject: [PATCH 21/35] Removed unnecessary sql folder in project. --- endpoint-insights-sql/user.sql | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 endpoint-insights-sql/user.sql diff --git a/endpoint-insights-sql/user.sql b/endpoint-insights-sql/user.sql deleted file mode 100644 index 73dd3b3..0000000 --- a/endpoint-insights-sql/user.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TABLE users ( - id SERIAL PRIMARY KEY, - name VARCHAR(100) NOT NULL, - email VARCHAR(255) NOT NULL UNIQUE, - role VARCHAR(100) NOT NULL, - created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP - -); \ No newline at end of file From a2cbf20bd13d374e7dc27a653105e09ba66c4291 Mon Sep 17 00:00:00 2001 From: cbrock-csus Date: Sat, 1 Nov 2025 11:55:26 -0700 Subject: [PATCH 22/35] EI-242 - Add architecture writeup and diagram (#31) * EI-242 - Add architecture writeup and diagram * Moved docs to /docs folder --- ...nt Insights UI API Integration Diagram.pdf | Bin 0 -> 113132 bytes docs/design.md | 41 ++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 docs/Endpoint Insights UI API Integration Diagram.pdf create mode 100644 docs/design.md diff --git a/docs/Endpoint Insights UI API Integration Diagram.pdf b/docs/Endpoint Insights UI API Integration Diagram.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8e8f1b0950ac339327a7d4e483fbb3e35875fae6 GIT binary patch literal 113132 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

LB5rOv0jooCSRE8FT9*c+xZl%Kl>d~Ux^ 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 Date: Sun, 2 Nov 2025 12:19:35 -0800 Subject: [PATCH 23/35] job and test_batch entity relationship done, had to make changes to id's in job/job controller to be UUID from String. --- .../controller/JobsController.java | 5 +++-- .../com/vsp/endpointinsightsapi/model/Job.java | 18 +++++++++++++++--- .../endpointinsightsapi/model/TestBatch.java | 16 ++++++++-------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java index f631ed7..2584bbf 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java @@ -16,6 +16,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.UUID; @RestController @RequestMapping("/api/jobs") @@ -55,7 +56,7 @@ public ResponseEntity updateJob( LOG.info("Updating job"); Job updatedJob = new Job(); - updatedJob.setJobId(jobId); + updatedJob.setJobId(UUID.fromString(jobId)); updatedJob.setName("Updated Job #" + jobId); updatedJob.setDescription("This is a stub for job #" + jobId); @@ -85,7 +86,7 @@ public ResponseEntity getJob( String jobId) { Job job = new Job(); - job.setJobId(jobId); + job.setJobId(UUID.fromString(jobId)); job.setName("Job #" + jobId); job.setDescription("This is a stub for job #" + jobId); diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 55df833..1369777 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -4,8 +4,6 @@ import java.util.Date; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -16,6 +14,9 @@ import org.hibernate.annotations.UuidGenerator; import org.hibernate.type.SqlTypes; import java.util.Map; +import java.util.Set; +import java.util.UUID; + import com.vsp.endpointinsightsapi.model.enums.JobStatus; import com.vsp.endpointinsightsapi.model.enums.TestType; @@ -31,7 +32,7 @@ public class Job { @GeneratedValue @UuidGenerator @Column(name = "job_id") - private String jobId; + private UUID jobId; @Column(name = "name", nullable = false) private String name; @@ -43,12 +44,23 @@ public class Job { @Column(name = "test_type", nullable = false, length = 20) private TestType testType; + + @ManyToMany + @JoinTable( + name = "test_batch_tests", + joinColumns = @JoinColumn(name = "job_id", columnDefinition = "uuid"), + inverseJoinColumns = @JoinColumn(name = "test_job_id", columnDefinition = "uuid") + ) + private Set testBatches; + + // Uncomment when the TestTarget and User Entities are created /* @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "target_id") private TestTarget testTarget; + @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "created_by") private User createdBy; diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index b5bd756..879d2a5 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -5,11 +5,11 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.UUID; +import org.hibernate.annotations.UuidGenerator; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; + +import java.util.*; @Data @Entity @@ -20,12 +20,12 @@ public class TestBatch { @Id @GeneratedValue - @UUID - private String id; + @UuidGenerator + @Column(name = "id", nullable = false) + private UUID batch_id; -// @ManyToMany -// @JoinTable(name = ) -// private List jobs; + @ManyToMany(mappedBy = "testBatches") + private List jobs; @Column(name = "batch_name", nullable = false) String batchName; From e717677dd9bd5b0c16d7a3858199ab0c75621c3b Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 2 Nov 2025 18:45:03 -0800 Subject: [PATCH 24/35] Corrections to toast component and jobs UUID type --- .../controller/JobsController.java | 5 +++-- .../com/vsp/endpointinsightsapi/model/Job.java | 5 +++-- .../vsp/endpointinsightsapi/model/TestBatch.java | 9 ++++----- endpoint-insights-ui/src/styles.scss | 14 +++++++------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java index f631ed7..2584bbf 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java @@ -16,6 +16,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; +import java.util.UUID; @RestController @RequestMapping("/api/jobs") @@ -55,7 +56,7 @@ public ResponseEntity updateJob( LOG.info("Updating job"); Job updatedJob = new Job(); - updatedJob.setJobId(jobId); + updatedJob.setJobId(UUID.fromString(jobId)); updatedJob.setName("Updated Job #" + jobId); updatedJob.setDescription("This is a stub for job #" + jobId); @@ -85,7 +86,7 @@ public ResponseEntity getJob( String jobId) { Job job = new Job(); - job.setJobId(jobId); + job.setJobId(UUID.fromString(jobId)); job.setName("Job #" + jobId); job.setDescription("This is a stub for job #" + jobId); diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 55df833..6518c42 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -16,6 +16,8 @@ import org.hibernate.annotations.UuidGenerator; import org.hibernate.type.SqlTypes; import java.util.Map; +import java.util.UUID; + import com.vsp.endpointinsightsapi.model.enums.JobStatus; import com.vsp.endpointinsightsapi.model.enums.TestType; @@ -30,8 +32,7 @@ public class Job { @Id @GeneratedValue @UuidGenerator - @Column(name = "job_id") - private String jobId; + private UUID jobId; @Column(name = "name", nullable = false) private String name; diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index b5bd756..62193f0 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -5,11 +5,10 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.UUID; +import org.hibernate.annotations.UuidGenerator; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; +import java.util.UUID; @Data @Entity @@ -20,8 +19,8 @@ public class TestBatch { @Id @GeneratedValue - @UUID - private String id; + @UuidGenerator + private UUID id; // @ManyToMany // @JoinTable(name = ) diff --git a/endpoint-insights-ui/src/styles.scss b/endpoint-insights-ui/src/styles.scss index dbe36ba..fc55505 100644 --- a/endpoint-insights-ui/src/styles.scss +++ b/endpoint-insights-ui/src/styles.scss @@ -81,16 +81,16 @@ body { .toast-success, .toast-error { - background: transparent !important; - box-shadow: none !important; - padding: 0 !important; - max-width: 500px !important; + background: transparent; + box-shadow: none; + padding: 0; + max-width: 500px; .mat-mdc-snack-bar-container, .mdc-snackbar__surface { - background: transparent !important; - box-shadow: none !important; - padding: 0 !important; + background: transparent; + box-shadow: none; + padding: 0; } } From 4c311feb0ce61d1bc40cdc9e0ed88a92ff3070bf Mon Sep 17 00:00:00 2001 From: Nicholas Cooper Date: Sun, 2 Nov 2025 19:00:34 -0800 Subject: [PATCH 25/35] EI-243 - Modal creation along with setting them up in the batch cards for demonstration and beginning of setup for the next sprint. (#29) * EI-243 - Modal creation along with setting them up in the batch cards for demonstration and beginning of setup for the next sprint. * Blunder correction * Review tweaks * Review tweaks * Removed title and title test --------- Signed-off-by: Nicholas Cooper --- endpoint-insights-ui/src/app/app.config.ts | 4 +- endpoint-insights-ui/src/app/app.html | 12 ++-- endpoint-insights-ui/src/app/app.scss | 49 +++++++++++++++ endpoint-insights-ui/src/app/app.spec.ts | 6 -- endpoint-insights-ui/src/app/app.ts | 11 ++-- .../app/batch-component/batch-component.scss | 17 +++--- .../app/batch-component/batch-component.ts | 4 +- .../batch-card/batch-card.component.html | 32 ++++++---- .../batch-card/batch-card.component.scss | 53 ++++++++-------- .../batch-card/batch-card.component.ts | 61 ++++++++++++++----- .../test-results-card.component.html | 2 +- .../dashboard-component.scss | 14 +++++ .../dashboard-component.ts | 8 +-- .../src/app/models/batch.model.ts | 15 ++++- .../src/app/shared/modal/modal.component.html | 32 ++++++++++ .../src/app/shared/modal/modal.component.scss | 16 +++++ .../src/app/shared/modal/modal.component.ts | 24 ++++++++ .../src/app/shared/modal/modal.models.ts | 16 +++++ .../src/app/shared/modal/modal.service.ts | 21 +++++++ endpoint-insights-ui/src/main.ts | 1 + 20 files changed, 309 insertions(+), 89 deletions(-) create mode 100644 endpoint-insights-ui/src/app/shared/modal/modal.component.html create mode 100644 endpoint-insights-ui/src/app/shared/modal/modal.component.scss create mode 100644 endpoint-insights-ui/src/app/shared/modal/modal.component.ts create mode 100644 endpoint-insights-ui/src/app/shared/modal/modal.models.ts create mode 100644 endpoint-insights-ui/src/app/shared/modal/modal.service.ts diff --git a/endpoint-insights-ui/src/app/app.config.ts b/endpoint-insights-ui/src/app/app.config.ts index e6b1db6..1d94833 100644 --- a/endpoint-insights-ui/src/app/app.config.ts +++ b/endpoint-insights-ui/src/app/app.config.ts @@ -1,11 +1,11 @@ import { ApplicationConfig } from '@angular/core'; import { provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router'; import { routes } from './app.routes'; -//import { provideAnimations } from '@angular/platform-browser/animations'; +import { provideAnimations } from '@angular/platform-browser/animations'; export const appConfig: ApplicationConfig = { providers: [ provideRouter(routes, withEnabledBlockingInitialNavigation()), - //provideAnimations(), + provideAnimations(), ], }; diff --git a/endpoint-insights-ui/src/app/app.html b/endpoint-insights-ui/src/app/app.html index 794c097..e970f91 100644 --- a/endpoint-insights-ui/src/app/app.html +++ b/endpoint-insights-ui/src/app/app.html @@ -1,9 +1,9 @@

-

{{ title() }}

-
- + + \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/app.scss b/endpoint-insights-ui/src/app/app.scss index e69de29..fb1a81e 100644 --- a/endpoint-insights-ui/src/app/app.scss +++ b/endpoint-insights-ui/src/app/app.scss @@ -0,0 +1,49 @@ +:root, body, html { + max-width: 100%; + overflow-x: hidden; +} + +.sr-only { + position: absolute; + width: 1px; height: 1px; + padding: 0; margin: -1px; + overflow: hidden; clip: rect(0,0,1px,1px); + white-space: nowrap; border: 0; +} + +.app-header { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; + padding: .75rem 1rem; + background: #0b2335; +} + +.brand { + margin: 0; + color: rgba(255,255,255,.82); + text-transform: uppercase; + letter-spacing: .06em; + font-size: 1rem; + line-height: 1; +} + +.nav { + display: flex; + gap: 0.75rem; +} + +.nav a[mat-button] { + border-radius: 9999px; + padding: 0.5rem 1.1rem; + font-weight: 600; + background: #1976d2; + color: #fff; + text-decoration: none; + transition: background .18s ease, box-shadow .18s ease, transform .12s ease; +} + +.nav a[mat-button].active { background: #2196f3; } +.nav a[mat-button]:hover { background: #42a5f5; box-shadow: 0 4px 14px rgba(25,118,210,.22); } +.nav a[mat-button]:active { transform: translateY(1px); } diff --git a/endpoint-insights-ui/src/app/app.spec.ts b/endpoint-insights-ui/src/app/app.spec.ts index 060c162..b56a712 100644 --- a/endpoint-insights-ui/src/app/app.spec.ts +++ b/endpoint-insights-ui/src/app/app.spec.ts @@ -1,4 +1,3 @@ -// app.spec.ts import { TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app'; @@ -18,9 +17,4 @@ describe('App', () => { expect(fixture.componentInstance).toBeTruthy(); }); - it('should render title', () => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - expect(fixture.nativeElement.textContent).toContain('endpoint-insights-ui'); // or whatever selector you assert - }); }); diff --git a/endpoint-insights-ui/src/app/app.ts b/endpoint-insights-ui/src/app/app.ts index 283712f..f36a204 100644 --- a/endpoint-insights-ui/src/app/app.ts +++ b/endpoint-insights-ui/src/app/app.ts @@ -1,12 +1,15 @@ -import {Component, signal} from '@angular/core'; + +import { Component, signal } from '@angular/core'; import { RouterOutlet, RouterLink, RouterLinkActive } from '@angular/router'; +import { MatButtonModule, MatButton } from '@angular/material/button'; @Component({ selector: 'app-root', standalone: true, - imports: [RouterOutlet, RouterLink, RouterLinkActive], + imports: [RouterLink, RouterLinkActive, MatButtonModule, RouterOutlet], templateUrl: './app.html', + styleUrls: ['./app.scss'], }) export class AppComponent { - readonly title = signal('endpoint-insights-ui'); -} \ No newline at end of file + readonly title = signal('endpoint-insights-ui'); // needed for the test +} diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.scss b/endpoint-insights-ui/src/app/batch-component/batch-component.scss index af1e542..87e71ea 100644 --- a/endpoint-insights-ui/src/app/batch-component/batch-component.scss +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.scss @@ -1,13 +1,14 @@ +:host { + display: block; + padding: 8px; +} + .grid { display: grid; - grid-template-columns: repeat(12, 1fr); gap: 12px; + grid-template-columns: repeat(auto-fit, minmax(320px, 1fr)); + max-width: 1200px; + margin: 0 auto; } -app-batch-card { - grid-column: span 6; -} - -@media (max-width: 900px) { - app-batch-card { grid-column: span 12; } -} +:host, :host * { box-sizing: border-box; } diff --git a/endpoint-insights-ui/src/app/batch-component/batch-component.ts b/endpoint-insights-ui/src/app/batch-component/batch-component.ts index 9651bbe..0729b6c 100644 --- a/endpoint-insights-ui/src/app/batch-component/batch-component.ts +++ b/endpoint-insights-ui/src/app/batch-component/batch-component.ts @@ -13,8 +13,8 @@ import { BatchCardComponent } from './components/batch-card/batch-card.component export class BatchComponent { // mock data for now; I will need to fetch this from the server later batches: Batch[] = [ - { id: 'B-2025-00123', title: 'Nightly ETL (US-East)', createdIso: '2025-10-17T02:13:00Z' }, - { id: 'B-2025-00124', title: 'Customer Backfill – Oct', createdIso: '2025-10-18T15:45:00Z' }, + { id: 'B-2025-00123', title: 'Nightly ETL (US-East)', date: '2025-10-17T02:13:00Z' }, + { id: 'B-2025-00124', title: 'Customer Backfill – Oct', date: '2025-10-18T15:45:00Z' }, ]; onConfigure(batch: Batch) { diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html index 4b6a511..66f084f 100644 --- a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.html @@ -1,16 +1,24 @@ + -
-
-

{{ batch.title }}

-
Batch ID{{ batch.id }}
-
Date{{ formattedDate() }}
-
+
+
+

{{ batch.title }}

+
+ Batch ID + {{ batch.id }} +
+
+ Date + {{ formattedDate() }} +
+
-
- +
+ + +
-
diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss index 17c5e01..ecb6aa5 100644 --- a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.scss @@ -1,12 +1,14 @@ .batch-card { - border-radius: 12px; - padding: 10px 12px; + border: 1px solid #3359; + border-radius: 5px; + padding: 12px; + box-sizing: border-box; } .row { - display: grid; - grid-template-columns: 1fr auto; - align-items: start; + display: flex; + align-items: flex-start; + justify-content: space-between; gap: 12px; } @@ -16,39 +18,36 @@ } .title { - margin: 0; + margin: 0 0 2px 0; font-size: 1.05rem; - font-weight: 700; - letter-spacing: .2px; + line-height: 1.2; } .kv { display: grid; - grid-template-columns: 110px 1fr; - gap: 8px; + grid-template-columns: auto 1fr; + gap: 4px 8px; align-items: baseline; - - .label { color: #6b7280; } - .value { font-weight: 600; } } +.kv .label { color: rgba(0,0,0,.62); } +.kv .value { font-weight: 600; font-variant-numeric: tabular-nums; } .actions { display: flex; align-items: center; - justify-content: flex-end; - min-width: 160px; + gap: 8px; +} - button[mat-stroked-button] { - display: inline-flex; - gap: 6px; - border-radius: 999px; - padding: 0 14px; - } +button[mat-stroked-button] { + border-radius: 8px; + font-weight: 500; + transition: transform .15s ease, box-shadow .15s ease; } -.batch-card { - transition: transform .06s ease, box-shadow .12s ease; +button[mat-stroked-button]:hover { transform: translateY(-2px); box-shadow: 0 4px 8px rgba(0,0,0,.15); } +button[mat-stroked-button]:active { transform: translateY(1px); box-shadow: 0 2px 4px rgba(0,0,0,.2) inset; } +button[mat-stroked-button]:focus-visible { outline: 2px solid #0b2335; outline-offset: 2px; } + +@media (max-width: 480px) { + .row { flex-direction: column; align-items: stretch; } + .actions { justify-content: flex-end; } } -.batch-card:hover { - transform: translateY(-1px); - box-shadow: 0 6px 18px rgba(2, 12, 27, .08); -} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts index 11d42f3..0c5584a 100644 --- a/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts +++ b/endpoint-insights-ui/src/app/batch-component/components/batch-card/batch-card.component.ts @@ -1,24 +1,57 @@ -import { Component, EventEmitter, Input, Output, ChangeDetectionStrategy } from '@angular/core'; +// batch-card.component.ts +import { Component, Input, Output, EventEmitter, inject } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MatCardModule } from '@angular/material/card'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; +import { ModalService } from '../../../shared/modal/modal.service'; import { Batch } from '../../../models/batch.model'; - @Component({ - selector: 'app-batch-card', - standalone: true, - imports: [CommonModule, MatCardModule, MatButtonModule, MatIconModule], - templateUrl: './batch-card.component.html', - styleUrls: ['./batch-card.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'app-batch-card', + standalone: true, + imports: [CommonModule, MatCardModule, MatButtonModule, MatIconModule], + templateUrl: './batch-card.component.html', + styleUrls: ['./batch-card.component.scss'], }) export class BatchCardComponent { - @Input({ required: true }) batch!: Batch; - @Output() configure = new EventEmitter(); + @Input() batch!: Batch; + + @Output() configure = new EventEmitter(); + + private modal = inject(ModalService); + + onConfigure() { + // Open the reusable modal with multiple tabs + this.modal.open({ + title: `Configure: ${this.batch.title}`, + tabs: [ + { + label: 'Overview', + content: ` +

Batch ID: ${this.batch.id}

+

Date: ${new Date(this.batch.date).toLocaleString()}

+ `, + }, + { + label: 'Settings', + content: ` +

Owner, thresholds, notifications…

+ `, + }, + { + label: 'Runs', + content: ` +

Recent executions and statuses.

+ `, + }, + ], + }); + + // If parents still expect the event, keep it: + this.configure.emit(this.batch); + } - formattedDate(): string { - const d = new Date(this.batch?.createdIso ?? ''); - return isNaN(d.valueOf()) ? '—' : d.toLocaleString(); - } + formattedDate(): string { + return new Date(this.batch.date).toLocaleString(); + } } diff --git a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html index 7298d9a..181773b 100644 --- a/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html +++ b/endpoint-insights-ui/src/app/components/test-results-card/test-results-card.component.html @@ -115,7 +115,7 @@
- Aggregate Error Rate + Aggregate Error Rate: {{ pct(test.errorRatePct) }}
diff --git a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.scss b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.scss index e69de29..ae06d93 100644 --- a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.scss +++ b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.scss @@ -0,0 +1,14 @@ +:host { + display: block; + padding: 8px; +} + +.grid { + display: grid; + gap: 12px; + grid-template-columns: repeat(auto-fit, minmax(340px, 1fr)); + max-width: 1200px; + margin: 0 auto; +} + +:host, :host * { box-sizing: border-box; } diff --git a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts index 057e78e..7b05b29 100644 --- a/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts +++ b/endpoint-insights-ui/src/app/dashboard-component/dashboard-component.ts @@ -1,12 +1,14 @@ -import { Component } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { CommonModule } from '@angular/common'; import { TestResultsCardComponent } from '../components/test-results-card/test-results-card.component'; import { TestRecord } from '../models/test-record.model'; +import { MatButtonModule } from '@angular/material/button'; +//import { ModalService } from '../shared/modal/modal.service'; @Component({ selector: 'app-dashboard', standalone: true, - imports: [ CommonModule, TestResultsCardComponent,], + imports: [CommonModule, TestResultsCardComponent, MatButtonModule], templateUrl: './dashboard-component.html', styleUrls: ['./dashboard-component.scss'], }) @@ -39,6 +41,4 @@ export class DashboardComponent { //Currently just a mock data for now; I will n ]; trackById = (_: number, t: TestRecord) => t.id; - } - diff --git a/endpoint-insights-ui/src/app/models/batch.model.ts b/endpoint-insights-ui/src/app/models/batch.model.ts index 2ca271d..f21aeca 100644 --- a/endpoint-insights-ui/src/app/models/batch.model.ts +++ b/endpoint-insights-ui/src/app/models/batch.model.ts @@ -1,5 +1,14 @@ +/** Represents a single batch entry shown on the Dashboard. */ export interface Batch { - id: string; // Batch ID - title: string; // Name - createdIso: string; // ISO date string + /** Unique ID for the batch (UUID) */ + id: string; + + /** Display title (usually a short descriptive name) */ + title: string; + + /** ISO string or timestamp representing when the batch was created or run */ + date: string; + + /** description or notes */ + description?: string; } diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.component.html b/endpoint-insights-ui/src/app/shared/modal/modal.component.html new file mode 100644 index 0000000..7b0db3e --- /dev/null +++ b/endpoint-insights-ui/src/app/shared/modal/modal.component.html @@ -0,0 +1,32 @@ + +

+ {{ data.title || 'Details' }} + +

+ + + +
+ No content yet. +
+ + +
+

{{ tabs[0].label }}

+
+
+ + + + +
+ + + + + + + + diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.component.scss b/endpoint-insights-ui/src/app/shared/modal/modal.component.scss new file mode 100644 index 0000000..baa18f5 --- /dev/null +++ b/endpoint-insights-ui/src/app/shared/modal/modal.component.scss @@ -0,0 +1,16 @@ +:host { + display: block; +} + +:host ::ng-deep .mat-dialog-container { + display: flex; + flex-direction: column; +} + +.modal-body { + flex: 1 1 auto; + max-height: 70vh; + overflow: auto; +} + +.tab-pane { padding: .25rem 0; } diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.component.ts b/endpoint-insights-ui/src/app/shared/modal/modal.component.ts new file mode 100644 index 0000000..fd8c1f9 --- /dev/null +++ b/endpoint-insights-ui/src/app/shared/modal/modal.component.ts @@ -0,0 +1,24 @@ +import { Component, Inject } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MAT_DIALOG_DATA, MatDialogContent, MatDialogTitle, MatDialogActions, MatDialogClose } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTabsModule } from '@angular/material/tabs'; +import { ModalConfig } from './modal.models'; + +@Component({ + selector: 'app-modal', + standalone: true, + imports: [ + CommonModule, + MatDialogTitle, MatDialogContent, MatDialogActions, MatDialogClose, + MatButtonModule, MatIconModule, MatTabsModule + ], + templateUrl: './modal.component.html', + styleUrls: ['./modal.component.scss'] +}) +export class ModalComponent { + constructor(@Inject(MAT_DIALOG_DATA) public data: ModalConfig) {} + get tabs() { return this.data?.tabs ?? []; } + get showTabHeader() { return this.tabs.length > 1; } +} diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.models.ts b/endpoint-insights-ui/src/app/shared/modal/modal.models.ts new file mode 100644 index 0000000..ce810db --- /dev/null +++ b/endpoint-insights-ui/src/app/shared/modal/modal.models.ts @@ -0,0 +1,16 @@ +export interface ModalTab { + /** Text shown on the tab button */ + label: string; + /** Plain content for now (can be upgraded to TemplateRef later) */ + content: string; +} + +export interface ModalConfig { + /** Title shown in the modal header */ + title?: string; + /** Tabs to render. 0, 1, or many allowed. */ + tabs: ModalTab[]; + /** Optional width constraints */ + width?: string; + maxWidth?: string; +} diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.service.ts b/endpoint-insights-ui/src/app/shared/modal/modal.service.ts new file mode 100644 index 0000000..4a74076 --- /dev/null +++ b/endpoint-insights-ui/src/app/shared/modal/modal.service.ts @@ -0,0 +1,21 @@ +import { Injectable, inject } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { ModalComponent } from './modal.component'; +import { ModalConfig } from './modal.models'; + +@Injectable({ providedIn: 'root' }) +export class ModalService { + private dialog = inject(MatDialog); + + open(config: ModalConfig) { + return this.dialog.open(ModalComponent, { + data: config, + width: config.width ?? '600px', + maxWidth: config.maxWidth ?? '95vw', + autoFocus: 'first-tabbable', + restoreFocus: true, + enterAnimationDuration: '150ms', + exitAnimationDuration: '100ms' + }); + } +} diff --git a/endpoint-insights-ui/src/main.ts b/endpoint-insights-ui/src/main.ts index e47684e..9483d1b 100644 --- a/endpoint-insights-ui/src/main.ts +++ b/endpoint-insights-ui/src/main.ts @@ -1,5 +1,6 @@ import { bootstrapApplication } from '@angular/platform-browser'; import { AppComponent } from './app/app'; import { appConfig } from './app/app.config'; +import { provideAnimations } from '@angular/platform-browser/animations'; bootstrapApplication(AppComponent, appConfig); From f7b62a63c6dfdc7d34f8eb24e626da899dc9dd8c Mon Sep 17 00:00:00 2001 From: cbrock-csus Date: Sun, 2 Nov 2025 19:13:24 -0800 Subject: [PATCH 26/35] EI-40 - Test Results Tables (#36) * EI-40 - Test Results Tables * EI-40 - Update test_result_tables.sql --- endpoint-insights-sql/test_result_tables.sql | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 endpoint-insights-sql/test_result_tables.sql diff --git a/endpoint-insights-sql/test_result_tables.sql b/endpoint-insights-sql/test_result_tables.sql new file mode 100644 index 0000000..57359d7 --- /dev/null +++ b/endpoint-insights-sql/test_result_tables.sql @@ -0,0 +1,34 @@ +create table test_result +( + result_id uuid default gen_random_uuid() + constraint test_result_pk + primary key, + job_type integer +); + +create table perf_test_result +( + result_id uuid not null + constraint perf_test_result_pk + primary key + constraint perf_test_result_fk + references test_result, + p50_latency_ms integer, + p95_latency_ms integer, + p99_latency_ms integer, + volume_last_minute integer, + volume_last_5_minutes integer, + error_rate_percent double precision +); + +create table perf_test_result_code +( + result_id uuid not null + constraint perf_test_result_code_fk + references perf_test_result, + error_code integer not null, + count integer, + constraint perf_test_result_code_pk + primary key (result_id, error_code) +); + From 41fff1f1bda504fe4b0941ab28c2c5e25ca4d564 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 2 Nov 2025 21:08:51 -0800 Subject: [PATCH 27/35] Corrections to toast component and jobs UUID type --- endpoint-insights-ui/src/styles.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/endpoint-insights-ui/src/styles.scss b/endpoint-insights-ui/src/styles.scss index dbe36ba..99291b0 100644 --- a/endpoint-insights-ui/src/styles.scss +++ b/endpoint-insights-ui/src/styles.scss @@ -81,16 +81,16 @@ body { .toast-success, .toast-error { - background: transparent !important; - box-shadow: none !important; - padding: 0 !important; - max-width: 500px !important; + background: transparent; + box-shadow: none; + padding: 0 ; + max-width: 500px; .mat-mdc-snack-bar-container, .mdc-snackbar__surface { - background: transparent !important; - box-shadow: none !important; - padding: 0 !important; + background: transparent; + box-shadow: none; + padding: 0; } } From 68ced1495dab60df6ed4d1c592d5ddde6772eff5 Mon Sep 17 00:00:00 2001 From: Tyler Date: Sat, 8 Nov 2025 19:40:27 -0800 Subject: [PATCH 28/35] Audit class completed --- .../EndpointInsightsApiApplication.java | 2 + .../config/EntityAuditConfig.java | 26 ++++++++++ .../model/AuditingEntity.java | 36 +++++++++++++ .../endpointinsightsapi/model/TestBatch.java | 4 +- .../repository/TestBatchRepository.java | 11 ++++ .../src/main/resources/application.yaml | 4 ++ .../model/AbstractEntityTest.java | 51 +++++++++++++++++++ 7 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/config/EntityAuditConfig.java create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java create mode 100644 endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java create mode 100644 endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java index cd8967f..35e5a8f 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication public class EndpointInsightsApiApplication { diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/config/EntityAuditConfig.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/config/EntityAuditConfig.java new file mode 100644 index 0000000..186b8f9 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/config/EntityAuditConfig.java @@ -0,0 +1,26 @@ +package com.vsp.endpointinsightsapi.config; + + +import com.vsp.endpointinsightsapi.model.UserContext; +import com.vsp.endpointinsightsapi.util.CurrentUser; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.domain.AuditorAware; + +import java.util.Optional; + +@Configuration +public class EntityAuditConfig { + + @Bean + public AuditorAware auditorProvider() { + + return () -> { + if(!CurrentUser.getUsername().equals("system")) { + return Optional.of(CurrentUser.getUsername()); + } + return Optional.of("system"); + }; + } + +} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java new file mode 100644 index 0000000..deb599e --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java @@ -0,0 +1,36 @@ +package com.vsp.endpointinsightsapi.model; + + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@EntityListeners(AuditingEntityListener.class) +@MappedSuperclass +public abstract class AuditingEntity { + + @CreatedBy + @Column(nullable = false, updatable = false) + private String createdBy; + + @CreatedDate + @Column(nullable = false, updatable = false) + private LocalDateTime createdDate; + + @LastModifiedBy + @Column(nullable = false, updatable = false) + private String lastModifiedBy; + + @LastModifiedDate + @Column(nullable = false, updatable = false) + private LocalDateTime lastModifiedDate; + +} diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java index e156a15..50624a9 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/TestBatch.java @@ -3,6 +3,7 @@ import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.UuidGenerator; @@ -10,12 +11,13 @@ import java.util.*; +@EqualsAndHashCode(callSuper = true) @Data @Entity @AllArgsConstructor @NoArgsConstructor @Table(name = "test_batch") -public class TestBatch { +public class TestBatch extends AuditingEntity{ @Id @GeneratedValue diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java new file mode 100644 index 0000000..2a11eb6 --- /dev/null +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java @@ -0,0 +1,11 @@ +package com.vsp.endpointinsightsapi.repository; + +import com.vsp.endpointinsightsapi.model.TestBatch; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface TestBatchRepository extends JpaRepository { + + public TestBatch findByTestId(UUID testId); +} diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml index befc2bd..094129d 100644 --- a/endpoint-insights-api/src/main/resources/application.yaml +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -5,6 +5,10 @@ spring: url: jdbc:${DB_URI} username: ${DB_NAME} password: ${DB_PASSWORD} + jpa: + database-platform: org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: create security: oauth2: diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java new file mode 100644 index 0000000..04f1e81 --- /dev/null +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java @@ -0,0 +1,51 @@ +package com.vsp.endpointinsightsapi.model; + +import com.vsp.endpointinsightsapi.repository.TestBatchRepository; +import jakarta.persistence.EntityManager; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.ArrayList; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class AbstractEntityTest { + + @Mock + private TestBatchRepository testBatchRepository; + + @Test + public void createEntityWithAuditFields() { + // Arrange + TestBatch batch = new TestBatch(); + batch.setBatchName("batchName"); + batch.setJobs(new ArrayList<>()); + + // Create a mock saved entity with ID + TestBatch savedBatch = new TestBatch(); + UUID batchId = UUID.randomUUID(); + savedBatch.setBatch_id(batchId); + savedBatch.setBatchName("batchName"); + + when(testBatchRepository.save(any(TestBatch.class))).thenReturn(savedBatch); + + when(testBatchRepository.findByTestId(batchId)).thenReturn(savedBatch); + + TestBatch result = testBatchRepository.save(batch); + TestBatch expectedBatch = testBatchRepository.findByTestId(savedBatch.getBatch_id()); + + assertNotNull(result); + assertNotNull(expectedBatch); + assertEquals("batchName", expectedBatch.getBatchName()); + assertEquals(batchId, expectedBatch.getBatch_id()); + + verify(testBatchRepository, times(1)).save(batch); + verify(testBatchRepository, times(1)).findByTestId(batchId); + } +} \ No newline at end of file From eda9a5b26972dba0471b5c133b707025a3dc34af Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Fri, 14 Nov 2025 23:57:10 -0800 Subject: [PATCH 29/35] Modal made, form almost done --- .../create-job-form/create-job-form.ts | 20 +++- .../edit-job-modal/edit-job-modal.html | 63 +++++++++++++ .../edit-job-modal/edit-job-modal.scss | 92 +++++++++++++++++++ .../edit-job-modal/edit-job-modal.ts | 50 ++++++++++ .../app/pages/test-overview/test-overview.ts | 32 ++++++- .../src/app/shared/modal/modal.models.ts | 1 + 6 files changed, 252 insertions(+), 6 deletions(-) create mode 100644 endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html create mode 100644 endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss create mode 100644 endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts diff --git a/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts b/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts index 72b925c..b512ca4 100644 --- a/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts +++ b/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Output} from '@angular/core'; +import {Component, EventEmitter, Input, Output, SimpleChanges} from '@angular/core'; import { AbstractControl, FormBuilder, @@ -10,6 +10,7 @@ import { import {MatFormField} from "@angular/material/form-field"; import {MatInputModule} from "@angular/material/input"; import {MatOption, MatSelect} from "@angular/material/select"; +import {TestItem} from "../../pages/test-overview/test-overview"; @Component({ selector: 'app-job-form', @@ -26,7 +27,7 @@ import {MatOption, MatSelect} from "@angular/material/select"; }) export class CreateJobForm { createJobForm: FormGroup; - + @Input() job!: TestItem; constructor(private formBuilder: FormBuilder) { this.createJobForm = this.formBuilder.group({ name: ["", [ @@ -53,6 +54,21 @@ export class CreateJobForm { }) } + ngOnChanges(changes: SimpleChanges) { + if (changes['job'] && this.job) { + this.createJobForm.patchValue({ + name: this.job.name, + description: this.job.description, + gitUrl: this.job.gitUrl, + jobType: this.job.jobType, + runCommand: this.job.runCommand, + compileCommand: this.job.compileCommand, + }); + } + } + + + @Output() jobSubmitted = new EventEmitter(); getErrorMessage(fieldName: string): string { diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html new file mode 100644 index 0000000..669e1d4 --- /dev/null +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html @@ -0,0 +1,63 @@ +
+
+

Edit: {{data.name}}

+

#{{ data.id }}

+
+ + + @if (state().inEditMode){ + + } + @else { +
+
+
+ +

{{ data.name }}

+
+
+ +

{{ data.description }}

+
+
+ +
+
+ +

{{ data.gitUrl }}

+
+
+ +

{{ data.jobType }}

+
+
+ +
+
+ +

{{ data.runCommand }}

+
+
+ +

{{ data.compileCommand }}

+
+
+
+ } + + + +
+ + + +
+ +
\ No newline at end of file diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss new file mode 100644 index 0000000..7804ef4 --- /dev/null +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss @@ -0,0 +1,92 @@ +button.mat-mdc-raised-button.create-job-modal-cancel-button { + background-color: transparent; + color: #666; + border: 1px #ccc solid; + border-radius: 4px; + transition: background-color 0.2s; + + &:hover { + background-color: #f5f5f5; + border-color: #999; + } + + &:active { + background-color: #e0e0e0; + } + + &:focus-visible { + outline: 2px solid #1976d2; + outline-offset: 2px; + } + + &:focus:not(:focus-visible) { + outline: none; + } +} + +.form { + display: flex; + flex-direction: column; + gap: 20px; + padding: 24px; + max-width: 600px; +} + +.header{ + display: flex; + flex-direction: column; + padding: 0px; + +} + +.form-row { + display: flex; + gap: 16px; + mat-form-field { + flex: 1; + } +} + +.form-row-commands { + margin-top: 24px; +} + +.form-field { + width: 100%; +} + +mat-error { + color: #f44336; + font-size: 0.75rem; + margin-top: 4px; + line-height: 1.2; + + div { + margin: 0; + } +} + + +button.mat-mdc-raised-button.create-job-modal-create-button { + background-color: #1976d2; + color: white; + border-radius: 4px; + transition: background-color 0.2s; + + &:hover { + background-color: #1565c0; + } + + &:active { + background-color: #0d47a1; + } + + &:focus-visible { + outline: 2px solid #1976d2; + outline-offset: 2px; + } + + &:focus:not(:focus-visible) { + outline: none; + } +} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts new file mode 100644 index 0000000..003e8f9 --- /dev/null +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts @@ -0,0 +1,50 @@ +import {Component, Inject, signal, ViewChild} from "@angular/core"; +import { + MAT_DIALOG_DATA, + MatDialogActions, + MatDialogContent, + MatDialogRef, + MatDialogTitle +} from "@angular/material/dialog"; +import {MatButton} from "@angular/material/button"; +import {TestItem} from "../../pages/test-overview/test-overview"; +import {CreateJobForm} from "../create-job-form/create-job-form"; + +@Component({ + selector:'edit-job-modal', + standalone:true, + templateUrl:'edit-job-modal.html', + styleUrl:'edit-job-modal.scss', + imports: [ + MatDialogContent, + MatDialogActions, + MatButton, + CreateJobForm, + MatDialogTitle, + ] +}) + +export class EditJobModal{ + @ViewChild(CreateJobForm) createJobForm!: CreateJobForm; + private dialogRef: MatDialogRef; + public state = signal({ + inEditMode: false, + }) + constructor( + dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: TestItem) + { + this.dialogRef = dialogRef; + } + + toggleEditMode(){ + this.state.update(s => ({ + ...s, + inEditMode: !s.inEditMode + })) + } + + onCancel(){ + this.dialogRef.close() + } +} diff --git a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts index 1e61588..75a535e 100644 --- a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts +++ b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts @@ -4,11 +4,18 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import {MatDialog} from "@angular/material/dialog"; import {CreateJobModal} from "../../components/create-job-modal/create-job-modal"; +import {EditJobModal} from "../../components/edit-job-modal/edit-job-modal"; +import {ModalComponent} from "../../shared/modal/modal.component"; export interface TestItem { id: string; name: string; batch: string; + description: string, + gitUrl: string, + runCommand: string, + compileCommand: string, + jobType: string, createdAt: Date | string; createdBy: string; status: 'running' | 'stopped'; @@ -22,7 +29,8 @@ export interface TestItem { imports: [ CommonModule, MatIconModule, - MatButtonModule + MatButtonModule, + EditJobModal ], }) export class TestOverview { @@ -33,13 +41,17 @@ export class TestOverview { tests: TestItem[] = [ - { id:'1', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'running' }, - { id:'2', name:'Billing – Refund', batch:'Nightly-01', createdAt:new Date(), createdBy:'Sam', status:'stopped' }, + { id:'1', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'running', + gitUrl:"git.com/test", description: "this is a test", jobType:"jmeter", compileCommand:"./ep-compile ", + runCommand:"./ep-run -" }, + + { id:'2', name:'Billing – Refund', batch:'Nightly-01', createdAt:new Date(), createdBy:'Sam', status:'stopped', + gitUrl:"git.com/test", description: "", jobType:"nightwatch", compileCommand:"", runCommand:"./ep-run -"}, ]; onOpen(t: TestItem) { console.log('Open Clicked') } onRun(t: TestItem) { console.log('Run Clicked') } - onEdit(t: TestItem) { console.log('Edit Clicked') } + onEdit(t: TestItem) { this.openEditModal(t) } onDelete(t: TestItem){ console.log('Delete Clicked') } @@ -58,4 +70,16 @@ export class TestOverview { } }); } + openEditModal(t:TestItem){ + const dialogRef = this.dialog.open(EditJobModal, { + width: '600px', + maxWidth: '95vw', + data: t, + }); + dialogRef.afterClosed().subscribe((result: any) => { + if (result) { + console.log("New job created:", result); + } + }); + } } diff --git a/endpoint-insights-ui/src/app/shared/modal/modal.models.ts b/endpoint-insights-ui/src/app/shared/modal/modal.models.ts index ce810db..4a990d1 100644 --- a/endpoint-insights-ui/src/app/shared/modal/modal.models.ts +++ b/endpoint-insights-ui/src/app/shared/modal/modal.models.ts @@ -10,6 +10,7 @@ export interface ModalConfig { title?: string; /** Tabs to render. 0, 1, or many allowed. */ tabs: ModalTab[]; + initialState?: Record /** Optional width constraints */ width?: string; maxWidth?: string; From 5391862c29c9c0f0167bc54a0c88f375f89d03a0 Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Sat, 15 Nov 2025 17:48:07 -0800 Subject: [PATCH 30/35] Hooking up API to backend --- .../controller/JobsController.java | 21 +++++++------- .../vsp/endpointinsightsapi/model/Job.java | 25 ++-------------- .../src/main/resources/application.yaml | 2 +- endpoint-insights-ui/src/app/app.config.ts | 2 ++ .../src/app/common/job.constants.ts | 4 +++ .../edit-job-modal/edit-job-modal.html | 3 +- .../edit-job-modal/edit-job-modal.ts | 29 +++++++++++++++++-- .../app/pages/test-overview/test-overview.ts | 7 +++-- .../src/app/services/job-services.ts | 22 ++++++++++++++ 9 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 endpoint-insights-ui/src/app/common/job.constants.ts create mode 100644 endpoint-insights-ui/src/app/services/job-services.ts diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java index a5136f2..2f5233c 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java @@ -25,6 +25,7 @@ @RestController @RequestMapping("/api/jobs") @Validated +@CrossOrigin(origins = "http://localhost:4200") // Add this public class JobsController { private final static Logger LOG = LoggerFactory.getLogger(JobsController.class); @@ -40,16 +41,16 @@ public JobsController(JobService jobService) { * @param request the job details * @return the created Job * */ - @PostMapping //("/") - // public ResponseEntity createJob(@RequestBody @Valid Job jobRequest) { - // try { - // jobService.createJob(jobRequest); - // return new ResponseEntity<>(jobRequest, HttpStatus.CREATED); - // } catch (RuntimeException e) { - // LOG.error("Error creating job: {}", e.getMessage()); - // return new ResponseEntity<>(null); - // } - // } + @PostMapping + public ResponseEntity createJob(@RequestBody @Valid Job jobRequest) { + try { + jobService.createJob(jobRequest); + return new ResponseEntity<>(jobRequest, HttpStatus.CREATED); + } catch (RuntimeException e) { + LOG.error("Error creating job: {}", e.getMessage()); + return new ResponseEntity<>(null); + } + } public ResponseEntity createJob(@RequestBody @Valid JobCreateRequest request) { LOG.info("Creating job"); try { diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 2d645d1..19edf01 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -8,6 +8,7 @@ import lombok.Setter; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.annotations.UuidGenerator; import org.hibernate.type.SqlTypes; import java.util.Date; @@ -24,7 +25,8 @@ public class Job { @Id - @ColumnDefault("get_random_uuid()") + @GeneratedValue + @UuidGenerator @Column(name = "job_id") private UUID jobId; @@ -60,17 +62,6 @@ public class Job { @Column(name = "status", nullable = false, length = 20) private JobStatus status = JobStatus.PENDING; - @Column(name = "created_at", nullable = false, updatable = false) - private Date createdAt; - - @Column(name = "updated_at", nullable = false) - private Date updatedAt; - - @Column(name = "started_at", nullable = false) - private Date startedAt; - - @Column(name = "completed_at", nullable = false) - private Date completedAt; // JSONB config: arbitrary key/value settings for the job @JdbcTypeCode(SqlTypes.JSON) @@ -78,14 +69,4 @@ public class Job { private Map config; - @PrePersist - void onCreate() { - this.createdAt = new Date(); - this.updatedAt = new Date(); - } - - @PreUpdate - void onUpdate() { - this.updatedAt = new Date(); - } } diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml index befc2bd..3df5fd8 100644 --- a/endpoint-insights-api/src/main/resources/application.yaml +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -28,7 +28,7 @@ spring: app: authentication: - enabled: true + enabled: false groups: write: "ei:write" read: "ei:read" diff --git a/endpoint-insights-ui/src/app/app.config.ts b/endpoint-insights-ui/src/app/app.config.ts index 1d94833..87427a2 100644 --- a/endpoint-insights-ui/src/app/app.config.ts +++ b/endpoint-insights-ui/src/app/app.config.ts @@ -2,10 +2,12 @@ import { ApplicationConfig } from '@angular/core'; import { provideRouter, withEnabledBlockingInitialNavigation } from '@angular/router'; import { routes } from './app.routes'; import { provideAnimations } from '@angular/platform-browser/animations'; +import {provideHttpClient} from "@angular/common/http"; export const appConfig: ApplicationConfig = { providers: [ provideRouter(routes, withEnabledBlockingInitialNavigation()), provideAnimations(), + provideHttpClient() ], }; diff --git a/endpoint-insights-ui/src/app/common/job.constants.ts b/endpoint-insights-ui/src/app/common/job.constants.ts new file mode 100644 index 0000000..cc5f097 --- /dev/null +++ b/endpoint-insights-ui/src/app/common/job.constants.ts @@ -0,0 +1,4 @@ + +export const JOB_STATUSES = ['RUNNING', 'STOPPED', 'PENDING', 'FAILED', 'SUCCESS'] as const; + +export type JobStatus = typeof JOB_STATUSES[number]; \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html index 669e1d4..2628998 100644 --- a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html @@ -1,7 +1,6 @@
-

Edit: {{data.name}}

-

#{{ data.id }}

+

{{data.name}}:{{ data.id }}

diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts index 003e8f9..6de769f 100644 --- a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts @@ -1,4 +1,4 @@ -import {Component, Inject, signal, ViewChild} from "@angular/core"; +import {Component, EventEmitter, Inject, Output, signal, ViewChild} from "@angular/core"; import { MAT_DIALOG_DATA, MatDialogActions, @@ -9,6 +9,8 @@ import { import {MatButton} from "@angular/material/button"; import {TestItem} from "../../pages/test-overview/test-overview"; import {CreateJobForm} from "../create-job-form/create-job-form"; +import {ToastService} from "../../services/toast.service"; +import {JobService} from "../../services/job-services"; @Component({ selector:'edit-job-modal', @@ -32,7 +34,9 @@ export class EditJobModal{ }) constructor( dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: TestItem) + @Inject(MAT_DIALOG_DATA) public data: TestItem, + private toastService :ToastService, + private jobService: JobService) { this.dialogRef = dialogRef; } @@ -42,6 +46,27 @@ export class EditJobModal{ ...s, inEditMode: !s.inEditMode })) + + // Check for sav3e + if (!this.state().inEditMode) { + this.onSave(); + } + } + + + onSave(){ + this.jobService.createJob(this.data).subscribe({ + next: (response) => { + console.log('Job created:', response); + this.toastService.onSuccess('Job created successfully!'); + // // Reset form + // this.job = { title: '', description: '', status: 'pending' }; + }, + error: (error) => { + console.error('Error creating job:', error); + this.toastService.onError('Failed to create job'); + } + }); } onCancel(){ diff --git a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts index 75a535e..9924d14 100644 --- a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts +++ b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts @@ -6,6 +6,7 @@ import {MatDialog} from "@angular/material/dialog"; import {CreateJobModal} from "../../components/create-job-modal/create-job-modal"; import {EditJobModal} from "../../components/edit-job-modal/edit-job-modal"; import {ModalComponent} from "../../shared/modal/modal.component"; +import {JobStatus} from "../../common/job.constants"; export interface TestItem { id: string; @@ -18,7 +19,7 @@ export interface TestItem { jobType: string, createdAt: Date | string; createdBy: string; - status: 'running' | 'stopped'; + status: JobStatus; } @Component({ @@ -41,11 +42,11 @@ export class TestOverview { tests: TestItem[] = [ - { id:'1', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'running', + { id:'1', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'RUNNING', gitUrl:"git.com/test", description: "this is a test", jobType:"jmeter", compileCommand:"./ep-compile ", runCommand:"./ep-run -" }, - { id:'2', name:'Billing – Refund', batch:'Nightly-01', createdAt:new Date(), createdBy:'Sam', status:'stopped', + { id:'2', name:'Billing – Refund', batch:'Nightly-01', createdAt:new Date(), createdBy:'Sam', status:'STOPPED', gitUrl:"git.com/test", description: "", jobType:"nightwatch", compileCommand:"", runCommand:"./ep-run -"}, ]; diff --git a/endpoint-insights-ui/src/app/services/job-services.ts b/endpoint-insights-ui/src/app/services/job-services.ts new file mode 100644 index 0000000..7085edb --- /dev/null +++ b/endpoint-insights-ui/src/app/services/job-services.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import {TestItem} from "../pages/test-overview/test-overview"; + + +@Injectable({ + providedIn: 'root' +}) +export class JobService { + private apiUrl = 'http://localhost:8080/api/jobs'; + + constructor(private http: HttpClient) {} + + createJob(test:TestItem): Observable{ + return this.http.post(this.apiUrl, test); + } + + updateJob(id: number, test: TestItem): Observable { + return this.http.put(`${this.apiUrl}/${id}`, test); + } +} \ No newline at end of file From b89d7ec9a8caafa46270b42912e8337a8a4e135a Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Sat, 15 Nov 2025 22:04:48 -0800 Subject: [PATCH 31/35] Api works with no auth, still need to hook that up --- .../controller/JobsController.java | 24 ++---------- .../model/AuditingEntity.java | 15 ++++---- .../vsp/endpointinsightsapi/model/Job.java | 4 +- .../repository/TestBatchRepository.java | 8 +++- .../service/JobService.java | 12 ++++++ .../model/AbstractEntityTest.java | 6 +-- .../model/JobEntityTest.java | 20 ---------- .../service/JobServiceTest.java | 37 +++++++++++++++++++ .../create-job-form/create-job-form.ts | 1 + .../edit-job-modal/edit-job-modal.html | 6 ++- .../edit-job-modal/edit-job-modal.scss | 9 +++++ .../edit-job-modal/edit-job-modal.ts | 10 ++--- .../app/pages/test-overview/test-overview.ts | 5 +-- .../src/app/services/job-services.ts | 2 +- 14 files changed, 93 insertions(+), 66 deletions(-) diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java index 2f5233c..926b40a 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/controller/JobsController.java @@ -25,7 +25,7 @@ @RestController @RequestMapping("/api/jobs") @Validated -@CrossOrigin(origins = "http://localhost:4200") // Add this +@CrossOrigin(origins = "http://localhost:4200") public class JobsController { private final static Logger LOG = LoggerFactory.getLogger(JobsController.class); @@ -51,19 +51,6 @@ public ResponseEntity createJob(@RequestBody @Valid Job jobRequest) { return new ResponseEntity<>(null); } } - public ResponseEntity createJob(@RequestBody @Valid JobCreateRequest request) { - LOG.info("Creating job"); - try { - Job newJob = new Job(); - newJob.setName(request.getName()); - jobService.createJob(newJob); - return new ResponseEntity<>(newJob, HttpStatus.CREATED); - } catch (RuntimeException e) { - LOG.error("Error creating job: {}", e.getMessage()); - return new ResponseEntity<>(null); - } - - } /** * Endpoint to update a job resource. @@ -76,18 +63,15 @@ public ResponseEntity createJob(@RequestBody @Valid JobCreateRequest reques public ResponseEntity updateJob( @RequestBody @Valid - JobUpdateRequest request, + Job request, @PathVariable("id") @NotNull(message = ErrorMessages.JOB_ID_REQUIRED) UUID jobId) { LOG.info("Updating job"); - Job updatedJob = new Job(); - updatedJob.setJobId(jobId); - updatedJob.setName("Updated Job #" + jobId); - updatedJob.setDescription("This is a stub for job #" + jobId); + Job savedJob = jobService.updateJob(jobId, request); - return ResponseEntity.ok(updatedJob); + return ResponseEntity.ok(savedJob); } /** diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java index deb599e..387f5d2 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/AuditingEntity.java @@ -11,6 +11,7 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import java.time.Instant; import java.time.LocalDateTime; @EntityListeners(AuditingEntityListener.class) @@ -18,19 +19,19 @@ public abstract class AuditingEntity { @CreatedBy - @Column(nullable = false, updatable = false) + @Column(name = "created_by", nullable = false, updatable = false) private String createdBy; @CreatedDate - @Column(nullable = false, updatable = false) - private LocalDateTime createdDate; + @Column(name = "created_date",nullable = false, updatable = false) + private Instant createdDate; @LastModifiedBy - @Column(nullable = false, updatable = false) - private String lastModifiedBy; + @Column(name = "updated_by",nullable = false) + private String updatedBy; @LastModifiedDate - @Column(nullable = false, updatable = false) - private LocalDateTime lastModifiedDate; + @Column(name = "updated_date",nullable = false) + private Instant updatedDate; } diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java index 19edf01..c9c332d 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/model/Job.java @@ -22,7 +22,7 @@ @AllArgsConstructor @Entity @Table(name = "job") -public class Job { +public class Job extends AuditingEntity { @Id @GeneratedValue @@ -38,7 +38,7 @@ public class Job { @Enumerated(EnumType.STRING) @Column(name = "test_type", nullable = false, length = 20) - private TestType testType; + private TestType jobType; @ManyToMany @JoinTable( diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java index 2a11eb6..c57a73c 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/repository/TestBatchRepository.java @@ -2,10 +2,14 @@ import com.vsp.endpointinsightsapi.model.TestBatch; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import java.util.UUID; +@Repository public interface TestBatchRepository extends JpaRepository { - - public TestBatch findByTestId(UUID testId); + @Query("SELECT t FROM TestBatch t WHERE t.batch_id = :id") + TestBatch findById(@Param("id") UUID id); } diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/service/JobService.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/service/JobService.java index a8ea6fb..e2592bb 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/service/JobService.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/service/JobService.java @@ -44,6 +44,18 @@ public Optional getJobById(UUID jobId) { } + public Job updateJob(UUID id, Job job) { + Job existingJob = jobRepository.findById(id) + .orElseThrow(() -> new JobNotFoundException(job.getJobId().toString())); + existingJob.setName(job.getName()); + existingJob.setDescription(job.getDescription()); + existingJob.setStatus(job.getStatus()); + existingJob.setTestBatches(job.getTestBatches()); + existingJob.setJobType(job.getJobType()); + existingJob.setConfig(job.getConfig()); + return jobRepository.save(existingJob); + } + @Transactional public void deleteJobById(UUID jobId) { LOG.debug("Attempting to delete job with ID {}", jobId); diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java index 04f1e81..96d13b3 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java @@ -35,10 +35,10 @@ public void createEntityWithAuditFields() { when(testBatchRepository.save(any(TestBatch.class))).thenReturn(savedBatch); - when(testBatchRepository.findByTestId(batchId)).thenReturn(savedBatch); + when(testBatchRepository.findById(batchId)).thenReturn(savedBatch); TestBatch result = testBatchRepository.save(batch); - TestBatch expectedBatch = testBatchRepository.findByTestId(savedBatch.getBatch_id()); + TestBatch expectedBatch = testBatchRepository.findById(savedBatch.getBatch_id()); assertNotNull(result); assertNotNull(expectedBatch); @@ -46,6 +46,6 @@ public void createEntityWithAuditFields() { assertEquals(batchId, expectedBatch.getBatch_id()); verify(testBatchRepository, times(1)).save(batch); - verify(testBatchRepository, times(1)).findByTestId(batchId); + verify(testBatchRepository, times(1)).findById(batchId); } } \ No newline at end of file diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java index d0fe0c6..4ed7cb5 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/JobEntityTest.java @@ -8,27 +8,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; public class JobEntityTest { - @Test - void shouldSetTimestampsOnCreate() { - Job job = new Job(); - job.onCreate(); - - assertThat(job.getCreatedAt()).isNotNull(); - assertThat(job.getUpdatedAt()).isNotNull(); - } - - @Test - void shouldUpdateTimestampOnUpdate() { - Job job = new Job(); - job.onCreate(); - - Date initialTime = new Date(System.currentTimeMillis() - 1000); - job.setUpdatedAt(initialTime); - job.onUpdate(); - - assertThat(job.getUpdatedAt()).isAfter(initialTime); - } @Test void shouldDefaultToPendingStatus() { diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/service/JobServiceTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/service/JobServiceTest.java index aae2507..5b7c0a8 100644 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/service/JobServiceTest.java +++ b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/service/JobServiceTest.java @@ -109,4 +109,41 @@ void deleteJobById_nonExistingJob_throwsJobNotFoundException() { assertEquals("Job not found with ID: " + jobId.toString(), exception.getErrorResponse().getDescription()); } + @Test + void updateExistingJob(){ + // Create job with ID + Job job = new Job(); + job.setJobId(UUID.randomUUID()); + + // Stub the save to return the job with ID + when(jobRepository.save(any(Job.class))).thenReturn(job); + + // Now this returns the job + Job saved = jobRepository.save(job); + verify(jobRepository, times(1)).save(any(Job.class)); + + // Stub findById + when(jobRepository.findById(saved.getJobId())).thenReturn(Optional.of(saved)); + + Job existing = jobRepository.findById(saved.getJobId()) + .orElseThrow(() -> new JobNotFoundException(saved.getJobId().toString())); + + existing.setName("changedName"); + + // Stub save again to return updated job + when(jobRepository.save(existing)).thenReturn(existing); + + jobRepository.save(existing); + verify(jobRepository, times(2)).save(any(Job.class)); + + // Stub findById to return updated job + when(jobRepository.findById(saved.getJobId())).thenReturn(Optional.of(existing)); + + existing = jobRepository.findById(saved.getJobId()) + .orElseThrow(() -> new JobNotFoundException(saved.getJobId().toString())); + + assertEquals("changedName", existing.getName()); + } + + } diff --git a/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts b/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts index b512ca4..a00555c 100644 --- a/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts +++ b/endpoint-insights-ui/src/app/components/create-job-form/create-job-form.ts @@ -154,6 +154,7 @@ export class CreateJobForm { if (this.createJobForm.valid) { this.jobSubmitted.emit(this.createJobForm.value); //TODO: Trigger success notification and call backend. + } else { this.createJobForm.markAllAsTouched(); //TODO: Trigger error notification. diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html index 2628998..58ac184 100644 --- a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.html @@ -1,6 +1,8 @@
-
-

{{data.name}}:{{ data.id }}

+
+

+ {{data.name}}: {{data.id}} +

diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss index 7804ef4..a3bf0ab 100644 --- a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.scss @@ -23,6 +23,15 @@ button.mat-mdc-raised-button.create-job-modal-cancel-button { outline: none; } } +.truncate-id .id-text { + display: inline-block; + max-width: 80px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: bottom; +} + .form { display: flex; diff --git a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts index 6de769f..35a9cb0 100644 --- a/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts +++ b/endpoint-insights-ui/src/app/components/edit-job-modal/edit-job-modal.ts @@ -1,4 +1,4 @@ -import {Component, EventEmitter, Inject, Output, signal, ViewChild} from "@angular/core"; +import {Component, Inject, signal, ViewChild} from "@angular/core"; import { MAT_DIALOG_DATA, MatDialogActions, @@ -49,18 +49,16 @@ export class EditJobModal{ // Check for sav3e if (!this.state().inEditMode) { - this.onSave(); + this.onUpdate(); } } - onSave(){ - this.jobService.createJob(this.data).subscribe({ + onUpdate(){ + this.jobService.updateJob(this.data.id,this.data).subscribe({ next: (response) => { console.log('Job created:', response); this.toastService.onSuccess('Job created successfully!'); - // // Reset form - // this.job = { title: '', description: '', status: 'pending' }; }, error: (error) => { console.error('Error creating job:', error); diff --git a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts index 9924d14..f4633d4 100644 --- a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts +++ b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts @@ -42,8 +42,8 @@ export class TestOverview { tests: TestItem[] = [ - { id:'1', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'RUNNING', - gitUrl:"git.com/test", description: "this is a test", jobType:"jmeter", compileCommand:"./ep-compile ", + { id:'7c601a1b-9c98-45f6-a8e6-786c0d797fe4', name:'Auth – Login OK', batch:'Nightly-01', createdAt:new Date(), createdBy:'Alex', status:'RUNNING', + gitUrl:"git.com/test", description: "this is a test", jobType:"E2E", compileCommand:"./ep-compile ", runCommand:"./ep-run -" }, { id:'2', name:'Billing – Refund', batch:'Nightly-01', createdAt:new Date(), createdBy:'Sam', status:'STOPPED', @@ -67,7 +67,6 @@ export class TestOverview { dialogRef.afterClosed().subscribe((result: any) => { if (result) { console.log("New job created:", result); - //handle backend call to create new job } }); } diff --git a/endpoint-insights-ui/src/app/services/job-services.ts b/endpoint-insights-ui/src/app/services/job-services.ts index 7085edb..f3a2d91 100644 --- a/endpoint-insights-ui/src/app/services/job-services.ts +++ b/endpoint-insights-ui/src/app/services/job-services.ts @@ -16,7 +16,7 @@ export class JobService { return this.http.post(this.apiUrl, test); } - updateJob(id: number, test: TestItem): Observable { + updateJob(id: string, test: TestItem): Observable { return this.http.put(`${this.apiUrl}/${id}`, test); } } \ No newline at end of file From b21f3162ea9cd2e44d3ae842610b0c50e806fba6 Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Sun, 16 Nov 2025 20:28:59 -0800 Subject: [PATCH 32/35] Build corrections --- .../EndpointInsightsApiApplication.java | 1 - .../src/main/resources/application.yaml | 2 +- .../model/AbstractEntityTest.java | 51 ------------------- .../app/pages/test-overview/test-overview.ts | 1 - 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java diff --git a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java index 35e5a8f..611c830 100644 --- a/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java +++ b/endpoint-insights-api/src/main/java/com/vsp/endpointinsightsapi/EndpointInsightsApiApplication.java @@ -4,7 +4,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -@EnableJpaAuditing @SpringBootApplication public class EndpointInsightsApiApplication { diff --git a/endpoint-insights-api/src/main/resources/application.yaml b/endpoint-insights-api/src/main/resources/application.yaml index 7ebf858..094129d 100644 --- a/endpoint-insights-api/src/main/resources/application.yaml +++ b/endpoint-insights-api/src/main/resources/application.yaml @@ -32,7 +32,7 @@ spring: app: authentication: - enabled: false + enabled: true groups: write: "ei:write" read: "ei:read" diff --git a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java b/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java deleted file mode 100644 index 96d13b3..0000000 --- a/endpoint-insights-api/src/test/java/com/vsp/endpointinsightsapi/model/AbstractEntityTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.vsp.endpointinsightsapi.model; - -import com.vsp.endpointinsightsapi.repository.TestBatchRepository; -import jakarta.persistence.EntityManager; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.ArrayList; -import java.util.UUID; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.*; - -@ExtendWith(MockitoExtension.class) -public class AbstractEntityTest { - - @Mock - private TestBatchRepository testBatchRepository; - - @Test - public void createEntityWithAuditFields() { - // Arrange - TestBatch batch = new TestBatch(); - batch.setBatchName("batchName"); - batch.setJobs(new ArrayList<>()); - - // Create a mock saved entity with ID - TestBatch savedBatch = new TestBatch(); - UUID batchId = UUID.randomUUID(); - savedBatch.setBatch_id(batchId); - savedBatch.setBatchName("batchName"); - - when(testBatchRepository.save(any(TestBatch.class))).thenReturn(savedBatch); - - when(testBatchRepository.findById(batchId)).thenReturn(savedBatch); - - TestBatch result = testBatchRepository.save(batch); - TestBatch expectedBatch = testBatchRepository.findById(savedBatch.getBatch_id()); - - assertNotNull(result); - assertNotNull(expectedBatch); - assertEquals("batchName", expectedBatch.getBatchName()); - assertEquals(batchId, expectedBatch.getBatch_id()); - - verify(testBatchRepository, times(1)).save(batch); - verify(testBatchRepository, times(1)).findById(batchId); - } -} \ No newline at end of file diff --git a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts index f4633d4..889ea93 100644 --- a/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts +++ b/endpoint-insights-ui/src/app/pages/test-overview/test-overview.ts @@ -31,7 +31,6 @@ export interface TestItem { CommonModule, MatIconModule, MatButtonModule, - EditJobModal ], }) export class TestOverview { From 8125f055086d4d0fe4a9da2bd5be7385682d88f1 Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Tue, 25 Nov 2025 22:44:21 -0800 Subject: [PATCH 33/35] add timeline to readme file. --- docs/document-assets/timeline.png | Bin 0 -> 100891 bytes docs/index.md | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 docs/document-assets/timeline.png diff --git a/docs/document-assets/timeline.png b/docs/document-assets/timeline.png new file mode 100644 index 0000000000000000000000000000000000000000..2a44986062d88e21b98d8357e89dec6012bf52b4 GIT binary patch literal 100891 zcmYhjby$<{`^Sxi0fGwBp$I6_FuGKv8A#{o8qH`BumH(@kRBx>L!`TziH-}4;D^M`tjvHRYA#d*EY_xU;vd!wds_YU11A|j%@N{X*FiHL5L5fNRdxkU_q z0vUdd1pi!d*Hm~#RM^9?0$yCVeF=R@L{x$#IW@llUf*_AG;k*(B5S$)a|P@2!-|OL zB3tS8OKl&M^)v4{*3p0w|3H`5ep>Mc22*wWfoN>+JEGek9@)voT(@H-NZGe3G(KHt z+Az9vZ?9)gY+#1z?;F25${PBLE0Cj?6I_|v^txBkDsENJf4i%Wc@9~BK=j~SOZJjspc(EX z*`w(Zw))c^?%r0I38%B1v;3qi>m$i@`TA=dOA1baU+iUo6QjJw1d{~9qYbmAfWz^w z|NJowiF)4@`15(5Tiqn0FC6xgLrx&x3W4~5Zns%^7It}Wd93`ulWTDaamwrAuoga2 z;!t8cXM2t**4F53IGvy%exCGWXSnkJZXNe6=qvKLme>QvJH-VaD~^RKLIA_39sv7T zUSl!b2Z_p@dD+>?a#%0j5fOHIH}+U_564gFb}ChO>lFIu+y;cL6OA2`h`Q&iY{}eS zPqHaHtiE(`DA`0z%6%ENsQO}6ITFPR-r>Cbks^m2gv$CQcq5U6wXEg-Tj|T6zRdh> zB^VhQ-8bRkB2ZV(T0J{`P$uDE{ay zB-F(nB!kin4p?CB!UPtaMUabBaIq&~`-o`jh(L4NJTj#<0gV)APU>JIb zXrWm_<~j!hreV±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 z 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

lL!>!I;2jm!{={?*5iY=rO>=hYCQ>QFKWg_ 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 Date: Tue, 25 Nov 2025 22:45:54 -0800 Subject: [PATCH 34/35] fix to image showing up --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index bb34c3f..7a2748f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,4 +14,4 @@ ### Timeline for Completion -[Image](document-assets/timeline.png) \ No newline at end of file +![Image](document-assets/timeline.png) \ No newline at end of file From 403b34d6ed60fa1f2aa81c06bd65dfb0b38b055a Mon Sep 17 00:00:00 2001 From: Morningstar515 Date: Sun, 30 Nov 2025 14:13:49 -0800 Subject: [PATCH 35/35] correction to file placement --- README.md | 5 ++++ endpoint-insights-ui/package-lock.json | 35 +++++++++++++++++++++++--- package-lock.json | 6 +++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 package-lock.json diff --git a/README.md b/README.md index 8367a07..f9c1816 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,11 @@ TBD ## Contributing TBD + +## Timeline for Completion +![Image](./docs/document-assets/timeline.png) + + ## Documentation For detailed information about the system architecture, deployment, and authentication: diff --git a/endpoint-insights-ui/package-lock.json b/endpoint-insights-ui/package-lock.json index bec6796..361ff46 100644 --- a/endpoint-insights-ui/package-lock.json +++ b/endpoint-insights-ui/package-lock.json @@ -484,6 +484,7 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-20.3.7.tgz", "integrity": "sha512-i655RaL0zmLE3OESUlDnRNBDRIMW/67nTQvMqP6V1cQ42l2+SMJtREsxmX6cWt55/qvvgeytAA6aBN4aerBl5A==", "license": "MIT", + "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -598,6 +599,7 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-20.2.10.tgz", "integrity": "sha512-d95C2r3JP11KCahouWmPaxswz/EE7Zn1k8ocoGt70jl33x42Sg96vAHeOpnQ4yfrdA4W7Q+eWB/NqqvAGCzOPQ==", "license": "MIT", + "peer": true, "dependencies": { "parse5": "^8.0.0", "tslib": "^2.3.0" @@ -648,6 +650,7 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-20.3.7.tgz", "integrity": "sha512-uf8dXYTJbedk/wudkt2MfbtvN/T97aEZBtOTq8/IFQQZ3722rag6D+Cg76e5hBccROOn+ueGJX2gpxz02phTwA==", "license": "MIT", + "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -676,6 +679,7 @@ "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-20.3.7.tgz", "integrity": "sha512-viZwWlwc1BAqryRJE0Wq2WgAxDaW9fuwtYHYrOWnIn9sy9KemKmR6RmU9VRydrwUROOlqK49R9+RC1wQ6sYwqA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/core": "7.28.3", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -708,6 +712,7 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-20.3.7.tgz", "integrity": "sha512-2UuYzC2A5SUtu33tYTN411Wk0WilA+2Uld/GP3O6mragw1O7v/M8pMFmbe9TR5Ah/abRJIocWGlNqeztZmQmrw==", "license": "MIT", + "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -733,6 +738,7 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-20.3.7.tgz", "integrity": "sha512-uOCGCoqXeAWIlQMWiIeed/W8g8h2tk91YemMI+Ce1VQ/36Xfft40Bouz4eKcvJV6kLXGygdpWjzFGz32CE+3Og==", "license": "MIT", + "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -751,6 +757,7 @@ "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-20.3.7.tgz", "integrity": "sha512-FYuuwU9ujiVT+0xjMIutaUT2PErV4AvxeAPWMlYRA1/yQxqn1VyNUd6kHPjAV+yrZg9Q0MDco2/c0Lh8rmAhSA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/core": "7.28.3", "@types/babel__core": "7.20.5", @@ -792,6 +799,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-20.3.7.tgz", "integrity": "sha512-AbLtyR7fVEGDYyrz95dP2pc69J5XIjLLsFNAuNQPzNX02WPoAxtrWrNY6UnTzGoSrCc5F52hiL2Uo6yPZTiJcg==", "license": "MIT", + "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -855,6 +863,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz", "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -3147,6 +3156,7 @@ "integrity": "sha512-nqhDw2ZcAUrKNPwhjinJny903bRhI0rQhiDz1LksjeRxqa36i3l75+4iXbOy0rlDpLJGxqtgoPavQjmmyS5UJw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@inquirer/checkbox": "^4.2.1", "@inquirer/confirm": "^5.1.14", @@ -4827,6 +4837,7 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "license": "MIT", + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -5809,6 +5820,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -5874,6 +5886,7 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -6343,6 +6356,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.19", "caniuse-lite": "^1.0.30001751", @@ -7891,6 +7905,7 @@ "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", @@ -9207,7 +9222,8 @@ "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.9.0.tgz", "integrity": "sha512-OMUvF1iI6+gSRYOhMrH4QYothVLN9C3EJ6wm4g7zLJlnaTl8zbaPOr0bTw70l7QxkoM7sVFOWo83u9B2Fe2Zng==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/jest-worker": { "version": "27.5.1", @@ -9352,6 +9368,7 @@ "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@colors/colors": "1.5.0", "body-parser": "^1.19.0", @@ -9863,6 +9880,7 @@ "integrity": "sha512-kdTwsyRuncDfjEs0DlRILWNvxhDG/Zij4YLO4TMJgDLW+8OzpfkdPnRgrsRuY1o+oaxJGWsps5f/RVBgGmmN0w==", "dev": true, "license": "Apache-2.0", + "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -9993,6 +10011,7 @@ "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", @@ -11709,6 +11728,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -12346,6 +12366,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "license": "Apache-2.0", + "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -12402,6 +12423,7 @@ "integrity": "sha512-9GUyuksjw70uNpb1MTYWsH9MQHOHY6kwfnkafC24+7aOMZn9+rVMBxRbLvw756mrBFbIsFg6Xw9IkR2Fnn3k+Q==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -13712,7 +13734,8 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" + "license": "0BSD", + "peer": true }, "node_modules/tuf-js": { "version": "3.1.0", @@ -13757,6 +13780,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -14003,6 +14027,7 @@ "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", @@ -14137,6 +14162,7 @@ "integrity": "sha512-4JLXU0tD6OZNVqlwzm3HGEhAHufSiyv+skb7q0d2367VDMzrU1Q/ZeepvkcHH0rZie6uqEtTQQe0OEOOluH3Mg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -14239,6 +14265,7 @@ "integrity": "sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/bonjour": "^3.5.13", "@types/connect-history-api-fallback": "^1.5.4", @@ -15186,6 +15213,7 @@ "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "dev": true, "license": "MIT", + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -15204,7 +15232,8 @@ "version": "0.15.1", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz", "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==", - "license": "MIT" + "license": "MIT", + "peer": true } } } diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..f5988db --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "EndpointInsights", + "lockfileVersion": 3, + "requires": true, + "packages": {} +}