remove adjacent excess Divider (#5680)

* remove adjacent excess 'Divider' * fix upload file tags may cover previous tags
haiwen · Oct 11, 2023 · d4445fa · d4445fa
1 parent 7c6e2bf
commit d4445fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/frontend/src/components/popover/list-tag-popover.js b/frontend/src/components/popover/list-tag-popover.js
@@ -46,8 +46,10 @@ export default class ListTagPopover extends React.Component {
     });
   };
 
-  updateTags = (repotagList) => {
-    this.setState({ repotagList });
+  updateTags = (newRepotagList) => {
+    this.setState({
+      repotagList: [...this.state.repotagList, ...newRepotagList],
+    });
   };
 
   onDeleteTag = (tag) => {

diff --git a/frontend/src/models/repo-tag.js b/frontend/src/models/repo-tag.js
@@ -1,7 +1,7 @@
 class RepoTag {
   constructor(object) {
     this.id = object.repo_tag_id;
-    this.fileCount = object.files_count;
+    this.fileCount = object.files_count || 0;
     this.name = object.tag_name;
     this.color = object.tag_color;
   }

diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
@@ -639,6 +639,15 @@ export const Utils = {
     if (list[list.length - 1] === 'Divider') {
       list.pop();
     }
+
+    // Remove adjacent excess 'Divider'
+    for (let i = 0; i < list.length; i++) {
+      if (list[i] === 'Divider' && list[i + 1] === 'Divider') {
+        list.splice(i, 1);
+        i--;
+      }
+    }
+
     return list;
   },