Breakout the UI from genie-web into genie-ui module

Move all the UI code from genie-web into a standalone genie-ui module. While not truly standalone due to some legacy `UIController` this sets us up to either develop a new independent UI or remove UI entirely.

In terms of improvements to the project overall moving the UI code out of `src/main/resources` into `src/main/web` and modifying the NPM tasks to property analyze the intput and output directories allows the build to properly understand if the NPM build task needs to be invoked or not. Also the compiled JS bundle is moved into the project build directory instead of dumped back into `src` which seems more proper.

The final results are build into a webjar and the resources are namespaced under `webjars/genie-ui` to avoid conflicts with any other bundles placed in the deployed space. The `index.html` template isn't namespaced properly still though.

Removed unnecessary images `GenieLogo.png` and `netflix-oss-logo.png` which weren't used by the UI.

Disabled gRPC for the UI integration tests.

Updated travis configuration for new cache locations.

Author: tgianos

.gitignore

@@ -99,7 +99,7 @@ genie-client/src/main/python/build
 genie-client/src/main/python/nflx_genie_client.egg-info
 genie-client/src/main/python/MANIFEST
 genie-common/src/generated
-genie-web/src/main/resources/static/build/
+/genie-ui/src/main/resources/static/build/
 node_modules
 node-v4.4.0-darwin-x64
 

.travis.yml

@@ -34,9 +34,9 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-    - genie-web/node_modules/
-    - genie-web/.gradle/nodejs
-    - genie-web/.gradle/npm
+    - genie-ui/node_modules/
+    - genie-ui/.gradle/nodejs
+    - genie-ui/.gradle/npm
   timeout: 1000
 env:
   global:

genie-app/build.gradle

@@ -5,8 +5,9 @@ dependencies {
      * Compile Dependencies
      *******************************/
 
-    compile(project(":genie-web"))
     compile(project(":genie-security"))
+    compile(project(":genie-web"))
+    compile(project(":genie-ui"))
 
     /*******************************
      * Provided Dependencies

genie-security/build.gradle

@@ -4,6 +4,7 @@ dependencies {
      *******************************/
 
     compile(project(":genie-web"))
+    compile(project(":genie-ui"))
     compile("org.bitbucket.b_c:jose4j")
     compile("org.springframework.boot:spring-boot-starter-security")
     compile("org.springframework.security:spring-security-jwt")
@@ -23,6 +24,7 @@ dependencies {
     /*******************************
      * Optional Dependencies
      *******************************/
+
     compileOnly("org.springframework.boot:spring-boot-configuration-processor")
 
     /*******************************

genie-web/README.md renamed to genie-ui/README.md

@@ -0,0 +1,74 @@
+plugins {
+    id "com.moowork.node" version "1.2.0"
+}
+
+dependencies {
+    /*******************************
+     * Compile Dependencies
+     *******************************/
+
+    compile(project(":genie-web"))
+    compile("org.springframework.boot:spring-boot-starter-thymeleaf")
+    compile("org.springframework.boot:spring-boot-starter-web")
+
+    /*******************************
+     * Provided Dependencies
+     *******************************/
+
+    /*******************************
+     * Optional Dependencies
+     *******************************/
+
+    /*******************************
+     * Runtime Dependencies
+     *******************************/
+
+    /*******************************
+     * Test Dependencies
+     *******************************/
+
+    testCompile(project(":genie-test"))
+}
+
+license {
+    exclude "templates/*"
+}
+
+node {
+    version = "8.11.1"
+    npmVersion = "5.8.0"
+    download = true
+}
+
+task bundle(type: NpmTask) {
+    inputs.files(fileTree("node_modules"))
+    inputs.files(fileTree("src/main/web"))
+    inputs.file("npm-shrinkwrap.json")
+    inputs.file("package.json")
+    inputs.file("server.js")
+    inputs.file("webpack.config.js")
+
+    outputs.dir file("${project.buildDir}/web/bundle")
+
+    dependsOn npmInstall
+    args = ["run", "build"]
+}
+
+jar {
+    dependsOn bundle
+
+    from(file("${project.buildDir}/web/bundle")) {
+        into "META-INF/resources/webjars/${project.name}"
+    }
+
+    from(file("${project.projectDir}/src/main/web/images")) {
+        into "META-INF/resources/webjars/${project.name}/images"
+    }
+
+    manifest {
+        attributes(
+                "Implementation-Title": project.name,
+                "Implementation-Version": project.version,
+        )
+    }
+}

genie-ui/build.gradle

@@ -1,6 +1,6 @@
 {
-  "name": "genie-web",
-  "version": "3.2.0",
+  "name": "genie-ui",
+  "version": "4.0.0",
   "description": "UI for Genie",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "url": "https://github.com/Netflix/genie.git"
   },
   "author": "Netflix",
-  "license": "Apache License, Version 2.0",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/Netflix/genie/issues"
   },

