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

client: fix issue of search only working once
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 

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