Merge branch 'master' into restcomm-1428

RestComm · Dec 13, 2017 · b60c6ad · b60c6ad
2 parents 536e158 + a0e40a0
commit b60c6ad
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -24,7 +24,7 @@ def publishRCResults() {
     checkstyle canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/checkstyle-result.xml', unHealthy: ''
     junit '**/target/surefire-reports/*.xml'
     step( [ $class: 'JacocoPublisher' ] )
-    if (currentBuild.currentResult != 'SUCCESS' ) {
+    if ((env.BRANCH_NAME == 'master') && (currentBuild.currentResult != 'SUCCESS') ) {
        slackSend "Build unstable - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
     }
     if (env.BRANCH_NAME ==~ /^PR-\d+$/) {

diff --git a/restcomm/pom.xml b/restcomm/pom.xml
@@ -80,6 +80,8 @@
 	</distributionManagement>
 
 	<properties>
+            <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
 		<scala-lang.version>2.10.1</scala-lang.version>
 		<akka.version>2.1.2</akka.version>
 		<guava.version>14.0.1</guava.version>

diff --git a/restcomm/restcomm.ui/.gitignore b/restcomm/restcomm.ui/.gitignore
@@ -1,6 +1,12 @@
-.classpath
-.settings
-.project
+# OSX Files
+.DS_Store
+
+# IntelliJ Files
+.idea
+
+# Output Files
 target
-bin
-logs
+
+# Node Files
+node
+node_modules
diff --git a/restcomm/restcomm.ui/Gruntfile.js b/restcomm/restcomm.ui/Gruntfile.js
@@ -0,0 +1,50 @@
+module.exports = function(grunt) {
+
+      grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
+        clean: ['target/dist'],
+        copy: {
+          main: {
+            expand: true,
+            cwd: 'src/main/webapp',
+            src: '**',
+            dest: 'target/dist',
+          },
+        },
+        cacheBust: {
+            taskName: {
+                options: {
+                    assets: ['resources/js/**/*', 'resources/css/**/*'],
+                    baseDir: 'target/dist/',
+                    outputDir: 'resources/assets/',
+                    clearOutputDir: true,
+                    deleteOriginals: true,
+                    queryString: false
+                },
+                files: [{
+                  src: ['target/dist/index.html']
+                }]
+            }
+        },
+        ngtemplates:  {
+          rcApp: {
+            cwd:      'target/dist',
+            src:      'modules/**/*.html',
+            dest:     'target/dist/resources/js/restcomm.js',
+            options:    {
+              append: true
+            }
+          }
+        },
+      });
+
+      grunt.loadNpmTasks('grunt-angular-templates');
+      grunt.loadNpmTasks('grunt-contrib-clean');
+      grunt.loadNpmTasks('grunt-contrib-copy');
+      grunt.loadNpmTasks('grunt-cache-bust');
+
+      grunt.registerTask('default', ['clean', 'copy', 'ngtemplates', 'cacheBust']);
+
+    };
+
+
diff --git a/restcomm/restcomm.ui/package.json b/restcomm/restcomm.ui/package.json
@@ -0,0 +1,18 @@
+{
+    "name": "restcomm-connect-console",
+    "version": "2.0.0",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/restcomm/restcomm-connect.git"
+    },
+    "license": "AGPL-3.0",
+    "devDependencies": {
+      "grunt": "~0.4.5",
+      "grunt-angular-templates": "^1.1.0",
+      "grunt-cache-bust": "^1.6.0",
+      "grunt-cli": "~1.2.0",
+      "grunt-contrib-clean": "^1.1.0",
+      "grunt-contrib-copy": "^1.0.0"
+    }
+  }
+
diff --git a/restcomm/restcomm.ui/pom.xml b/restcomm/restcomm.ui/pom.xml
@@ -16,25 +16,54 @@
 	<build>
 		<finalName>restcomm-management</finalName>
 		<plugins>
-			<!-- JRebel -->
 			<plugin>
-				<groupId>org.zeroturnaround</groupId>
-				<artifactId>jrebel-maven-plugin</artifactId>
-				<version>1.1.1</version>
+				<groupId>com.github.eirslett</groupId>
+				<artifactId>frontend-maven-plugin</artifactId>
+				<version>1.6</version>
+
 				<executions>
 					<execution>
-						<id>generate-rebel-xml</id>
-						<phase>process-resources</phase>
+						<id>install node and npm</id>
+						<goals>
+							<goal>install-node-and-npm</goal>
+						</goals>
+						<configuration>
+							<nodeVersion>v4.6.0</nodeVersion>
+							<npmVersion>2.15.9</npmVersion>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>npm install</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<configuration>
+							<arguments>install</arguments>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>grunt</id>
 						<goals>
-							<goal>generate</goal>
+							<goal>grunt</goal>
 						</goals>
+						<configuration>
+							<arguments>--no-color</arguments>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.4</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<warSourceDirectory>
+						${basedir}/target/dist
+					</warSourceDirectory>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/restcomm/restcomm.ui/src/main/webapp/modules/profile.html b/restcomm/restcomm.ui/src/main/webapp/modules/profile.html
@@ -29,7 +29,7 @@
                 <div class="col-md-2 col-sm-2 col-xs-12 account-field-title">Auth Token</div>
                 <div class="col-md-6 col-sm-4 col-xs-12 account-field-value">
                     <img src="resources/img/v2/d-r-pass-visible.png" class="auth-token-toggle" ng-click="authTokenType = (authTokenType === 'password' ? 'text' : 'password')">
-                    <input type="{{authTokenType}}" class="account-sid-auth-token-input" value="{{ loggedAccount.auth_token }}" readonly ng-init="authTokenType = 'password'" ng-click="authTokenType = 'text'" uib-tooltip="Click to view" tooltip-enable="authTokenType === 'password'">
+                    <input type="{{authTokenType}}" class="account-sid-auth-token-input" value="{{ urlAccount.auth_token }}" readonly ng-init="authTokenType = 'password'" ng-click="authTokenType = 'text'" uib-tooltip="Click to view" tooltip-enable="authTokenType === 'password'">
                 </div>
             </div>
             <div class="row">

diff --git a/restcomm/restcomm.ui/src/main/webapp/resources/js/filters.js b/restcomm/restcomm.ui/src/main/webapp/resources/js/filters.js
@@ -32,7 +32,7 @@ rcFilters.filter('noHTML', function () {
 rcFilters.filter("toDuration", function () {
   return function(timeInSeconds) {
     if (timeInSeconds < 60) {
-      return seconds + 's';
+      return timeInSeconds + 's';
     }
     else if (timeInSeconds < 60 * 60) {
       var minutes = parseInt(timeInSeconds / 60, 10);