amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: alert when searching notes from widget, and search is disabled - fixes #275 (!629)

Browse Source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/629

Closes #275

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2024-10-03 17:32:20 +00:00
commit 66ddf965b5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/frontend/src/components/MkWidgets.vue
View File

@ -65,13 +65,6 @@ const props = defineProps<{
edit: boolean; edit: boolean;
}>(); }>();
// This will not be available for now as I don't think this is needed
// const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
/* if (!notesSearchAvailable) {
const wid = widgetDefs.findIndex(widget => widget === 'search');
widgetDefs.splice(wid, 1);
} */
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'updateWidgets', widgets: Widget[]): void; (ev: 'updateWidgets', widgets: Widget[]): void;
(ev: 'addWidget', widget: Widget): void; (ev: 'addWidget', widget: Widget): void;

9
packages/frontend/src/widgets/WidgetSearch.vue
View File

@ -24,6 +24,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { useRouter } from '@/router/supplier.js'; import { useRouter } from '@/router/supplier.js';
import { GetFormResultType } from '@/scripts/form.js'; import { GetFormResultType } from '@/scripts/form.js';
import { notesSearchAvailable } from '@/scripts/check-permissions.js';
const name = 'search'; const name = 'search';
@ -128,6 +129,14 @@ async function search() {
return; return;
} }
if (!notesSearchAvailable) {
os.alert({
type: 'warning',
text: i18n.ts.notesSearchNotAvailable,
});
return;
}
notePagination.value = { notePagination.value = {
endpoint: 'notes/search', endpoint: 'notes/search',
limit: 10, limit: 10,