Allow connectivity config via webapp

GitVersion.yml

@@ -1,5 +1,5 @@
 assembly-versioning-scheme: Major
-next-version: 1.19
+next-version: 1.20
 branches:
   release:
     tag: rc

src/ServicePulse.Host.Tests/ApprovalFiles/APIApprovals.PlatformSampleApprovals.approved.txt

@@ -1,14 +1,6 @@
-;(function (window, angular, undefined) {  'use strict';
-
-    window.config = {
-        default_route: '/dashboard',
-        service_control_url: 'http://localhost:33333/api/',
-        monitoring_urls: ['http://localhost:33633/']
-    };
-
-    angular.module('sc')
-        .constant('version', '1.2.0')
-        .constant('showPendingRetry', false)
-        .constant('scConfig', window.config);
-
-}(window, window.angular));
+window.defaultConfig = {
+    default_route: '/dashboard',
+    version: '1.2.0',
+    service_control_url: 'http://localhost:33333/api/',
+    monitoring_urls: ['http://localhost:33633/']
+};

src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="Particular.Approvals" Version="0.2.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/ServicePulse.Host.Tests/VerifyAppConstantsJSTextReplacement.cs

@@ -1,13 +1,10 @@
-using System.Reflection;
-
-namespace ServicePulse.Host.Tests
+namespace ServicePulse.Host.Tests
 {
+    using NUnit.Framework;
     using System;
     using System.Collections.Generic;
     using System.IO;
-
     using System.Text.RegularExpressions;
-    using NUnit.Framework;
 
     [TestFixture]
     public class VerifyAppConstantsJSTextReplacement
@@ -16,14 +13,14 @@ public class VerifyAppConstantsJSTextReplacement
         // this both user configurable and updated during installation
 
         Regex sc_url_regex = new Regex(@"(service_control_url\s*\:\s*['""])(.*?)(['""])");
-        Regex version_regex = new Regex(@"(constant\s*\(\s*'version'\s*,\s*['""])(.*?)(['""])");
+        Regex version_regex = new Regex(@"(version\s*\:\s*['""])(.*?)(['""])");
 
         [Test]
         public void app_constants_js_validation()
         {
             var pathToConfig = Path.Combine(TestContext.CurrentContext.TestDirectory, "app.constants.js");
             Assert.IsTrue(File.Exists(pathToConfig), "app.constants.js does not exist - this will break installation code");
-            
+
             var config = File.ReadAllText(pathToConfig);
             var matchUrl = sc_url_regex.Match(config);
             Assert.IsTrue(matchUrl.Success, "regex failed to match app.constant.js for SC URI update");
@@ -37,35 +34,71 @@ public void app_constants_js_validation()
         [Test]
         public void replace_version_regex_tests()
         {
-            var configSnippets = new Dictionary<string, string>
+            var configSnippets = new Dictionary<string, (string ConfigSnippet, Regex VersionRegex)>()
             {
-                 {"1.3.0", @"angular.module('sc')
-                    .constant('version', '1.3.0')
-                    .constant('scConfig';"},
-                 {"1.3.0-beta1", @"angular.module('sc')
-                    .constant ( 'version' , '1.3.0-beta1')
-                    .constant('scConfig';"},
-                 {"", @"angular.module('sc')
-                    .constant('version' , '' )
-                    .constant('scConfig';"}
+                {
+                    "1.3.0",
+                    (
+                        ConfigSnippet: @"angular.module('sc')
+                            .constant('version', '1.3.0')
+                            .constant('scConfig';",
+                        VersionRegex: new Regex(@"(constant\s*\(\s*'version'\s*,\s*['""])(.*?)(['""])")
+                    )
+                },
+                {
+                    "1.3.0-beta1",
+                    (
+                        ConfigSnippet: @"angular.module('sc')
+                            .constant ( 'version' , '1.3.0-beta1')
+                            .constant('scConfig';",
+                        VersionRegex: new Regex(@"(constant\s*\(\s*'version'\s*,\s*['""])(.*?)(['""])")
+                    )
+                },
+                {
+                    "",
+                    (
+                        ConfigSnippet: @"angular.module('sc')
+                            .constant('version' , '' )
+                            .constant('scConfig';",
+                        VersionRegex: new Regex(@"(constant\s*\(\s*'version'\s*,\s*['""])(.*?)(['""])")
+                    )
+                },
+                {
+                    "1.20.0",
+                    (
+                        ConfigSnippet: @"window.defaultConfig = {
+                                version: '1.20.0',
+                                service_control_url: '
+                            };",
+                        VersionRegex: new Regex(@"(version\s*\:\s*['""])(.*?)(['""])")
+                    )
+                },
             };
 
             foreach (var config in configSnippets)
             {
                 var expectedResult = config.Key;
-                var text = config.Value;
+                var text = config.Value.ConfigSnippet;
 
-                var match = version_regex.Match(text);
+                var match = config.Value.VersionRegex.Match(text);
                 Assert.IsTrue(match.Success, "regex failed to match version string");
                 Assert.IsTrue(match.Groups[2].Value.Equals(expectedResult), string.Format("Version regex did not return expected value which was {0}", expectedResult));
             }
         }
-        
+
         [Test]
-        public void test_regex_match_against_config_variants ()
+        public void test_regex_match_against_config_variants()
         {
             var configVariations = new[]
             {
+                // Standard 1.20.0 config            
+                @"window.defaultConfig = {
+                    default_route: '/dashboard',
+                    version: '1.20.0',
+                    service_control_url: 'http://localhost:33333/api/',
+                    monitoring_urls: ['http://localhost:33633/']
+                };
+                ",
                 // Standard 1.3 config            
                 @"angular.module('sc')
                     .constant('version', '1.3.0')

src/ServicePulse.Host.Tests/karma.conf.js

@@ -4,17 +4,21 @@ module.exports = function(config) {
         browsers: ['PhantomJS', 'PhantomJS_custom', 'Chrome'],
         basePath: '../ServicePulse.Host/app',
         files: [
-            './modules/dist/shell.dist.js',
-            '../../ServicePulse.Host.Tests/tests/js/angular-mocks.js',
-            './js/app.js',            
+            './modules/dist/shell.dist.js',            
+            '../../ServicePulse.Host.Tests/tests/js/angular-mocks.js',                        
             './js/**/*.html',
             './js/app.constants.js',
+            './modules/dist/configuration.dist.js',
+            './js/app.js',
+            './js/app.bootstrap.js',            
             './js/**/*.module.js',
             './js/**/*.tabset.js',
-            './js/**/*.js',            
-            './modules/dist/configuration.dist.js',
-            './modules/dist/monitoring.dist.js',            
-            '../../ServicePulse.Host.Tests/tests/**/*.spec.js'],        
+            './js/directives/**/*.js', 
+            './js/polyfill/**/*.js', 
+            './js/services/**/*.js', 
+            './js/views/**/*.js', 
+            './modules/dist/monitoring.dist.js',
+            '../../ServicePulse.Host.Tests/tests/**/*.spec.js'],
         frameworks: ['jasmine'],
         // you can define custom flags
         customLaunchers: {
@@ -36,12 +40,12 @@ module.exports = function(config) {
         },
 
         proxies: {
-            '/js/views/dashboard/dashboard.html': '/base/js/views/dashboard/dashboard.html'            
+            '/js/views/dashboard/dashboard.html': '/base/js/views/dashboard/dashboard.html'
         },
 
         phantomjsLauncher: {
             // Have phantomjs exit if a ResourceError is encountered (useful if karma exits without killing phantom)
             exitOnResourceError: true
-        }        
+        }
     })
 }

src/ServicePulse.Host.Tests/package.json

@@ -1,9 +1,7 @@
 {
   "name": "ServicePulse.Host.Tests",
   "version": "1.0.0",
-  "dependencies": {
-
-  },  
+  "dependencies": {},
   "devDependencies": {
     "karma-chrome-launcher": "^2.2.0",
     "karma-firefox-launcher": "^1.1.0",

src/ServicePulse.Host.Tests/tests/js/services/services.monitoring.spec.js

@@ -22,22 +22,22 @@
 
     var monitoringService, $httpBackend, scConfig;
 
-    beforeEach(inject(function (_monitoringService_, _$httpBackend_, _scConfig_) {
+    beforeEach(inject(function (_monitoringService_, _$httpBackend_) {
         monitoringService = _monitoringService_;
         $httpBackend = _$httpBackend_;
-        scConfig = _scConfig_;
+        scConfig = window.defaultConfig;
     }));
 
     it('should push endpoints retrieved from monitoring server', function (done) {
-        scConfig.monitoring_urls = ['http://localhost:33633/'];
+        window.defaultConfig.monitoring_urls = ['http://localhost:33633/'];
 
         $httpBackend.whenGET('http://localhost:33633/monitored-endpoints?history=5').respond(monitoredEndpointWithData);
 
         var monitoredEndpoints = [];
         var subscription = monitoringService.createEndpointsSource(5).subscribe(function (response) {
             monitoredEndpoints.push(response);
 
-            if (monitoredEndpoints.length == 2) {
+            if (monitoredEndpoints.length === 2) {
                 expect(monitoredEndpoints[0].name).toEqual("Samples.Metrics.Tracing.Endpoint1");
                 expect(monitoredEndpoints[0].data.timestamps).toEqual([]);
                 expect(monitoredEndpoints[0].data.criticalTime).toEqual([]);
@@ -56,26 +56,4 @@
             $httpBackend.flush();
         }, 0);
     });
-
-    it('should push endpoints retrieved from multiple monitoring servers', function (done) {
-        $httpBackend.whenGET('http://localhost:1234/monitored-endpoints?history=5').respond(monitoredEndpointWithData);
-        $httpBackend.whenGET('http://localhost:5678/monitored-endpoints?history=5').respond(monitoredEndpointWithData);
-
-        scConfig.monitoring_urls = ['http://localhost:1234/', 'http://localhost:5678/'];
-
-        var monitoredEndpoints = [];
-        var subscription = monitoringService.createEndpointsSource(5).subscribe(function (response) {
-            monitoredEndpoints.push(response);
-
-            if (monitoredEndpoints.length == 4) {
-                expect(monitoredEndpoints.length).toEqual(4);
-                subscription.dispose();
-                done();
-            }
-        });
-
-        setTimeout(function () {
-            $httpBackend.flush();
-        }, 0);
-    });
 });

src/ServicePulse.Host.Tests/tests/js/services/services.spec.js

@@ -3,7 +3,7 @@
 describe("Unit: Uri Service ", function() {
 
     it('should load angular', function() {
-        expect(typeof (angular) == typeof (undefined)).toEqual(false);
+        expect(typeof (angular) === typeof (undefined)).toEqual(false);
     });
 
     describe("Uri Joins:", function() {
@@ -12,7 +12,7 @@ describe("Unit: Uri Service ", function() {
 
         it('should contain a uri service',
             inject(function(uri) {
-                expect(typeof (uri) == typeof(undefined)).toEqual(false);
+                expect(typeof (uri) === typeof(undefined)).toEqual(false);
             }));
 
         it('should prevent double slashes for leading and trailing slashes', inject(function (uri) {
@@ -25,39 +25,39 @@ describe("Unit: Uri Service ", function() {
             expect(url).toEqual('http://localhost:33333/api/eventlogitems');
         }));
 
-        it('should make a url for get Failed Messages For Exception Group', inject(function (uri, scConfig) {
+        it('should make a url for get Failed Messages For Exception Group', inject(function (uri) {
             var groupId = '85147b12-458c-431d-a389-35ea53abc9e1';
             var page = 1;
             var sortBy = 'time_of_failure';
-            var url = uri.join(scConfig.service_control_url, 'recoverability', 'groups', groupId, 'errors?page=' + page + '&sort=' + sortBy + '&status=unresolved');
+            var url = uri.join(window.defaultConfig.service_control_url, 'recoverability', 'groups', groupId, 'errors?page=' + page + '&sort=' + sortBy + '&status=unresolved');
             expect(url).toEqual('http://localhost:33333/api/recoverability/groups/85147b12-458c-431d-a389-35ea53abc9e1/errors?page=1&sort=time_of_failure&status=unresolved');
         }));
 
-        it('should make a url for get Failed Messages For Exception Group', inject(function (uri, scConfig) {
+        it('should make a url for get Failed Messages For Exception Group', inject(function (uri) {
             var messageId = '85147b12-458c-431d-a389-35ea53abc9e1';
-            var url = uri.join(scConfig.service_control_url, 'messages', messageId, 'body');
+            var url = uri.join(window.defaultConfig.service_control_url, 'messages', messageId, 'body');
             expect(url).toEqual('http://localhost:33333/api/messages/85147b12-458c-431d-a389-35ea53abc9e1/body');
         }));
 
-        it('should make a url for getMessageBody', inject(function (uri, scConfig) {
+        it('should make a url for getMessageBody', inject(function (uri) {
             var messageId = '85147b12-458c-431d-a389-35ea53abc9e1';
-            var url = uri.join(scConfig.service_control_url, 'messages', messageId, 'body');
+            var url = uri.join(window.defaultConfig.service_control_url, 'messages', messageId, 'body');
             expect(url).toEqual('http://localhost:33333/api/messages/85147b12-458c-431d-a389-35ea53abc9e1/body');
         }));
 
-        it('should make a url for getMessageHeaders', inject(function (uri, scConfig) {
+        it('should make a url for getMessageHeaders', inject(function (uri) {
             var messageId = '85147b12-458c-431d-a389-35ea53abc9e1';
-            var url = uri.join(scConfig.service_control_url, 'messages', 'search', messageId);
+            var url = uri.join(window.defaultConfig.service_control_url, 'messages', 'search', messageId);
             expect(url).toEqual('http://localhost:33333/api/messages/search/85147b12-458c-431d-a389-35ea53abc9e1');
         }));
 
-        it('should make a url for getTotalFailedMessages', inject(function (uri, scConfig) {
-            var url = uri.join(scConfig.service_control_url, 'errors?status=unresolved');
+        it('should make a url for getTotalFailedMessages', inject(function (uri) {
+            var url = uri.join(window.defaultConfig.service_control_url, 'errors?status=unresolved');
             expect(url).toEqual('http://localhost:33333/api/errors?status=unresolved');
         }));
 
-        it('should make a url for retry errors', inject(function (uri, scConfig) {
-            var url = uri.join(scConfig.service_control_url, 'errors', 'retry');
+        it('should make a url for retry errors', inject(function (uri) {
+            var url = uri.join(window.defaultConfig.service_control_url, 'errors', 'retry');
             expect(url).toEqual('http://localhost:33333/api/errors/retry');
         }));
 

src/ServicePulse.Host/Commands/ExtractAndUpdateConstantsCommand.cs

@@ -59,7 +59,7 @@ public static void UpdateVersion(string directoryPath)
         {
             var appJsPath = Path.Combine(directoryPath, "js/app.constants.js");
             var appJsCode = File.ReadAllText(appJsPath);
-            var updatedContent = Regex.Replace(appJsCode, @"(constant\(\s*'version'\s*,\s*')(.*?)(')", "${1}" + GetFileVersion() + "$3");
+            var updatedContent = Regex.Replace(appJsCode, @"(version\s*\:\s*['""])(.*?)(['""])", "${1}" + GetFileVersion() + "$3");
             File.WriteAllText(appJsPath, updatedContent);
         }
 
@@ -79,4 +79,4 @@ static string GetFileVersion()
             return typeof(AbstractCommand).Assembly.GetName().Version.ToString(4);
         }
     }
-}
+}

src/ServicePulse.Host/ServicePulse.Host.csproj

@@ -15,6 +15,12 @@
   <ItemGroup>
     <PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" PrivateAssets="All" />
     <PackageReference Include="Nancy.Hosting.Self" Version="1.4.1" />
+    <Content Include="app\modules\configuration\connectionsManager.js" />
+    <Content Include="app\js\views\sc_not_available.html" />
+    <Content Include="app\modules\configuration\js\connections\connections.controller.js" />
+    <Content Include="app\modules\configuration\js\connections\connections.module.js" />
+    <Content Include="app\modules\configuration\js\connections\connections.route.js" />
+    <Content Include="app\modules\configuration\views\connections.html" />
   </ItemGroup>
 
   <ItemGroup>