From 70d412bad8e39bbd56ad38f1d662cded9462a0cb Mon Sep 17 00:00:00 2001 From: Richard Date: Wed, 15 Feb 2017 13:15:04 +0000 Subject: [PATCH] Helion Service Manager Integration (view only) (#975) * WIP: HSM Support * Small improvements. Tidy ups. Lint fixes. Unit tests now run okay. * Many improvements and refinements * Added configure instance support. Refactor cerate instance dialog. Tidy ups. * Added upgrade support * Minor improvements * Allow only admins to see HSM endpoints * Tweaks * Fix broken redirect with a single HSM * Allow components to be shown or hidden * Don't show inline upgrade messages since they are distracting * Apply update to text and ensure write operations are turned off by default. * Updated icon * Tweaks + changes - Now rely on the base state fetch of instances and services. Leaf states will refer to these when applicable. The instance will still be updated on poll, covering both local and instances array entries. The instances array will also manually be updated on create, delete and reconfigure. - Instance and service arrays are now pre-sorted to avoid table sort flibble - Instances table state icons now match that of the instance detail icon (except their larger table located versions) - Handle create instance edge cases. Also improve error messages when creating a service. - Ensure secret params and empty string defaults are shown in the create instance param list - Show secret params as password input boxes - Always show the 'delete instance' option if not deleting/deleted. There's some edge cases where we can get stuck in 'creating'/interesting state - Changes some anchors to use ui-sref - Removed some comments + unrequired code * Small translation changes, comments + a catch around readAsText * Address Richard's review comments * Some extra fixes - Fixed alignment of first letter in instance state popover - Fixed HSM nav icon visibility for unregister - Make an info call for HSM service instances in user service instance list - Fixed a few Helion Service Manager references - For the HSM details screen show just 'Service Manager' for the name. This aligns how we handle the same breadcrumb/name in the CF endpoints pages (HCF/Clusters - HSM/Service Manager) - Fixed an issue where disconnected a HSM would not change the total upgrade number (if there are two registered) * Fix pause when deleting endpoint + table blibble on load - Don't wait for updated user service instance list on removal of endpoint (revert from previous commit) - Fixed lint error - Sort table without reverse (show cloud foundry first). This avoids having to hack st-table to sort by reverse 'type' then normal 'name' - Fix position of 'register +' link in register slideout when screen is thin * Fixed lint error and wizard nav bar button issue. Shortened nav bar HSM name --- .../widgets/file-drop/file-drop.directive.js | 49 +++ .../file-drop/prevent-drop.directive.js | 32 ++ .../widgets/file-read/file-read.directive.js | 32 ++ .../json-tree-view.directive.js | 74 ++++ .../json-tree-view/json-tree-view.html | 21 + .../json-tree-view/json-tree-view.scss | 33 ++ .../json-tree-view/recursion-helper.js | 50 +++ .../select-input/select-input.directive.js | 2 +- .../show-table-inline-message.directive.js | 8 + .../table-inline-message.directive.js | 28 +- .../table-inline-message.html | 3 +- framework/src/widgets/widgets.scss | 1 + .../scss/style/components/_detail_view.scss | 19 +- framework/theme/scss/style/index.scss | 1 + framework/theme/scss/style/utils.scss | 7 + .../scss/theme/components/_detail_view.scss | 3 +- framework/theme/svg/Service_manager.svg | 31 ++ oem/brands/hpe/oem_config.json | 1 + oem/config-defaults.json | 1 + .../serviceInstance/serviceInstance.api.js | 26 +- .../serviceInstance.api.spec.js | 4 +- src/app/event/event.service.js | 3 +- src/app/model/navigation/navigation.model.js | 21 +- .../serviceInstance/serviceInstance.model.js | 25 +- .../user/userServiceInstance.model.js | 12 +- src/app/view/application.html | 2 +- .../clusters/cluster/router.module.js | 2 + .../dashboard/endpoints-dashboard.html | 2 +- .../dashboard/endpoints-dashboard.module.js | 10 +- ...ints-dashboard-service-instance.service.js | 102 +++-- .../register/register-service-details.html | 6 + .../register/register-service-type.html | 17 + .../endpoints/register/register-service.scss | 9 +- .../register/register-service.service.js | 8 + src/app/view/navbar/navbar.scss | 31 ++ .../view/navbar/navigation/navigation.html | 7 +- .../view/util/filters/appStateIcon.filter.js | 3 + .../util/filters/smallToLargeIcon.filter.js | 26 ++ src/plugins/service-manager/api/HsmApi.js | 184 +++++++++ .../model/service-manager.model.js | 304 ++++++++++++++ src/plugins/service-manager/plugin.config.js | 13 + .../service-manager/service-manager.module.js | 90 +++++ .../service-manager/service-manager.scss | 356 +++++++++++++++++ src/plugins/service-manager/version.utils.js | 84 ++++ .../manage-instance-form.directive.js | 249 ++++++++++++ .../manage-instance/manage-instance-form.html | 136 +++++++ .../view/manage-instance/manage-instance.html | 3 + .../manage-instance.service.js | 115 ++++++ .../view/service/detail/detail.html | 90 +++++ .../view/service/detail/detail.module.js | 52 +++ .../instances/service-manager.instances.html | 72 ++++ .../service-manager.instances.module.js | 33 ++ .../services/service-manager.services.html | 68 ++++ .../service-manager.services.module.js | 33 ++ .../instance-detail/instance-components.html | 46 +++ .../instance-detail/instance-detail.html | 124 ++++++ .../instance-detail/instance-detail.module.js | 377 ++++++++++++++++++ .../instance-detail/instance-parameters.html | 43 ++ .../instance-detail/instance-scaling.html | 36 ++ .../instance-detail/instance-services.html | 37 ++ .../instance-detail/instance-versions.html | 29 ++ .../view/service/sdl-detail/sdl-detail.html | 28 ++ .../service/sdl-detail/sdl-detail.module.js | 137 +++++++ .../service-detail/service-detail.html | 113 ++++++ .../service-detail/service-detail.module.js | 98 +++++ .../view/service/service-manager.module.js | 91 +++++ .../manager/service-manager-tile.directive.js | 102 +++++ .../tiles/manager/service-manager-tile.html | 23 ++ .../view/tiles/service-manager-tiles.html | 34 ++ .../tiles/service-manager-tiles.module.js | 143 +++++++ .../service-manager/view/view.module.js | 90 +++++ 71 files changed, 4047 insertions(+), 98 deletions(-) create mode 100644 framework/src/widgets/file-drop/file-drop.directive.js create mode 100644 framework/src/widgets/file-drop/prevent-drop.directive.js create mode 100644 framework/src/widgets/file-read/file-read.directive.js create mode 100644 framework/src/widgets/json-tree-view/json-tree-view.directive.js create mode 100644 framework/src/widgets/json-tree-view/json-tree-view.html create mode 100644 framework/src/widgets/json-tree-view/json-tree-view.scss create mode 100644 framework/src/widgets/json-tree-view/recursion-helper.js create mode 100644 framework/theme/scss/style/utils.scss create mode 100644 framework/theme/svg/Service_manager.svg create mode 100644 src/plugins/cloud-foundry/view/util/filters/smallToLargeIcon.filter.js create mode 100644 src/plugins/service-manager/api/HsmApi.js create mode 100644 src/plugins/service-manager/model/service-manager.model.js create mode 100644 src/plugins/service-manager/plugin.config.js create mode 100644 src/plugins/service-manager/service-manager.module.js create mode 100644 src/plugins/service-manager/service-manager.scss create mode 100644 src/plugins/service-manager/version.utils.js create mode 100644 src/plugins/service-manager/view/manage-instance/manage-instance-form.directive.js create mode 100644 src/plugins/service-manager/view/manage-instance/manage-instance-form.html create mode 100644 src/plugins/service-manager/view/manage-instance/manage-instance.html create mode 100644 src/plugins/service-manager/view/manage-instance/manage-instance.service.js create mode 100644 src/plugins/service-manager/view/service/detail/detail.html create mode 100644 src/plugins/service-manager/view/service/detail/detail.module.js create mode 100644 src/plugins/service-manager/view/service/detail/instances/service-manager.instances.html create mode 100644 src/plugins/service-manager/view/service/detail/instances/service-manager.instances.module.js create mode 100644 src/plugins/service-manager/view/service/detail/services/service-manager.services.html create mode 100644 src/plugins/service-manager/view/service/detail/services/service-manager.services.module.js create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-components.html create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-detail.html create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-detail.module.js create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-parameters.html create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-scaling.html create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-services.html create mode 100644 src/plugins/service-manager/view/service/instance-detail/instance-versions.html create mode 100644 src/plugins/service-manager/view/service/sdl-detail/sdl-detail.html create mode 100644 src/plugins/service-manager/view/service/sdl-detail/sdl-detail.module.js create mode 100644 src/plugins/service-manager/view/service/service-detail/service-detail.html create mode 100644 src/plugins/service-manager/view/service/service-detail/service-detail.module.js create mode 100644 src/plugins/service-manager/view/service/service-manager.module.js create mode 100644 src/plugins/service-manager/view/tiles/manager/service-manager-tile.directive.js create mode 100644 src/plugins/service-manager/view/tiles/manager/service-manager-tile.html create mode 100644 src/plugins/service-manager/view/tiles/service-manager-tiles.html create mode 100644 src/plugins/service-manager/view/tiles/service-manager-tiles.module.js create mode 100644 src/plugins/service-manager/view/view.module.js diff --git a/framework/src/widgets/file-drop/file-drop.directive.js b/framework/src/widgets/file-drop/file-drop.directive.js new file mode 100644 index 0000000000..196a5d7fff --- /dev/null +++ b/framework/src/widgets/file-drop/file-drop.directive.js @@ -0,0 +1,49 @@ +(function () { + 'use strict'; + + angular + .module('helion.framework.widgets') + .directive('fileDrop', fileDrop); + + function fileDrop() { + var directive = { + link: link, + restrict: 'A', + scope: { + fileDrop: '=' + } + }; + return directive; + + function link(scope, element) { + + element[0].addEventListener('dragenter', function (evt) { + element.addClass('file-drop-active'); + evt.preventDefault(); + evt.stopPropagation(); + }); + + element[0].addEventListener('dragleave', function () { + element.removeClass('file-drop-active'); + }); + element[0].addEventListener('dragover', function (evt) { + evt.preventDefault(); + evt.stopPropagation(); + element.addClass('file-drop-active'); + }); + + element[0].addEventListener('drop', function (evt) { + evt.stopPropagation(); + evt.preventDefault(); + element.removeClass('file-drop-active'); + + var files = evt.dataTransfer.files; + if (files.length > 0) { + scope.$apply(function () { + scope.fileDrop = files[0]; + }); + } + }); + } + } +})(); diff --git a/framework/src/widgets/file-drop/prevent-drop.directive.js b/framework/src/widgets/file-drop/prevent-drop.directive.js new file mode 100644 index 0000000000..13991be4a1 --- /dev/null +++ b/framework/src/widgets/file-drop/prevent-drop.directive.js @@ -0,0 +1,32 @@ +(function () { + 'use strict'; + + angular + .module('helion.framework.widgets') + .directive('preventDrop', preventDrop); + + preventDrop.$inject = [ + '$window' + ]; + + function preventDrop($window) { + var directive = { + link: link, + restrict: 'A' + }; + return directive; + + function link() { + + $window.addEventListener('dragover', function (evt) { + evt.preventDefault(); + evt.stopPropagation(); + }); + + $window.addEventListener('drop', function (evt) { + evt.preventDefault(); + evt.stopPropagation(); + }); + } + } +})(); diff --git a/framework/src/widgets/file-read/file-read.directive.js b/framework/src/widgets/file-read/file-read.directive.js new file mode 100644 index 0000000000..a95cb5253f --- /dev/null +++ b/framework/src/widgets/file-read/file-read.directive.js @@ -0,0 +1,32 @@ +(function () { + 'use strict'; + + angular + .module('helion.framework.widgets') + .directive('fileread', fileRead); + + function fileRead() { + var directive = { + link: link, + restrict: 'A', + scope: { + fileread: '=' + } + }; + return directive; + + function link(scope, element) { + element.bind('change', function (changeEvent) { + scope.$apply(function () { + scope.fileread = changeEvent.target.files[0]; + }); + }); + + scope.$watch('fileread', function (nv, ov) { + if (ov && ov.name && nv && !nv.name) { + element.val(null); + } + }); + } + } +})(); diff --git a/framework/src/widgets/json-tree-view/json-tree-view.directive.js b/framework/src/widgets/json-tree-view/json-tree-view.directive.js new file mode 100644 index 0000000000..951b4366a3 --- /dev/null +++ b/framework/src/widgets/json-tree-view/json-tree-view.directive.js @@ -0,0 +1,74 @@ +(function () { + 'use strict'; + + angular + .module('helion.framework.widgets') + .directive('jsonTreeView', jsonTreeView); + + jsonTreeView.$inject = [ + 'helion.framework.basePath', + 'RecursionHelper' + ]; + + /** + * @name jsonTreeView + * @description A directive that displays JSON. + * @param {string} path - the framework base path + * @param {object} RecursionHelper - RecursionHelper + * @returns {object} The json-tree-view directive definition object + */ + function jsonTreeView(path, RecursionHelper) { + return { + bindToController: { + json: '=' + }, + controller: JsonTreeViewController, + controllerAs: 'jtvCtrl', + restrict: 'E', + scope: {}, + templateUrl: path + 'widgets/json-tree-view/json-tree-view.html', + compile: function (element) { + return RecursionHelper.compile(element); + } + }; + } + + JsonTreeViewController.$inject = ['$scope']; + + /** + * @namespace helion.framework.widgets.ActionsMenuController + * @memberof helion.framework.widgets + * @name ActionsMenuController + * @constructor + * @param {object} $scope - the angular $scope service + * @property {string} icon - the actions menu icon + * @property {boolean} position - the actions menu position + * @property {boolean} open - flag whether actions menu should be visible + * @property {boolean} buttonMode - do not show the drop down instead the single action as a button + */ + function JsonTreeViewController() { + this.array = _.isArray(this.json); + } + + angular.extend(JsonTreeViewController.prototype, { + + isArray: function () { + return _.isArray(this.json); + }, + + getTypeOf: function (value) { + if (_.isArray(value)) { + return 'array'; + } else if (_.isObject(value)) { + return 'object'; + } else if (_.isBoolean(value)) { + return 'bool'; + } else if (_.isNumber(value)) { + return 'number'; + } + + return 'string'; + } + }); + +})(); diff --git a/framework/src/widgets/json-tree-view/json-tree-view.html b/framework/src/widgets/json-tree-view/json-tree-view.html new file mode 100644 index 0000000000..a74370b799 --- /dev/null +++ b/framework/src/widgets/json-tree-view/json-tree-view.html @@ -0,0 +1,21 @@ +
+ {{key}} : +
+
+ { + +
}
+
+
+
+ [ + +
]
+
+ [] +
+ {{ value }} + {{ value }} + "{{ value }}" +
+
\ No newline at end of file diff --git a/framework/src/widgets/json-tree-view/json-tree-view.scss b/framework/src/widgets/json-tree-view/json-tree-view.scss new file mode 100644 index 0000000000..b7410fe531 --- /dev/null +++ b/framework/src/widgets/json-tree-view/json-tree-view.scss @@ -0,0 +1,33 @@ +json-tree-view { + font-size: 11pt; + font-family: "Source Code Pro", monospace; +} + +.json-view-item, .json-view-array, .json-view-object { + display: inline; + + json-tree-view { + display: block; + margin-left: 12px; + } +} + +.json-view-key { + color: #007B47; +} + +.json-view-string { + color: red; +} + +.json-view-number { + color: #0000DD; +} + +.json-view-bool { + color: #0000DD; +} + +.json-view-array-wtih-values { + display: inline; +} \ No newline at end of file diff --git a/framework/src/widgets/json-tree-view/recursion-helper.js b/framework/src/widgets/json-tree-view/recursion-helper.js new file mode 100644 index 0000000000..928b37a893 --- /dev/null +++ b/framework/src/widgets/json-tree-view/recursion-helper.js @@ -0,0 +1,50 @@ +(function () { + 'use strict'; + + angular + .module('helion.framework.widgets') + .factory('RecursionHelper', RecursionHelper); + + RecursionHelper.$inject = [ + '$compile' + ]; + + function RecursionHelper($compile) { + return { + /** + * Manually compiles the element, fixing the recursion loop. + * @param {object} element - Element + * @param {function} [link] - A post-link function, or an object with function(s) registered via pre and post properties. + * @returns {object} An object containing the linking functions. + */ + compile: function (element, link) { + // Normalize the link parameter + if (angular.isFunction(link)) { + link = { post: link }; + } + + // Break the recursion loop by removing the contents + var contents = element.contents().remove(); + var compiledContents; + return { + pre: link && link.pre ? link.pre : null, + post: function (scope, element) { + // Compile the contents + if (!compiledContents) { + compiledContents = $compile(contents); + } + // Re-add the compiled contents to the element + compiledContents(scope, function (clone) { + element.append(clone); + }); + + // Call the post-linking function, if any + if (link && link.post) { + link.post.apply(null, arguments); + } + } + }; + } + }; + } +})(); diff --git a/framework/src/widgets/select-input/select-input.directive.js b/framework/src/widgets/select-input/select-input.directive.js index 6bbf68ad5e..20113274df 100644 --- a/framework/src/widgets/select-input/select-input.directive.js +++ b/framework/src/widgets/select-input/select-input.directive.js @@ -191,7 +191,7 @@ setLabel: function (modelValue) { if (angular.isDefined(modelValue) && modelValue !== null) { var initialValue = _.find(this.inputOptions, {value: modelValue}); - this.modelLabel = initialValue.label; + this.modelLabel = initialValue ? initialValue.label : null; } else { this.modelLabel = null; } diff --git a/framework/src/widgets/show-table-inline-message/show-table-inline-message.directive.js b/framework/src/widgets/show-table-inline-message/show-table-inline-message.directive.js index 5ba93d058b..2bbf581e44 100644 --- a/framework/src/widgets/show-table-inline-message/show-table-inline-message.directive.js +++ b/framework/src/widgets/show-table-inline-message/show-table-inline-message.directive.js @@ -28,6 +28,7 @@ setMessage(attrs.showTableInlineMessage, true); setStatus(attrs.tableInlineStatus, true); setColSpan(attrs.inlineMessageColspan, true); + setLink(attrs.inlineMessageLink, true); element.after(elem); $compile(elem)(scope); @@ -36,6 +37,7 @@ attrs.$observe('showTableInlineMessage', setMessage); attrs.$observe('tableInlineStatus', setStatus); attrs.$observe('inlineMessageColspan', setColSpan); + attrs.$observe('inlineMessageLink', setLink); function setMessage(message, skipCompile) { if (message === elem.attr('message')) { @@ -69,6 +71,12 @@ } } + function setLink(newLink, skipCompile) { + elem.attr('link', newLink); + if (!skipCompile) { + $compile(elem)(scope); + } + } } } diff --git a/framework/src/widgets/table-inline-message/table-inline-message.directive.js b/framework/src/widgets/table-inline-message/table-inline-message.directive.js index e7f7b47cd6..02ce44673a 100644 --- a/framework/src/widgets/table-inline-message/table-inline-message.directive.js +++ b/framework/src/widgets/table-inline-message/table-inline-message.directive.js @@ -23,15 +23,37 @@ bindToController: { message: '@', status: '@', + link: '@?', colSpan: '@?' }, - controller: function () { - this.statusClass = 'hpe-popover-alert-' + (this.status ? this.status : 'warning'); - }, + controller: InlineMessageController, controllerAs: 'tableInlineMessageCtrl', scope: {}, templateUrl: path + 'widgets/table-inline-message/table-inline-message.html' }; } + InlineMessageController.$inject = [ + '$state' + ]; + + function InlineMessageController($state) { + + this.statusClass = 'hpe-popover-alert-' + (this.status ? this.status : 'warning'); + + this.openLink = function () { + var link = this.link; + var parts = link.split('/'); + var params = {}; + var state = parts[0]; + if (parts.length > 1) { + _.each(parts[1].split(','), function (p) { + var kv = p.split(':'); + params[kv[0]] = kv[1]; + }); + } + + $state.go(state, params); + }; + } })(); diff --git a/framework/src/widgets/table-inline-message/table-inline-message.html b/framework/src/widgets/table-inline-message/table-inline-message.html index b3931b06a7..dfc7898d61 100644 --- a/framework/src/widgets/table-inline-message/table-inline-message.html +++ b/framework/src/widgets/table-inline-message/table-inline-message.html @@ -2,7 +2,8 @@
- {{ tableInlineMessageCtrl.message }} + {{ tableInlineMessageCtrl.message }} + {{ tableInlineMessageCtrl.message }}
diff --git a/framework/src/widgets/widgets.scss b/framework/src/widgets/widgets.scss index 8d28604c99..ba7940ed4e 100644 --- a/framework/src/widgets/widgets.scss +++ b/framework/src/widgets/widgets.scss @@ -10,6 +10,7 @@ @import "flyout/flyout"; @import "gallery-card/gallery-card"; @import "global-spinner/global-spinner"; +@import "json-tree-view/json-tree-view"; @import "log-viewer/logs-viewer"; @import "paginator/paginator"; @import "password-reveal/password-reveal"; diff --git a/framework/theme/scss/style/components/_detail_view.scss b/framework/theme/scss/style/components/_detail_view.scss index 76f90f54a6..2e830b9bf2 100644 --- a/framework/theme/scss/style/components/_detail_view.scss +++ b/framework/theme/scss/style/components/_detail_view.scss @@ -22,6 +22,21 @@ $detail-view-margin: $hpe-unit-space * 4; } } } + &.detail-view-two-fields { + + > .modal-dialog { + width: $detail_view_two_fields_width; + left: 100%; + } + + &.fade.in { + .modal-dialog { + left: calc(100% - #{$detail_view_two_fields_width}); + transition: left 0.25s ease-out; + } + } + } + .detail-view-content { @@ -145,8 +160,8 @@ $detail-view-margin: $hpe-unit-space * 4; padding-top: $hpe-unit-space * 3 / 4; background: $white; - .btn:not(:last-child) { - margin-right: $hpe-unit-space / 2; + .btn { + margin-left: $hpe-unit-space / 2; } } } diff --git a/framework/theme/scss/style/index.scss b/framework/theme/scss/style/index.scss index f1976025a2..447b2f0667 100644 --- a/framework/theme/scss/style/index.scss +++ b/framework/theme/scss/style/index.scss @@ -3,4 +3,5 @@ @import "scaffolding"; @import "components/index"; @import "ie_fixes"; +@import "utils"; diff --git a/framework/theme/scss/style/utils.scss b/framework/theme/scss/style/utils.scss new file mode 100644 index 0000000000..b7cdf3849f --- /dev/null +++ b/framework/theme/scss/style/utils.scss @@ -0,0 +1,7 @@ +.first-letter-uppercase { + text-transform: lowercase; +} + +.first-letter-uppercase *:first-letter { + text-transform: uppercase; +} diff --git a/framework/theme/scss/theme/components/_detail_view.scss b/framework/theme/scss/theme/components/_detail_view.scss index ae0a890514..ef976fd647 100644 --- a/framework/theme/scss/theme/components/_detail_view.scss +++ b/framework/theme/scss/theme/components/_detail_view.scss @@ -1 +1,2 @@ -$detail_view_thin_width: $hpe-unit-space*10 + 324px \ No newline at end of file +$detail_view_thin_width: $hpe-unit-space * 10 + 324px; +$detail_view_two_fields_width: $hpe-unit-space * 8 + 648px; \ No newline at end of file diff --git a/framework/theme/svg/Service_manager.svg b/framework/theme/svg/Service_manager.svg new file mode 100644 index 0000000000..aa510593e1 --- /dev/null +++ b/framework/theme/svg/Service_manager.svg @@ -0,0 +1,31 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oem/brands/hpe/oem_config.json b/oem/brands/hpe/oem_config.json index da123c121e..de98d34004 100644 --- a/oem/brands/hpe/oem_config.json +++ b/oem/brands/hpe/oem_config.json @@ -5,6 +5,7 @@ "PRODUCT_FAMILY_LOGO_HREF": "images/brand_product_family_logo.png", "CODE_ENGINE": "Helion Code Engine", "CLOUD_FOUNDRY": "Cloud Foundry", + "SERVICE_MANAGER": "Helion Service Manager", "TERMS_OF_USE_HREF": "http://docs.hpcloud.com/permalink/helion-openstack/3.0/eula", "PRIVACY_HREF": "https://www.hpe.com/us/en/legal/privacy.html" } \ No newline at end of file diff --git a/oem/config-defaults.json b/oem/config-defaults.json index 54ab98646d..9b5fb0e67b 100644 --- a/oem/config-defaults.json +++ b/oem/config-defaults.json @@ -12,6 +12,7 @@ "PRIVACY": "Privacy", "CODE_ENGINE": "Code Engine", "CLOUD_FOUNDRY": "Cloud Foundry", + "SERVICE_MANAGER": "Service Manager", "COMPANY_LOGO_HREF": "images/brand_company_logo.png", "PRODUCT_FAMILY_LOGO_HREF": "", "ABOUT_COMPANY_LOGO_HREF": "images/brand_company_logo.png" diff --git a/src/app/api/serviceInstance/serviceInstance.api.js b/src/app/api/serviceInstance/serviceInstance.api.js index 00eb44498f..4fe426a8e9 100644 --- a/src/app/api/serviceInstance/serviceInstance.api.js +++ b/src/app/api/serviceInstance/serviceInstance.api.js @@ -45,37 +45,19 @@ * @param {string} url - the service instance endpoint * @param {string} name - the service instance friendly name * @param {boolean} skipSslValidation - whether to skip SSL validation for this endpoint + * @param {string} serviceType - the type of the service instance to create * @returns {promise} A resolved/rejected promise * @public */ - create: function (url, name, skipSslValidation) { + create: function (url, name, skipSslValidation, serviceType) { var config = { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }; + serviceType = serviceType || 'hcf'; var data = this.$httpParamSerializer({ api_endpoint: url, cnsi_name: name, skip_ssl_validation: skipSslValidation }); - return this.$http.post('/pp/v1/register/hcf', data, config); - }, - - /** - * @function createHce - * @memberof app.api.serviceInstance.ServiceInstanceApi - * @description Create a HCE service instance - * @param {string} url - the service instance endpoint - * @param {string} name - the service instance friendly name - * @param {boolean} skipSslValidation - whether to skip SSL validation for this endpoint - * @returns {promise} A resolved/rejected promise - * @public - */ - createHce: function (url, name, skipSslValidation) { - var config = { - headers: { - 'Content-Type': 'application/x-www-form-urlencoded' - } - }; - var data = this.$httpParamSerializer({ api_endpoint: url, cnsi_name: name, skip_ssl_validation: skipSslValidation }); - return this.$http.post('/pp/v1/register/hce', data, config); + return this.$http.post('/pp/v1/register/' + serviceType, data, config); }, /** diff --git a/src/app/api/serviceInstance/serviceInstance.api.spec.js b/src/app/api/serviceInstance/serviceInstance.api.spec.js index cebd48a47f..f3536b2851 100644 --- a/src/app/api/serviceInstance/serviceInstance.api.spec.js +++ b/src/app/api/serviceInstance/serviceInstance.api.spec.js @@ -37,10 +37,10 @@ $httpBackend.flush(); }); - it('should send POST request for createHCE', function () { + it('should send POST request for create for HCE', function () { var data = { api_endpoint: 'url', cnsi_name: 'name' }; $httpBackend.expectPOST('/pp/v1/register/hce', $httpParamSerializer(data)).respond(200, ''); - serviceInstanceApi.createHce('url', 'name'); + serviceInstanceApi.create('url', 'name', undefined, 'hce'); $httpBackend.flush(); }); diff --git a/src/app/event/event.service.js b/src/app/event/event.service.js index 2131a66a79..7dca762102 100644 --- a/src/app/event/event.service.js +++ b/src/app/event/event.service.js @@ -19,7 +19,8 @@ MODAL_INTERACTION_END : 'MODAL_INTERACTION_END', APP_ERROR_NOTIFY : 'APP_ERROR_NOTIFY', APP_ERROR_CLEAR : 'APP_ERROR_CLEAR', - VCS_OAUTH_CANCELLED : 'vcs.OAUTH_CANCELLED' + VCS_OAUTH_CANCELLED : 'vcs.OAUTH_CANCELLED', + ENDPOINT_CONNECT_CHANGE : 'ENDPOINT_CONNECTION_STATUS_CHANGED' }; angular diff --git a/src/app/model/navigation/navigation.model.js b/src/app/model/navigation/navigation.model.js index 935b5fab17..a965d9c5c2 100644 --- a/src/app/model/navigation/navigation.model.js +++ b/src/app/model/navigation/navigation.model.js @@ -65,6 +65,7 @@ $rootScope.$on('$stateChangeSuccess', function (event, toState) { // eslint-disable-line angular/on-watch // Activate the correct menu entry or deactivate all menu entries if none match that.menu.currentState = _.get(toState, 'data.activeMenuState', ''); + // Scroll to the console-view's top after a state transition var consoleViewScrollPanel = angular.element(document).find('#console-view-scroll-panel'); if (consoleViewScrollPanel[0]) { @@ -75,6 +76,7 @@ } angular.extend(NavigationModel.prototype, { + /** * @function onLogin * @memberof app.model.NavigationModel @@ -125,6 +127,18 @@ Menu.prototype = []; angular.extend(Menu.prototype, { + + /** + * @function getMenuItem + * @memberof app.model.navigation.Menu + * @description Gets the menu item with the specified name + * @param {string} name - the name/ID of the menu item + * @returns {object} Menu item for the specified item + */ + getMenuItem: function (name) { + return _.find(this, {name: name}); + }, + /** * @function addMenuItem * @memberof app.model.navigation.Menu @@ -202,7 +216,12 @@ _.each(sorted, function (item) { that.push(item); }); - return this; + + item.svgIcon = item.icon.indexOf('svg://') === 0; + if (item.svgIcon) { + item.icon = '/svg/' + item.icon.substr(6); + } + return item; }, /** diff --git a/src/app/model/serviceInstance/serviceInstance.model.js b/src/app/model/serviceInstance/serviceInstance.model.js index a4051679bf..b44503cf31 100644 --- a/src/app/model/serviceInstance/serviceInstance.model.js +++ b/src/app/model/serviceInstance/serviceInstance.model.js @@ -49,34 +49,15 @@ create: function (type, url, name, skipSslValidation) { var that = this; var serviceInstanceApi = this.apiManager.retrieve('app.api.serviceInstance'); - var promise = type === 'hcf' - ? serviceInstanceApi.create(url, name, !!skipSslValidation) - : serviceInstanceApi.createHce(url, name, !!skipSslValidation); + type = type || 'hcf'; + + var promise = serviceInstanceApi.create(url, name, !!skipSslValidation, type); return promise.then(function (response) { that.serviceInstances.push(response.data); return response.data; }); }, - /** - * @function createHce - * @memberof app.model.serviceInstance.ServiceInstance - * @description Create an HCE service instance - * @param {string} url - the service instance API endpoint - * @param {string} name - the service instance friendly name - * @param {boolean} skipSslValidation - whether to skip SSL validation for this endpoint - * @returns {promise} A resolved/rejected promise - * @public - */ - createHce: function (url, name, skipSslValidation) { - var that = this; - var serviceInstanceApi = this.apiManager.retrieve('app.api.serviceInstance'); - return serviceInstanceApi.createHce(url, name, !!skipSslValidation) - .then(function (response) { - that.serviceInstances.push(response.data); - }); - }, - /** * @function disconnect * @memberof app.model.serviceInstance.ServiceInstance diff --git a/src/app/model/serviceInstance/user/userServiceInstance.model.js b/src/app/model/serviceInstance/user/userServiceInstance.model.js index 150cfb0eac..8251cefb59 100644 --- a/src/app/model/serviceInstance/user/userServiceInstance.model.js +++ b/src/app/model/serviceInstance/user/userServiceInstance.model.js @@ -97,6 +97,8 @@ }); }, + /* eslint-disable complexity */ + // NOTE - Complexity of 11, left in to improve readability. /** * @function list * @memberof app.model.serviceInstance.user.UserServiceInstance @@ -109,6 +111,7 @@ var serviceInstanceApi = this.apiManager.retrieve('app.api.serviceInstance.user'); var cfInfoApi = this.apiManager.retrieve('cloud-foundry.api.Info'); var hceInfoApi = this.apiManager.retrieve('cloud-foundry.api.HceInfoApi'); + var hsmApi = this.apiManager.retrieve('service-manager.api.HsmApi'); return serviceInstanceApi.list().then(function (response) { var items = response.data; @@ -116,17 +119,21 @@ var hcfGuids = _.map(_.filter(items, {cnsi_type: 'hcf'}) || [], 'guid') || []; var hcfCfg = {headers: {'x-cnap-cnsi-list': hcfGuids.join(',')}}; var hceGuids = _.map(_.filter(items, {cnsi_type: 'hce'}) || [], 'guid') || []; + var hsmGuids = _.map(_.filter(items, {cnsi_type: 'hsm'}) || [], 'guid') || []; var tasks = []; - // call /v2/info to refresh tokens, then list + // make a request on each service type to refresh the oauth token if (hcfGuids.length > 0) { tasks.push(cfInfoApi.GetInfo({}, hcfCfg).then(function (response) { - return response.data ? response.data : {}; + return response.data || {}; })); } if (hceGuids.length > 0) { tasks.push(hceInfoApi.info(hceGuids.join(','))); } + if (hsmGuids.length > 0) { + tasks.push(hsmApi.info(hsmGuids.join(','))); + } if (tasks.length === 0) { that.onList(response); @@ -146,6 +153,7 @@ }); }, + /* eslint-enable complexity */ /** * @function onConnect diff --git a/src/app/view/application.html b/src/app/view/application.html index ec60b852e7..80a4275773 100644 --- a/src/app/view/application.html +++ b/src/app/view/application.html @@ -1,7 +1,7 @@ - +