Add DMS UI (#20)

* Add UI * Fix UI * DMS Service and DMS UI with own root redirects * Remove npmWorkDir * Update server/build.gradle.kts * Migrate to rest/api/3 controllers * Fix to rest/api/3 requests * Fix to rest/api/3 requests * Fix to rest/api/3 requests * Fix dev run configurations * Add actuator/info fetching * Remove version.json * Fix README.md * Reformat code, rearrange imports * Fix small issues
octopusden · Jun 21, 2024 · 93cd9ac · 93cd9ac
1 parent 7416f31
commit 93cd9ac
Show file tree

Hide file tree

Showing 60 changed files with 32,851 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ out/
 build
 test_db.mv.db
 .env
+**/resources/public
+**/node_modules
diff --git a/.run/DmsService (bootRun, frontend live reload).run.xml b/.run/DmsService (bootRun, frontend live reload).run.xml
@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DmsService (bootRun, frontend live reload)" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/server" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="bootRun" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="net.ashald.envfile">
+        <option name="IS_ENABLED" value="true" />
+        <option name="IS_SUBST" value="true" />
+        <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+        <option name="IS_IGNORE_MISSING_FILES" value="false" />
+        <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="true" />
+        <ENTRIES>
+          <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+          <ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH="$USER_HOME$/dev.env" />
+        </ENTRIES>
+      </extension>
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/DmsServiceApplication (dev).run.xml → .run/DmsService (dev).run.xml b/.run/DmsServiceApplication (dev).run.xml → .run/DmsService (dev).run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DmsServiceApplication (dev)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+  <configuration default="false" name="DmsService (dev)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev" />
     <additionalParameters>
       <param>

diff --git a/.run/Frontend (dev).run.xml b/.run/Frontend (dev).run.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Frontend (dev)" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/server/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <package-manager value="npm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/README.md b/README.md
@@ -38,3 +38,9 @@
 * Execute `chmod -R 777` for `test-common/src/main/artifactory/dump`
 * Remove old dump from `test-common/src/main/artifactory/dump`
 * Run `:dms-service:composeDown` gradle task
+
+## Frontend development
+start `DmsService (bootRun, frontend live reload)` run configuration, wait for start app completely\
+start `Frontend (dev)` run configuration \
+`Frontend (dev)` profile uses `--watch` flag in package.json which enables watching of changes in frontend source code
+After frontend is rebuilt, refresh web page and test you changes
diff --git a/ft/src/ft/docker/docker-compose.yaml b/ft/src/ft/docker/docker-compose.yaml
@@ -70,7 +70,7 @@ services:
 
     api-gateway:
         container_name: dms-ft-api-gateway
-        image: ${OCTOPUS_GITHUB_DOCKER_REGISTRY}/octopusden/api-gateway:2.0.1
+        image: ${OCTOPUS_GITHUB_DOCKER_REGISTRY}/octopusden/api-gateway:2.0.9
         ports:
             - "8765:8765"
         volumes:

diff --git a/server/.babelrc b/server/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["react", "env", "stage-0"]
+}
diff --git a/server/.eslintrc.json b/server/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+    "extends": "standard"
+}
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
     id("org.jetbrains.kotlin.plugin.noarg")
     id("com.bmuschko.docker-spring-boot-application") version "6.4.0"
     id("com.avast.gradle.docker-compose") version "0.14.3"
+    id("com.github.node-gradle.node") version "7.0.2"
     `maven-publish`
 }
 
@@ -118,6 +119,30 @@ tasks.named("dockerBuildImage") {
     dependsOn("test")
 }
 
+val npmBuild = tasks.register<com.github.gradle.node.npm.task.NpmTask>("npmBuild") {
+    dependsOn("npmInstall")
+    npmCommand.set(listOf("run", "build"))
+}
+
+tasks.withType<ProcessResources> {
+    dependsOn(npmBuild)
+}
+
+node {
+    version.set("16.20.2")
+    download.set(true)
+    npmVersion.set("8.19.4")
+}
+
+tasks.getByName<Delete>("clean") {
+    this.delete.add("$projectDir/node_modules")
+}
+
+tasks.named<org.springframework.boot.gradle.tasks.run.BootRun>("bootRun") {
+    args("--spring.cloud.config.enabled=false", "--spring.profiles.active=dev", "--spring.config.additional-location=dev/")
+    sourceResources(sourceSets.main.get())
+}
+
 dependencies {
     implementation(project(":common"))
     implementation("org.springframework.boot:spring-boot-starter-web")

diff --git a/server/dev/api-gateway.yaml b/server/dev/api-gateway.yaml
@@ -14,6 +14,18 @@ spring:
             - Path=/dms-service/**
           filters:
             - StripPrefix=1
+        - id: dms-ui-redirect
+          uri: no://op
+          predicates:
+            - Path=/dms-ui
+          filters:
+            - RedirectTo=302, /dms-ui/index.html, true
+        - id: dms-ui
+          uri: http://host.docker.internal:8080
+          predicates:
+            - Path=/dms-ui/**
+          filters:
+            - StripPrefix=1
   security:
     oauth2:
       client:

diff --git a/server/dev/application-dev.yml b/server/dev/application-dev.yml
@@ -24,12 +24,16 @@ auth-server:
 storage:
   maven-group-prefix: corp.domain.dms
   artifactory:
-    host: http://localhost:8081
+    host: http://localhost:18081
     user: admin
     password: password
     upload-repositories:
       MAVEN: example-repo-local
 
+dms-service:
+  webhook:
+    url: http://localhost:1080/webhook
+
 components-registry-service:
   url: # set via env
 
@@ -89,7 +93,8 @@ management:
 
 logging.level:
   ROOT: INFO
+  org.springframework.security: DEBUG
   org.octopusden.octopus.platform.commons.http.client: ERROR
   org.octopusden.cloud.commons.security: TRACE
   org.octopusden.octopus.dms.security: TRACE
-  org.octopusden.octopus.dms: DEBUG
+  org.octopusden.octopus.dms: DEBUG
diff --git a/server/dev/docker-compose.yml b/server/dev/docker-compose.yml
@@ -33,7 +33,7 @@ services:
 
     api-gateway:
         container_name: dms-dev-api-gateway
-        image: ${OCTOPUS_GITHUB_DOCKER_REGISTRY}/octopusden/api-gateway:2.0.1
+        image: ${OCTOPUS_GITHUB_DOCKER_REGISTRY}/octopusden/api-gateway:2.0.9
         ports:
             - 8765:8765
         volumes:
@@ -46,3 +46,5 @@ services:
             - AUTH_SERVER_REALM=${AUTH_SERVER_REALM}
             - AUTH_SERVER_CLIENT_ID=${AUTH_SERVER_CLIENT_ID}
             - AUTH_SERVER_CLIENT_SECRET=${AUTH_SERVER_CLIENT_SECRET}
+        extra_hosts:
+            - "host.docker.internal:host-gateway"