Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into 858

awx/ui/client/lib/lrInfiniteScroll/.bower.json

@@ -0,0 +1,32 @@
+{
+  "name": "lrInfiniteScroll",
+  "main": "lrInfiniteScroll.js",
+  "version": "1.0.0",
+  "homepage": "https://github.com/lorenzofox3/lrInfiniteScroll",
+  "authors": [
+    "lorenzofox3 <laurent34azerty@gmail.com>"
+  ],
+  "description": "angular directive to handle element scroll",
+  "keywords": [
+    "angular",
+    "scroll",
+    "inifinite"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "_release": "1.0.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "1.0.0",
+    "commit": "c833e9d8ff56d6c66e2a21ed7f27ad840f159a8b"
+  },
+  "_source": "https://github.com/lorenzofox3/lrInfiniteScroll.git",
+  "_target": "~1.0.0",
+  "_originalSource": "lrInfiniteScroll"
+}

awx/ui/client/lib/lrInfiniteScroll/index.js

@@ -0,0 +1,2 @@
+require('./lrInfiniteScroll');
+module.exports = 'lrInfiniteScroll';

awx/ui/client/lib/lrInfiniteScroll/lrInfiniteScroll.js

@@ -2,13 +2,12 @@
     'use strict';
     var module = ng.module('lrInfiniteScroll', []);
 
