FoundKeyGang/FoundKey
FoundKeyGang/FoundKey
7
19
Fork 22
Code Issues 37 Pull requests 4 Releases Activity

client: fix issue of search only working once
All checks were successful
ci/woodpecker/push/lint-client Pipeline was successful
Details
ci/woodpecker/push/build Pipeline was successful
Details
ci/woodpecker/push/lint-backend Pipeline was successful
Details
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
Details
ci/woodpecker/push/test Pipeline was successful
Details

Browse source 
closes #274

Changelog: Fixed
This commit is contained in:
Johann150 2022-12-07 21:55:39 +01:00
parent b66f7550ab
commit 501cf834c8
Signed by: Johann150
GPG key ID: 9EE6577A2A06F8F1
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
packages/client/src/pages/search.vue
View file

@ -55,7 +55,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch } from 'vue'; import { computed, nextTick, watch } from 'vue';
import XNotes from '@/components/notes.vue'; import XNotes from '@/components/notes.vue';
import XUserList from '@/components/user-list.vue'; import XUserList from '@/components/user-list.vue';
import MkButton from '@/components/ui/button.vue'; import MkButton from '@/components/ui/button.vue';
@ -115,6 +115,9 @@ function selectUser() {
} }
async function search(): void { async function search(): void {
userPagination = null;
notePagination = null;
switch (tab) { switch (tab) {
case 'all': { case 'all': {
query = query.trim(); query = query.trim();
@ -138,20 +141,22 @@ async function search(): void {
mainRouter.push(`/notes/${res.object.id}`); mainRouter.push(`/notes/${res.object.id}`);
} }
} else { } else {
notePagination = { nextTick(() => {
endpoint: 'notes/search' as const, notePagination = {
limit: 10, endpoint: 'notes/search' as const,
params: { query }, limit: 10,
}; params: { query },
origin = 'combined'; };
userPagination = { origin = 'combined';
endpoint: 'users/search' as const, userPagination = {
limit: 4, endpoint: 'users/search' as const,
params: { limit: 4,
query, params: {
origin, query,
}, origin,
}; },
};
});
} }
break; break;
} }
@ -171,24 +176,26 @@ async function search(): void {
params.host = host; params.host = host;
break; break;
} }
notePagination = { nextTick(() => {
endpoint: 'notes/search' as const, notePagination = {
limit: 10, endpoint: 'notes/search' as const,
params, limit: 10,
}; params,
userPagination = null; };
});
break; break;
} }
case 'users': { case 'users': {
notePagination = null; nextTick(() => {
userPagination = { userPagination = {
endpoint: 'users/search' as const, endpoint: 'users/search' as const,
limit: 10, limit: 10,
params: { params: {
query, query,
origin, origin,
}, },
}; };
});
break; break;
} }
} }