Skip to content

Fixes for table #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vis97c merged 2 commits into from
May 19, 2026
Merged

Fixes for table #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
199f50e
fix(vue): deselect deleted items
vis97c May 15, 2026
b477292
fix(vue): correct theme type for pagination table
vis97c May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/components-vue/src/components/pagination/ContentTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
iGetPage,
iNodeFn,
iNodeStreamFn,
tProp,
tThemeModifier,
tThemeTuple,
} from "@open-xamu-co/ui-common-types";
Expand Down Expand Up @@ -146,7 +147,7 @@
noContentMessage?: string;
renderErrorMessage?: string;
tableProps?: Omit<iTableProps<Ti, TMi>, "nodes" | "refresh">;
theme?: tThemeModifier | tThemeTuple;
theme?: tThemeTuple | tProp<tThemeModifier>;
/**
* Whether to fetch data on client side only
*/
Expand Down
23 changes: 16 additions & 7 deletions packages/components-vue/src/components/table/Simple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,7 @@
*
* @batch
*/
async function deleteNodesAndRefresh(
nodes = props.nodes.filter((_, nodeIndex) => selectedNodes.value[nodeIndex])
) {
async function deleteNodesAndRefresh() {
// Request confirmation
const { value } = await Swal.firePrevent({
title: t("table_delete"),
Expand All @@ -644,11 +642,19 @@
// Display loader
Swal.fireLoader();

const queue = props.nodes.reduce<{ node: T; selectedIndex: number }[]>(
(acc, node, selectedIndex) => {
if (selectedNodes.value[selectedIndex]) acc.push({ node, selectedIndex });

return acc;
},
[]
);
const updatedNodes: T[] = [...props.nodes];
const streams: Promise<boolean | T>[] = [];
// Run processes in parallel, get deletion responses
const deleted: iNodeFnResponse<T>[] = await Promise.all(
nodes.map(async (node) => {
queue.map(async ({ node, selectedIndex }) => {
const [deletedNodeStream, ...response] = await useResolveNodeFn(
props.deleteNode?.(node)
);
Expand All @@ -660,10 +666,13 @@
streams.push(...stream);

// Remove deleted node
const nodeIndex = updatedNodes.findIndex(({ id }) => id === node.id);
const deletedIndex = updatedNodes.findIndex(({ id }) => id === node.id);

// Remove single node
if (nodeIndex > -1) updatedNodes.splice(nodeIndex, 1);
// Remove single node & clear selection
if (deletedIndex > -1) {
updatedNodes.splice(deletedIndex, 1);
selectedNodes.value[selectedIndex] = false;
}

return [deletedNode, ...response];
})
Expand Down
2 changes: 1 addition & 1 deletion packages/components-vue/src/types/props/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,5 +288,5 @@ export interface iTableChildProps<
*
* @batch
*/
deleteNodesAndRefresh(nodes?: Ti[]): Promise<void>;
deleteNodesAndRefresh(): Promise<void>;
}
Loading