Comvert callback to promise

cloudfoundry · nwmac · Sep 15, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017
commit 3ea4f3ba8b033d2d954dfa6a5535084a6c0cc970
diff --git a/.../application/service-catalogue/service-catalogue-card/service-catalogue-card.directive.js b/.../application/service-catalogue/service-catalogue-card/service-catalogue-card.directive.js
@@ -35,7 +35,6 @@
    * @param {object} $scope - the Angular $scope service
    * @param {app.model.modelManager} modelManager - the application model manager
    * @param {app.utils.appEventService} appEventService - the event management service
-   * @param {object} cfServiceInstanceService - the service instance service
    * @property {app.utils.appEventService} appEventService - the event management service
    * @property {object} cfServiceInstanceService - the service instance service
    * @property {cloud-foundry.model.service-binding} bindingModel - the Cloud Foundry service binding model

diff --git a/...rontend/src/view/applications/application/services/service-card/service-card.directive.js b/...rontend/src/view/applications/application/services/service-card/service-card.directive.js
@@ -33,11 +33,13 @@
    * @description Controller for service card directive
    * @constructor
    * @param {object} $scope - the Angular $scope service
+   * @param {object} $q - the Angular $q service
    * @param {object} cfServiceInstanceService - the service instance service
    * @property {array} actions - the actions that can be performed from vm.service card
    */
   function ServiceCardController(
     $scope,
+    $q,
     cfServiceInstanceService
   ) {
     var vm = this;
@@ -49,7 +51,7 @@
       {
         name: 'app.app-info.app-tabs.services.card.actions.detach',
         execute: function () {
-          detach(vm.service, function (result) {
+          detach(vm.service).then(function (result) {
             vm.service = result;
           });
         }
@@ -67,29 +69,31 @@
     /**
      * @function detach
      * @memberof cloud-foundry.view.applications.application.services.serviceCard.ServiceCardController
+     * @param serviceInstance The service instance to be detached from the application
      * @description Detach service instance from app
      * @returns {undefined}
      */
-    function detach(serviceInstance, cb) {
+    function detach(serviceInstance) {
       var serviceBinding = serviceInstance.entity.service_bindings
       ? _.find(serviceInstance.entity.service_bindings, function (binding) {
         return vm.app.summary.guid === binding.entity.app_guid;
+
       }) : null;
       if (serviceBinding) {
-        return cfServiceInstanceService.unbindServiceFromApp(
+        var deferred = $q.defer();
+        cfServiceInstanceService.unbindServiceFromApp(
           vm.cnsiGuid,
           vm.app.summary.guid,
           serviceBinding.metadata.guid,
           serviceInstance.entity.name,
           function () {
             serviceInstance.entity.service_bindings = [];
-            if (cb) {
-              return cb(serviceInstance);
-            }
+            return deferred.resolve(serviceInstance);
           }
         );
+        return deferred.promise;
       }
-      return cb(serviceInstance);
+      return $q.resolve(serviceInstance);
     }
 
     /**

diff --git a/...ents/cloud-foundry/frontend/src/view/applications/application/services/services.module.js b/...ents/cloud-foundry/frontend/src/view/applications/application/services/services.module.js
@@ -30,9 +30,10 @@
   /**
    * @name ApplicationServicesController
    * @constructor
+   * @param {object} $scope - the Angular $scope service
    * @param {app.model.modelManager} modelManager - the model management service
    * @param {object} $stateParams - the UI router $stateParams service
-   * @property {object} $scope - the Angular $scope service
+   * @param {object} $state - the UI router $state service
    * @property {cloud-foundry.model.space} model - the Cloud Foundry space model
    * @property {cloud-foundry.model.application} model - the Cloud Foundry application model
    * @property {string} id - the application GUID