Skip to content

fix(views): return column IDs from getColumnsArray() #3083

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
blizzz merged 1 commit into from
Oct 16, 2026
Merged

fix(views): return column IDs from getColumnsArray() #3083

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
2 changes: 1 addition & 1 deletion lib/Db/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function getColumnsArray(): array {

$columnSettings = $this->getColumnsSettingsArray();
usort($columnSettings, static fn (ViewColumnInformation $a, ViewColumnInformation $b) => $a->getOrder() - $b->getOrder());
return array_column($columnSettings, ViewColumnInformation::KEY_ID);
return array_map(static fn (ViewColumnInformation $column): int => $column->getId(), $columnSettings);
}

/**
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/Db/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,37 @@ public static function provideUnusableViewSettings(): array {
'sources of the wrong type' => ['{"cardBackgroundSource":"3","cardTitleSource":[]}'],
];
}

private function makeView(string $columns): View {
$view = new View();
$view->setColumns($columns);
return $view;
}

public function testGetColumnsArrayEmptyReturnsEmpty(): void {
$view = $this->makeView('');
$this->assertSame([], $view->getColumnsArray());
}

public function testGetColumnsArrayLegacyPlainIdFormat(): void {
// Legacy format: plain array of integer column IDs — order is derived from index
$view = $this->makeView(\json_encode([10, 20, 30]));
$this->assertSame([10, 20, 30], $view->getColumnsArray());
}

public function testGetColumnsArrayObjectFormatIsSortedByOrder(): void {
$view = $this->makeView(\json_encode([
['columnId' => 5, 'order' => 2, 'readonly' => false, 'mandatory' => false],
['columnId' => 3, 'order' => 1, 'readonly' => false, 'mandatory' => false],
]));
$this->assertSame([3, 5], $view->getColumnsArray());
}

public function testJsonSerializeReturnsColumnIds(): void {
$view = $this->makeView(\json_encode([
['columnId' => 5, 'order' => 2, 'readonly' => false, 'mandatory' => false],
['columnId' => 3, 'order' => 1, 'readonly' => false, 'mandatory' => false],
]));
$this->assertSame([3, 5], $view->jsonSerialize()['columns']);
}
}
Loading