Skip to content

A self-hosted media server and file management system

chore: code smells and duplications

aminnausind0a1cf01fa0a
diff --git a/resources/js/components/dashboard/DashboardAnalytics.vue b/resources/js/components/dashboard/DashboardAnalytics.vue
index 0f2dee9f..88f64366 100644
--- a/resources/js/components/dashboard/DashboardAnalytics.vue
+++ b/resources/js/components/dashboard/DashboardAnalytics.vue
@@ -7,8 +7,14 @@ import { useGetPulse, useGetSiteAnalytics } from '@/service/queries';
import { handleStartTask } from '@/service/taskService';
import { periodForHumans } from '@/service/pulseUtil';
+import PulseSlowOutgoingRequests from '@/components/pulseCards/PulseSlowOutgoingRequests.vue';
+import LucideChartNoAxesCombined from '~icons/lucide/chart-no-axes-combined';
+import PulseSlowRequests from '@/components/pulseCards/PulseSlowRequests.vue';
import DashboardTaskMenu from '@/components/dashboard/DashboardTaskMenu.vue';
+import PulseSlowQueries from '@/components/pulseCards/PulseSlowQueries.vue';
+import PulseExceptions from '@/components/pulseCards/PulseExceptions.vue';
import PulseRequests from '@/components/pulseCards/PulseRequests.vue';
+import PulseSlowJobs from '@/components/pulseCards/PulseSlowJobs.vue';
import DashboardCard from '@/components/cards/DashboardCard.vue';
import PulseServers from '@/components/pulseCards/PulseServers.vue';
import PulseQueues from '@/components/pulseCards/PulseQueues.vue';
@@ -16,19 +22,12 @@ import BreadCrumbs from '@/components/pinesUI/BreadCrumbs.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
import PulseUsage from '@/components/pulseCards/PulseUsage.vue';
import ButtonText from '@/components/inputs/ButtonText.vue';
+import PulseCache from '@/components/pulseCards/PulseCache.vue';
-import LucideChartNoAxesCombined from '~icons/lucide/chart-no-axes-combined';
import ProiconsArrowSync from '~icons/proicons/arrow-sync';
import ProiconsHome2 from '~icons/proicons/home-2';
import ProiconsBolt from '~icons/proicons/bolt';
import ProiconsAdd from '~icons/proicons/add';
-import PulseExceptions from '../pulseCards/PulseExceptions.vue';
-import PulseSlowRequests from '../pulseCards/PulseSlowRequests.vue';
-import PulseSlowJobs from '../pulseCards/PulseSlowJobs.vue';
-import PulseSlowOutgoingRequests from '../pulseCards/PulseSlowOutgoingRequests.vue';
-import PulseSlowQueries from '../pulseCards/PulseSlowQueries.vue';
-import PulseCache from '../pulseCards/PulseCache.vue';
-import PulseServersPlaceholder from '../pulse/PulseServersPlaceholder.vue';
const validPeriods: { key: string; value: string }[] = [
{ key: '1h', value: '1_hour' },
diff --git a/resources/js/components/pulse/PulseSelectLabel.vue b/resources/js/components/pulse/PulseSelectLabel.vue
index f31e8f43..356a812f 100644
--- a/resources/js/components/pulse/PulseSelectLabel.vue
+++ b/resources/js/components/pulse/PulseSelectLabel.vue
@@ -1,6 +1,10 @@
+<script setup lang="ts">
+defineProps<{ controlId: string }>();
+</script>
<template>
<label
class="capitalize whitespace-nowrap h-10 flex items-center justify-between w-full py-2 p-3 text-left rounded-l-md shadow-sm text-sm ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 text-neutral-900 dark:text-neutral-100 bg-primary-800 dark:bg-neutral-900"
+ :for="controlId"
>
<slot></slot>
</label>
diff --git a/resources/js/components/pulseCards/PulseServers.vue b/resources/js/components/pulseCards/PulseServers.vue
index e056a3ab..e3c4c5e8 100644
--- a/resources/js/components/pulseCards/PulseServers.vue
+++ b/resources/js/components/pulseCards/PulseServers.vue
@@ -5,11 +5,11 @@ import { format_number, friendlyFileSize } from '@/service/pulseUtil';
import { toTimeSpan } from '@/service/util';
import { ref, watch } from 'vue';
+import PulseServersPlaceholder from '@/components/pulse/PulseServersPlaceholder.vue';
import PulseDoughnutChart from '@/components/charts/PulseDoughnutChart.vue';
import IconSignalSlash from '@/components/icons/IconSignalSlash.vue';
import PulseLineChart from '@/components/charts/PulseLineChart.vue';
import IconServer from '@/components/icons/IconServer.vue';
-import PulseServersPlaceholder from '../pulse/PulseServersPlaceholder.vue';
const props = withDefaults(
defineProps<{
diff --git a/resources/js/components/pulseCards/PulseSlowJobs.vue b/resources/js/components/pulseCards/PulseSlowJobs.vue
index 40cafbbb..5a60c51f 100644
--- a/resources/js/components/pulseCards/PulseSlowJobs.vue
+++ b/resources/js/components/pulseCards/PulseSlowJobs.vue
@@ -72,7 +72,7 @@ const config = computed(() => {
</template>
<template #actions>
- <PulseSelectLabel> Sort By </PulseSelectLabel>
+ <PulseSelectLabel controlId="Select-Slow-Jobs-Order"> Sort By </PulseSelectLabel>
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
@@ -80,6 +80,7 @@ const config = computed(() => {
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
+ id="Select-Slow-Jobs-Order"
/>
</template>
diff --git a/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue b/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue
index 95d25960..bd10d902 100644
--- a/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue
+++ b/resources/js/components/pulseCards/PulseSlowOutgoingRequests.vue
@@ -87,7 +87,7 @@ function getDomainFromUrl(input: string): string | null {
>
<IconInformationCircle class="w-5 h-5 stroke-gray-400 dark:stroke-gray-600" />
</button>
- <PulseSelectLabel> Sort By </PulseSelectLabel>
+ <PulseSelectLabel controlId="Select-Slow-Outgoing-Requests-Order"> Sort By </PulseSelectLabel>
<InputSelect
:placeholder="'None'"
:options="exceptionOptions"
@@ -95,6 +95,7 @@ function getDomainFromUrl(input: string): string | null {
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
+ id="Select-Slow-Outgoing-Requests-Order"
/>
</template>
@@ -126,12 +127,12 @@ function getDomainFromUrl(input: string): string | null {
<PulseTd class="max-w-[1px]">
<div class="flex items-center" :title="slowRequest.uri">
<img
- v-once
v-if="getDomainFromUrl(slowRequest.uri)"
:src="`https://unavatar.io/${getDomainFromUrl(slowRequest.uri)}?fallback=false`"
loading="lazy"
class="w-4 h-4 mr-2"
onerror="this.style.display='none'"
+ alt="URL favicon"
/>
<code class="block text-xs text-gray-900 dark:text-gray-100 truncate">
{{ slowRequest.uri }}
diff --git a/resources/js/components/pulseCards/PulseSlowQueries.vue b/resources/js/components/pulseCards/PulseSlowQueries.vue
index aab09ae0..48d43734 100644
--- a/resources/js/components/pulseCards/PulseSlowQueries.vue
+++ b/resources/js/components/pulseCards/PulseSlowQueries.vue
@@ -72,7 +72,7 @@ const config = computed(() => {
</template>
<template #actions>
- <PulseSelectLabel> Sort By </PulseSelectLabel>
+ <PulseSelectLabel controlId="Select-Slow-Queries-Order"> Sort By </PulseSelectLabel>
<InputSelect
:placeholder="'None'"
@@ -81,6 +81,7 @@ const config = computed(() => {
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
+ id="Select-Slow-Queries-Order"
/>
</template>
diff --git a/resources/js/components/pulseCards/PulseSlowRequests.vue b/resources/js/components/pulseCards/PulseSlowRequests.vue
index a2fdb53c..e8bd31b8 100644
--- a/resources/js/components/pulseCards/PulseSlowRequests.vue
+++ b/resources/js/components/pulseCards/PulseSlowRequests.vue
@@ -73,7 +73,7 @@ const config = computed(() => {
</template>
<template #actions>
- <PulseSelectLabel> Sort By </PulseSelectLabel>
+ <PulseSelectLabel controlId="Select-Slow-Requests-Order"> Sort By </PulseSelectLabel>
<InputSelect
:placeholder="'None'"
@@ -82,6 +82,7 @@ const config = computed(() => {
title="Select usage type"
@selectItem="handleSetSort"
:defaultItem="0"
+ id="Select-Slow-Requests-Order"
/>
</template>
diff --git a/resources/js/components/pulseCards/PulseUsage.vue b/resources/js/components/pulseCards/PulseUsage.vue
index f3306081..219cc9c5 100644
--- a/resources/js/components/pulseCards/PulseUsage.vue
+++ b/resources/js/components/pulseCards/PulseUsage.vue
@@ -13,6 +13,7 @@ import InputSelect from '@/components/pinesUI/InputSelect.vue';
import PulseScroll from '@/components/pulse/PulseScroll.vue';
import IconClock from '@/components/icons/IconClock.vue';
import IconScale from '@/components/icons/IconScale.vue';
+import PulseSelectLabel from '../pulse/PulseSelectLabel.vue';
const requestOptions = [
{ value: 'requests', title: 'making requests', key: 'userRequestsConfig' },
@@ -86,10 +87,7 @@ const sampleRate = () => {
</template>
<template #actions>
<span class="flex items-center text-sm">
- <label
- class="capitalize whitespace-nowrap h-10 flex items-center justify-between w-full py-2 p-3 text-left rounded-l-md shadow-sm text-sm ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 text-gray-900 dark:text-neutral-100 bg-primary-800 dark:bg-neutral-900"
- >Top 10 users</label
- >
+ <PulseSelectLabel control-id="Select-Usage"> Top 10 users </PulseSelectLabel>
<InputSelect
:placeholder="'None'"
:options="requestOptions"
@@ -97,6 +95,7 @@ const sampleRate = () => {
title="Select usage type"
@selectItem="handleSetType"
:defaultItem="0"
+ id="Select-Usage"
/>
</span>
</template>
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index cbe0912d..f31d0d53 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -214,8 +214,9 @@ export const useContentStore = defineStore('Content', () => {
});
if (!nextFolder?.id) {
- toast.add('Invalid folder', { type: 'danger', description: `The folder '${nextFolderName}' does not exist.` });
- return;
+ const message = `The folder '${nextFolderName}' does not exist.`;
+ toast.add('Invalid folder', { type: 'danger', description: message });
+ throw new Error(message);
}
const { data, error } = await mediaAPI.getFolder(nextFolder.id); // get videos with given folder id (list of videos organised by folder id)
@@ -223,15 +224,14 @@ export const useContentStore = defineStore('Content', () => {
if (error) {
toast.add('Invalid folder', { type: 'danger', description: `The folder '${nextFolderName}' does not exist.` });
console.log(error ?? data?.message);
- return Promise.reject(error);
+ throw error;
}
stateFolder.value = { ...data.data };
-
searchQuery.value = '';
-
playlistFind(route.query?.video);
- return Promise.resolve(true);
+
+ return true;
}
//#endregion