From 23accc277248f47891d3dd9817669e4fa9e03672 Mon Sep 17 00:00:00 2001
From: pckinghao <1824455240@qq.com>
Date: Sun, 8 Sep 2024 17:41:57 +0800
Subject: [PATCH 1/3] Add a ci job for Vue/Typescript unit testing

---
 .github/workflows/ci.yml     | 12 ++++++++++++
 bigtop-manager-ui/.gitignore |  1 +
 bigtop-manager-ui/pom.xml    | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c762d922..747618d87 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,18 @@ jobs:
           java-version: '17'
           cache: 'maven'
       - run: ./mvnw clean test -Dskip.pnpm -Dskip.installnodepnpm
+      
+  unit-tests-ts:
+    name: "Run unit tests(Vue/Typescript)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+      - run: ./mvnw -pl bigtop-manager-ui test
 
   build:
     name: "Build project"
diff --git a/bigtop-manager-ui/.gitignore b/bigtop-manager-ui/.gitignore
index 401fa5244..d63b3688d 100644
--- a/bigtop-manager-ui/.gitignore
+++ b/bigtop-manager-ui/.gitignore
@@ -6,6 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
+package-lock.json
 
 node
 node_modules
diff --git a/bigtop-manager-ui/pom.xml b/bigtop-manager-ui/pom.xml
index 010537fb4..21be531eb 100644
--- a/bigtop-manager-ui/pom.xml
+++ b/bigtop-manager-ui/pom.xml
@@ -34,6 +34,7 @@
         <node.version>v18.17.0</node.version>
         <pnpm.version>v8.6.9</pnpm.version>
         <frontend-maven-plugin.version>1.13.4</frontend-maven-plugin.version>
+        <skip.pnpm.test>false</skip.pnpm.test>
     </properties>
 
     <build>
@@ -71,13 +72,22 @@
                         <goals>
                             <goal>pnpm</goal>
                         </goals>
-                        <phase>generate-resources</phase>
                         <configuration>
                             <arguments>build</arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>pnpm test</id>
+                        <goals>
+                            <goal>pnpm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>test:run</arguments>
+                            <skip>${skip.pnpm.test}</skip>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

From 63fbc31698a441ff3613b9b828baa11baebf6341 Mon Sep 17 00:00:00 2001
From: pckinghao <1824455240@qq.com>
Date: Sun, 8 Sep 2024 20:22:55 +0800
Subject: [PATCH 2/3] Add a ci job for Vue/Typescript unit testing

---
 .github/workflows/ci.yml       | 6 +++---
 bigtop-manager-ui/package.json | 4 ++--
 bigtop-manager-ui/pom.xml      | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 747618d87..fb7a351f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,8 @@ jobs:
           cache: 'maven'
       - run: ./mvnw clean spotless:check
 
-  unit-tests:
-    name: "Run unit tests"
+  unit-tests-java:
+    name: "Run unit test(java)"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'maven'
-      - run: ./mvnw clean test -Dskip.pnpm -Dskip.installnodepnpm
+      - run: ./mvnw clean test -Dskip.pnpm -Dskip.installnodepnpm -Dskip.pnpm.test
       
   unit-tests-ts:
     name: "Run unit tests(Vue/Typescript)"
diff --git a/bigtop-manager-ui/package.json b/bigtop-manager-ui/package.json
index 6cf75363e..71035f4c8 100644
--- a/bigtop-manager-ui/package.json
+++ b/bigtop-manager-ui/package.json
@@ -7,8 +7,8 @@
     "preview": "vite preview",
     "lint": "eslint src --fix --ext .ts,.tsx,.vue",
     "prettier": "prettier --write \"src/**/*.{vue,ts,tsx}\"",
-    "test:unit": "vitest",
-    "test": "vitest"
+    "test": "vitest",
+    "test:run": "vitest run"
   },
   "dependencies": {
     "@ant-design/icons-vue": "^6.1.0",
diff --git a/bigtop-manager-ui/pom.xml b/bigtop-manager-ui/pom.xml
index 21be531eb..795ec79f7 100644
--- a/bigtop-manager-ui/pom.xml
+++ b/bigtop-manager-ui/pom.xml
@@ -64,7 +64,7 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <arguments>install --force</arguments>
+                            <arguments>install</arguments>
                         </configuration>
                     </execution>
                     <execution>
@@ -81,6 +81,7 @@
                         <goals>
                             <goal>pnpm</goal>
                         </goals>
+                        <phase>test</phase>
                         <configuration>
                             <arguments>test:run</arguments>
                             <skip>${skip.pnpm.test}</skip>
@@ -90,4 +91,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

From 184bf2b5a02a40a1897a7b81e955a4363ecf779b Mon Sep 17 00:00:00 2001
From: pckinghao <1824455240@qq.com>
Date: Sun, 8 Sep 2024 20:31:31 +0800
Subject: [PATCH 3/3] Add a ci job for Vue/Typescript unit testing

---
 .github/workflows/ci.yml  | 2 +-
 bigtop-manager-ui/pom.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb7a351f9..6822ade7d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - run: ./mvnw clean spotless:check
 
   unit-tests-java:
-    name: "Run unit test(java)"
+    name: "Run unit test(Java)"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/bigtop-manager-ui/pom.xml b/bigtop-manager-ui/pom.xml
index 795ec79f7..23cc14add 100644
--- a/bigtop-manager-ui/pom.xml
+++ b/bigtop-manager-ui/pom.xml
@@ -72,6 +72,7 @@
                         <goals>
                             <goal>pnpm</goal>
                         </goals>
+                        <phase>generate-resources</phase>
                         <configuration>
                             <arguments>build</arguments>
                         </configuration>