Skip to content

A self-hosted media server and file management system

feat: update local table

aminnausind084f161615e
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
index 29bfa969..2424cfe5 100755
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components/table/TableBase.vue
@@ -1,7 +1,8 @@
-<script setup lang="ts" generic="T">
-import type { SortOption, TableProps } from '@/types/types';
+<script setup lang="ts" generic="T extends TableRow">
+import type { SortOption, TableProps, TableRow } from '@/types/types';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, toRef } from 'vue';
+import { cn } from '@aminnausin/cedar-ui';
import TableLoadingSpinner from '@/components/table/TableLoadingSpinner.vue';
import TextInputLabelled from '@/components/inputs/TextInputLabelled.vue';
@@ -24,7 +25,8 @@ const props = withDefaults(defineProps<TableProps<T>>(), {
noResultsMessage: 'No Results',
});
-const tableData = useTable(props);
+const { currentPage, itemsPerPage, pageData, setPage } = useTable<T>({ itemsPerPage: props.itemsPerPage, data: toRef(props, 'data') });
+
const sortAscending = ref(props.startAscending);
const lastSortKey = ref('');
@@ -84,7 +86,7 @@ onMounted(() => {
"
:title="`Reorder Results...`"
:aria-label="`Reorder Results`"
- class="ring-inset"
+ class="inline-flex h-full ring-inset"
>
<template #icon>
<!-- Arrow Pointing Down if ascending and then Up otherwise (arrow shows what to change to ?? idk descending points up actually)-->
@@ -94,15 +96,10 @@ onMounted(() => {
</ButtonIcon>
</span>
</section>
- <section :class="[useGrid || `flex w-full flex-wrap gap-2 ${tableStyles ?? ''}`]">
- <TableLoadingSpinner
- v-if="loading || tableData.filteredPage.length === 0"
- :is-loading="loading"
- :data-length="tableData.filteredPage.length"
- :no-results-message="noResultsMessage"
- />
+ <section :class="cn(useGrid || 'flex w-full flex-wrap gap-2', tableStyles)">
+ <TableLoadingSpinner v-if="loading || pageData.length === 0" :is-loading="loading" :data-length="pageData.length" :no-results-message="noResultsMessage" />
<template v-else>
- <template v-for="(row, index) in tableData.filteredPage" :key="row?.id ?? index">
+ <template v-for="(row, index) in pageData" :key="row?.id ?? index">
<slot name="row" :row="row" :index="index" :selectedID="props.selectedID">
<component
:is="props.row"
@@ -121,11 +118,11 @@ onMounted(() => {
v-if="usePagination"
:class="paginationClass"
:listLength="props.data?.length ?? 0"
- :itemsPerPage="tableData.fields.itemsPerPage"
- :currentPage="tableData.fields.currentPage"
+ :itemsPerPage="itemsPerPage"
+ :currentPage="currentPage"
:useIcons="props.usePaginationIcons"
:max-visible-pages="props.maxVisiblePages"
- @setPage="tableData.handlePageChange"
+ @setPage="setPage"
/>
</section>
</template>
diff --git a/resources/js/components/table/TableLoadingSpinner.vue b/resources/js/components/table/TableLoadingSpinner.vue
index cb48a311..ba246076 100644
--- a/resources/js/components/table/TableLoadingSpinner.vue
+++ b/resources/js/components/table/TableLoadingSpinner.vue
@@ -4,10 +4,7 @@ import SvgSpinners90RingWithBg from '~icons/svg-spinners/90-ring-with-bg';
const props = withDefaults(defineProps<{ isLoading?: boolean; noResultsMessage?: string; dataLength?: number }>(), { noResultsMessage: 'No Results' });
</script>
<template>
- <div
- v-if="isLoading || dataLength === 0"
- class="col-span-full flex w-full items-center justify-center gap-2 text-center text-lg tracking-wider text-gray-500 uppercase dark:text-gray-400"
- >
+ <div class="col-span-full flex w-full items-center justify-center gap-2 text-center text-lg tracking-wider text-gray-500 uppercase dark:text-gray-400">
<p>{{ isLoading ? '...Loading' : noResultsMessage }}</p>
<SvgSpinners90RingWithBg v-show="isLoading" />
</div>
diff --git a/resources/js/components/table/TablePaginationButton.vue b/resources/js/components/table/TablePaginationButton.vue
index f82b14d9..8d33dc95 100755
--- a/resources/js/components/table/TablePaginationButton.vue
+++ b/resources/js/components/table/TablePaginationButton.vue
@@ -17,10 +17,10 @@ const props = withDefaults(
</script>
<template>
- <li :class="{ hidden: props.currentPage !== props.pageNumber && !props.text && !props.sticky }" class="h-full md:block z-0">
+ <li :class="{ hidden: props.currentPage !== props.pageNumber && !props.text && !props.sticky }" class="z-0 h-full md:block">
<button
- class="relative inline-flex items-center h-full px-3 group hover:text-gray-900 dark:hover:text-white dark:disabled:text-neutral-500 disabled:text-neutral-400 disabled:cursor-not-allowed"
- :class="{ 'text-gray-900 dark:text-white bg-gray-50 dark:bg-neutral-900': props.currentPage === props.pageNumber }"
+ class="group relative inline-flex h-full items-center px-3 hover:text-gray-900 disabled:cursor-not-allowed disabled:text-neutral-400 dark:hover:text-white dark:disabled:text-neutral-500"
+ :class="{ 'bg-gray-50 text-gray-900 dark:bg-neutral-900 dark:text-white': props.currentPage === props.pageNumber }"
:disabled="props.disabled ?? false"
>
<slot name="content">
@@ -31,13 +31,13 @@ const props = withDefaults(
<span
v-if="!props.text || props.underline"
- class="box-content absolute bottom-0 w-0 h-px -mx-px duration-200 ease-out translate-y-px border-transparent group-hover:left-0 group-hover:w-full group-hover:border-l group-hover:border-r bg-violet-600 group-hover:border-violet-600"
+ class="absolute bottom-0 -mx-px box-content h-px w-0 translate-y-px border-transparent bg-violet-600 duration-200 ease-out group-hover:left-0 group-hover:w-full group-hover:border-r group-hover:border-l group-hover:border-violet-600"
bg-neutral-900
dark:bg-violet-600
group-hover:border-neutral-900
dark:group-hover:border-violet-600
:class="{
- 'left-0 w-full border-l border-r': props.currentPage === props.pageNumber,
+ 'left-0 w-full border-r border-l': props.currentPage === props.pageNumber,
'left-1/2': props.currentPage !== props.pageNumber,
}"
>
diff --git a/resources/js/composables/useTable.ts b/resources/js/composables/useTable.ts
index 0cf31b7b..1345bca9 100644
--- a/resources/js/composables/useTable.ts
+++ b/resources/js/composables/useTable.ts
@@ -1,33 +1,46 @@
-import { computed, reactive, ref, watch } from 'vue';
+// import type { UseTableOptions } from '@/types/types';
+import type { UseTableOptions } from '@aminnausin/cedar-ui';
-export default function useTable(props: any) {
+import { computed, ref, toRef, watch } from 'vue';
+
+export default function useTable<T>(options: UseTableOptions<T>) {
+ const itemsPerPage = ref(options.itemsPerPage ?? 10);
const currentPage = ref(1);
- const itemsPerPage = ref(props.itemsPerPage ?? 10);
-
- const table = reactive({
- filteredPage: computed(() => {
- const minIndex = itemsPerPage.value * (currentPage.value - 1);
- const maxIndex = Math.min(itemsPerPage.value * currentPage.value, props.data.length);
-
- return props.data.slice(minIndex, maxIndex);
- }),
- props,
- fields: { currentPage, itemsPerPage },
- handlePageChange(page: number) {
- currentPage.value = page;
- },
- handlePageReset() {
- currentPage.value = 1;
- },
+ const data = toRef(options, 'data');
+
+ const pageCount = computed(() => Math.ceil(data.value.length / itemsPerPage.value));
+ const pageData = computed(() => {
+ const start = (currentPage.value - 1) * itemsPerPage.value;
+ return data.value.slice(start, start + itemsPerPage.value);
});
+ function setPage(page: number) {
+ currentPage.value = Math.min(Math.max(1, page), pageCount.value);
+ }
+
+ function resetPage() {
+ currentPage.value = 1;
+ }
+
watch(
- () => props.data,
- (newData, old) => {
- if (newData?.length !== old?.length || (newData[0] && old[0] && newData[0]?.id !== old[0]?.id)) table.handlePageReset();
+ () => data,
+ () => {
+ if (options.resetOnDataChange !== false) resetPage();
},
{ immediate: true },
);
- return table;
+ return {
+ // state
+ currentPage,
+ itemsPerPage,
+
+ // derived
+ pageCount,
+ pageData,
+
+ // actions
+ setPage,
+ resetPage,
+ };
}
diff --git a/resources/js/types/types.ts b/resources/js/types/types.ts
index c0075ad3..5a28f159 100644
--- a/resources/js/types/types.ts
+++ b/resources/js/types/types.ts
@@ -180,7 +180,17 @@ export declare type GenericSortOption<T> = {
disabled?: boolean;
};
-export interface TableProps<T> {
+export type TableRow = {
+ id: number;
+};
+
+export interface UseTableOptions<T> {
+ data: T[];
+ itemsPerPage?: number;
+ resetOnDataChange?: boolean;
+}
+
+export interface TableProps<T extends TableRow> {
useToolbar?: boolean;
usePagination?: boolean;
usePaginationIcons?: boolean;
@@ -189,7 +199,7 @@ export interface TableProps<T> {
row: DefineComponent<any, any, any> | Component;
rowAttributes?: Record<string, any>;
loading?: boolean;
- clickAction?: (id: number, ...args: any[]) => void;
+ clickAction?: (id: TableRow['id'], ...args: any[]) => void;
otherAction?: (...args: any[]) => void;
sortAction?: (sortKey: keyof T, direction: 1 | -1) => void;
sortingOptions?: SortOption[];
@@ -202,6 +212,7 @@ export interface TableProps<T> {
paginationClass?: string;
maxVisiblePages?: number;
noResultsMessage?: string;
+ resetOnDataChange?: boolean;
}
export interface DropdownMenuItem {