Merge pull request #1909 from GilbertCherrie/fix_order_page_custom_logo

Fixed custom logo on order page (cherry picked from commit fc23cae)
ManageIQ · Jul 9, 2024 · 9c64f3a · 9c64f3a
1 parent 6692d1e
commit 9c64f3a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/client/app/states/orders/details/details.html b/client/app/states/orders/details/details.html
@@ -18,7 +18,10 @@
             <div class="col-md-12">
               <div class="ss-details-header__title-img">
                 <span class="ss-details-header__title-img__center"></span>
-                <img class="ss-details-header__title-img__logo" src="images/brand_transparent.png"/>
+                <img class="ss-details-header__title-img__logo" ng-if="!vm.serviceTemplate.picture.image_href"
+                alt="{{ ::vm.order.name }}" src="images/service.png"/>
+                <img class="ss-details-header__title-img__logo" ng-if="vm.serviceTemplate.picture.image_href "
+                alt="{{ ::vm.order.name }}" ng-src="{{ ::vm.serviceTemplate.picture.image_href }}"/>
               </div>
               <div class="ss-details-header__title">
                 <h2>{{'Order #' |translate}}{{vm.order.id}}</h2>

diff --git a/client/app/states/orders/details/details.state.js b/client/app/states/orders/details/details.state.js
@@ -14,7 +14,8 @@ function getStates (RBAC) {
       controllerAs: 'vm',
       title: __('Order Details'),
       resolve: {
-        order: resolveOrder
+        order: resolveOrder,
+        serviceTemplate: resolveServiceTemplate
       },
       data: {
         authorization: RBAC.has('miq_request_show')
@@ -31,9 +32,24 @@ function resolveOrder ($stateParams, CollectionsApi) {
 }
 
 /** @ngInject */
-function StateController (order, $state) {
+function resolveServiceTemplate ($stateParams, CollectionsApi) {
+  return CollectionsApi.get('service_orders', $stateParams.serviceOrderId, {
+    expand: ['resources', 'service_requests']
+  }).then((ServiceOrder) => {
+    const serviceTemplateId = ServiceOrder.service_requests[0].source_id;
+    return CollectionsApi.get('service_templates', serviceTemplateId, {
+      expand: ['resources'],
+      attributes: ['picture', 'resource_actions', 'picture.image_href'],
+    })
+  })
+}
+
+/** @ngInject */
+function StateController (order, serviceTemplate, $state) {
   const vm = this
   vm.order = order
+  vm.serviceTemplate = serviceTemplate
+
   vm.requestListConfig = {
     showSelectBox: false,
     selectionMatchProp: 'id'

diff --git a/client/app/states/orders/details/details.state.spec.js b/client/app/states/orders/details/details.state.spec.js
@@ -14,7 +14,8 @@ describe('State: orders.details', () => {
       $stateParams: {
         serviceOrderId: 213
       },
-      order: {name: 'test order'}
+      order: {name: 'test order'},
+      serviceTemplate: {name: 'test template'}
     })
   })