recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix "Map omits required key" exception by comparing result order against modern field keys

Summary:
Sorting a Maniphest search query by custom fields throws a "Map returned omits required key" exception.

The `isCustomFieldOrderKey()` check still tested against legacy field key format (for example `[custom:]std:maniphest:deadline.due`) while the code passes modern field key format (for example `custom.deadline.due`).

After fixing this, `PhutilTypeSpec::checkMap()` throws an exception when a non-optional (extra) key `$column` is in `$columns` but not in the array of type parameters below to check against:
`"Got unexpected parameters: customfield, customfield.index.table, customfield.index.key"`
Thus add optional types for customfields in `buildPagingClauseFromMultipleColumns()` to allow them instead of throwing another exception.

Closes T15631

Test Plan:
* Have a custom field (with search: true) defined via http://phorge.localhost/config/edit/maniphest.custom-field-definitions/
* Have two tasks have the custom field set
* Go to http://phorge.localhost/maniphest/query/ , select the custom field (e.g. "Due Date (Reversed)") in the "Order By" field, and click the "Search" button. Iterate through the results via the "Next" button if needed

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15631

Differential Revision: https://we.phorge.it/D25504

Andre Klapper d42b3eb0 328aee03

+5 -2
+5 -2
src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
··· 735 735 array( 736 736 'table' => 'optional string|null', 737 737 'column' => 'string', 738 + 'customfield' => 'optional bool', 739 + 'customfield.index.key' => 'optional string', 740 + 'customfield.index.table' => 'optional string', 738 741 'value' => 'wild', 739 742 'type' => 'string', 740 743 'reverse' => 'optional bool', ··· 1747 1750 1748 1751 $map = array(); 1749 1752 foreach ($fields->getFields() as $field) { 1750 - $map['custom:'.$field->getFieldKey()] = $field->getValueForStorage(); 1753 + $map[$field->getModernFieldKey()] = $field->getValueForStorage(); 1751 1754 } 1752 1755 1753 1756 return $map; ··· 1758 1761 * @task customfield 1759 1762 */ 1760 1763 protected function isCustomFieldOrderKey($key) { 1761 - $prefix = 'custom:'; 1764 + $prefix = 'custom.'; 1762 1765 return !strncmp($key, $prefix, strlen($prefix)); 1763 1766 } 1764 1767