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

Improve trigger editor behavior when switching to/from tokenizers

Browse source 
Summary:
Ref T13269. See D20329. When we switch trigger rule control types, reset the rule value.

Also, pick slightly nicer defaults for status/priority.

Test Plan:
  - Created a "Change Status To: X" rule.
  - Saved it.
  - Edited it.
  - Selected "Assign to" for the existing action's dropdown.
  - Before: tokenizer filled with nonsense.
  - After: tokenizer cleared.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T13269

Differential Revision: https://secure.phabricator.com/D20416
This commit is contained in:
epriestley 2019-04-13 09:02:30 -07:00
parent b8551bb5f9
commit 9532bfbb32
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/celerity/map.php
View file

@ -433,7 +433,7 @@ return array(
'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '600f440c', 'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '600f440c',
'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => '2bdadf1a', 'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => '2bdadf1a',
'rsrc/js/application/transactions/behavior-transaction-list.js' => '9cec214e', 'rsrc/js/application/transactions/behavior-transaction-list.js' => '9cec214e',
'rsrc/js/application/trigger/TriggerRule.js' => '1c60c3fc', 'rsrc/js/application/trigger/TriggerRule.js' => '41b7b4f6',
'rsrc/js/application/trigger/TriggerRuleControl.js' => '5faf27b9', 'rsrc/js/application/trigger/TriggerRuleControl.js' => '5faf27b9',
'rsrc/js/application/trigger/TriggerRuleEditor.js' => 'b49fd60c', 'rsrc/js/application/trigger/TriggerRuleEditor.js' => 'b49fd60c',
'rsrc/js/application/trigger/TriggerRuleType.js' => '4feea7d3', 'rsrc/js/application/trigger/TriggerRuleType.js' => '4feea7d3',
@ -894,7 +894,7 @@ return array(
'syntax-default-css' => '055fc231', 'syntax-default-css' => '055fc231',
'syntax-highlighting-css' => '4234f572', 'syntax-highlighting-css' => '4234f572',
'tokens-css' => 'ce5a50bd', 'tokens-css' => 'ce5a50bd',
'trigger-rule' => '1c60c3fc', 'trigger-rule' => '41b7b4f6',
'trigger-rule-control' => '5faf27b9', 'trigger-rule-control' => '5faf27b9',
'trigger-rule-editor' => 'b49fd60c', 'trigger-rule-editor' => 'b49fd60c',
'trigger-rule-type' => '4feea7d3', 'trigger-rule-type' => '4feea7d3',

2
src/applications/project/trigger/PhabricatorProjectTriggerManiphestPriorityRule.php
View file

@ -54,7 +54,7 @@ final class PhabricatorProjectTriggerManiphestPriorityRule
} }
protected function getDefaultValue() { protected function getDefaultValue() {
return head_key(ManiphestTaskPriority::getTaskPriorityMap()); return ManiphestTaskPriority::getDefaultPriority();
} }
protected function getPHUIXControlType() { protected function getPHUIXControlType() {

2
src/applications/project/trigger/PhabricatorProjectTriggerManiphestStatusRule.php
View file

@ -53,7 +53,7 @@ final class PhabricatorProjectTriggerManiphestStatusRule
} }
protected function getDefaultValue() { protected function getDefaultValue() {
return head_key(ManiphestTaskStatus::getTaskStatusMap()); return ManiphestTaskStatus::getDefaultClosedStatus();
} }
protected function getPHUIXControlType() { protected function getPHUIXControlType() {

19
webroot/rsrc/js/application/trigger/TriggerRule.js
View file

@ -98,7 +98,24 @@ JX.install('TriggerRule', {
}, },
_onTypeChange: function(control) { _onTypeChange: function(control) {
this.setType(control.value); var new_type = control.value;
this.setType(new_type);
// Before we build a new control, change the rule value to be appropriate
// for the new rule type.
// TODO: Currently, we set the rule value to the default value for the
// type. This works most of the time, but if the user selects type "A",
// makes a change to the value, selects type "B", then changes back to
// type "A", it would be better to retain their edit. This is currently
// difficult because of tokenizers: if you save their value, you get a
// list of PHIDs which do not restore cleanly into tokens later.
var editor = this.getEditor();
var type = editor.getType(new_type);
this.setValue(type.getDefaultValue());
this._rebuildValueControl(); this._rebuildValueControl();
}, },