cloudfoundry · nwmac · Sep 15, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017
diff --git a/components/app-framework/src/widgets/gallery-card/gallery-card.html b/components/app-framework/src/widgets/gallery-card/gallery-card.html
@@ -5,6 +5,7 @@
     <span ng-if="galleryCardCtrl.cardData.titleTranslate" class="gallery-card-title" translate>{{ galleryCardCtrl.cardData.titleTranslate }}</span>
     <actions-menu class="gallery-card-actions" ng-if="galleryCardCtrl.cardActions"
       actions="galleryCardCtrl.cardActions" action-target="galleryCardCtrl.cardData"
+      enable-button-mode="true"
       menu-position="{{galleryCardCtrl.actionsPosition}}">
     </actions-menu>
   </div>

diff --git a/components/app-framework/src/widgets/select-input/select-input.directive.js b/components/app-framework/src/widgets/select-input/select-input.directive.js
@@ -131,7 +131,7 @@
      */
     function init() {
       $scope.$watch(function () {
-        return vm.inputOptions.length;
+        return vm.inputOptions ? vm.inputOptions.length : 0;
       }, function (length) {
         if (length === 1) {
           vm.setValue(vm.inputOptions[0]);

diff --git a/components/cloud-foundry/frontend/i18n/en_GB/overrides.json b/components/cloud-foundry/frontend/i18n/en_GB/overrides.json
@@ -55,6 +55,14 @@
           "summary-panel": {
             "org-label": "Organisation"
           }
+        },
+        "services": {
+          "messages": {
+            "view-catalogue-link": "service catalogue"
+          }
+        },
+        "service-catalogue": {
+          "label": "Service Catalogue"
         }
       }
     }

diff --git a/components/cloud-foundry/frontend/i18n/en_US/app.json b/components/cloud-foundry/frontend/i18n/en_US/app.json
@@ -47,7 +47,7 @@
         "ssh-restart-warning": "Note: Enabling or disabling SSH Access will restart all application instances.",
         "ssh-no-edit": "Note: SSH Access for this application can not be modified as the Space is set to disallow all SSH access."
       },
