Skip to content

Commit 82c46f4

Browse files
author
epriestley
committedApr 14, 2019
Update "add panel" and "remove panel" Dashboard flows to the new panel storage format
Summary: Depends on D20407. Ref T13272. This updates the "add panel" (which has two flavors: "add existing" and "create new") and "remove panel" flows to work with the new duplicate-friendly storage format. - We now modify panels by "panelKey", not by panel PHID, so one dashboard may have multiple copies of the same panel and we can still figure out what's going on. - We now work with "contextPHID", not "dashboardID", to make some flows with tab panels (or other nested panels in the future) easier. The only major remaining flow is the Javascript "move panels around with drag-and-drop" flow. Test Plan: - Added panels to a dashboard with "Create New Panel". - Added panels to a dashboard with "Add Existing Panel". - Removed panels from a dashboard. - Added and removed duplicate panels, got a correctly-functioning dashboard that didn't care about duplicates. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13272 Differential Revision: https://secure.phabricator.com/D20408
1 parent a3c43c4 commit 82c46f4

18 files changed

+574
-413
lines changed
 

‎resources/celerity/map.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'conpherence.pkg.css' => '3c8a0668',
1111
'conpherence.pkg.js' => '020aebcf',
1212
'core.pkg.css' => '294e365c',
13-
'core.pkg.js' => '794952ae',
13+
'core.pkg.js' => '69247edd',
1414
'differential.pkg.css' => '8d8360fb',
1515
'differential.pkg.js' => '67e02996',
1616
'diffusion.pkg.css' => '42c75c37',
@@ -371,7 +371,7 @@
371371
'rsrc/js/application/conpherence/behavior-toggle-widget.js' => '8f959ad0',
372372
'rsrc/js/application/countdown/timer.js' => '6a162524',
373373
'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => '3829a3cf',
374-
'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '09ecf50c',
374+
'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => 'a871fe00',
375375
'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '076bd092',
376376
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
377377
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
@@ -594,7 +594,7 @@
594594
'javelin-behavior-conpherence-search' => '91befbcc',
595595
'javelin-behavior-countdown-timer' => '6a162524',
596596
'javelin-behavior-dark-console' => 'f39d968b',
597-
'javelin-behavior-dashboard-async-panel' => '09ecf50c',
597+
'javelin-behavior-dashboard-async-panel' => 'a871fe00',
598598
'javelin-behavior-dashboard-move-panels' => '076bd092',
599599
'javelin-behavior-dashboard-query-panel-select' => '1e413dc9',
600600
'javelin-behavior-dashboard-tab-panel' => '0116d3e8',
@@ -982,11 +982,6 @@
982982
'herald-rule-editor',
983983
'javelin-behavior',
984984
),
985-
'09ecf50c' => array(
986-
'javelin-behavior',
987-
'javelin-dom',
988-
'javelin-workflow',
989-
),
990985
'0ad8d31f' => array(
991986
'javelin-behavior',
992987
'javelin-stratcom',
@@ -1794,6 +1789,11 @@
17941789
'javelin-install',
17951790
'javelin-dom',
17961791
),
1792+
'a871fe00' => array(
1793+
'javelin-behavior',
1794+
'javelin-dom',
1795+
'javelin-workflow',
1796+
),
17971797
'a9942052' => array(
17981798
'javelin-behavior',
17991799
'javelin-dom',

‎src/__phutil_library_map__.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -2906,7 +2906,7 @@
29062906
'PhabricatorDarkConsoleTabSetting' => 'applications/settings/setting/PhabricatorDarkConsoleTabSetting.php',
29072907
'PhabricatorDarkConsoleVisibleSetting' => 'applications/settings/setting/PhabricatorDarkConsoleVisibleSetting.php',
29082908
'PhabricatorDashboard' => 'applications/dashboard/storage/PhabricatorDashboard.php',
2909-
'PhabricatorDashboardAddPanelController' => 'applications/dashboard/controller/PhabricatorDashboardAddPanelController.php',
2909+
'PhabricatorDashboardAdjustController' => 'applications/dashboard/controller/dashboard/PhabricatorDashboardAdjustController.php',
29102910
'PhabricatorDashboardApplication' => 'applications/dashboard/application/PhabricatorDashboardApplication.php',
29112911
'PhabricatorDashboardApplicationInstallWorkflow' => 'applications/dashboard/install/PhabricatorDashboardApplicationInstallWorkflow.php',
29122912
'PhabricatorDashboardArchiveController' => 'applications/dashboard/controller/dashboard/PhabricatorDashboardArchiveController.php',
@@ -2927,7 +2927,6 @@
29272927
'PhabricatorDashboardInstall' => 'applications/dashboard/storage/PhabricatorDashboardInstall.php',
29282928
'PhabricatorDashboardInstallController' => 'applications/dashboard/controller/dashboard/PhabricatorDashboardInstallController.php',
29292929
'PhabricatorDashboardInstallWorkflow' => 'applications/dashboard/install/PhabricatorDashboardInstallWorkflow.php',
2930-
'PhabricatorDashboardLayoutConfig' => 'applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php',
29312930
'PhabricatorDashboardLayoutMode' => 'applications/dashboard/layoutconfig/PhabricatorDashboardLayoutMode.php',
29322931
'PhabricatorDashboardLayoutTransaction' => 'applications/dashboard/xaction/dashboard/PhabricatorDashboardLayoutTransaction.php',
29332932
'PhabricatorDashboardListController' => 'applications/dashboard/controller/PhabricatorDashboardListController.php',
@@ -2964,6 +2963,7 @@
29642963
'PhabricatorDashboardPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelType.php',
29652964
'PhabricatorDashboardPanelUsedByObjectEdgeType' => 'applications/search/edge/PhabricatorDashboardPanelUsedByObjectEdgeType.php',
29662965
'PhabricatorDashboardPanelViewController' => 'applications/dashboard/controller/panel/PhabricatorDashboardPanelViewController.php',
2966+
'PhabricatorDashboardPanelsTransaction' => 'applications/dashboard/xaction/dashboard/PhabricatorDashboardPanelsTransaction.php',
29672967
'PhabricatorDashboardPortal' => 'applications/dashboard/storage/PhabricatorDashboardPortal.php',
29682968
'PhabricatorDashboardPortalController' => 'applications/dashboard/controller/portal/PhabricatorDashboardPortalController.php',
29692969
'PhabricatorDashboardPortalDatasource' => 'applications/dashboard/typeahead/PhabricatorDashboardPortalDatasource.php',
@@ -2998,7 +2998,6 @@
29982998
'PhabricatorDashboardQueryPanelQueryTransaction' => 'applications/dashboard/xaction/panel/PhabricatorDashboardQueryPanelQueryTransaction.php',
29992999
'PhabricatorDashboardQueryPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php',
30003000
'PhabricatorDashboardRemarkupRule' => 'applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php',
3001-
'PhabricatorDashboardRemovePanelController' => 'applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php',
30023001
'PhabricatorDashboardRenderingEngine' => 'applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php',
30033002
'PhabricatorDashboardSchemaSpec' => 'applications/dashboard/storage/PhabricatorDashboardSchemaSpec.php',
30043003
'PhabricatorDashboardSearchEngine' => 'applications/dashboard/query/PhabricatorDashboardSearchEngine.php',
@@ -8906,7 +8905,7 @@
89068905
'PhabricatorNgramsInterface',
89078906
'PhabricatorDashboardPanelContainerInterface',
89088907
),
8909-
'PhabricatorDashboardAddPanelController' => 'PhabricatorDashboardController',
8908+
'PhabricatorDashboardAdjustController' => 'PhabricatorDashboardController',
89108909
'PhabricatorDashboardApplication' => 'PhabricatorApplication',
89118910
'PhabricatorDashboardApplicationInstallWorkflow' => 'PhabricatorDashboardInstallWorkflow',
89128911
'PhabricatorDashboardArchiveController' => 'PhabricatorDashboardController',
@@ -8927,7 +8926,6 @@
89278926
'PhabricatorDashboardInstall' => 'PhabricatorDashboardDAO',
89288927
'PhabricatorDashboardInstallController' => 'PhabricatorDashboardController',
89298928
'PhabricatorDashboardInstallWorkflow' => 'Phobject',
8930-
'PhabricatorDashboardLayoutConfig' => 'Phobject',
89318929
'PhabricatorDashboardLayoutMode' => 'Phobject',
89328930
'PhabricatorDashboardLayoutTransaction' => 'PhabricatorDashboardTransactionType',
89338931
'PhabricatorDashboardListController' => 'PhabricatorDashboardController',
@@ -8971,6 +8969,7 @@
89718969
'PhabricatorDashboardPanelType' => 'Phobject',
89728970
'PhabricatorDashboardPanelUsedByObjectEdgeType' => 'PhabricatorEdgeType',
89738971
'PhabricatorDashboardPanelViewController' => 'PhabricatorDashboardController',
8972+
'PhabricatorDashboardPanelsTransaction' => 'PhabricatorDashboardTransactionType',
89748973
'PhabricatorDashboardPortal' => array(
89758974
'PhabricatorDashboardDAO',
89768975
'PhabricatorApplicationTransactionInterface',
@@ -9013,7 +9012,6 @@
90139012
'PhabricatorDashboardQueryPanelQueryTransaction' => 'PhabricatorDashboardPanelPropertyTransaction',
90149013
'PhabricatorDashboardQueryPanelType' => 'PhabricatorDashboardPanelType',
90159014
'PhabricatorDashboardRemarkupRule' => 'PhabricatorObjectRemarkupRule',
9016-
'PhabricatorDashboardRemovePanelController' => 'PhabricatorDashboardController',
90179015
'PhabricatorDashboardRenderingEngine' => 'Phobject',
90189016
'PhabricatorDashboardSchemaSpec' => 'PhabricatorConfigSchemaSpec',
90199017
'PhabricatorDashboardSearchEngine' => 'PhabricatorApplicationSearchEngine',

‎src/applications/auth/engine/PhabricatorAuthSessionEngine.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public function logoutSession(
389389
* appropriate for one-time checks.
390390
*
391391
* @param PhabricatorUser User whose session needs to be in high security.
392-
* @param AphrontReqeust Current request.
392+
* @param AphrontRequest Current request.
393393
* @param string URI to return the user to if they cancel.
394394
* @return PhabricatorAuthHighSecurityToken Security token.
395395
* @task hisec
@@ -421,7 +421,7 @@ public function requireHighSecurityToken(
421421
* use @{method:requireHighSecurityToken}.
422422
*
423423
* @param PhabricatorUser User whose session needs to be in high security.
424-
* @param AphrontReqeust Current request.
424+
* @param AphrontRequest Current request.
425425
* @param string URI to return the user to if they cancel.
426426
* @param bool True to jump partial sessions directly into high
427427
* security instead of just upgrading them to full

‎src/applications/dashboard/application/PhabricatorDashboardApplication.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ public function getRoutes() {
4848
'(?:(?P<modeKey>[^/]+)/)?)?' =>
4949
'PhabricatorDashboardInstallController',
5050
'console/' => 'PhabricatorDashboardConsoleController',
51-
'addpanel/(?P<id>\d+)/' => 'PhabricatorDashboardAddPanelController',
5251
'movepanel/(?P<id>\d+)/' => 'PhabricatorDashboardMovePanelController',
53-
'removepanel/(?P<id>\d+)/'
54-
=> 'PhabricatorDashboardRemovePanelController',
52+
'adjust/(?P<op>remove|add)/'
53+
=> 'PhabricatorDashboardAdjustController',
5554
'panel/' => array(
5655
'install/(?P<engineKey>[^/]+)/(?:(?P<queryKey>[^/]+)/)?' =>
5756
'PhabricatorDashboardQueryPanelInstallController',

‎src/applications/dashboard/controller/PhabricatorDashboardAddPanelController.php

-103
This file was deleted.

‎src/applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php

-77
This file was deleted.

0 commit comments

Comments
 (0)
Failed to load comments.