@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
Make herald tokenizers copy values more correctly
Summary:
Fixes T10190. This is still a touch weird (newly typed tokens lose icons when copied) but basically works correctly. Saving/editing rules is fine, just some minor display glitching.
Fixing the icon thing is a little more involved.
Test Plan: Swapped Herald tokenizer fields around saw values (approximately) preserved.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T10190
Differential Revision: https://secure.phabricator.com/D15077
+22
-12
+11
-11
resources/celerity/map.php
+11
-11
resources/celerity/map.php
···
395
395
'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
396
396
'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
397
397
'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
398
-
'rsrc/js/application/herald/HeraldRuleEditor.js' => '5bd8f385',
398
+
'rsrc/js/application/herald/HeraldRuleEditor.js' => '746ca158',
399
399
'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
400
400
'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
401
401
'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
···
552
552
'global-drag-and-drop-css' => '697324ad',
553
553
'harbormaster-css' => 'b0758ca5',
554
554
'herald-css' => '826075fa',
555
-
'herald-rule-editor' => '5bd8f385',
555
+
'herald-rule-editor' => '746ca158',
556
556
'herald-test-css' => 'a52e323e',
557
557
'inline-comment-summary-css' => '51efda3a',
558
558
'javelin-aphlict' => '5359e785',
···
1245
1245
'javelin-uri',
1246
1246
'javelin-routable',
1247
1247
),
1248
-
'5bd8f385' => array(
1249
-
'multirow-row-manager',
1250
-
'javelin-install',
1251
-
'javelin-util',
1252
-
'javelin-dom',
1253
-
'javelin-stratcom',
1254
-
'javelin-json',
1255
-
'phabricator-prefab',
1256
-
),
1257
1248
'5c54cbf3' => array(
1258
1249
'javelin-behavior',
1259
1250
'javelin-stratcom',
···
1369
1360
'javelin-behavior',
1370
1361
'javelin-vector',
1371
1362
'javelin-dom',
1363
+
),
1364
+
'746ca158' => array(
1365
+
'multirow-row-manager',
1366
+
'javelin-install',
1367
+
'javelin-util',
1368
+
'javelin-dom',
1369
+
'javelin-stratcom',
1370
+
'javelin-json',
1371
+
'phabricator-prefab',
1372
1372
),
1373
1373
'76b9fc3e' => array(
1374
1374
'javelin-behavior',
+11
-1
webroot/rsrc/js/application/herald/HeraldRuleEditor.js
+11
-1
webroot/rsrc/js/application/herald/HeraldRuleEditor.js
···
293
293
},
294
294
function(map) {
295
295
for (var k in map) {
296
-
var v = JX.Prefab.transformDatasourceResults(map[k]);
296
+
var v = map[k];
297
+
298
+
// The control value may be set from wire values from the server,
299
+
// or a transformed value from another control, or a bare string
300
+
// value from another control.
301
+
if (typeof v == 'string') {
302
+
v = v;
303
+
} else if (!v.hasOwnProperty('id')) {
304
+
v = JX.Prefab.transformDatasourceResults(v);
305
+
}
306
+
297
307
build.tokenizer.addToken(k, v);
298
308
}
299
309
}];