Merge branch 'master' into xml_path_23_8

Author: Aias00

manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java

@@ -60,6 +60,10 @@ public class TagServiceImpl implements TagService {
     public void addTags(List<Tag> tags) {
         // Verify request data
         tags = tags.stream().peek(tag -> {
+            Optional<Tag> tagOptional = tagDao.findTagByNameAndTagValue(tag.getName(), tag.getTagValue());
+            if (tagOptional.isPresent()) {
+                throw new IllegalArgumentException("The tag already exists.");
+            }
             tag.setType((byte) 1);
             tag.setId(null);
         }).distinct().collect(Collectors.toList());
@@ -70,6 +74,11 @@ public void addTags(List<Tag> tags) {
     public void modifyTag(Tag tag) {
         Optional<Tag> tagOptional = tagDao.findById(tag.getId());
         if (tagOptional.isPresent()) {
+            
+            Optional<Tag> tagExistOptional = tagDao.findTagByNameAndTagValue(tag.getName(), tag.getTagValue());
+            if (tagExistOptional.isPresent() && !tagExistOptional.get().getId().equals(tag.getId())) {
+                throw new IllegalArgumentException("The tag with same key and value already exists.");
+            }
             tag.setTagValue(StringUtils.isEmpty(tag.getTagValue()) ? null : tag.getTagValue());
             tagDao.save(tag);
         } else {

manager/src/test/java/org/apache/hertzbeat/manager/service/TagServiceTest.java

@@ -20,14 +20,18 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+
 import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.apache.hertzbeat.common.support.exception.CommonException;
 import org.apache.hertzbeat.manager.dao.TagDao;
@@ -47,22 +51,30 @@
  */
 @ExtendWith(MockitoExtension.class)
 class TagServiceTest {
-
+    
     @InjectMocks
     private TagServiceImpl tagService;
-
+    
     @Mock
     private TagDao tagDao;
-
+    
     @Mock
     private TagMonitorBindDao tagMonitorBindDao;
-
+    
     @Test
     void addTags() {
-        when(tagDao.saveAll(anyList())).thenReturn(anyList());
-        assertDoesNotThrow(() -> tagService.addTags(Collections.singletonList(new Tag())));
+        // Prepare test data
+        List<Tag> tags = Collections.singletonList(
+                Tag.builder().id(1L).name("tagname").tagValue("tagvalue").build()
+        );
+        when(tagDao.findTagByNameAndTagValue(anyString(), anyString())).thenReturn(Optional.empty());
+        
+        tagService.addTags(tags);
+        
+        verify(tagDao).saveAll(tags);
+        
     }
-
+    
     @Test
     void modifyTag() {
         Tag tag = Tag.builder().id(1L).build();
@@ -73,18 +85,18 @@ void modifyTag() {
         when(tagDao.findById(1L)).thenReturn(Optional.empty());
         assertThrows(IllegalArgumentException.class, () -> tagService.modifyTag(tag));
     }
-
+    
     @Test
     void getTags() {
         when(tagDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(Page.empty());
         assertNotNull(tagService.getTags(null, null, 1, 10));
     }
-
+    
     @Test
     void deleteTags() {
         assertDoesNotThrow(() -> tagService.deleteTags(new HashSet<>(1)));
     }
-
+    
     @Test
     void deleteUsingTags() {
         when(tagMonitorBindDao.countByTagIdIn(anySet())).thenReturn(1L);

web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html

@@ -177,7 +177,7 @@
           <nz-upload
             nzName="file"
             nzListType="text"
-            [nzShowUploadList]="true"
+            [nzShowUploadList]="false"
             [nzMultiple]="false"
             [nzLimit]="1"
             [nzCustomRequest]="handleTemplateInput"