From 454a9ce1ad13dc8bff413d1be39f29ea1d4af8a9 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 22:38:12 -0700 Subject: [PATCH 01/19] add new columns --- web-console/src/utils/general.tsx | 2 +- .../src/views/task-view/tasks-view.tsx | 87 ++++++++++++++++--- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/web-console/src/utils/general.tsx b/web-console/src/utils/general.tsx index 64ec28c09137..8395cb328300 100644 --- a/web-console/src/utils/general.tsx +++ b/web-console/src/utils/general.tsx @@ -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') { diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 942677e2cef7..27262a3d2e06 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -40,7 +40,7 @@ import { BasicAction } from '../../utils/basic-action'; import './tasks-view.scss'; -const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Status', ActionCell.COLUMN_LABEL]; +const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration Seconds', ActionCell.COLUMN_LABEL]; const taskTableColumns: string[] = ['Task ID', 'Type', 'Datasource', 'Location', 'Created time', 'Status', 'Duration', ActionCell.COLUMN_LABEL]; export interface TasksViewProps extends React.Props { @@ -181,6 +181,10 @@ export class TasksView extends React.Component { this.supervisorQueryManager = new QueryManager({ processQuery: async (query: string) => { const resp = await axios.get('/druid/indexer/v1/supervisor?full'); + const data = resp.data; + for ( let i = 0 ; i < data.length; i++) { + data[i].status = await axios.get(`/druid/indexer/v1/supervisor/${data[i].id}/status`); + } return resp.data; }, onStateChange: ({ result, loading, error }) => { @@ -462,21 +466,76 @@ ORDER BY "rank" DESC, "created_time" DESC`); show: supervisorTableColumnSelectionHandler.showColumn('Topic/Stream') }, { - Header: 'Status', + Header: 'Detailed status', id: 'status', - accessor: (row) => row.spec.suspended ? 'Suspended' : 'Running', - Cell: row => { - const value = row.value; - return - - ●  - - {value} - ; + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.detailedState; + }, + show: supervisorTableColumnSelectionHandler.showColumn('Detailed status') + }, + { + Header: 'Recent Errors', + id: 'errors', + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.recentErrors.length; + }, + show: supervisorTableColumnSelectionHandler.showColumn('Recent Errors') + }, + { + Header: 'Partitions', + id: 'partitiond', + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.partitions; + }, + show: supervisorTableColumnSelectionHandler.showColumn('Partitions') + }, + { + Header: 'Replicas', + id: 'replicas', + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.replicas; + }, + show: supervisorTableColumnSelectionHandler.showColumn('Replicas') + }, + { + Header: 'Partitions', + id: 'partitions', + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.partitions; + }, + show: supervisorTableColumnSelectionHandler.showColumn('Partitions') + }, + { + Header: 'Duration seconds', + id: 'seconds_duration', + accessor: (row) => { + const { status } = row; + if (!status) return ''; + const { data } = status; + if (!data) return ''; + return data.payload.durationSeconds; }, - show: supervisorTableColumnSelectionHandler.showColumn('Status') + show: supervisorTableColumnSelectionHandler.showColumn('Duration seconds') }, { Header: ActionCell.COLUMN_LABEL, From 938ec5e299c46b5650b4ea37d138facb45ff74c1 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:10:57 -0700 Subject: [PATCH 02/19] fix syling --- .../__snapshots__/tasks-view.spec.tsx.snap | 49 ++++++++--- .../src/views/task-view/tasks-view.tsx | 83 ++++++++++++++----- 2 files changed, 96 insertions(+), 36 deletions(-) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index d2f1cc665d14..99109aba92f5 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -36,7 +36,11 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Datasource", "Type", "Topic/Stream", - "Status", + "Detailed status", + "Recent errors", + "Replicas", + "Partitions", + "Duration Seconds", "Actions", ] } @@ -77,7 +81,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -90,7 +93,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -121,12 +123,41 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "show": true, }, Object { - "Cell": [Function], - "Header": "Status", + "Header": "Detailed status", "accessor": [Function], "id": "status", "show": true, }, + Object { + "Header": "Recent Errors", + "accessor": [Function], + "id": "errors", + "show": true, + }, + Object { + "Header": "Partitions", + "accessor": [Function], + "id": "partitiond", + "show": true, + }, + Object { + "Header": "Replicas", + "accessor": [Function], + "id": "replicas", + "show": true, + }, + Object { + "Header": "Partitions", + "accessor": [Function], + "id": "partitions", + "show": true, + }, + Object { + "Header": "Duration seconds", + "accessor": [Function], + "id": "seconds_duration", + "show": true, + }, Object { "Cell": [Function], "Header": "Actions", @@ -142,7 +173,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -191,7 +221,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -209,7 +238,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} @@ -411,7 +439,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -424,7 +451,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -502,7 +528,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -567,7 +592,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -586,7 +610,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 27262a3d2e06..6e34aa8cf4c7 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -40,7 +40,7 @@ import { BasicAction } from '../../utils/basic-action'; import './tasks-view.scss'; -const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration Seconds', ActionCell.COLUMN_LABEL]; +const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration Seconds', 'Aggragate lag', ActionCell.COLUMN_LABEL]; const taskTableColumns: string[] = ['Task ID', 'Type', 'Datasource', 'Location', 'Created time', 'Status', 'Duration', ActionCell.COLUMN_LABEL]; export interface TasksViewProps extends React.Props { @@ -109,6 +109,22 @@ function statusToColor(status: string): string { } } +function detailedStatusToColor(status: string): string { + switch (status) { + case 'RUNNING': return '#2167d5'; + case 'CONNECTING_TO_STREAM': return '#d5631a'; + case 'DISCOVERING_INITIAL_TASKS': return '#d5631a'; + case 'CREATING_TASKS': return '#d5631a'; + case 'SUSPENDED': return '#d5631a'; + case 'WAITING_TO_RUN': return '#d5631a'; + case 'SHUTTING_DOWN': return '#d5631a'; + case 'UNHEALTHY': return '#d5100a'; + case 'LOST_CONTACT_WITH_STREAM': return '#d5100a'; + case 'UNABLE_TO_CONNECT_TO_STREAM': return '#d5100a'; + default: return '#0a1500'; + } +} + export class TasksView extends React.Component { private supervisorQueryManager: QueryManager; private taskQueryManager: QueryManager; @@ -317,7 +333,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); onAction: () => this.setState({ terminateSupervisorId: id }) } ); - // @ts-ignore + return actions; } @@ -468,12 +484,23 @@ ORDER BY "rank" DESC, "created_time" DESC`); { Header: 'Detailed status', id: 'status', + width: 300, accessor: (row) => { const { status } = row; if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.detailedState; + const { payload } = data; + if (!payload) return ''; + const value = payload.detailedState; + return + + ●  + + {value} + ; }, show: supervisorTableColumnSelectionHandler.showColumn('Detailed status') }, @@ -485,19 +512,23 @@ ORDER BY "rank" DESC, "created_time" DESC`); if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.recentErrors.length; + const { payload } = data; + if (!payload) return ''; + return payload.recentErrors.length; }, show: supervisorTableColumnSelectionHandler.showColumn('Recent Errors') }, { Header: 'Partitions', - id: 'partitiond', + id: 'partitions', accessor: (row) => { const { status } = row; if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.partitions; + const { payload } = data; + if (!payload) return ''; + return payload.partitions; }, show: supervisorTableColumnSelectionHandler.showColumn('Partitions') }, @@ -509,33 +540,39 @@ ORDER BY "rank" DESC, "created_time" DESC`); if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.replicas; + const { payload } = data; + if (!payload) return ''; + return payload.replicas; }, show: supervisorTableColumnSelectionHandler.showColumn('Replicas') }, { - Header: 'Partitions', - id: 'partitions', + Header: 'Duration seconds', + id: 'seconds_duration', accessor: (row) => { const { status } = row; if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.partitions; + const { payload } = data; + if (!payload) return ''; + return payload.durationSeconds; }, - show: supervisorTableColumnSelectionHandler.showColumn('Partitions') + show: supervisorTableColumnSelectionHandler.showColumn('Duration seconds') }, { - Header: 'Duration seconds', - id: 'seconds_duration', + Header: 'Aggregate lag', + id: 'aggregat_lag', accessor: (row) => { const { status } = row; if (!status) return ''; const { data } = status; if (!data) return ''; - return data.payload.durationSeconds; + const { payload } = data; + if (!payload) return ''; + return payload.aggregateLag; }, - show: supervisorTableColumnSelectionHandler.showColumn('Duration seconds') + show: supervisorTableColumnSelectionHandler.showColumn('Aggragate lag') }, { Header: ActionCell.COLUMN_LABEL, @@ -858,19 +895,19 @@ ORDER BY "rank" DESC, "created_time" DESC`); { supervisorTableActionDialogId && this.setState({supervisorTableActionDialogId: null})} + isOpen + supervisorId={supervisorTableActionDialogId} + actions={supervisorTableActionDialogActions} + onClose={() => this.setState({supervisorTableActionDialogId: null})} /> } { taskTableActionDialogId && this.setState({taskTableActionDialogId: null})} + isOpen + taskId={taskTableActionDialogId} + actions={taskTableActionDialogActions} + onClose={() => this.setState({taskTableActionDialogId: null})} /> } ; From 101104ed1859500a7444946b7e240b46e6632788 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:16:02 -0700 Subject: [PATCH 03/19] fix spaces --- web-console/src/views/task-view/tasks-view.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 6e34aa8cf4c7..666e2aad8f9d 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -333,7 +333,6 @@ ORDER BY "rank" DESC, "created_time" DESC`); onAction: () => this.setState({ terminateSupervisorId: id }) } ); - return actions; } @@ -895,19 +894,19 @@ ORDER BY "rank" DESC, "created_time" DESC`); { supervisorTableActionDialogId && this.setState({supervisorTableActionDialogId: null})} + isOpen + supervisorId={supervisorTableActionDialogId} + actions={supervisorTableActionDialogActions} + onClose={() => this.setState({supervisorTableActionDialogId: null})} /> } { taskTableActionDialogId && this.setState({taskTableActionDialogId: null})} + isOpen + taskId={taskTableActionDialogId} + actions={taskTableActionDialogActions} + onClose={() => this.setState({taskTableActionDialogId: null})} /> } ; From 86350b031caa524d604a2bbbf4eae7b8960b2df4 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:18:41 -0700 Subject: [PATCH 04/19] update snapshots --- .../__snapshots__/datasource-view.spec.tsx.snap | 5 ----- .../__snapshots__/lookups-view.spec.tsx.snap | 5 ----- .../__snapshots__/segments-view.spec.tsx.snap | 5 ----- .../__snapshots__/servers-view.spec.tsx.snap | 5 ----- .../sql-view/__snapshots__/sql-view.spec.tsx.snap | 5 ----- .../task-view/__snapshots__/tasks-view.spec.tsx.snap | 12 +++++++----- 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap index 9d1065582ce1..516c111686ec 100644 --- a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap +++ b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap @@ -71,7 +71,6 @@ exports[`describe data source view data source view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -84,7 +83,6 @@ exports[`describe data source view data source view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -158,7 +156,6 @@ exports[`describe data source view data source view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -209,7 +206,6 @@ exports[`describe data source view data source view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -227,7 +223,6 @@ exports[`describe data source view data source view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap b/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap index fe2625abc5b7..2ef65d6af5d1 100644 --- a/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap +++ b/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap @@ -64,7 +64,6 @@ exports[`describe lookups view lookups view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -77,7 +76,6 @@ exports[`describe lookups view lookups view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -131,7 +129,6 @@ exports[`describe lookups view lookups view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -180,7 +177,6 @@ exports[`describe lookups view lookups view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -198,7 +194,6 @@ exports[`describe lookups view lookups view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap index f56b6a706f7d..ec973f4b274d 100644 --- a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap +++ b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap @@ -74,7 +74,6 @@ exports[`describe segments-view segments view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -87,7 +86,6 @@ exports[`describe segments-view segments view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -198,7 +196,6 @@ exports[`describe segments-view segments view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -264,7 +261,6 @@ exports[`describe segments-view segments view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -283,7 +279,6 @@ exports[`describe segments-view segments view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={false} showPageSizeOptions={true} diff --git a/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap b/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap index 6e987efd94d6..dee904dad6a0 100644 --- a/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap +++ b/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap @@ -92,7 +92,6 @@ exports[`describe servers view action servers view 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -105,7 +104,6 @@ exports[`describe servers view action servers view 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -204,7 +202,6 @@ exports[`describe servers view action servers view 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -255,7 +252,6 @@ exports[`describe servers view action servers view 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -274,7 +270,6 @@ exports[`describe servers view action servers view 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap index 68411a1fa7ed..4921e90cb60e 100644 --- a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap +++ b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap @@ -59,7 +59,6 @@ exports[`describe sql view sql view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, - "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -72,7 +71,6 @@ exports[`describe sql view sql view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, - "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -86,7 +84,6 @@ exports[`describe sql view sql view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} - defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -135,7 +132,6 @@ exports[`describe sql view sql view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" - pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -153,7 +149,6 @@ exports[`describe sql view sql view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} - rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index 99109aba92f5..638aa7d004a4 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -41,6 +41,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Replicas", "Partitions", "Duration Seconds", + "Aggragate lag", "Actions", ] } @@ -127,6 +128,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "accessor": [Function], "id": "status", "show": true, + "width": 300, }, Object { "Header": "Recent Errors", @@ -137,7 +139,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` Object { "Header": "Partitions", "accessor": [Function], - "id": "partitiond", + "id": "partitions", "show": true, }, Object { @@ -147,15 +149,15 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "show": true, }, Object { - "Header": "Partitions", + "Header": "Duration seconds", "accessor": [Function], - "id": "partitions", + "id": "seconds_duration", "show": true, }, Object { - "Header": "Duration seconds", + "Header": "Aggregate lag", "accessor": [Function], - "id": "seconds_duration", + "id": "aggregat_lag", "show": true, }, Object { From 383c018c9004bd0bf0132284271fbba456a17c2b Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:25:37 -0700 Subject: [PATCH 05/19] fix Spelling --- web-console/src/views/task-view/tasks-view.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 666e2aad8f9d..b63f27274c37 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -40,7 +40,7 @@ import { BasicAction } from '../../utils/basic-action'; import './tasks-view.scss'; -const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration Seconds', 'Aggragate lag', ActionCell.COLUMN_LABEL]; +const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration seconds', 'Aggragate lag', ActionCell.COLUMN_LABEL]; const taskTableColumns: string[] = ['Task ID', 'Type', 'Datasource', 'Location', 'Created time', 'Status', 'Duration', ActionCell.COLUMN_LABEL]; export interface TasksViewProps extends React.Props { @@ -504,7 +504,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); show: supervisorTableColumnSelectionHandler.showColumn('Detailed status') }, { - Header: 'Recent Errors', + Header: 'Recent errors', id: 'errors', accessor: (row) => { const { status } = row; From 825dc45ef1b03ba40fae257cbb098daa78a15408 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:26:54 -0700 Subject: [PATCH 06/19] fix capitalization --- web-console/src/views/task-view/tasks-view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index b63f27274c37..d9e01dd3494e 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -515,7 +515,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); if (!payload) return ''; return payload.recentErrors.length; }, - show: supervisorTableColumnSelectionHandler.showColumn('Recent Errors') + show: supervisorTableColumnSelectionHandler.showColumn('Recent errors') }, { Header: 'Partitions', From 54eb705ee9fdbda636f61cb2bde33c8bcc1b9e37 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Wed, 29 May 2019 23:29:23 -0700 Subject: [PATCH 07/19] reorder action dialog --- .../supervisor-table-action-dialog.tsx | 3 ++- .../views/task-view/__snapshots__/tasks-view.spec.tsx.snap | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web-console/src/dialogs/supervisor-table-action-dialog/supervisor-table-action-dialog.tsx b/web-console/src/dialogs/supervisor-table-action-dialog/supervisor-table-action-dialog.tsx index 46b9ff81b961..27cd0a4622eb 100644 --- a/web-console/src/dialogs/supervisor-table-action-dialog/supervisor-table-action-dialog.tsx +++ b/web-console/src/dialogs/supervisor-table-action-dialog/supervisor-table-action-dialog.tsx @@ -79,8 +79,9 @@ export class SupervisorTableActionDialog extends React.Component - {activeTab === 'payload' && } + {activeTab === 'status' && } + {activeTab === 'payload' && } {activeTab === 'stats' && } {activeTab === 'history' && } ; diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index 638aa7d004a4..f40b28b303b6 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -40,7 +40,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Recent errors", "Replicas", "Partitions", - "Duration Seconds", + "Duration seconds", "Aggragate lag", "Actions", ] @@ -131,7 +131,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "width": 300, }, Object { - "Header": "Recent Errors", + "Header": "Recent errors", "accessor": [Function], "id": "errors", "show": true, From 757a0945d7b5d98517203334f6ab97448e45cb65 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Thu, 30 May 2019 10:42:19 -0700 Subject: [PATCH 08/19] set color using state --- .../supervisor-table-action-dialog.spec.tsx.snap | 0 .../__snapshots__/lookups-view.spec.tsx.snap | 5 +++++ .../__snapshots__/segments-view.spec.tsx.snap | 5 +++++ .../__snapshots__/servers-view.spec.tsx.snap | 5 +++++ .../__snapshots__/sql-view.spec.tsx.snap | 5 +++++ web-console/src/views/task-view/tasks-view.tsx | 16 ++++++---------- 6 files changed, 26 insertions(+), 10 deletions(-) mode change 100644 => 100755 web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap mode change 100644 => 100755 web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap mode change 100644 => 100755 web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap mode change 100644 => 100755 web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap mode change 100644 => 100755 web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap diff --git a/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap b/web-console/src/dialogs/supervisor-table-action-dialog/__snapshots__/supervisor-table-action-dialog.spec.tsx.snap old mode 100644 new mode 100755 diff --git a/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap b/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap old mode 100644 new mode 100755 index 2ef65d6af5d1..fe2625abc5b7 --- a/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap +++ b/web-console/src/views/lookups-view/__snapshots__/lookups-view.spec.tsx.snap @@ -64,6 +64,7 @@ exports[`describe lookups view lookups view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -76,6 +77,7 @@ exports[`describe lookups view lookups view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -129,6 +131,7 @@ exports[`describe lookups view lookups view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -177,6 +180,7 @@ exports[`describe lookups view lookups view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -194,6 +198,7 @@ exports[`describe lookups view lookups view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap old mode 100644 new mode 100755 index ec973f4b274d..f56b6a706f7d --- a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap +++ b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap @@ -74,6 +74,7 @@ exports[`describe segments-view segments view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -86,6 +87,7 @@ exports[`describe segments-view segments view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -196,6 +198,7 @@ exports[`describe segments-view segments view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -261,6 +264,7 @@ exports[`describe segments-view segments view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -279,6 +283,7 @@ exports[`describe segments-view segments view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={false} showPageSizeOptions={true} diff --git a/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap b/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap old mode 100644 new mode 100755 index dee904dad6a0..6e987efd94d6 --- a/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap +++ b/web-console/src/views/servers-view/__snapshots__/servers-view.spec.tsx.snap @@ -92,6 +92,7 @@ exports[`describe servers view action servers view 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -104,6 +105,7 @@ exports[`describe servers view action servers view 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -202,6 +204,7 @@ exports[`describe servers view action servers view 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -252,6 +255,7 @@ exports[`describe servers view action servers view 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -270,6 +274,7 @@ exports[`describe servers view action servers view 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap old mode 100644 new mode 100755 index 4921e90cb60e..68411a1fa7ed --- a/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap +++ b/web-console/src/views/sql-view/__snapshots__/sql-view.spec.tsx.snap @@ -59,6 +59,7 @@ exports[`describe sql view sql view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -71,6 +72,7 @@ exports[`describe sql view sql view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -84,6 +86,7 @@ exports[`describe sql view sql view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -132,6 +135,7 @@ exports[`describe sql view sql view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -149,6 +153,7 @@ exports[`describe sql view sql view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index d9e01dd3494e..5106e7b9d2a3 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -109,18 +109,14 @@ function statusToColor(status: string): string { } } -function detailedStatusToColor(status: string): string { +function stateToColor(status: string): string { switch (status) { case 'RUNNING': return '#2167d5'; - case 'CONNECTING_TO_STREAM': return '#d5631a'; - case 'DISCOVERING_INITIAL_TASKS': return '#d5631a'; - case 'CREATING_TASKS': return '#d5631a'; case 'SUSPENDED': return '#d5631a'; - case 'WAITING_TO_RUN': return '#d5631a'; - case 'SHUTTING_DOWN': return '#d5631a'; - case 'UNHEALTHY': return '#d5100a'; - case 'LOST_CONTACT_WITH_STREAM': return '#d5100a'; - case 'UNABLE_TO_CONNECT_TO_STREAM': return '#d5100a'; + case 'PENDING': return '#d5631a'; + case 'UNHEALTHY_SUPERVISOR': return '#d5100a'; + case 'UNHEALTHY_TASKS': return '#d5100a'; + case 'STOPPING': return '#d5100a'; default: return '#0a1500'; } } @@ -494,7 +490,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); const value = payload.detailedState; return ●  From fc4e664eba97cf95d632ddf33afb4dfb82b59b97 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Thu, 30 May 2019 10:46:39 -0700 Subject: [PATCH 09/19] fix snapshots --- .../__snapshots__/datasource-view.spec.tsx.snap | 5 +++++ 1 file changed, 5 insertions(+) mode change 100644 => 100755 web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap diff --git a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap old mode 100644 new mode 100755 index 516c111686ec..9d1065582ce1 --- a/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap +++ b/web-console/src/views/datasource-view/__snapshots__/datasource-view.spec.tsx.snap @@ -71,6 +71,7 @@ exports[`describe data source view data source view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -83,6 +84,7 @@ exports[`describe data source view data source view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -156,6 +158,7 @@ exports[`describe data source view data source view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={50} defaultResized={Array []} defaultSortDesc={false} @@ -206,6 +209,7 @@ exports[`describe data source view data source view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -223,6 +227,7 @@ exports[`describe data source view data source view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} From 395f5aa785203f21ed20267d489cdd8d23c320e4 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Thu, 30 May 2019 16:38:32 -0700 Subject: [PATCH 10/19] fix array --- web-console/src/views/task-view/tasks-view.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 5106e7b9d2a3..ed3c4dbd53d8 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -194,9 +194,9 @@ export class TasksView extends React.Component { processQuery: async (query: string) => { const resp = await axios.get('/druid/indexer/v1/supervisor?full'); const data = resp.data; - for ( let i = 0 ; i < data.length; i++) { - data[i].status = await axios.get(`/druid/indexer/v1/supervisor/${data[i].id}/status`); - } + data.forEach( async (item: any ) => { + item.status = await axios.get(`/druid/indexer/v1/supervisor/${item.id}/status`); + }); return resp.data; }, onStateChange: ({ result, loading, error }) => { From a131242b528ee50df8dffa281a98993447d34c93 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Thu, 30 May 2019 17:45:55 -0700 Subject: [PATCH 11/19] update snapshots --- .../task-view/__snapshots__/tasks-view.spec.tsx.snap | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index f40b28b303b6..62065d32ef14 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -82,6 +82,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -94,6 +95,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -175,6 +177,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -223,6 +226,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` ofText="of" onFetchData={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -240,6 +244,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} @@ -441,6 +446,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "Header": undefined, "Pivot": undefined, "PivotValue": undefined, + "Placeholder": undefined, "aggregate": undefined, "className": "", "filterAll": false, @@ -453,6 +459,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "getProps": [Function], "headerClassName": "", "headerStyle": Object {}, + "minResizeWidth": 11, "minWidth": 100, "resizable": undefined, "show": true, @@ -530,6 +537,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` defaultExpanded={Object {}} defaultFilterMethod={[Function]} defaultFiltered={Array []} + defaultPage={0} defaultPageSize={20} defaultResized={Array []} defaultSortDesc={false} @@ -594,6 +602,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` onFetchData={[Function]} onFilteredChange={[Function]} originalKey="_original" + pageJumpText="jump to page" pageSizeOptions={ Array [ 5, @@ -612,6 +621,7 @@ exports[`describe tasks view tasks view snapshot 1`] = ` previousText="Previous" resizable={true} resolveData={[Function]} + rowsSelectorText="rows per page" rowsText="rows" showPageJump={true} showPageSizeOptions={true} From 328d40ba8d60522bfee071c740fb78d12e1e5ced Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Sun, 9 Jun 2019 19:39:50 -0700 Subject: [PATCH 12/19] remove extra columns --- .../src/views/task-view/tasks-view.tsx | 83 +------------------ 1 file changed, 1 insertion(+), 82 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index ed3c4dbd53d8..77d76405caf1 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -109,17 +109,6 @@ function statusToColor(status: string): string { } } -function stateToColor(status: string): string { - switch (status) { - case 'RUNNING': return '#2167d5'; - case 'SUSPENDED': return '#d5631a'; - case 'PENDING': return '#d5631a'; - case 'UNHEALTHY_SUPERVISOR': return '#d5100a'; - case 'UNHEALTHY_TASKS': return '#d5100a'; - case 'STOPPING': return '#d5100a'; - default: return '#0a1500'; - } -} export class TasksView extends React.Component { private supervisorQueryManager: QueryManager; @@ -490,7 +479,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); const value = payload.detailedState; return ●  @@ -499,76 +488,6 @@ ORDER BY "rank" DESC, "created_time" DESC`); }, show: supervisorTableColumnSelectionHandler.showColumn('Detailed status') }, - { - Header: 'Recent errors', - id: 'errors', - accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - return payload.recentErrors.length; - }, - show: supervisorTableColumnSelectionHandler.showColumn('Recent errors') - }, - { - Header: 'Partitions', - id: 'partitions', - accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - return payload.partitions; - }, - show: supervisorTableColumnSelectionHandler.showColumn('Partitions') - }, - { - Header: 'Replicas', - id: 'replicas', - accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - return payload.replicas; - }, - show: supervisorTableColumnSelectionHandler.showColumn('Replicas') - }, - { - Header: 'Duration seconds', - id: 'seconds_duration', - accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - return payload.durationSeconds; - }, - show: supervisorTableColumnSelectionHandler.showColumn('Duration seconds') - }, - { - Header: 'Aggregate lag', - id: 'aggregat_lag', - accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - return payload.aggregateLag; - }, - show: supervisorTableColumnSelectionHandler.showColumn('Aggragate lag') - }, { Header: ActionCell.COLUMN_LABEL, id: ActionCell.COLUMN_ID, From ecafb75dace30e0492cc412b8071d46289e6d867 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Sun, 9 Jun 2019 20:08:01 -0700 Subject: [PATCH 13/19] update snapshots --- .../__snapshots__/tasks-view.spec.tsx.snap | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index 62065d32ef14..76e95df133b9 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -132,36 +132,6 @@ exports[`describe tasks view tasks view snapshot 1`] = ` "show": true, "width": 300, }, - Object { - "Header": "Recent errors", - "accessor": [Function], - "id": "errors", - "show": true, - }, - Object { - "Header": "Partitions", - "accessor": [Function], - "id": "partitions", - "show": true, - }, - Object { - "Header": "Replicas", - "accessor": [Function], - "id": "replicas", - "show": true, - }, - Object { - "Header": "Duration seconds", - "accessor": [Function], - "id": "seconds_duration", - "show": true, - }, - Object { - "Header": "Aggregate lag", - "accessor": [Function], - "id": "aggregat_lag", - "show": true, - }, Object { "Cell": [Function], "Header": "Actions", From f2978ccdd3d7ed001fee9d6f9b807fae6b7a2c7a Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Sun, 9 Jun 2019 20:27:07 -0700 Subject: [PATCH 14/19] update snapshots --- .../views/task-view/__snapshots__/tasks-view.spec.tsx.snap | 5 ----- web-console/src/views/task-view/tasks-view.tsx | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index 3a57edb4fbc7..87910452866d 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -37,11 +37,6 @@ exports[`tasks view matches snapshot 1`] = ` "Type", "Topic/Stream", "Detailed status", - "Recent errors", - "Replicas", - "Partitions", - "Duration seconds", - "Aggragate lag", "Actions", ] } diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 59aac7b6a4d3..b8d35ed688c9 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -40,7 +40,7 @@ import { BasicAction } from '../../utils/basic-action'; import './tasks-view.scss'; -const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', 'Recent errors', 'Replicas', 'Partitions', 'Duration seconds', 'Aggragate lag', ActionCell.COLUMN_LABEL]; +const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', ActionCell.COLUMN_LABEL]; const taskTableColumns: string[] = ['Task ID', 'Type', 'Datasource', 'Location', 'Created time', 'Status', 'Duration', ActionCell.COLUMN_LABEL]; export interface TasksViewProps extends React.Props { From 2a3cbf38447827d5316ea6fe92cef49962b0a926 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Sun, 9 Jun 2019 23:07:26 -0700 Subject: [PATCH 15/19] fixes --- .../src/views/task-view/tasks-view.tsx | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index b8d35ed688c9..4ca929ff7314 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -40,7 +40,7 @@ import { BasicAction } from '../../utils/basic-action'; import './tasks-view.scss'; -const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Detailed status', ActionCell.COLUMN_LABEL]; +const supervisorTableColumns: string[] = ['Datasource', 'Type', 'Topic/Stream', 'Status', ActionCell.COLUMN_LABEL]; const taskTableColumns: string[] = ['Task ID', 'Type', 'Datasource', 'Location', 'Created time', 'Status', 'Duration', ActionCell.COLUMN_LABEL]; export interface TasksViewProps extends React.Props { @@ -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 { private supervisorQueryManager: QueryManager; private taskQueryManager: QueryManager; @@ -181,10 +193,6 @@ export class TasksView extends React.PureComponent { const resp = await axios.get('/druid/indexer/v1/supervisor?full'); - const data = resp.data; - data.forEach( async (item: any ) => { - item.status = await axios.get(`/druid/indexer/v1/supervisor/${item.id}/status`); - }); return resp.data; }, onStateChange: ({ result, loading, error }) => { @@ -466,28 +474,24 @@ ORDER BY "rank" DESC, "created_time" DESC`); show: supervisorTableColumnSelectionHandler.showColumn('Topic/Stream') }, { - Header: 'Detailed status', + Header: 'Status', id: 'status', width: 300, accessor: (row) => { - const { status } = row; - if (!status) return ''; - const { data } = status; - if (!data) return ''; - const { payload } = data; - if (!payload) return ''; - const value = payload.detailedState; + console.log(row); + const value = row.detailedState; return ●  {value} ; }, - show: supervisorTableColumnSelectionHandler.showColumn('Detailed status') + show: supervisorTableColumnSelectionHandler.showColumn('Status') }, + { Header: ActionCell.COLUMN_LABEL, id: ActionCell.COLUMN_ID, From dbe690f72bb7e4b73eb781e1e44ef737810861ba Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Mon, 10 Jun 2019 13:51:17 -0700 Subject: [PATCH 16/19] update snapshots --- .../views/task-view/__snapshots__/tasks-view.spec.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index 87910452866d..cdb1297ae9c2 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -36,7 +36,7 @@ exports[`tasks view matches snapshot 1`] = ` "Datasource", "Type", "Topic/Stream", - "Detailed status", + "Status", "Actions", ] } @@ -121,7 +121,7 @@ exports[`tasks view matches snapshot 1`] = ` "show": true, }, Object { - "Header": "Detailed status", + "Header": "Status", "accessor": [Function], "id": "status", "show": true, From 908f97a032c8dec7199d5b189c1b1351230afcf1 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Mon, 10 Jun 2019 15:15:24 -0700 Subject: [PATCH 17/19] use cell --- web-console/src/views/task-view/tasks-view.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 4ca929ff7314..2abcca137bb0 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -477,12 +477,12 @@ ORDER BY "rank" DESC, "created_time" DESC`); Header: 'Status', id: 'status', width: 300, - accessor: (row) => { - console.log(row); - const value = row.detailedState; + accessor: (row) => { return row.detailedState; }, + Cell: (row) =>{ + const value = row.original.detailedState; return ●  From 8fc2c95fb776e1b910794742edd7d559eca16325 Mon Sep 17 00:00:00 2001 From: Maggie Brewster Date: Mon, 10 Jun 2019 15:17:56 -0700 Subject: [PATCH 18/19] fix spacing --- web-console/src/views/task-view/tasks-view.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web-console/src/views/task-view/tasks-view.tsx b/web-console/src/views/task-view/tasks-view.tsx index 2abcca137bb0..768a6861ca75 100644 --- a/web-console/src/views/task-view/tasks-view.tsx +++ b/web-console/src/views/task-view/tasks-view.tsx @@ -478,7 +478,7 @@ ORDER BY "rank" DESC, "created_time" DESC`); id: 'status', width: 300, accessor: (row) => { return row.detailedState; }, - Cell: (row) =>{ + Cell: (row) => { const value = row.original.detailedState; return Date: Mon, 10 Jun 2019 16:54:00 -0700 Subject: [PATCH 19/19] update snapshot --- .../src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap | 1 + 1 file changed, 1 insertion(+) diff --git a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap index cdb1297ae9c2..a01963f57cac 100644 --- a/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap +++ b/web-console/src/views/task-view/__snapshots__/tasks-view.spec.tsx.snap @@ -121,6 +121,7 @@ exports[`tasks view matches snapshot 1`] = ` "show": true, }, Object { + "Cell": [Function], "Header": "Status", "accessor": [Function], "id": "status",