genie-web/npm-shrinkwrap.json renamed to genie-ui/npm-shrinkwrap.json

@@ -15,8 +15,9 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.web.controllers;
+package com.netflix.genie.ui.controllers;
 
+import com.netflix.genie.web.controllers.ControllerUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

genie-web/package.json renamed to genie-ui/package.json

@@ -0,0 +1,28 @@
+/*
+ *
+ *  Copyright 2018 Netflix, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+
+/**
+ * Controllers for MVC.
+ *
+ * @author tgianos
+ * @since 4.0.0
+ */
+@ParametersAreNonnullByDefault
+package com.netflix.genie.ui.controllers;
+
+import javax.annotation.ParametersAreNonnullByDefault;

genie-web/server.js renamed to genie-ui/server.js

@@ -0,0 +1,12 @@
+<html lang="en-US">
+<head>
+    <meta charset="utf-8">
+    <title>Genie</title>
+    <link rel="shortcut icon" href="webjars/genie-ui/images/favicon.ico"/>
+    </meta>
+</head>
+<body>
+<div id="root"></div>
+<script src="webjars/genie-ui/bundle.js" type="text/javascript"></script>
+</body>
+</html>

genie-web/src/main/java/com/netflix/genie/web/controllers/UIController.java renamed to genie-ui/src/main/java/com/netflix/genie/ui/controllers/UIController.java

@@ -7,7 +7,7 @@ import Picker from "rc-calendar/lib/Picker";
 import enUS from "rc-calendar/lib/locale/en_US";
 import Panel from "rc-time-picker/lib/Panel";
 
-import { momentFormat, milliSeconds, nowUtc } from "./../utils";
+import { momentFormat, milliSeconds, nowUtc } from "../utils";
 
 import T from "prop-types";
 

genie-ui/src/main/java/com/netflix/genie/ui/controllers/package-info.java

@@ -1,4 +1,4 @@
-package com.netflix.genie.web.controllers;
+package com.netflix.genie.ui.controllers;
 
 import com.netflix.genie.GenieWeb;
 import com.netflix.genie.test.categories.IntegrationTest;
@@ -12,7 +12,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -33,8 +33,8 @@
 @Category(IntegrationTest.class)
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = GenieWeb.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles(resolver = IntegrationTestActiveProfilesResolver.class)
 @AutoConfigureMockMvc
