fix kanbanboard sorting

This commit is contained in:
marlon-erler
2024-07-25 18:25:05 +02:00
parent 1fc3e9062b
commit 07a4cc5379
3 changed files with 46 additions and 15 deletions
+18 -6
View File
@@ -351,7 +351,7 @@
continue; continue;
values.add(stringEntryObjectValue); values.add(stringEntryObjectValue);
} }
return [...values.values()].sort(localeCompare); return [...values.values()];
} }
function checkDoesObjectMatchSearch(query, getStringsOfObject, object) { function checkDoesObjectMatchSearch(query, getStringsOfObject, object) {
if (query == "") return true; if (query == "") return true;
@@ -2690,14 +2690,22 @@
// src/View/ChatPages/boardKanbanPage.tsx // src/View/ChatPages/boardKanbanPage.tsx
function BoardKanbanPage(boardViewModel) { function BoardKanbanPage(boardViewModel) {
const categoryNameConverter = (categoryName) => {
return KanbanBoard(categoryName, boardViewModel);
};
return PropertyValueList( return PropertyValueList(
"category", "category",
(taskViewModel) => taskViewModel.task, (taskViewModel) => taskViewModel.task,
boardViewModel.taskViewModels, boardViewModel.taskViewModels,
(categories) => { (categories) => {
const sortedCategories = createProxyState(
[categories],
() => [...categories.value.values()].sort(localeCompare)
);
const categoryNameConverter = (categoryName) => {
const index = createProxyState(
[sortedCategories],
() => sortedCategories.value.indexOf(categoryName)
);
return KanbanBoard(categoryName, index, boardViewModel);
};
return /* @__PURE__ */ createElement( return /* @__PURE__ */ createElement(
"div", "div",
{ {
@@ -2708,7 +2716,7 @@
} }
); );
} }
function KanbanBoard(categoryName, boardViewModel) { function KanbanBoard(categoryName, index, boardViewModel) {
return FilteredList( return FilteredList(
{ category: categoryName }, { category: categoryName },
(taskViewModel) => taskViewModel.task, (taskViewModel) => taskViewModel.task,
@@ -2718,7 +2726,7 @@
function drop() { function drop() {
boardViewModel.handleDropWithinBoard(categoryName); boardViewModel.handleDropWithinBoard(categoryName);
} }
return /* @__PURE__ */ createElement("div", { class: "flex-column flex-no", "on:dragover": allowDrop, "on:drop": drop }, /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement( const view = /* @__PURE__ */ createElement("div", { class: "flex-column flex-no", "on:dragover": allowDrop, "on:drop": drop }, /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement(
"input", "input",
{ {
placeholder: translations.chatPage.task.renameCategoryInputPlaceholder, placeholder: translations.chatPage.task.renameCategoryInputPlaceholder,
@@ -2740,6 +2748,10 @@
"children:append": [taskViewModels, TaskViewModelToEntry] "children:append": [taskViewModels, TaskViewModelToEntry]
} }
)); ));
index.subscribe((newIndex) => {
view.style.order = newIndex;
});
return view;
} }
); );
} }
+1 -1
View File
@@ -90,7 +90,7 @@ export function collectObjectValuesForKey<T>(
values.add(stringEntryObjectValue); values.add(stringEntryObjectValue);
} }
return [...values.values()].sort(localeCompare); return [...values.values()];
} }
export function filterObjectsByWords<T>( export function filterObjectsByWords<T>(
+27 -8
View File
@@ -7,20 +7,30 @@ import { TaskCategoryBulkChangeViewModel } from "../../ViewModel/Utility/taskPro
import TaskViewModel from "../../ViewModel/Pages/taskViewModel"; import TaskViewModel from "../../ViewModel/Pages/taskViewModel";
import { TaskViewModelToEntry } from "../Components/taskEntry"; import { TaskViewModelToEntry } from "../Components/taskEntry";
import { allowDrop } from "../utility"; import { allowDrop } from "../utility";
import { localeCompare } from "../../Model/Utility/utility";
import { translations } from "../translations"; import { translations } from "../translations";
export function BoardKanbanPage(boardViewModel: BoardViewModel) { export function BoardKanbanPage(boardViewModel: BoardViewModel) {
const categoryNameConverter: React.StateItemConverter<string> = (
categoryName: string
) => {
return KanbanBoard(categoryName, boardViewModel);
};
return PropertyValueList( return PropertyValueList(
"category", "category",
(taskViewModel: TaskViewModel) => taskViewModel.task, (taskViewModel: TaskViewModel) => taskViewModel.task,
boardViewModel.taskViewModels, boardViewModel.taskViewModels,
(categories: React.ListState<string>) => { (categories: React.ListState<string>) => {
const sortedCategories: React.State<string[]> = React.createProxyState(
[categories],
() => [...categories.value.values()].sort(localeCompare)
);
const categoryNameConverter: React.StateItemConverter<string> = (
categoryName: string
) => {
const index: React.State<number> = React.createProxyState(
[sortedCategories],
() => sortedCategories.value.indexOf(categoryName)
);
return KanbanBoard(categoryName, index, boardViewModel);
};
return ( return (
<div <div
class="kanban-board-wrapper" class="kanban-board-wrapper"
@@ -31,7 +41,11 @@ export function BoardKanbanPage(boardViewModel: BoardViewModel) {
); );
} }
function KanbanBoard(categoryName: string, boardViewModel: BoardViewModel) { function KanbanBoard(
categoryName: string,
index: React.State<number>,
boardViewModel: BoardViewModel
) {
return FilteredList( return FilteredList(
{ category: categoryName }, { category: categoryName },
(taskViewModel: TaskViewModel) => taskViewModel.task, (taskViewModel: TaskViewModel) => taskViewModel.task,
@@ -44,7 +58,7 @@ function KanbanBoard(categoryName: string, boardViewModel: BoardViewModel) {
boardViewModel.handleDropWithinBoard(categoryName); boardViewModel.handleDropWithinBoard(categoryName);
} }
return ( const view = (
<div class="flex-column flex-no" on:dragover={allowDrop} on:drop={drop}> <div class="flex-column flex-no" on:dragover={allowDrop} on:drop={drop}>
<div class="flex-row width-input"> <div class="flex-row width-input">
<input <input
@@ -71,6 +85,11 @@ function KanbanBoard(categoryName: string, boardViewModel: BoardViewModel) {
></div> ></div>
</div> </div>
); );
index.subscribe((newIndex) => {
view.style.order = newIndex;
})
return view;
} }
); );
} }