diff options
| author | Terry Truong <terry06890@gmail.com> | 2022-07-08 14:50:21 +1000 |
|---|---|---|
| committer | Terry Truong <terry06890@gmail.com> | 2022-07-08 15:00:32 +1000 |
| commit | 4e2830b6986aef2486d12c20ffc37d4bb595ced4 (patch) | |
| tree | 22d1daa307b72da75634200c5faea221ec44c742 /src | |
| parent | d84a2dab11aa23d56c3213008424872e1a011279 (diff) | |
Send activeRoot to server, for reducing toroot response sizes
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.vue | 7 | ||||
| -rw-r--r-- | src/components/SearchModal.vue | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/App.vue b/src/App.vue index 434eb08..e379a1d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -49,7 +49,8 @@ </div> <!-- Modals --> <transition name="fade"> - <search-modal v-if="searchOpen" :tolMap="tolMap" :lytMap="layoutMap" :lytOpts="lytOpts" :uiOpts="uiOpts" + <search-modal v-if="searchOpen" + :tolMap="tolMap" :lytMap="layoutMap" :activeRoot="activeRoot" :lytOpts="lytOpts" :uiOpts="uiOpts" @close="onSearchClose" @search="onSearch" @info-click="onInfoClick" @setting-chg="onSettingChg" @net-wait="primeLoadInd('Loading data')" @net-get="endLoadInd" class="z-10" ref="searchModal"/> </transition> @@ -542,7 +543,7 @@ export default defineComponent({ layoutNode.addDescendantChain(nodesToAdd, this.tolMap, this.layoutMap); // Expand-to-view on target-node's parent targetNode = this.layoutMap.get(name); - if (targetNode.parent != this.activeRoot){ + if (targetNode!.parent != this.activeRoot){ await this.onLeafClickHeld(targetNode!.parent!, true); } else { await this.onLeafClick(targetNode!.parent!, true); @@ -864,7 +865,7 @@ export default defineComponent({ let urlParams = new URLSearchParams({type: 'node', tree: this.uiOpts.tree}); if (nodeName != null){ urlParams.append('name', nodeName); - urlParams.append('toroot', 'true'); + urlParams.append('toroot', this.activeRoot.name); } let responseObj: {[x: string]: TolNode} = await this.loadFromServer(urlParams); if (responseObj == null){ diff --git a/src/components/SearchModal.vue b/src/components/SearchModal.vue index de6bc75..990312a 100644 --- a/src/components/SearchModal.vue +++ b/src/components/SearchModal.vue @@ -43,6 +43,7 @@ import {queryServer, SearchSugg, SearchSuggResponse, UiOptions} from '../lib'; export default defineComponent({ props: { lytMap: {type: Object as PropType<LayoutMap>, required: true}, // Used to check if a searched-for node exists + activeRoot: {type: Object as PropType<LayoutNode>, required: true}, // Sent to server to reduce response size tolMap: {type: Object as PropType<TolMap>, required: true}, // Upon a search response, gets new nodes added lytOpts: {type: Object as PropType<LayoutOptions>, required: true}, uiOpts: {type: Object as PropType<UiOptions>, required: true}, @@ -205,7 +206,7 @@ export default defineComponent({ let urlParams = new URLSearchParams({ type: 'node', name: tolNodeName, - toroot: 'true', + toroot: this.activeRoot.name, tree: this.uiOpts.tree, }); this.$emit('net-wait'); // Allows the parent component to show a loading-indicator |