From be89d8475ec00011f837708376ac3af5d5b27671 Mon Sep 17 00:00:00 2001
From: Allen Wight <allen.b.wight@gmail.com>
Date: Thu, 31 May 2018 10:51:36 -0400
Subject: [PATCH] Merge pull request #1438 from
 d-m-u/fixing_sui_api_call_to_match_cui

Change service dialog api call to match CUI
(cherry picked from commit c0f89fc93a69c40af56b98f38f99134481edfe40)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1585709
---
 client/app/states/catalogs/details/details.state.js | 10 +++++-----
 .../states/catalogs/details/details.state.spec.js   | 13 ++++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/app/states/catalogs/details/details.state.js b/client/app/states/catalogs/details/details.state.js
index c77d0a49d..a5b315b26 100644
--- a/client/app/states/catalogs/details/details.state.js
+++ b/client/app/states/catalogs/details/details.state.js
@@ -105,15 +105,15 @@ function Controller ($stateParams, CollectionsApi, EventNotifications, ShoppingC
             vm.parsedDialogs = dialogs.resources[0].content
           }
         }
-        setDialogUrl(vm.serviceTemplate.service_template_catalog_id)
+        setDialogUrl()
         vm.loading = false
       })
     })
   }
 
   init()
-  function setDialogUrl (serviceTemplateCatalogId) {
-    vm.dialogUrl = `service_catalogs/${serviceTemplateCatalogId}/service_templates`
+  function setDialogUrl () {
+    vm.dialogUrl = `service_dialogs`
 
     return vm.dialogUrl
   }
@@ -131,12 +131,12 @@ function Controller ($stateParams, CollectionsApi, EventNotifications, ShoppingC
     }
 
     let idList = {
-      dialogId: vm.parsedDialogs.id,
+      dialogId: vm.parsedDialogs[0].id,
       resourceActionId: resourceActionId,
       targetId: vm.serviceTemplate.id,
       targetType: 'service_template'
     }
-    const url = `${vm.dialogUrl}/${vm.serviceTemplate.id}`
+    const url = `${vm.dialogUrl}`
     return DialogFieldRefresh.refreshDialogField(vm.dialogData, [field.name], url, idList)
   }
   /**
diff --git a/client/app/states/catalogs/details/details.state.spec.js b/client/app/states/catalogs/details/details.state.spec.js
index 2bd729ccb..c624223ee 100644
--- a/client/app/states/catalogs/details/details.state.spec.js
+++ b/client/app/states/catalogs/details/details.state.spec.js
@@ -61,12 +61,17 @@ describe('State: catalogs.details', () => {
       it('it allows a field to be refreshed', (done) => {
         controller = $controller($state.get('catalogs.details').controller)
         controller.serviceTemplate = serviceTemplate
-        controller.setDialogUrl(serviceTemplate.service_template_catalog_id)
+        controller.setDialogUrl()
         const refreshSpy = sinon.stub(DialogFieldRefresh, 'refreshDialogField').returns(Promise.resolve({'status': 'success'}))
         const dialogData = {
           'dialogField1': '1',
           'dialogField2': '2'
         }
+        const parsedDialogs = [
+          {
+            id: 1234
+          }
+        ]
         const field = {'name': 'dialogField1'}
         const idList = {
           dialogId: 1234,
@@ -75,14 +80,12 @@ describe('State: catalogs.details', () => {
           targetType: 'service_template'
         }
         controller.dialogData = dialogData
-        controller.parsedDialogs = {
-          id: 1234
-        }
+        controller.parsedDialogs = parsedDialogs
 
         controller.refreshField(field).then((data) => {
           done()
         })
-        const url = `service_catalogs/${serviceTemplate.service_template_catalog_id}/service_templates/${serviceTemplate.id}`
+        const url = `service_dialogs`
         expect(refreshSpy).to.have.been.calledWith(dialogData, ['dialogField1'], url, idList)
       })
       it('allows dialog data to be updated', () => {