revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-19 05:12:41 +01:00
Code Issues Releases Wiki Activity

Move token rendering into Datasources

Browse source 
Summary:
Ref T4100. I want to reduce the amount of code duplication that function datasources currently need to wrap some parameter datasource.

For example, `ProjectMembersDatasource` should really just be a little bit of logic on top of `ProjectsDatasource`, which should do most of the heavy lifting.

Moving rendering into datasources brings us a step closer to being able to do this.

Test Plan:
  - Rendered normal, function, and invalid tokens.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T4100

Differential Revision: https://secure.phabricator.com/D12457
This commit is contained in:
epriestley 2015-04-18 08:55:21 -07:00
parent a11dab59b0
commit 2bbe3b0cbf
2 changed files with 58 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
View file

@ -199,6 +199,62 @@ abstract class PhabricatorTypeaheadDatasource extends Phobject {
->setTokenType(PhabricatorTypeaheadTokenView::TYPE_INVALID);
}
public function renderTokens(array $values) {
$phids = array();
$setup = array();
$tokens = array();
foreach ($values as $key => $value) {
if (!self::isFunctionToken($value)) {
$phids[$key] = $value;
} else {
$function = $this->parseFunction($value);
if ($function) {
$setup[$function['name']][$key] = $function;
} else {
$name = pht('Invalid Function: %s', $value);
$tokens[$key] = $this->newInvalidToken($name)
->setKey($value);
}
}
}
if ($phids) {
$handles = $this->getViewer()->loadHandles($phids);
foreach ($phids as $key => $phid) {
$handle = $handles[$phid];
$tokens[$key] = PhabricatorTypeaheadTokenView::newFromHandle($handle);
}
}
if ($setup) {
foreach ($setup as $function_name => $argv_list) {
// Render the function tokens.
$function_tokens = $this->renderFunctionTokens(
$function_name,
ipull($argv_list, 'argv'));
// Rekey the function tokens using the original array keys.
$function_tokens = array_combine(
array_keys($argv_list),
$function_tokens);
// For any functions which were invalid, set their value to the
// original input value before it was parsed.
foreach ($function_tokens as $key => $token) {
$type = $token->getTokenType();
if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
$token->setKey($values[$key]);
}
}
$tokens += $function_tokens;
}
}
return array_select_keys($tokens, array_keys($values));
}
/* -( Token Functions )---------------------------------------------------- */

27
src/view/form/control/AphrontFormTokenizerControl.php
View file

@ -62,34 +62,11 @@ final class AphrontFormTokenizerControl extends AphrontFormControl {
$placeholder = $datasource->getPlaceholderText();
}
$tokens = array();
$values = nonempty($this->getValue(), array());
foreach ($values as $value) {
if (isset($handles[$value])) {
$token = PhabricatorTypeaheadTokenView::newFromHandle($handles[$value]);
} else {
$token = null;
$tokens = $datasource->renderTokens($values);
$function = $datasource->parseFunction($value);
if ($function) {
$token_list = $datasource->renderFunctionTokens(
$function['name'],
array($function['argv']));
$token = head($token_list);
}
if (!$token) {
$name = pht('Invalid Function: %s', $value);
$token = $datasource->newInvalidToken($name);
}
$type = $token->getTokenType();
if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
$token->setKey($value);
}
}
foreach ($tokens as $token) {
$token->setInputName($this->getName());
$tokens[] = $token;
}
$template = new AphrontTokenizerTemplateView();