fix datatree sub and unsubscribe at tree

This commit is contained in:
Adrian Zürcher
2025-05-12 17:17:53 +02:00
parent 802f1c71db
commit c8b27813ae
5 changed files with 196 additions and 42 deletions

View File

@@ -7,10 +7,11 @@
dense
:nodes="dbmData"
node-key="key"
:default-expand-all="true"
:default-expand-all="false"
v-model:expanded="expanded"
>
<template v-slot:[`default-header`]="props">
<div class="row items-center text-blue">
<div class="row items-center text-blue" @click="ClickNode(props.node)">
<div
class="row items-center text-blue"
@contextmenu.prevent="openContextMenu($event, props.node)"
@@ -25,12 +26,12 @@
/>
</div>
<q-popup-edit
v-if="props.node.value !== undefined"
v-if="props.node.value !== undefined && props.node.value !== ''"
v-model="props.node.value"
class="q-ml-xl bg-grey text-white"
@save="(val) => onValueEdit(val, props.node)"
>
<template v-if="props.node.value !== undefined" v-slot="scope">
<template v-slot="scope">
<q-input
dark
color="white"
@@ -56,29 +57,34 @@
</template>
<script setup lang="ts">
import { onMounted } from 'vue';
import { onMounted, ref } from 'vue';
import type { TreeNode } from 'src/composables/dbmTree';
import { subs, dbmData, buildTree } from 'src/composables/dbmTree';
import {
dbmData,
buildTree,
// addChildrentoTree,
getSubscriptionsByUuid,
addChildrentoTree,
removeSubtreeByParentKey,
} from 'src/composables/dbmTree';
import { openContextMenu } from 'src/composables/useContextMenu';
import SubMenu from 'src/components/SubMenu.vue';
import { QCard } from 'quasar';
import { send } from 'src/services/websocket';
import { onBeforeRouteLeave } from 'vue-router';
onMounted(() => {
send({
subscribe: [
{
path: '.*',
depth: 2,
depth: 1,
},
],
})
.then((response) => {
if (response?.subscribe) {
subs.value = response.subscribe;
dbmData.value = buildTree(subs.value);
} else {
console.log('Response from server:', response);
dbmData.value = buildTree(response.subscribe ?? []);
}
})
.catch((err) => {
@@ -86,16 +92,95 @@ onMounted(() => {
});
});
// function updateValue(uuid: string, newValue: string) {
// const target = subs.value.find((s) => s.uuid === uuid);
// if (target) {
// target.value = newValue;
// treeData.value = buildTree(subs.value);
// }
// }
onBeforeRouteLeave((to, from, next) => {
send({
unsubscribe: [
{
path: '.*',
depth: 0,
},
],
})
.then((response) => {
if (response?.subscribe) {
dbmData.value = buildTree(response.subscribe ?? []);
}
})
.catch((err) => {
console.error('Error fetching data:', err);
});
next();
});
const expanded = ref<string[]>([]);
function ClickNode(node: TreeNode) {
if (node.key === 'DBM') return;
const nodeKey = node.key as string;
const isExpanded = expanded.value.includes(nodeKey);
if (isExpanded) {
// Collapse the parent node and its children
//expanded.value = expanded.value.filter((k) => k !== nodeKey && !k.startsWith(nodeKey));
// 2. Send unsubscribe request
send({
unsubscribe: [
{
uuid: nodeKey,
path: '.*',
depth: 0,
},
],
})
.then((response) => {
if (response?.unsubscribe) {
removeSubtreeByParentKey(nodeKey);
}
requestAnimationFrame(() => {
expanded.value = expanded.value.filter((k) => k !== nodeKey && !k.startsWith(nodeKey));
});
})
.catch((err) => {
console.error('Error during unsubscribe:', err);
});
// 3. Do not continue further — important!
return;
}
// 4. If not expanded, send subscribe and expand
send({
subscribe: [
{
uuid: nodeKey,
path: '.*',
depth: 1,
},
],
})
.then((response) => {
if (response?.subscribe) {
addChildrentoTree(response.subscribe);
// Delay to ensure reactive updates apply cleanly
requestAnimationFrame(() => {
if (!expanded.value.includes(nodeKey)) {
expanded.value.push(nodeKey);
}
});
}
})
.catch((err) => {
console.error('Error during subscribe:', err);
});
}
function onValueEdit(newValue: undefined, node: TreeNode) {
const sub = subs.value.find((s) => s.uuid === node.key);
console.log(node.value, node.value === undefined);
const sub = getSubscriptionsByUuid(node.key);
if (sub) {
send({
set: [