@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
Update Deamons with new UI
Summary: Modernize and use newer UI
Test Plan: Bounce around various views.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D15574
+99
-79
+21
-16
src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
+21
-16
src/applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php
···
23
23
$crumbs = $this->buildApplicationCrumbs();
24
24
$crumbs->addTextCrumb(pht('Bulk Jobs'), '/daemon/bulk/');
25
25
$crumbs->addTextCrumb($title);
26
+
$crumbs->setBorder(true);
26
27
27
28
$properties = $this->renderProperties($job);
28
-
$actions = $this->renderActions($job);
29
-
$properties->setActionList($actions);
29
+
$curtain = $this->buildCurtainView($job);
30
30
31
31
$box = id(new PHUIObjectBoxView())
32
-
->setHeaderText($title)
32
+
->setHeaderText(pht('DETAILS'))
33
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
33
34
->addPropertyList($properties);
34
35
35
36
$timeline = $this->buildTransactionTimeline(
···
37
38
new PhabricatorWorkerBulkJobTransactionQuery());
38
39
$timeline->setShouldTerminate(true);
39
40
40
-
return $this->buildApplicationPage(
41
-
array(
42
-
$crumbs,
41
+
$header = id(new PHUIHeaderView())
42
+
->setHeader($title)
43
+
->setHeaderIcon('fa-hourglass');
44
+
45
+
$view = id(new PHUITwoColumnView())
46
+
->setHeader($header)
47
+
->setCurtain($curtain)
48
+
->setMainColumn(array(
43
49
$box,
44
50
$timeline,
45
-
),
46
-
array(
47
-
'title' => $title,
48
51
));
52
+
53
+
return $this->newPage()
54
+
->setTitle($title)
55
+
->setCrumbs($crumbs)
56
+
->appendChild($view);
49
57
}
50
58
51
59
private function renderProperties(PhabricatorWorkerBulkJob $job) {
···
64
72
return $view;
65
73
}
66
74
67
-
private function renderActions(PhabricatorWorkerBulkJob $job) {
75
+
private function buildCurtainView(PhabricatorWorkerBulkJob $job) {
68
76
$viewer = $this->getViewer();
69
-
70
-
$actions = id(new PhabricatorActionListView())
71
-
->setUser($viewer)
72
-
->setObject($job);
77
+
$curtain = $this->newCurtainView($job);
73
78
74
79
if ($job->isConfirming()) {
75
80
$continue_uri = $job->getMonitorURI();
···
77
82
$continue_uri = $job->getDoneURI();
78
83
}
79
84
80
-
$actions->addAction(
85
+
$curtain->addAction(
81
86
id(new PhabricatorActionView())
82
87
->setHref($continue_uri)
83
88
->setIcon('fa-arrow-circle-o-right')
84
89
->setName(pht('Continue')));
85
90
86
-
return $actions;
91
+
return $curtain;
87
92
}
88
93
89
94
}
+8
-10
src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
+8
-10
src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
···
117
117
'n',
118
118
));
119
119
120
-
$completed_panel = new PHUIObjectBoxView();
121
-
$completed_panel->setHeaderText(
122
-
pht('Recently Completed Tasks (Last 15m)'));
123
-
$completed_panel->setTable($completed_table);
120
+
$completed_panel = id(new PHUIObjectBoxView())
121
+
->setHeaderText(pht('Recently Completed Tasks (Last 15m)'))
122
+
->setTable($completed_table);
124
123
125
124
$daemon_table = new PhabricatorDaemonLogListView();
126
125
$daemon_table->setUser($viewer);
127
126
$daemon_table->setDaemonLogs($logs);
128
127
129
-
$daemon_panel = new PHUIObjectBoxView();
128
+
$daemon_panel = id(new PHUIObjectBoxView());
130
129
$daemon_panel->setHeaderText(pht('Active Daemons'));
131
130
$daemon_panel->setObjectList($daemon_table);
132
131
···
218
217
$triggers_panel,
219
218
));
220
219
221
-
return $this->buildApplicationPage(
222
-
$nav,
223
-
array(
224
-
'title' => pht('Console'),
225
-
));
220
+
return $this->newPage()
221
+
->setTitle(pht('Console'))
222
+
->appendChild($nav);
223
+
226
224
}
227
225
228
226
private function buildTriggersTable(array $triggers) {
+16
-12
src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php
+16
-12
src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php
···
17
17
->setCombinedLog(true)
18
18
->setShowFullMessage(true);
19
19
20
-
$log_panel = new PHUIObjectBoxView();
21
-
$log_panel->setHeaderText(pht('Combined Log'));
22
-
$log_panel->appendChild($event_view);
20
+
$log_panel = id(new PHUIObjectBoxView())
21
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
22
+
->appendChild($event_view);
23
23
24
24
$daemon_id = $event->getLogID();
25
25
···
27
27
->addTextCrumb(
28
28
pht('Daemon %s', $daemon_id),
29
29
$this->getApplicationURI("log/{$daemon_id}/"))
30
-
->addTextCrumb(pht('Event %s', $event->getID()));
30
+
->addTextCrumb(pht('Event %s', $event->getID()))
31
+
->setBorder(true);
31
32
33
+
$header = id(new PHUIHeaderView())
34
+
->setHeader(pht('Combined Log'))
35
+
->setHeaderIcon('fa-file-text');
32
36
33
-
return $this->buildApplicationPage(
34
-
array(
35
-
$crumbs,
36
-
$log_panel,
37
-
),
38
-
array(
39
-
'title' => pht('Combined Daemon Log'),
40
-
));
37
+
$view = id(new PHUITwoColumnView())
38
+
->setHeader($header)
39
+
->setFooter($log_panel);
40
+
41
+
return $this->newPage()
42
+
->setTitle(pht('Combined Daemon Log'))
43
+
->appendChild($view);
44
+
41
45
}
42
46
43
47
}
+4
-5
src/applications/daemon/controller/PhabricatorDaemonLogListController.php
+4
-5
src/applications/daemon/controller/PhabricatorDaemonLogListController.php
···
31
31
$nav->appendChild($box);
32
32
$nav->appendChild($pager);
33
33
34
-
return $this->buildApplicationPage(
35
-
$nav,
36
-
array(
37
-
'title' => pht('All Daemons'),
38
-
));
34
+
return $this->newPage()
35
+
->setTitle(pht('All Daemons'))
36
+
->appendChild($nav);
37
+
39
38
}
40
39
41
40
}
+35
-24
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
+35
-24
src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
···
22
22
23
23
$crumbs = $this->buildApplicationCrumbs();
24
24
$crumbs->addTextCrumb(pht('Daemon %s', $log->getID()));
25
+
$crumbs->setBorder(true);
25
26
26
27
$header = id(new PHUIHeaderView())
27
-
->setHeader($log->getDaemon());
28
+
->setHeader($log->getDaemon())
29
+
->setHeaderIcon('fa-pied-piper-alt');
28
30
29
31
$tag = id(new PHUITagView())
30
32
->setType(PHUITagView::TYPE_STATE);
···
32
34
$status = $log->getStatus();
33
35
switch ($status) {
34
36
case PhabricatorDaemonLog::STATUS_UNKNOWN:
35
-
$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
36
-
$tag->setName(pht('Unknown'));
37
+
$color = 'orange';
38
+
$name = pht('Unknown');
39
+
$icon = 'fa-warning';
37
40
break;
38
41
case PhabricatorDaemonLog::STATUS_RUNNING:
39
-
$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
40
-
$tag->setName(pht('Running'));
42
+
$color = 'green';
43
+
$name = pht('Running');
44
+
$icon = 'fa-rocket';
41
45
break;
42
46
case PhabricatorDaemonLog::STATUS_DEAD:
43
-
$tag->setBackgroundColor(PHUITagView::COLOR_RED);
44
-
$tag->setName(pht('Dead'));
47
+
$color = 'red';
48
+
$name = pht('Dead');
49
+
$icon = 'fa-times';
45
50
break;
46
51
case PhabricatorDaemonLog::STATUS_WAIT:
47
-
$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
48
-
$tag->setName(pht('Waiting'));
52
+
$color = 'blue';
53
+
$name = pht('Waiting');
54
+
$icon = 'fa-clock-o';
49
55
break;
50
56
case PhabricatorDaemonLog::STATUS_EXITING:
51
-
$tag->setBackgroundColor(PHUITagView::COLOR_YELLOW);
52
-
$tag->setName(pht('Exiting'));
57
+
$color = 'yellow';
58
+
$name = pht('Exiting');
59
+
$icon = 'fa-check';
53
60
break;
54
61
case PhabricatorDaemonLog::STATUS_EXITED:
55
-
$tag->setBackgroundColor(PHUITagView::COLOR_GREY);
56
-
$tag->setName(pht('Exited'));
62
+
$color = 'bluegrey';
63
+
$name = pht('Exited');
64
+
$icon = 'fa-check';
57
65
break;
58
66
}
59
67
60
-
$header->addTag($tag);
68
+
$header->setStatus($icon, $color, $name);
61
69
62
70
$properties = $this->buildPropertyListView($log);
63
71
···
65
73
->setUser($viewer)
66
74
->setEvents($events);
67
75
68
-
$event_panel = new PHUIObjectBoxView();
69
-
$event_panel->setHeaderText(pht('Events'));
70
-
$event_panel->appendChild($event_view);
76
+
$event_panel = id(new PHUIObjectBoxView())
77
+
->setHeaderText(pht('Events'))
78
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
79
+
->appendChild($event_view);
71
80
72
81
$object_box = id(new PHUIObjectBoxView())
73
-
->setHeader($header)
74
82
->addPropertyList($properties);
75
83
76
-
return $this->buildApplicationPage(
77
-
array(
78
-
$crumbs,
84
+
$view = id(new PHUITwoColumnView())
85
+
->setHeader($header)
86
+
->setFooter(array(
79
87
$object_box,
80
88
$event_panel,
81
-
),
82
-
array(
83
-
'title' => pht('Daemon Log'),
84
89
));
90
+
91
+
return $this->newPage()
92
+
->setTitle(pht('Daemon Log'))
93
+
->setCrumbs($crumbs)
94
+
->appendChild($view);
95
+
85
96
}
86
97
87
98
private function buildPropertyListView(PhabricatorDaemonLog $daemon) {
+15
-12
src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
+15
-12
src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
···
31
31
$title = pht('Task %d', $task->getID());
32
32
33
33
$header = id(new PHUIHeaderView())
34
-
->setHeader(pht('Task %d (%s)',
34
+
->setHeader(pht('Task %d: %s',
35
35
$task->getID(),
36
-
$task->getTaskClass()));
36
+
$task->getTaskClass()))
37
+
->setHeaderIcon('fa-sort');
37
38
38
39
$properties = $this->buildPropertyListView($task);
39
40
40
41
$object_box = id(new PHUIObjectBoxView())
41
-
->setHeader($header)
42
+
->setHeaderText($title)
43
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
42
44
->addPropertyList($properties);
43
-
44
45
45
46
$retry_head = id(new PHUIHeaderView())
46
47
->setHeader(pht('Retries'));
···
49
50
50
51
$retry_box = id(new PHUIObjectBoxView())
51
52
->setHeader($retry_head)
53
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
52
54
->addPropertyList($retry_info);
53
55
54
56
$content = array(
···
59
61
60
62
$crumbs = $this->buildApplicationCrumbs();
61
63
$crumbs->addTextCrumb($title);
64
+
$crumbs->setBorder(true);
62
65
63
-
return $this->buildApplicationPage(
64
-
array(
65
-
$crumbs,
66
-
$content,
67
-
),
68
-
array(
69
-
'title' => $title,
70
-
));
66
+
$view = id(new PHUITwoColumnView())
67
+
->setHeader($header)
68
+
->setFooter($content);
69
+
70
+
return $this->newPage()
71
+
->setTitle($title)
72
+
->setCrumbs($crumbs)
73
+
->appendChild($view);
71
74
}
72
75
73
76
private function buildPropertyListView(