Hide empty webhooks on rule details and hint the default cooldown

Author: Daman Arora

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertServiceImpl.java

@@ -295,7 +295,8 @@ private ResourceAlertRuleResponse toRuleResponse(ResourceAlertRuleJoinVO vo) {
         r.setResetInterval(vo.getResetInterval());
         List<Pair<String, String>> webhooks = describeWebhooks(vo.getId());
         r.setWebhookIds(webhooks.stream().map(Pair::first).collect(Collectors.toList()));
-        r.setWebhookNames(webhooks.stream().map(Pair::second).collect(Collectors.toList()));
+        // Left out when empty so the UI hides it
+        r.setWebhookNames(webhooks.isEmpty() ? null : webhooks.stream().map(Pair::second).collect(Collectors.toList()));
         r.setAccountName(vo.getAccountName());
         r.setDomainId(vo.getDomainUuid());
         r.setDomainName(vo.getDomainName());

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertServiceImplTest.java

@@ -18,6 +18,7 @@
 package org.apache.cloudstack.resourcealert;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
@@ -520,4 +521,16 @@ public void testRuleResponseIncludesWebhookIdsAndNames() {
         assertEquals(List.of("wh-1"), org.springframework.test.util.ReflectionTestUtils.getField(response, "webhookIds"));
         assertEquals(List.of("ops-hook"), org.springframework.test.util.ReflectionTestUtils.getField(response, "webhookNames"));
     }
+
+    @Test
+    public void testRuleResponseLeavesOutWebhookNamesWhenNone() {
+        ResourceAlertRuleJoinVO joined = mock(ResourceAlertRuleJoinVO.class);
+        when(joined.getResourceType()).thenReturn(ResourceAlertRule.ResourceType.VirtualMachine);
+        when(ruleJoinDao.findById(Mockito.anyLong())).thenReturn(joined);
+
+        ResourceAlertRuleResponse response = service.createResourceAlertRule(validVmCreateCmd());
+
+        assertEquals(List.of(), org.springframework.test.util.ReflectionTestUtils.getField(response, "webhookIds"));
+        assertNull(org.springframework.test.util.ReflectionTestUtils.getField(response, "webhookNames"));
+    }
 }

ui/public/locales/en.json

@@ -2328,6 +2328,7 @@
 "label.message": "Message",
 "label.resetinterval": "Cooldown (seconds)",
 "label.resource.alert.all.resources": "All resources",
+"label.resource.alert.cooldown.default": "Leave empty to use the default",
 "label.resource.alert.owner.self": "Your own account",
 "label.alertrulename": "Alert rule",
 "label.webhookids": "Webhooks",

ui/src/views/resourcealert/CreateResourceAlertRule.vue

@@ -115,7 +115,7 @@
 
       <a-form-item name="resetinterval" ref="resetinterval">
         <template #label>{{ $t('label.resetinterval') }}</template>
-        <a-input-number v-model:value="form.resetinterval" :min="0" style="width: 100%" />
+        <a-input-number v-model:value="form.resetinterval" :min="0" :placeholder="$t('label.resource.alert.cooldown.default')" style="width: 100%" />
       </a-form-item>
 
       <a-form-item name="webhookids" ref="webhookids" v-if="'listWebhooks' in $store.getters.apis">