Bug 1056877 - Update UI path references after directory moves

As part of merging the UI repo into this one, the following directory
moves were performed:
  webapp/app/                   ->  ui/
  webapp/test/                  ->  tests/ui/
  webapp/config/                ->  tests/ui/config/
  webapp/scripts/               ->  tests/ui/scripts/
  webapp/scripts/web-server.js  ->  web-server.js

.jshintignore

@@ -1,3 +1,3 @@
-webapp/app/vendor/
-webapp/scripts/web-server.js
-webapp/test/vendor/
+ui/vendor/
+tests/ui/vendor/
+web-server.js

Gruntfile.js

@@ -17,35 +17,35 @@ module.exports = function(grunt) {
                 reportpath: null
             },
             files: {
-                src: ['webapp/app/*.html'],
+                src: ['ui/*.html'],
                 nonull: true
             },
         },
 
         useminPrepare:{
             index: {
-                src:'webapp/app/index.html',
+                src:'ui/index.html',
                 nonull: true,
                 options:{
                     dest:'dist'
                 }
             },
             help: {
-                src:'webapp/app/help.html',
+                src:'ui/help.html',
                 nonull: true,
                 options:{
                     dest:'dist'
                 }
             },
             logviewer: {
-                src:'webapp/app/logviewer.html',
+                src:'ui/logviewer.html',
                 nonull: true,
                 options:{
                     dest:'dist'
                 }
             },
             perf: {
-                src:'webapp/app/perf.html',
+                src:'ui/perf.html',
                 nonull: true,
                 options:{
                     dest:'dist'
@@ -105,16 +105,16 @@ module.exports = function(grunt) {
 
             main: {
                 files: [
-                    { src:'webapp/app/index.html', dest:'dist/index.html', nonull: true },
-                    { src:'webapp/app/help.html', dest:'dist/help.html', nonull: true },
-                    { src:'webapp/app/logviewer.html', dest:'dist/logviewer.html', nonull: true },
-                    { src:'webapp/app/perf.html', dest:'dist/perf.html', nonull: true }
+                    { src:'ui/index.html', dest:'dist/index.html', nonull: true },
+                    { src:'ui/help.html', dest:'dist/help.html', nonull: true },
+                    { src:'ui/logviewer.html', dest:'dist/logviewer.html', nonull: true },
+                    { src:'ui/perf.html', dest:'dist/perf.html', nonull: true }
                 ]
             },
             // Copy img dir
             img:{
                 expand: true,
-                src: 'webapp/app/img/*',
+                src: 'ui/img/*',
                 dest: 'dist/img/',
                 nonull: true,
                 flatten: true
@@ -122,7 +122,7 @@ module.exports = function(grunt) {
             // Copy html in partials
             partials:{
                 expand: true,
-                src: 'webapp/app/partials/*',
+                src: 'ui/partials/*',
                 dest: 'dist/partials/',
                 nonull: true,
                 flatten: true
@@ -130,7 +130,7 @@ module.exports = function(grunt) {
             // Copy fonts
             fonts:{
                 expand: true,
-                src: 'webapp/app/fonts/*',
+                src: 'ui/fonts/*',
                 dest: 'dist/fonts/',
                 nonull: true,
                 flatten: true
@@ -140,7 +140,7 @@ module.exports = function(grunt) {
             // and make paths relative with cwd definition.
             plugins:{
                 expand: true,
-                cwd: 'webapp/app/plugins/',
+                cwd: 'ui/plugins/',
                 src: '**/*.html',
                 dest: 'dist/plugins/',
                 nonull: true,
@@ -157,7 +157,7 @@ module.exports = function(grunt) {
         },
         ngtemplates: {
             treeherder: {
-                cwd: 'webapp/app',
+                cwd: 'ui',
                 src: ['partials/main/*.html', 'plugins/**/*.html'],
                 dest: 'dist/js/index.min.js',
                 options: {
@@ -178,7 +178,7 @@ module.exports = function(grunt) {
                 }
             },
             logviewer: {
-                cwd: 'webapp/app',
+                cwd: 'ui',
                 src: 'partials/logviewer/*.html',
                 dest: 'dist/js/logviewer.min.js',
                 options: {
@@ -198,7 +198,7 @@ module.exports = function(grunt) {
                 }
             },
             perf: {
-                cwd: 'webapp/app',
+                cwd: 'ui',
                 src: 'partials/perf/*.html',
                 dest: 'dist/js/perf.min.js',
                 options: {

README-UI.md

@@ -13,8 +13,8 @@ Treeherder exists on two instances, [stage](https://treeherder.allizom.org) for
 The easiest way to run Treeherder's UI locally is to simply clone this repo, install [Node.js](http://nodejs.org/download/) and then from the root of the repo:
 
 ```
-cp webapp/app/js/config/sample.local.conf.js webapp/app/js/config/local.conf.js
-./webapp/scripts/web-server.js
+cp ui/js/config/sample.local.conf.js ui/js/config/local.conf.js
+./web-server.js
 ```
 
 The UI can then be viewed at [http://localhost:8000/index.html](http://localhost:8000/index.html).

docs/ui/installation.rst

@@ -21,8 +21,8 @@ Running the web-server
 
   .. code-block:: bash
 
-     cp webapp/app/js/config/sample.local.conf.js webapp/app/js/config/local.conf.js
-     ./webapp/scripts/web-server.js
+     cp ui/js/config/sample.local.conf.js ui/js/config/local.conf.js
+     ./web-server.js
 
 Viewing the UI
 --------------
@@ -34,7 +34,7 @@ Configuration
 =============
 
 The sample configuration makes the UI load job/push data from the production service API. If you wish to test the UI against stage/dev's service instead, adjust ``thServiceDomain`` in the config file created as part of installation:
-``webapp/app/js/config/local.conf.js``
+``ui/js/config/local.conf.js``
 
 If you wish to run the full treeherder-service Vagrant project (service + UI), remember to remove local.conf.js or else change ``thServiceDomain`` within it to refer to ``vagrant``, so the UI will use the local Vagrant service API.
 
@@ -51,8 +51,7 @@ Requirements
 
 Execution::
 
-    cd webapp
-    ./scripts/test.sh
+    ./tests/ui/scripts/test.sh
 
 Build
 =====

docs/ui/plugin.rst

@@ -6,7 +6,7 @@ of that job.  You can add your own tab to that panel in the form of a
 ``plugin``.
 
 The existing ``Jobs Detail`` tab is, itself, a plugin.  So it is a good example
-to follow.  See ``webapp/app/plugins/jobdetail``.
+to follow.  See ``ui/plugins/jobdetail``.
 
 To create a new plugin the following steps are required:
 

package.json

@@ -26,7 +26,7 @@
     "karma-ng-scenario": ">=0.1.0"
   },
   "scripts": {
-    "test": "karma start webapp/config/karma.conf.js --single-run --browsers Firefox"
+    "test": "karma start tests/ui/config/karma.conf.js --single-run --browsers Firefox"
   }
 }
 

puppet/manifests/vagrant.pp

@@ -10,8 +10,8 @@ $APP_USER="vagrant"
 $APP_GROUP="vagrant"
 $PROJ_DIR = "/home/${APP_USER}/treeherder"
 $VENV_DIR = "/home/${APP_USER}/venv"
-# Serve ui from app directory
-$APP_UI="webapp/app"
+# Serve ui from the non-minified directory
+$APP_UI="ui"
 # You can make these less generic if you like, but these are box-specific
 # so it's not required.
 $DB_NAME = "treeherder"

tests/ui/config/karma-e2e.conf.js

@@ -6,14 +6,13 @@ module.exports = function (config) {
     config.set({
         frameworks: ['ng-scenario'],
 
-        basePath: '../',
+        basePath: '../../../',
 
         files: [
-            'test/e2e/**/*.js',
-            'https://tbpl.mozilla.org/js/Config.js',
+            'tests/ui/e2e/**/*.js',
 
             // fixtures
-            {pattern: 'test/mock/*.json', watched: true, served: true, included: false}
+            {pattern: 'tests/ui/mock/*.json', watched: true, served: true, included: false}
         ],
 
         autoWatch: false,

tests/ui/config/karma.conf.js

@@ -12,33 +12,33 @@ module.exports = function (config) {
     config.set({
         frameworks: ['jasmine'],
 
-        basePath: '../',
+        basePath: '../../../',
 
         files: [
-            'app/vendor/angular/angular.js',
-            'app/vendor/angular/angular-*.js',
-            'app/vendor/ui-bootstrap-*.js',
-            'app/vendor/jquery-*.js',
-            'app/vendor/jquery.ui.effect.js',
-            'app/vendor/jquery.ui.effect-highlight.js',
-            'app/vendor/bootstrap*.js',
-            'app/js/treeherder.js',
-            'app/js/filters.js',
-            'app/js/providers.js',
-            'app/js/values.js',
-            'app/js/logviewer.js',
-            'app/js/treeherder_app.js',
-            'app/js/controllers/**/*.js',
-            'app/js/directives/**/*.js',
-            'app/js/models/**/*.js',
-            'app/js/services/**/*.js',
-            'app/plugins/**/*.js',
-            'test/vendor/jasmine-jquery.js',
-            'test/unit/**/*.js',
-            'app/vendor/*.js',
+            'ui/vendor/angular/angular.js',
+            'ui/vendor/angular/angular-*.js',
+            'ui/vendor/ui-bootstrap-*.js',
+            'ui/vendor/jquery-*.js',
+            'ui/vendor/jquery.ui.effect.js',
+            'ui/vendor/jquery.ui.effect-highlight.js',
+            'ui/vendor/bootstrap*.js',
+            'ui/js/treeherder.js',
+            'ui/js/filters.js',
+            'ui/js/providers.js',
+            'ui/js/values.js',
+            'ui/js/logviewer.js',
+            'ui/js/treeherder_app.js',
+            'ui/js/controllers/**/*.js',
+            'ui/js/directives/**/*.js',
+            'ui/js/models/**/*.js',
+            'ui/js/services/**/*.js',
+            'ui/plugins/**/*.js',
+            'tests/ui/vendor/jasmine-jquery.js',
+            'tests/ui/unit/**/*.js',
+            'ui/vendor/*.js',
 
             // fixtures
-            {pattern: 'test/mock/**/*.json', watched: true, served: true, included: false}
+            {pattern: 'tests/ui/mock/**/*.json', watched: true, served: true, included: false}
         ],
 
         autoWatch: false,
@@ -55,7 +55,7 @@ module.exports = function (config) {
 
         reporters: ['progress', 'coverage'],
         preprocessors: {
-            'app/js/**/*.js': ['coverage']
+            'ui/js/**/*.js': ['coverage']
         }
     });
 };

web-server.js

@@ -8,7 +8,7 @@ var util = require('util'),
     events = require('events');
 
 var DEFAULT_PORT = 8000;
-var APP_ROOT = path.join(__dirname, "..", "app");
+var APP_ROOT = path.join(__dirname, "ui");
 
 function main(argv) {
   new HttpServer({