changes for resource icon

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/main/java/com/cloud/server/ResourceTag.java

@@ -66,6 +66,7 @@ public enum ResourceObjectType {
         LBStickinessPolicy(false, true),
         LBHealthCheckPolicy(false, true),
         SnapshotPolicy(true, true),
+        GuestOsCategory(false, false, true),
         GuestOs(false, true),
         NetworkOffering(false, true),
         VpcOffering(true, false),

api/src/main/java/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java

@@ -26,7 +26,7 @@
 import com.cloud.storage.GuestOsCategory;
 
 @EntityReference(value = GuestOsCategory.class)
-public class GuestOSCategoryResponse extends BaseResponse {
+public class GuestOSCategoryResponse extends BaseResponse implements SetResourceIconResponse {
     @SerializedName(ApiConstants.ID)
     @Param(description = "the ID of the OS category")
     private String id;
@@ -36,9 +36,13 @@ public class GuestOSCategoryResponse extends BaseResponse {
     private String name;
 
     @SerializedName(ApiConstants.IS_FEATURED)
-    @Param(description = "Whether the OS category is featured")
+    @Param(description = "Whether the OS category is featured", since = "4.20.1")
     private Boolean featured;
 
+    @SerializedName(ApiConstants.RESOURCE_ICON)
+    @Param(description = "Base64 string representation of the resource icon", since = "4.20.1")
+    private ResourceIconResponse resourceIconResponse;
+
     public String getId() {
         return id;
     }
@@ -58,4 +62,9 @@ public void setName(String name) {
     public void setFeatured(Boolean featured) {
         this.featured = featured;
     }
+
+    @Override
+    public void setResourceIconResponse(ResourceIconResponse resourceIconResponse) {
+        this.resourceIconResponse = resourceIconResponse;
+    }
 }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -48,6 +48,7 @@
 import com.cloud.dc.dao.ASNumberRangeDao;
 import com.cloud.dc.dao.VlanDetailsDao;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.icon.ResourceIconVO;
 import com.cloud.storage.BucketVO;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
@@ -3884,6 +3885,12 @@ public GuestOSCategoryResponse createGuestOSCategoryResponse(GuestOsCategory gue
         categoryResponse.setId(guestOsCategory.getUuid());
         categoryResponse.setName(guestOsCategory.getName());
         categoryResponse.setFeatured(guestOsCategory.isFeatured());
+        ResourceIconVO resourceIcon = ApiDBUtils.getResourceIconByResourceUUID(guestOsCategory.getUuid(),
+                ResourceObjectType.GuestOsCategory);
+        if (resourceIcon != null) {
+            ResourceIconResponse iconResponse = ApiDBUtils.newResourceIconResponse(resourceIcon);
+            categoryResponse.setResourceIconResponse(iconResponse);
+        }
         categoryResponse.setObjectName("oscategory");
         return categoryResponse;
     }

server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java

@@ -58,6 +58,7 @@
 import com.cloud.server.ResourceTag;
 import com.cloud.service.ServiceOfferingVO;
 import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.GuestOsCategory;
 import com.cloud.storage.SnapshotPolicyVO;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.VMTemplateVO;
@@ -117,6 +118,7 @@ public class ResourceManagerUtilImpl implements ResourceManagerUtil {
         s_typeMap.put(ResourceTag.ResourceObjectType.NetworkOffering, NetworkOfferingVO.class);
         s_typeMap.put(ResourceTag.ResourceObjectType.VpcOffering, VpcOfferingVO.class);
         s_typeMap.put(ResourceTag.ResourceObjectType.Domain, DomainVO.class);
+        s_typeMap.put(ResourceTag.ResourceObjectType.GuestOsCategory, GuestOsCategory.class);
     }
 
     @Inject

ui/src/components/view/InfoCard.vue

@@ -34,7 +34,7 @@
                   <resource-icon :image="getImage(resource.icon && resource.icon.base64image || images.template || images.iso || resourceIcon)" size="4x" style="margin-right: 5px"/>
                 </span>
                 <span v-else>
-                  <os-logo v-if="resource.ostypeid || resource.ostypename" :osId="resource.ostypeid" :osName="resource.ostypename" size="3x" @update-osname="setResourceOsType"/>
+                  <os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.name" size="3x" @update-osname="setResourceOsType"/>
                   <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
                   <font-awesome-icon
                     v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)"

ui/src/components/view/ListView.vue

@@ -58,7 +58,7 @@
           </span>
           <span v-if="$showIcon() && !['vm', 'vnfapp'].includes($route.path.split('/')[1])" style="margin-right: 5px">
             <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="2x"/>
-            <os-logo v-else-if="record.ostypename" :osName="record.ostypename" size="xl" />
+            <os-logo v-else-if="record.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osName="record.ostypename || record.name" size="xl" />
             <render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 16px;" :icon="$route.meta.icon"/>
             <render-icon v-else style="font-size: 16px;" :svgIcon="$route.meta.icon" />
           </span>

ui/src/utils/plugins.js

@@ -338,7 +338,7 @@ export const showIconPlugin = {
       if (resource) {
         resourceType = resource
       }
-      if (['zone', 'zones', 'template', 'iso', 'account', 'accountuser', 'vm', 'domain', 'project', 'vpc', 'guestnetwork'].includes(resourceType)) {
+      if (['zone', 'zones', 'template', 'iso', 'account', 'accountuser', 'vm', 'domain', 'project', 'vpc', 'guestnetwork', 'guestoscategory'].includes(resourceType)) {
         return true
       } else {
         return false

ui/src/views/compute/DeployVM.vue

@@ -212,10 +212,15 @@
                                     style="border-width: 2px"
                                     :class="'square-block-radio-button'">
                                     <div style="text-align: center;">
+                                      <resource-icon
+                                        v-if="item.icon && item.icon.base64image"
+                                        class="radio-group__os-logo"
+                                        :image="item.icon.base64image"
+                                        size="2x"/>
                                       <os-logo
+                                        v-else
                                         class="radio-group__os-logo"
                                         size="2x"
-                                        :osId="item.id"
                                         :os-name="item.name" />
                                       <br>
                                       {{ item.name }}
@@ -241,7 +246,7 @@
                           <a-select-option v-for="item in options.guestOsCategories" :key="item.id" :label="item.name">
                             <span>
                               <resource-icon v-if="item.icon && item.icon.base64image" :image="item.icon.base64image" size="2x" style="margin-right: 5px"/>
-                              <global-outlined v-else style="margin-right: 5px" />
+                              <os-logo v-else :os-name="item.name" style="margin-right: 5px" />
                               {{ item.name }}
                             </span>
                           </a-select-option>