refactor: remove useless wrappers

ui/app/components/Dialog.vue

@@ -5,7 +5,7 @@
     :title="state.current?.opts.title ?? defaultTitle"
     :dismissible="true"
     :ui="{ content: 'max-w-lg', body: 'space-y-4', footer: 'justify-end gap-2' }"
-    @update:open="(open) => !open && onCancel()"
+    @update:open="(open) => !open && cancel()"
     @after:enter="focusInput"
   >
     <template #body>
@@ -63,7 +63,7 @@
           {{ state.current?.opts.confirmText ?? 'OK' }}
         </UButton>
 
-        <UButton color="neutral" variant="outline" @click="onCancel">
+        <UButton color="neutral" variant="outline" @click="cancel">
           {{ (state.current?.opts as PromptOptions | ConfirmOptions)?.cancelText ?? 'Cancel' }}
         </UButton>
       </template>
@@ -121,7 +121,6 @@ const focusInput = async () => {
   requestAnimationFrame(focusPrimary);
 };
 
-const onCancel = () => cancel();
 const onEnter = () =>
   confirm('confirm' === state.current?.type ? selected.value : localInput.value);
 

ui/app/components/NewDownload.vue

@@ -170,7 +170,7 @@
           </div>
 
           <div
-            v-if="show_description && !hasFormatInConfig && get_preset(form.preset)?.description"
+            v-if="show_description && !hasFormatInConfig && findPreset(form.preset)?.description"
             class="max-h-36 overflow-auto rounded-md border border-default bg-muted/30 px-3 py-2 text-sm text-toned"
           >
             <button
@@ -180,7 +180,7 @@
             >
               <span class="inline-flex items-start gap-2">
                 <UIcon name="i-lucide-info" class="mt-0.5 size-4 shrink-0 text-info" />
-                <span class="is-ellipsis">{{ get_preset(form.preset)?.description }}</span>
+                <span class="is-ellipsis">{{ findPreset(form.preset)?.description }}</span>
               </span>
             </button>
           </div>
@@ -1124,7 +1124,6 @@ const hasFormatInConfig = computed(
   (): boolean => !!form.value.cli?.match(/(?<!\S)(-f|--format)(=|\s)(\S+)/),
 );
 
-const get_preset = (name: string | undefined) => findPreset(name);
 const expand_description = (e: Event) =>
   toggleClass(e.target as HTMLElement, ['is-ellipsis', 'is-pre-wrap']);
 

ui/app/pages/conditions.vue

@@ -63,7 +63,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void loadContent(page)"
         >
           <span>Reload</span>
         </UButton>
@@ -122,7 +122,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -447,7 +447,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -648,14 +648,6 @@ const loadContent = async (pageNumber = 1): Promise<void> => {
   await syncPageQuery(pageNumber);
 };
 
-const reloadContent = async (): Promise<void> => {
-  await loadContent(page.value);
-};
-
-const navigatePage = async (newPage: number): Promise<void> => {
-  await loadContent(newPage);
-};
-
 const resetEditor = (): void => {
   item.value = {};
   itemRef.value = null;

ui/app/pages/dl_fields.vue

@@ -63,7 +63,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void loadContent(page)"
         >
           <span>Reload</span>
         </UButton>
@@ -122,7 +122,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -399,7 +399,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -567,14 +567,6 @@ const loadContent = async (pageNumber = 1): Promise<void> => {
   await syncPageQuery(pageNumber);
 };
 
-const reloadContent = async (): Promise<void> => {
-  await loadContent(page.value);
-};
-
-const navigatePage = async (newPage: number): Promise<void> => {
-  await loadContent(newPage);
-};
-
 const resetEditor = (): void => {
   item.value = {};
   itemRef.value = null;

ui/app/pages/notifications.vue

@@ -76,7 +76,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void loadContent(page)"
         >
           <span>Reload</span>
         </UButton>
@@ -135,7 +135,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -497,7 +497,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -706,14 +706,6 @@ const loadContent = async (pageNumber = page.value): Promise<void> => {
   await notificationsStore.loadNotifications(pageNumber);
 };
 
-const reloadContent = async (): Promise<void> => {
-  await loadContent(page.value);
-};
-
-const navigatePage = async (newPage: number): Promise<void> => {
-  await loadContent(newPage);
-};
-
 const resetEditor = (): void => {
   target.value = defaultState();
   targetRef.value = undefined;

ui/app/pages/presets.vue

@@ -62,7 +62,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void presetsStore.loadPresets(1, 1000)"
         >
           <span>Reload</span>
         </UButton>
@@ -553,10 +553,6 @@ const toggleFilterPanel = async (): Promise<void> => {
   filterInput.value?.inputRef?.value?.focus?.({ preventScroll: true });
 };
 
-const reloadContent = async (): Promise<void> => {
-  await presetsStore.loadPresets(1, 1000);
-};
-
 const toggleMasterSelection = (): void => {
   if (allSelected.value) {
     selectedIds.value = [];
@@ -644,5 +640,5 @@ const calcPath = (path?: string): string => {
   return path ? location + '/' + sTrim(path, '/') : location;
 };
 
-onMounted(async () => await reloadContent());
+onMounted(async () => await presetsStore.loadPresets(1, 1000));
 </script>

ui/app/pages/task_definitions.vue

@@ -71,7 +71,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void loadDefinitions(1, 1000)"
         >
           <span>Reload</span>
         </UButton>
@@ -642,10 +642,6 @@ const toggleFilterPanel = async (): Promise<void> => {
   filterInput.value?.inputRef?.value?.focus?.({ preventScroll: true });
 };
 
-const reloadContent = async (): Promise<void> => {
-  await loadDefinitions(1, 1000);
-};
-
 const toggleDisplayStyle = (): void => {
   display_style.value = display_style.value === 'list' ? 'grid' : 'list';
 };
@@ -837,7 +833,7 @@ const exportDefinition = async (summary: TaskDefinitionSummary): Promise<void> =
 
 onMounted(async () => {
   if (!definitions.value.length) {
-    await reloadContent();
+    await loadDefinitions(1, 1000);
   }
 });
 </script>

ui/app/pages/tasks.vue

@@ -62,7 +62,7 @@
           icon="i-lucide-refresh-cw"
           :loading="isLoading"
           :disabled="isLoading"
-          @click="() => void reloadContent()"
+          @click="() => void loadContent(page)"
         >
           <span>Reload</span>
         </UButton>
@@ -121,7 +121,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -646,7 +646,7 @@
         :disabled="isLoading"
         show-edges
         :sibling-count="0"
-        @update:page="navigatePage"
+        @update:page="loadContent"
         size="sm"
       />
     </div>
@@ -1002,14 +1002,6 @@ const loadContent = async (pageNumber = page.value, fromMounted: boolean = false
   }
 };
 
-const reloadContent = async (fromMounted: boolean = false) => {
-  await loadContent(page.value, fromMounted);
-};
-
-const navigatePage = async (newPage: number): Promise<void> => {
-  await loadContent(newPage);
-};
-
 const resetForm = (closeForm: boolean = false) => {
   task.value = createEmptyTask();
   taskRef.value = null;