+@TestPropertySource(properties = {"genie.grpc.server.enabled = false"})
 @Slf4j
 public class UIControllerIntegrationTest {
 

genie-ui/src/main/resources/templates/index.html

@@ -15,7 +15,7 @@
  *     limitations under the License.
  *
  */
-package com.netflix.genie.web.controllers;
+package com.netflix.genie.ui.controllers;
 
 import com.netflix.genie.test.categories.UnitTest;
 import org.hamcrest.Matchers;

genie-web/src/main/resources/static/fonts/FontAwesome.otf renamed to genie-ui/src/main/web/fonts/FontAwesome.otf

@@ -0,0 +1,28 @@
+/*
+ *
+ *  Copyright 2018 Netflix, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+
+/**
+ * Tests for MVC controllers.
+ *
+ * @author tgianos
+ * @since 4.0.0
+ */
+@ParametersAreNonnullByDefault
+package com.netflix.genie.ui.controllers;
+
+import javax.annotation.ParametersAreNonnullByDefault;

genie-web/src/main/resources/static/fonts/fontawesome-webfont.eot renamed to genie-ui/src/main/web/fonts/fontawesome-webfont.eot

@@ -1,12 +1,12 @@
 var webpack = require("webpack");
 var path = require("path");
 
-var APP_DIR = path.resolve(__dirname, "src/main/resources/static");
-var BUILD_DIR = APP_DIR + "/build";
+var APP_DIR = path.resolve(__dirname, "src/main/web");
+var BUILD_DIR = path.resolve(__dirname, "build/web/bundle");
 
 var config = {
   entry: { app: [ APP_DIR + "/index.js" ] },
-  output: { path: BUILD_DIR, filename: "bundle.js", publicPath: "/build/" },
+  output: { path: BUILD_DIR, filename: "bundle.js", publicPath: "webjars/genie-ui/" },
   plugins: [
     new webpack.optimize.DedupePlugin(),
     new webpack.optimize.UglifyJsPlugin({ compressor: { warnings: false } }),

genie-web/src/main/resources/static/fonts/fontawesome-webfont.svg renamed to genie-ui/src/main/web/fonts/fontawesome-webfont.svg

@@ -5,8 +5,9 @@ dependencies {
      * Compile Dependencies
      *******************************/
 
-    compile(project(":genie-web"))
     compile(project(":genie-security"))
+    compile(project(":genie-web"))
+    compile(project(":genie-ui"))
 
     /*******************************
      * Provided Dependencies

genie-web/src/main/resources/static/fonts/fontawesome-webfont.ttf renamed to genie-ui/src/main/web/fonts/fontawesome-webfont.ttf

@@ -1,16 +1,10 @@
-plugins {
-    id "com.moowork.node" version "1.2.0"
-}
-
 apply plugin: "org.asciidoctor.convert"
 
 project.parent.tasks.collectDocumentation.dependsOn project.tasks.asciidoctor
 
 ext {
     metaModelIgnorePattern = "**/com/netflix/genie/web/jpa/entities/*_.java"
     snippetsDir = new File(project.buildDir, "generated-snippets")
-    static_build_dir = new File(project.projectDir, "/src/main/resources/static/build")
-    static_project_dir = new File(project.projectDir, "/src/main/resources/static")
 }
 
 dependencies {
@@ -49,7 +43,6 @@ dependencies {
     compile("org.springframework.boot:spring-boot-starter-mail")
     compile("org.springframework.boot:spring-boot-starter-hateoas")
     compile("org.springframework.boot:spring-boot-starter-integration")
-    compile("org.springframework.boot:spring-boot-starter-thymeleaf")
     compile("org.springframework.boot:spring-boot-starter-tomcat")
     compile("org.springframework.boot:spring-boot-starter-web")
     compile("org.springframework.cloud:spring-cloud-starter-aws")
@@ -98,8 +91,6 @@ dependencies {
 }
 
 license {
-    exclude "static/*"
-    exclude "templates/*"
     exclude "*.yml"
     exclude "genie-banner.txt"
     exclude "db/**/*.sql"
@@ -153,43 +144,10 @@ compileJava {
     dependsOn processResources
 }
 
-node {
-    version = "4.4.0"
-    npmVersion = "3.8.6"
-    download = true
-}
-
-clean {
-    delete static_build_dir
-}
-
-task bundle(type: NpmTask) {
-    inputs.files(fileTree("node_modules"))
-    inputs.file("npm-shrinkwrap.json")
-    inputs.file("package.json")
-    inputs.file("server.js")
-    inputs.file("webpack.config.js")
-    inputs.dir static_project_dir
-
-    outputs.dir static_build_dir
-
-    dependsOn npm_install
-    args = ["run", "build"]
-}
-
-npm_install.args = ["--loglevel", "error"]
-npmInstall.args = ["--loglevel", "error"]
-
 jar {
-    dependsOn bundle
-
     manifest {
         attributes("Implementation-Version": genieVersion)
     }
-
-    from(static_build_dir) {
-        into "static"
-    }
 }
 
 //Ignore the generated classes from all our style/coverage/bug finding tools