A continuation of HomeBox the inventory and organization system built for the Home User
disable sort (via table) on item page (#1087)
Tonya78d05bb15570
diff --git a/frontend/components/Item/View/Selectable.vue b/frontend/components/Item/View/Selectable.vueindex 40bf13b9..73632d63 100644--- a/frontend/components/Item/View/Selectable.vue+++ b/frontend/components/Item/View/Selectable.vue@@ -18,6 +18,7 @@items: ItemSummary[];locationFlatTree?: FlatTreeItem[];pagination?: Pagination;+ disableSort?: boolean;}>();const emit = defineEmits<{@@ -27,8 +28,10 @@const preferences = useViewPreferences();const { t } = useI18n();const columns = computed(() =>- makeColumns(t, () => {- emit("refresh");+ makeColumns({+ t,+ refresh: () => emit("refresh"),+ disableSort: props.disableSort,}));diff --git a/frontend/components/Item/View/Table.vue b/frontend/components/Item/View/Table.vueindex 90e8b002..d54ec376 100644--- a/frontend/components/Item/View/Table.vue+++ b/frontend/components/Item/View/Table.vue@@ -11,7 +11,7 @@const { t } = useI18n();- const columns = computed(() => makeColumns(t).filter(c => c.enableHiding !== false));+ const columns = computed(() => makeColumns({ t }).filter(c => c.enableHiding !== false));</script><template>diff --git a/frontend/components/Item/View/table/columns.ts b/frontend/components/Item/View/table/columns.tsindex 7dbcb658..449ea87c 100644--- a/frontend/components/Item/View/table/columns.ts+++ b/frontend/components/Item/View/table/columns.ts@@ -13,18 +13,30 @@ import { cn } from "~/lib/utils";* Create columns with i18n support.* Pass `t` from useI18n() when creating the columns in your component.*/-export function makeColumns(t: (key: string) => string, refresh?: () => void): ColumnDef<ItemSummary>[] {+export function makeColumns({+ t,+ refresh,+ disableSort,+}: {+ t: (key: string) => string;+ refresh?: () => void;+ disableSort?: boolean;+}): ColumnDef<ItemSummary>[] {const sortable = (column: Column<ItemSummary, unknown>, key: string) => {const sortState = column.getIsSorted(); // 'asc' | 'desc' | falseif (!sortState) {// show the neutral up/down icon when not sorted- return [t(key), h(ArrowUpDown, { class: "ml-2 h-4 w-4 opacity-40" })];+ return [t(key), h(ArrowUpDown, { class: cn(["ml-2 h-4 w-4 opacity-40", disableSort && "opacity-0"]) })];}// show a single arrow that points up for asc (rotate-180) and down for descreturn [t(key),h(ArrowDown, {- class: cn(["ml-2 h-4 w-4 transition-transform opacity-100", sortState === "asc" ? "rotate-180" : ""]),+ class: cn([+ "ml-2 h-4 w-4 transition-transform opacity-100",+ sortState === "asc" ? "rotate-180" : "",+ disableSort && "opacity-0",+ ]),}),];};@@ -58,7 +70,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.asset_id")),@@ -72,7 +84,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.name")),@@ -86,7 +98,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.quantity")),@@ -100,7 +112,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.insured")),@@ -121,7 +133,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.purchase_price")),@@ -136,14 +148,14 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.location")),cell: ({ row }) => {const loc = (row.original as ItemSummary).location as { id: string; name: string } | null;if (loc) {- return h("NuxtLink", { to: `/location/${loc.id}`, class: "hover:underline text-sm" }, () => loc.name);+ return h("a", { href: `/location/${loc.id}`, class: "hover:underline text-sm" }, loc.name);}return h("div", { class: "text-sm text-muted-foreground" }, "");},@@ -156,7 +168,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.archived")),@@ -177,7 +189,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.created_at")),@@ -196,7 +208,7 @@ export function makeColumns(t: (key: string) => string, refresh?: () => void): CButton,{variant: "ghost",- onClick: () => column.toggleSorting(column.getIsSorted() === "asc"),+ onClick: () => !disableSort && column.toggleSorting(column.getIsSorted() === "asc"),},() => sortable(column, "items.updated_at")),diff --git a/frontend/components/Item/View/table/table-view.vue b/frontend/components/Item/View/table/table-view.vueindex abf74a4a..b8a1c9f6 100644--- a/frontend/components/Item/View/table/table-view.vue+++ b/frontend/components/Item/View/table/table-view.vue@@ -46,7 +46,9 @@v-for="cell in row.getVisibleCells()":key="cell.id":href="- cell.column.id !== 'select' && cell.column.id !== 'actions' ? `/item/${row.original.id}` : undefined+ cell.column.id !== 'select' && cell.column.id !== 'actions' && cell.column.id !== 'location'+ ? `/item/${row.original.id}`+ : undefined":class="cell.column.id === 'select' || cell.column.id === 'actions' ? 'w-10 px-3' : ''":compact="cell.column.id === 'select' || cell.column.id === 'actions'"diff --git a/frontend/pages/items.vue b/frontend/pages/items.vueindex cd2430bd..88217a56 100644--- a/frontend/pages/items.vue+++ b/frontend/pages/items.vue@@ -437,6 +437,7 @@<SelectValue :placeholder="$t('items.order_by')" /></SelectTrigger><SelectContent>+ <SelectItem value="name"> {{ $t("items.name") }} </SelectItem><SelectItem value="createdAt"> {{ $t("items.created_at") }} </SelectItem><SelectItem value="updatedAt"> {{ $t("items.updated_at") }} </SelectItem></SelectContent>@@ -509,6 +510,7 @@:items="items":location-flat-tree="locationFlatTree":pagination="pagination"+ disable-sort@refresh="async () => search()"/></section>