-      "app-instances-actions" :{
+      "app-instances-actions": {
         "terminate": "Terminate"
       },
       "terminate-instance": {
@@ -113,6 +113,7 @@
             "org-label": "[[@:organization]]",
             "space-label": "[[@:space]]",
             "edit-button": "Edit",
+            "service-count": "Services",
             "edit-dialog": {
               "title": "Edit App",
               "name-label": "Application Name",
@@ -183,7 +184,93 @@
           "scroll-button": "Scroll To Bottom"
         },
         "services": {
-          "label": "Services",
+          "label": "Service Instances",
+          "labels": {
+            "type": "Type",
+            "description": "Description",
+            "created-date": "Date created",
+            "env-variables": "Show environment variables"
+          },
+          "messages": {
+            "no-services": "This application has no bound service instances.",
+            "view-catalogue": "To view the available services for this application, please visit the",
+            "view-catalogue-link": "service catalog",
+            "no-services-search": "No services instances found matching your search.",
+            "currently-viewing-1": "You are currently viewing {{ type }} instances.",
+            "click-here": "Click here",
+            "currently-viewing-2": "to view all types."
+          },
+          "types": {
+            "show": "Show",
+            "all": "All Types"
+          },
+          "card": {
+            "version": "Version",
+            "attached": "Attached",
+            "cannot-bind": "This service cannot be bound to an Application",
+            "actions": {
+              "detach": "Detach"
+            }
+          },
+          "unbind": {
+            "title": "Detach Service",
+            "description": "Are you sure you want to detach {{name}}?",
+            "error-message": "There was a problem detaching this service. Please try again. If this error persists, please contact the Administrator.",
+            "button": {
+              "yes": "Detach",
+              "no": "@:buttons.cancel"
+            },
+            "error": "Some applications failed to detach from the service instance",
+            "success": "Service instance successfully detached"
+          },
+          "delete": {
+            "title": "Delete Service",
+            "description": "Are you sure you want to delete {{name}}?",
+            "error-message": "There was a problem deleting this service. Please try again. If this error persists, please contact the Administrator.",
+            "button": {
+              "yes": "Delete",
+              "no": "@:buttons.cancel"
+            },
+            "success": "Service instance successfully deleted"
+          },
+          "view-envs": {
+            "title": "{{instanceName}}: Variables"
+          },
+          "add": {
+            "title": "Add Service to {{ appName }}",
+            "back-to-services": "Back to Services",
+            "add": "Add Service Instance",
+            "create": {
+              "title": "Create New Instance",
+              "name-label": "Name",
+              "name-error-required": "Name is required",
+              "name-error-unique": "Name must be unique",
+              "name-error-pattern": "Name contains invalid pattern",
+              "plan-label": "Plan",
+              "plan-placeholder": "Select a Plan"
+            },
+            "existing": {
+              "title": "Choose Existing Instance",
+              "name-label": "Name",
+              "plan-label": "Plan",
+              "apps-label": "Apps Attached"
+            },
+            "notifications": {
+              "success": "The '{{ service }}' service has been successfully attached to application '{{ appName }}'",
+              "failure-create": "There was a problem creating the instance. Please try again. If this error persists, please contact the administrator.",
+              "failure-bind": "There was a problem binding the service instance to the application. Please try again. If this error persists, please contact the administrator."
+            },
+            "acknowledge": {
+              "info": "A best practice for persisting the binding of this service to your application is to update your application's manifest file.",
+              "add-to-manifest": "Add to Manifest"
+            }
+          }
+        },
+        "service-catalogue": {
+          "label": "Service Catalog",
+          "messages": {
+            "no-services": "There are no services available for this endpoint. Please contact your Administrator to add services so you can bind them to your applications."
+          },
           "categories": {
             "show": "Show",
             "attached": "Attached Service Instances",
@@ -303,7 +390,7 @@
           "empty": "No events available",
           "error": "An error occurred retrieving events",
           "detail": "Event Detail",
-          "labels":{
+          "labels": {
             "timestamp": "Timestamp",
             "type": "Type",
             "actor-name": "Actor Name",
@@ -360,4 +447,4 @@
       }
     }
   }
-}
+}
diff --git a/components/cloud-foundry/frontend/src/model/space.model.js b/components/cloud-foundry/frontend/src/model/space.model.js
@@ -438,10 +438,10 @@
      * @public
      */
     function updateRoutesCount(cnsiGuid, guid, count) {
-      var promise = $q.resolve({data: {total_results: count}});
+      var promise = $q.resolve({ data: { total_results: count } });
       if (!count) {
         promise = apiManager.retrieve('cloud-foundry.api.Spaces')
-          .ListAllRoutesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid));
+          .ListAllRoutesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid));
       }
       return promise.then(function (response) {
         _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalRoutes', response.data.total_results);
@@ -461,10 +461,10 @@
      * @public
      */
     function updateServiceInstanceCount(cnsiGuid, guid, count) {
-      var promise = $q.resolve({data: {total_results: count}});
+      var promise = $q.resolve({ data: { total_results: count } });
       if (!count) {
         promise = apiManager.retrieve('cloud-foundry.api.Spaces')
-          .ListAllServiceInstancesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid));
+          .ListAllServiceInstancesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid));
       }
       return promise.then(function (response) {
         _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalServiceInstances', response.data.total_results);
@@ -484,10 +484,10 @@
      * @public
      */
     function updateServiceCount(cnsiGuid, guid, count) {
-      var promise = $q.resolve({data: {total_results: count}});
+      var promise = $q.resolve({ data: { total_results: count } });
       if (!count) {
         promise = apiManager.retrieve('cloud-foundry.api.Spaces')
-          .ListAllServicesForSpace(guid, {'results-per-page': 1}, modelUtils.makeHttpConfig(cnsiGuid));
+          .ListAllServicesForSpace(guid, { 'results-per-page': 1 }, modelUtils.makeHttpConfig(cnsiGuid));
       }
       return promise.then(function (response) {
         _.set(model, 'spaces.' + cnsiGuid + '.' + guid + '.details.totalServices', response.data.total_results);
@@ -732,8 +732,7 @@
       var updateData = {
         allow_ssh: enabled
       };
-      return spaceApi.UpdateSpace(spaceGuid, updateData, null,
-        modelUtils.makeHttpConfig(cnsiGuid)).then(function (response) {
+      return spaceApi.UpdateSpace(spaceGuid, updateData, null, modelUtils.makeHttpConfig(cnsiGuid)).then(function (response) {
         // Refresh the space itself
         return getSpaceDetails(cnsiGuid, response.data);
       });

diff --git a/components/cloud-foundry/frontend/src/view/applications/application/application.module.js b/components/cloud-foundry/frontend/src/view/applications/application/application.module.js
@@ -6,6 +6,7 @@
       'cloud-foundry.view.applications.application.summary',
       'cloud-foundry.view.applications.application.log-stream',
       'cloud-foundry.view.applications.application.services',
+      'cloud-foundry.view.applications.application.service-catalogue',
       'cloud-foundry.view.applications.application.variables',
       'cloud-foundry.view.applications.application.events'
     ])

diff --git a/components/cloud-foundry/frontend/src/view/applications/application/application.scss b/components/cloud-foundry/frontend/src/view/applications/application/application.scss
@@ -1,4 +1,5 @@
 @import 'services/services',
+        'service-catalogue/service-catalogue',
         'summary/summary',
         'log-stream/cf-log-viewer',
         'variables/variables';
@@ -47,7 +48,7 @@
       cursor: pointer;
     }
   }
-  
+
 }
 
 .application-header {

diff --git a/.../cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js b/.../cloud-foundry/frontend/src/view/applications/application/log-stream/log-stream.module.js
@@ -2,11 +2,9 @@
   'use strict';
 
   angular
-    .module('cloud-foundry.view.applications.application.log-stream',
-      [
-        'cloud-foundry.view.applications.application.log-stream.cfLogViewer',
-        'cloud-foundry.view.applications.application.log-stream.cfLogViewerReize'
-      ])
+    .module('cloud-foundry.view.applications.application.log-stream', [
+      'cloud-foundry.view.applications.application.log-stream.cfLogViewer',
+      'cloud-foundry.view.applications.application.log-stream.cfLogViewerReize'])
     .config(registerRoute)
     .run(registerAppTab);
 
@@ -25,7 +23,7 @@
       hide: false,
       uiSref: 'cf.applications.application.log-stream',
       uiSrefParam: function () {
-        return {guid: $stateParams.guid};
+        return { guid: $stateParams.guid };
       },
       label: 'app.app-info.app-tabs.log-stream.label'
     });