Skip to content

fix(registry): личный порядок колонок для всех ролей (#16, 2.4.3) #21

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
MaximilianKaufmannCode merged 1 commit into from
Jun 30, 2026
Merged

fix(registry): личный порядок колонок для всех ролей (#16, 2.4.3) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ Versioning policy: see [CONTRIBUTING.md](CONTRIBUTING.md#versioning).

## [Unreleased]

## [2.4.3] — 2026-06-30

### Fixed
- **Любой пользователь теперь может менять порядок колонок реестра под себя (issue #16).** Раньше перетаскивание колонок было доступно только администратору (порядок хранился общим на всю организацию), а редактор/наблюдатель могли лишь включать/выключать колонки. Теперь **порядок колонок — личная настройка** (как и видимость): каждый перетаскивает колонки «под себя» — стрелками ↑/↓ или мышью — и порядок сохраняется лично в браузере. Никто не меняет вид другим.

### Changed
- **Закрепление колонки и переименование колонки** остаются **только у администратора** (это общая для всех настройка-«по умолчанию»). Перетаскивание колонок администратором по-прежнему задаёт общий порядок по умолчанию для тех, кто ещё не настроил свой; «По умолчанию» в панели сбрасывает личный порядок.

> Только фронтенд: бэкенд, схема БД и публичный контракт не менялись (личный порядок хранится в localStorage, как видимость колонок). PATCH согласно [политике версионирования](CONTRIBUTING.md#versioning) — устранение дефекта доступа.

## [2.4.2] — 2026-06-30

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lotsman/web",
"version": "2.4.2",
"version": "2.4.3",
"license": "BUSL-1.1",
"private": true,
"type": "module",
Expand Down
79 changes: 67 additions & 12 deletions web/src/pages/registry/RegistryPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ import { ImportXlsxDialog } from "./ImportXlsxDialog";
// ── Constants ─────────────────────────────────────────────────────────────────

const COLUMN_VISIBILITY_STORAGE_KEY_PREFIX = "lotsman_column_visibility_";
// Personal column ORDER override (issue #16) — like visibility, the arrangement
// is per-user (localStorage). The tenant-wide admin order is the default seed.
const COLUMN_ORDER_STORAGE_KEY_PREFIX = "lotsman_column_order_";
// Base row height at font-scale 100 (the historical fixed value). The effective
// height is derived from the user's font scale so rows grow with the text
// instead of clipping/mis-centering it (see deriveRowHeight + useFontScale).
Expand Down Expand Up @@ -223,6 +226,38 @@ export function RegistryPage() {
[storageKey],
);

// ── Personal column order (localStorage per user — issue #16) ───────────────
// Reordering columns is a personal view preference: every role arranges their
// own columns. The admin's tenant-wide order (server) is the default seed used
// when a user has no personal order.
const orderStorageKey = `${COLUMN_ORDER_STORAGE_KEY_PREFIX}${userId}`;
const [personalColumnOrder, setPersonalColumnOrder] = React.useState<string[] | null>(() => {
try {
const stored = localStorage.getItem(orderStorageKey);
if (stored) {
const parsed = JSON.parse(stored) as unknown;
if (Array.isArray(parsed) && parsed.every((x) => typeof x === "string")) {
return parsed as string[];
}
}
} catch {
// localStorage blocked / parse failed — fall back to the tenant-wide order
}
return null;
});
const persistPersonalColumnOrder = React.useCallback(
(next: string[] | null) => {
setPersonalColumnOrder(next);
try {
if (next === null) localStorage.removeItem(orderStorageKey);
else localStorage.setItem(orderStorageKey, JSON.stringify(next));
} catch {
// private browsing — no crash
}
},
[orderStorageKey],
);

// ── Tenant-wide column order (US-N) ────────────────────────────────────────
const { data: columnOrderResp } = useColumnOrder();
const updateColumnOrder = useUpdateColumnOrder();
Expand Down Expand Up @@ -577,7 +612,9 @@ export function RegistryPage() {
// second (pin-left invariant — sticky positioning depends on this).
const effectiveColumnOrder = React.useMemo<ColumnOrderState>(() => {
const knownColIds = new Set<string>(columns.map((c) => c.id ?? "").filter(Boolean));
const stored = (columnOrderResp?.order ?? []).filter((id) => knownColIds.has(id));
// Personal order (this user) wins; the tenant-wide admin order is the seed.
const source = personalColumnOrder ?? columnOrderResp?.order ?? [];
const stored = source.filter((id) => knownColIds.has(id));
const fallback = stored.length > 0 ? stored : DEFAULT_COLUMN_ORDER;
const seen = new Set<string>(fallback);
const tail = Array.from(knownColIds).filter((id) => !seen.has(id));
Expand All @@ -590,7 +627,7 @@ export function RegistryPage() {
merged.splice(1, 0, effectivePinnedId);
}
return merged;
}, [columnOrderResp, columns, effectivePinnedId]);
}, [personalColumnOrder, columnOrderResp, columns, effectivePinnedId]);

// ── Table instance ─────────────────────────────────────────────────────────
const table = useReactTable({
Expand Down Expand Up @@ -963,6 +1000,9 @@ export function RegistryPage() {
order: [...DEFAULT_COLUMN_ORDER],
pinned_column_id: "asset_name",
});
} else {
// Drop this user's personal order → fall back to the default.
persistPersonalColumnOrder(null);
}
}}
onShowAll={() => {
Expand All @@ -975,14 +1015,21 @@ export function RegistryPage() {
}
persistColumnVisibility(all);
}}
canReorder={isAdmin}
canReorder={true}
canManageLayout={isAdmin}
pinnedColumnId={effectivePinnedId}
onReorder={(nextOrder) =>
updateColumnOrder.mutate({
order: nextOrder,
pinned_column_id: effectivePinnedId,
})
}
onReorder={(nextOrder) => {
if (isAdmin) {
// Admin reorder sets the tenant-wide default for everyone.
updateColumnOrder.mutate({
order: nextOrder,
pinned_column_id: effectivePinnedId,
});
} else {
// Editors/viewers arrange their own view (personal, localStorage).
persistPersonalColumnOrder(nextOrder);
}
}}
onEditColumn={
isAdmin
? (colId) => {
Expand Down Expand Up @@ -1600,6 +1647,7 @@ function ColumnVisibilityPanel({
onReset,
onShowAll,
canReorder,
canManageLayout,
pinnedColumnId,
onReorder,
onChangePinned,
Expand All @@ -1612,8 +1660,12 @@ function ColumnVisibilityPanel({
/** Show every column (including custom-field cf_* ones) — useful right
* after an import when the user wants the registry to mirror the xlsx. */
onShowAll: () => void;
/** True for admin role — gates reorder gestures and arrow buttons. */
/** Gates reorder gestures (drag handle + ↑/↓). Available to every role —
* reordering is a personal view preference (issue #16). */
canReorder: boolean;
/** Gates tenant-wide layout controls (pin column, rename column) — admin
* only, since these change the shared default for everyone. */
canManageLayout: boolean;
/** Currently pinned (sticky-left) column id. */
pinnedColumnId: string;
/** Called with the new full column order (incl. `select`) when the user
Expand Down Expand Up @@ -1747,6 +1799,7 @@ function ColumnVisibilityPanel({
index={idx}
lastIndex={visibleColumns.length - 1}
canReorder={canReorder}
canManageLayout={canManageLayout}
pinnedColumnId={pinnedColumnId}
onPin={() => onChangePinned(col.id)}
onMoveUp={() => {
Expand Down Expand Up @@ -1794,6 +1847,7 @@ function SortableColumnRow({
index,
lastIndex,
canReorder,
canManageLayout,
pinnedColumnId,
onPin,
onMoveUp,
Expand All @@ -1804,6 +1858,7 @@ function SortableColumnRow({
index: number;
lastIndex: number;
canReorder: boolean;
canManageLayout: boolean;
pinnedColumnId: string;
onPin: () => void;
onMoveUp: () => void;
Expand Down Expand Up @@ -1890,7 +1945,7 @@ function SortableColumnRow({
</label>
{canReorder && (
<span className="flex shrink-0 items-center">
{onEdit && (
{canManageLayout && onEdit && (
<button
type="button"
onClick={onEdit}
Expand All @@ -1901,7 +1956,7 @@ function SortableColumnRow({
<Pencil className="size-3.5" aria-hidden />
</button>
)}
{!isPinned && (
{canManageLayout && !isPinned && (
<button
type="button"
onClick={onPin}
Expand Down
Loading