[cloudstack] branch main updated: ui: Fix Management server comments PR 7379 UI issue (#7450)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 2ac1b7e9599 ui: Fix Management server comments PR 7379 UI issue (#7450)
2ac1b7e9599 is described below

commit 2ac1b7e9599b048d3490577b0823752fc7a740d7
Author: kishankavala <kishankav...@users.noreply.github.com>
AuthorDate: Thu Apr 20 15:53:11 2023 +0530

    ui: Fix Management server comments PR 7379 UI issue (#7450)
    
    This PR adds support for annotations to be added for the management server 
as a resource/type.
---
 .../java/org/apache/cloudstack/annotation/AnnotationService.java   | 1 +
 ui/src/config/section/infra/managementServers.js                   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java 
b/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java
index 9628bd6475e..51c6286a9d5 100644
--- a/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java
+++ b/api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java
@@ -77,6 +77,7 @@ public interface AnnotationService {
             list.add(EntityType.SECONDARY_STORAGE);
             list.add(EntityType.VR);
             list.add(EntityType.SYSTEM_VM);
+            list.add(EntityType.MANAGEMENT_SERVER);
             if (roleType != RoleType.DomainAdmin) {
                 list.add(EntityType.DOMAIN);
                 list.add(EntityType.SERVICE_OFFERING);
diff --git a/ui/src/config/section/infra/managementServers.js 
b/ui/src/config/section/infra/managementServers.js
index 14bb5f11788..d1dfa6df70d 100644
--- a/ui/src/config/section/infra/managementServers.js
+++ b/ui/src/config/section/infra/managementServers.js
@@ -42,6 +42,10 @@ export default {
     {
       name: 'pending.jobs',
       component: shallowRef(defineAsyncComponent(() => 
import('@/views/infra/AsyncJobsTab.vue')))
+    },
+    {
+      name: 'comments',
+      component: shallowRef(defineAsyncComponent(() => 
import('@/components/view/AnnotationsTab.vue')))
     }
   ],
   actions: [
@@ -81,9 +85,6 @@ export default {
           value: (record, params) => { return record.id }
         }
       }
-    }, {
-      name: 'comments',
-      component: shallowRef(defineAsyncComponent(() => 
import('@/components/view/AnnotationsTab.vue')))
     }
   ]
 }