Merge branch 'main' into concept-fs

apache · Jul 13, 2023 · c766222 · c766222
2 parents e00fe4e + aee9148
commit c766222
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,12 @@ Release Notes.
 
 - List all properties in a group.
 
+### Bugs
+
+- BanyanDB ui unable to load icon.
+- BanyanDB ui type error
+- Fix timer not released
+
 ### Chores
 
 - Bump several dependencies and tools.

diff --git a/pkg/index/inverted/inverted.go b/pkg/index/inverted/inverted.go
@@ -309,9 +309,11 @@ func (s *store) run() {
 			timer := time.NewTimer(s.batchInterval)
 			select {
 			case <-s.closer.CloseNotify():
+				timer.Stop()
 				return
 			case event, more := <-s.ch:
 				if !more {
+					timer.Stop()
 					return
 				}
 				switch d := event.(type) {
@@ -349,6 +351,7 @@ func (s *store) run() {
 			case <-timer.C:
 				flush()
 			}
+			timer.Stop()
 		}
 	}()
 }

diff --git a/ui/src/components/Aside/index.vue b/ui/src/components/Aside/index.vue
@@ -28,7 +28,6 @@ import { Search } from '@element-plus/icons-vue'
 const router = useRouter()
 const route = useRoute()
 const { proxy } = getCurrentInstance()
-const { ctx: that } = getCurrentInstance()
 
 // ref
 const ruleForm = ref()
@@ -215,7 +214,6 @@ function searchGroup() {
         }
     })
     data.groupLists = JSON.parse(JSON.stringify(groupLists))
-    that.$forceUpdate()
 }
 // init data
 function getGroupLists() {
@@ -281,7 +279,6 @@ function getGroupLists() {
                 Promise.all(promise).then(() => {
                     data.showSearch = true
                     data.groupListsCopy = JSON.parse(JSON.stringify(data.groupLists))
-                    that.$forceUpdate()
                 }).catch((err) => {
                     ElMessage({
                         message: 'An error occurred while obtaining group data. Please refresh and try again. Error: ' + err,

diff --git a/ui/src/components/Header/components/header.vue b/ui/src/components/Header/components/header.vue
@@ -22,6 +22,7 @@ import { reactive } from "vue";
 import { ElImage, ElTooltip, ElMenu, ElMenuItem } from 'element-plus'
 import { useRoute } from 'vue-router'
 import { watch, getCurrentInstance } from '@vue/runtime-core'
+import userImg from '@/assets/banyandb_small.jpg'
 
 // Eventbus
 const $bus = getCurrentInstance().appContext.config.globalProperties.mittBus
@@ -35,7 +36,6 @@ const data = reactive({
     isCollapse: false,
     showButton: false
 })
-const userImg = 'http://localhost:5173/src/assets/banyandb_small.jpg'
 
 // watch
 watch(() => route, () => {