-    module.directive('lrInfiniteScroll', ['$log', '$timeout', function ($log, timeout) {
+    module.directive('lrInfiniteScroll', ['$timeout', function (timeout) {
         return{
             link: function (scope, element, attr) {
                 var
                     lengthThreshold = attr.scrollThreshold || 50,
                     timeThreshold = attr.timeThreshold || 400,
-                    direction = attr.direction || 'down',
                     handler = scope.$eval(attr.lrInfiniteScroll),
                     promise = null,
                     lastRemaining = 9999;
@@ -20,14 +19,14 @@
                     handler = ng.noop;
                 }
 
-                $log.debug('lrInfiniteScroll: ' + attr.lrInfiniteScroll);
-
                 element.bind('scroll', function () {
-                    var remaining = (direction === 'down') ? element[0].scrollHeight - (element[0].clientHeight + element[0].scrollTop) : element[0].scrollTop;
+                    var
-                    // if we have reached the threshold and we scroll down
+                        remaining = element[0].scrollHeight - (element[0].clientHeight + element[0].scrollTop);
-                    if ((direction === 'down' && remaining < lengthThreshold && (remaining - lastRemaining) < 0) ||
+
-                         direction === 'up' && remaining < lengthThreshold) {
+                    //if we have reached the threshold and we scroll down
-                        //if there is already a timer running which has not expired yet we have to cancel it and restart the timer
+                    if (remaining < lengthThreshold && (remaining - lastRemaining) < 0) {
+
+                        //if there is already a timer running which has no expired yet we have to cancel it and restart the timer
                         if (promise !== null) {
                             timeout.cancel(promise);
                         }

awx/ui/client/src/app.js

@@ -79,6 +79,7 @@ __deferLoadIfEnabled();
 
 var tower = angular.module('Tower', [
     //'ngAnimate',
+    'lrInfiniteScroll',
     'ngSanitize',
     'ngCookies',
     about.name,
@@ -269,7 +270,7 @@ var tower = angular.module('Tower', [
             }).
 
             state('projects', {
-                url: '/projects',
+                url: '/projects?{status}',
                 templateUrl: urlPrefix + 'partials/projects.html',
                 controller: ProjectsList,
                 data: {

awx/ui/client/src/controllers/Projects.js

@@ -22,7 +22,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
     Wait('start');
 
     var list = ProjectList,
-        defaultUrl = GetBasePath('projects'),
+        defaultUrl = GetBasePath('projects') + ($stateParams.status ? '?status=' + $stateParams.status : ''),
         view = GenerateList,
         base = $location.path().replace(/^\//, '').split('/')[0],
         mode = (base === 'projects') ? 'edit' : 'select',

awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js

@@ -49,7 +49,7 @@ export default
                                 label: "Inventories",
                             },
                             {
-                                url: "/#/inventories/?inventory_sources_with_failures",
+                                url: "/#/inventories?status=sync-failed",
                                 number: scope.data.inventories.inventory_failed,
                                 label: "Inventory Sync Failures",
                                 isFailureCount: true
@@ -60,7 +60,7 @@ export default
                                 label: "Projects"
                             },
                             {
-                                url: "/#/projects/?status=failed",
+                                url: "/#/projects?status=failed",
                                 number: scope.data.projects.failed,
                                 label: "Project Sync Failures",
                                 isFailureCount: true

awx/ui/client/src/inventories/list/inventory-list.controller.js

@@ -17,7 +17,7 @@ function InventoriesList($scope, $rootScope, $location, $log,
     Find, Empty, $state) {
 
     var list = InventoryList,
-        defaultUrl = GetBasePath('inventory'),
+        defaultUrl = GetBasePath('inventory') + ($stateParams.status === 'sync-failed' ? '?not__inventory_sources_with_failures=0' : ''),
         view = generateList,
         paths = $location.path().replace(/^\//, '').split('/'),
         mode = (paths[0] === 'inventories') ? 'edit' : 'select';

awx/ui/client/src/inventories/list/inventory-list.route.js

@@ -9,7 +9,7 @@ import InventoriesList from './inventory-list.controller';
 
 export default {
     name: 'inventories',
-    route: '/inventories',
+    route: '/inventories?{status}',
     templateUrl: templateUrl('inventories/inventories'),
     controller: InventoriesList,
     data: {

awx/ui/client/src/job-templates/add/job-templates-add.controller.js

@@ -72,6 +72,7 @@
             jQuery.extend(true, CloudCredentialList, CredentialList);
             CloudCredentialList.name = 'cloudcredentials';
             CloudCredentialList.iterator = 'cloudcredential';
+            CloudCredentialList.basePath = '/api/v1/credentials?cloud=true';
 
             SurveyControllerInit({
                 scope: $scope,

awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js

@@ -300,6 +300,7 @@ export default
                 jQuery.extend(true, CloudCredentialList, CredentialList);
                 CloudCredentialList.name = 'cloudcredentials';
                 CloudCredentialList.iterator = 'cloudcredential';
+                CloudCredentialList.basePath = '/api/v1/credentials?cloud=true';
                 LookUpInit({
                     url: GetBasePath('credentials') + '?cloud=true',
                     scope: $scope,

awx/ui/client/src/notifications/notificationTemplates.form.js

@@ -141,7 +141,23 @@ export default function() {
                     reqExpression: "channel_required",
                     init: "false"
                 },
-                ngShow: "notification_type.value == 'slack' || notification_type.value == 'hipchat'",
+                ngShow: "notification_type.value == 'slack'",
+                subForm: 'typeSubForm'
+            },
+            rooms: {
+                label: 'Destination Channels',
+                type: 'textarea',
+                rows: 3,
+                awPopOver: '<p>Type an option on each line. The pound symbol (#) is not required.</p>'+
+                            '<p>For example:<br>engineering<br>\n #support<br>\n',
+                dataTitle: 'Destination Channels',
+                dataPlacement: 'right',
+                dataContainer: "body",
+                awRequiredWhen: {
+                    reqExpression: "room_required",
+                    init: "false"
+                },
+                ngShow: "notification_type.value == 'hipchat'",
                 subForm: 'typeSubForm'
             },
             token: {
@@ -265,11 +281,7 @@ export default function() {
             },
             notify: {
                 label: 'Notify Channel',
-                type: 'text',
+                type: 'checkbox',
-                awRequiredWhen: {
-                    reqExpression: "hipchat_required",
-                    init: "false"
-                },
                 ngShow: "notification_type.value == 'hipchat' ",
                 subForm: 'typeSubForm'
             },

awx/ui/client/src/notifications/shared/type-change.service.js

@@ -39,7 +39,7 @@ function () {
                 case 'hipchat':
                     obj.tokenLabel = ' Token';
                     obj.hipchat_required = true;
-                    obj.channel_required = true;
+                    obj.room_required = true;
                     obj.token_required = true;
                     break;
                 case 'twilio':

awx/ui/client/src/standard-out/log/standard-out-log.controller.js

@@ -87,7 +87,7 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
         });
 
         function loadStdout() {
-            Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=-' + page_size);
+            Rest.setUrl($scope.stdoutEndpoint + '?format=json&start_line=0&end_line=' + page_size);
             Rest.get()
                 .success(function(data) {
                     Wait('stop');
@@ -145,38 +145,17 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
                 });
         }
 
-        $scope.stdOutScrollToTop = function() {
+        // lrInfiniteScroll handler
-            // scroll up or back in time toward the beginning of the file
+        // grabs the next stdout section
-            var start, end, url;
+        $scope.stdOutGetNextSection = function(){
-            if (loaded_sections.length > 0 && loaded_sections[0].start > 0) {
+            if (current_range.absolute_end > current_range.end){
-                start = (loaded_sections[0].start - page_size > 0) ? loaded_sections[0].start - page_size : 0;
+                var url = $scope.stdoutEndpoint + '?format=json&start_line=' + current_range.end +
-                end = loaded_sections[0].start - 1;
+                    '&end_line=' + (current_range.end + page_size);
-            }
-            else if (loaded_sections.length === 0) {
-                start = 0;
-                end = page_size;
-            }
-            if (start !== undefined  && end !== undefined) {
-                $('#stdoutMoreRowsTop').fadeIn();
-                url = stdout_url + '?format=json&start_line=' + start + '&end_line=' + end;
                 Rest.setUrl(url);
                 Rest.get()
-                    .success( function(data) {
+                    .success(function(data){
-                        //var currentPos = $('#pre-container').scrollTop();
+                        $('#pre-container-content').append(data.content);
-                        var newSH, oldSH = $('#pre-container').prop('scrollHeight'),
-                            st = $('#pre-container').scrollTop();
-
-                        $('#pre-container-content').prepend(data.content);
-
-                        newSH = $('#pre-container').prop('scrollHeight');
-                        $('#pre-container').scrollTop(newSH - oldSH + st);
-
-                        loaded_sections.unshift({
-                            start: (data.range.start < 0) ? 0 : data.range.start,
-                            end: data.range.end
-                        });
                         current_range = data.range;
-                        $('#stdoutMoreRowsTop').fadeOut(400);
                     })
                     .error(function(data, status) {
                         ProcessErrors($scope, data, status, null, { hdr: 'Error!',

awx/ui/client/src/standard-out/log/standard-out-log.partial.html

@@ -1,6 +1,5 @@
-<div class="StandardOut-consoleOutput">
+<div class="StandardOut-consoleOutput" lr-infinite-scroll="stdOutGetNextSection" scroll-threshold="300" time-threshold="500">
-    <div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer"
+    <div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer">
-    lr-infinite-scroll="stdOutScrollToTop" scroll-threshold="300" data-direction="up" time-threshold="500">
         <div id="pre-container-content"  class="StandardOut-preContent"></div>
     </div>
     <div class="scroll-spinner" id="stdoutMoreRowsBottom">