Skip to content

Web-console: update supervisors table #7799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clintropolis merged 20 commits into from
Jun 11, 2019
Merged

Web-console: update supervisors table #7799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
454a9ce
add new columns
mcbrewster May 30, 2019
938ec5e
fix syling
mcbrewster May 30, 2019
101104e
fix spaces
mcbrewster May 30, 2019
86350b0
update snapshots
mcbrewster May 30, 2019
383c018
fix Spelling
mcbrewster May 30, 2019
825dc45
fix capitalization
mcbrewster May 30, 2019
54eb705
reorder action dialog
mcbrewster May 30, 2019
757a094
set color using state
mcbrewster May 30, 2019
fc4e664
fix snapshots
mcbrewster May 30, 2019
395f5aa
fix array
mcbrewster May 30, 2019
a131242
update snapshots
mcbrewster May 31, 2019
328d40b
remove extra columns
mcbrewster Jun 10, 2019
ecafb75
update snapshots
mcbrewster Jun 10, 2019
8c9a1fd
remove merge conflicts
mcbrewster Jun 10, 2019
f2978cc
update snapshots
mcbrewster Jun 10, 2019
2a3cbf3
fixes
mcbrewster Jun 10, 2019
dbe690f
update snapshots
mcbrewster Jun 10, 2019
908f97a
use cell
mcbrewster Jun 10, 2019
8fc2c95
fix spacing
mcbrewster Jun 10, 2019
9904e69
update snapshot
mcbrewster Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified ...supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion web-console/src/utils/general.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export function booleanCustomTableFilter(filter: Filter, value: any): boolean {
return true;
}
if (value === null) return false;
const haystack = String(value.toLowerCase());
const haystack = String(value).toLowerCase();
const needleAndMode: NeedleAndMode = getNeedleAndMode(filter.value.toLowerCase());
const needle = needleAndMode.needle;
if (needleAndMode.mode === 'exact') {
Expand Down
Empty file modified web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap
100644 → 100755
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ exports[`tasks view matches snapshot 1`] = `
"accessor": [Function],
"id": "status",
"show": true,
"width": 300,
},
Object {
"Cell": [Function],
Expand Down
21 changes: 17 additions & 4 deletions web-console/src/views/task-view/tasks-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ function statusToColor(status: string): string {
}
}

function stateToColor(status: string): string {
switch (status) {
case 'UNHEALTHY_SUPERVISOR': return '#d5100a';
case 'UNHEALTHY_TASKS': return '#d5100a';
case 'PENDING': return '#ffbf00';
case `SUSPENDED`: return '#ffbf00';
case 'STOPPING': return '#d5100a';
case 'RUNNING': return '#2167d5';
default: return '#0a1500';
}
}

export class TasksView extends React.PureComponent<TasksViewProps, TasksViewState> {
private supervisorQueryManager: QueryManager<string, SupervisorQueryResultRow[]>;
private taskQueryManager: QueryManager<string, TaskQueryResultRow[]>;
Expand Down Expand Up @@ -464,12 +476,13 @@ ORDER BY "rank" DESC, "created_time" DESC`);
{
Header: 'Status',
id: 'status',
accessor: (row) => row.spec.suspended ? 'Suspended' : 'Running',
Cell: row => {
const value = row.value;
width: 300,
accessor: (row) => { return row.detailedState; },
Cell: (row) => {
const value = row.original.detailedState;
return <span>
<span
style={{ color: value === 'Suspended' ? '#d58512' : '#2167d5' }}
style={{ color: stateToColor(row.original.state)}}
>
&#x25cf;&nbsp;
</span>
Expand Down