From df13bd67b29adbc6c184c386292681627305d6b2 Mon Sep 17 00:00:00 2001 From: ButterBright <52878305+ButterBright@users.noreply.github.com> Date: Sun, 9 Jul 2023 21:22:44 +0800 Subject: [PATCH 1/3] fix: BanyanDB ui unable to load icon (#298) * fix: BanyanDB ui unable to load icon --- CHANGES.md | 4 ++++ ui/src/components/Header/components/header.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index daa9272b1..adba19f9b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,10 @@ Release Notes. - List all properties in a group. +### Bugs + +- BanyanDB ui unable to load icon. + ### Chores - Bump several dependencies and tools. diff --git a/ui/src/components/Header/components/header.vue b/ui/src/components/Header/components/header.vue index 647c995f0..f34107d2d 100644 --- 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, () => { From 0fadd209f66c619ac546414604f344171005b916 Mon Sep 17 00:00:00 2001 From: Wu ChuSheng Date: Mon, 10 Jul 2023 23:13:51 +0800 Subject: [PATCH 2/3] Fix bug BanyanDB ui type error (#299) * Fix bug BanyanDB ui type error #11066 * change CHANGES.MD --- CHANGES.md | 1 + ui/src/components/Aside/index.vue | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index adba19f9b..0b28d403a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Release Notes. ### Bugs - BanyanDB ui unable to load icon. +- BanyanDB ui type error ### Chores diff --git a/ui/src/components/Aside/index.vue b/ui/src/components/Aside/index.vue index 6fd81b8c2..5c4c3812c 100644 --- 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, From aee914839f2f92c8973bd795379096757d23d668 Mon Sep 17 00:00:00 2001 From: hailin0 Date: Thu, 13 Jul 2023 20:13:42 +0800 Subject: [PATCH 3/3] Fix timer not released (#300) * Fix timer not released * Update server.go --- CHANGES.md | 1 + pkg/index/inverted/inverted.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 0b28d403a..e49c8616d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Release Notes. - BanyanDB ui unable to load icon. - BanyanDB ui type error +- Fix timer not released ### Chores diff --git a/pkg/index/inverted/inverted.go b/pkg/index/inverted/inverted.go index 8d3d5d302..5601d94a6 100644 --- 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() } }() }