This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472

Merged
n-riesco merged 34 commits into from
Jul 3, 2018
Merged

Add scheduled query browser #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
adf348d
Add scheduler
mfix22 Jun 25, 2018
5f338ad
Add sort fns
mfix22 Jun 25, 2018
a7591a4
Move info to props and use defaultProps for mock
mfix22 Jun 25, 2018
72f6fc8
Create scheduled query button
mfix22 Jun 26, 2018
0608d45
Number bug fix
mfix22 Jun 26, 2018
3ddfde1
Fix search and sort
mfix22 Jun 26, 2018
5aa210e
Use rowGetter
mfix22 Jun 26, 2018
c666552
Use selectors
mfix22 Jun 26, 2018
29d7f0a
Remove stage 2 and 3 code
mfix22 Jun 26, 2018
a2fd188
fetch scheduled queries and add to store
briandennis Jun 27, 2018
9bc1a55
Add PropTypes
mfix22 Jun 27, 2018
d96e543
Fix column resize issue
mfix22 Jun 27, 2018
108793b
save all queries in the store and filter by connection in Settings co…
briandennis Jun 27, 2018
96ff033
Use react-click-outside, preview modal
mfix22 Jun 27, 2018
664f395
Create modal factory, lint
mfix22 Jun 28, 2018
c106d88
Extract Modal, Row, Column components to own files
mfix22 Jun 28, 2018
0d73275
add SQL syntax highlighting in schedule tab
briandennis Jun 28, 2018
5b73177
misc style fixes, add modal close button
jakedex Jun 29, 2018
453f04e
add tests for Scheduler, update Scheduler/Modal with fixes found testing
briandennis Jun 29, 2018
cfc1919
Review Comments #1:
mfix22 Jul 2, 2018
bf5f4c6
.js extensions
mfix22 Jul 2, 2018
4c34df3
Word wrap SQL preview
mfix22 Jul 2, 2018
a7089ab
Add Layout description comment
mfix22 Jul 2, 2018
8c2ea91
Comment react-data-grid formatters
mfix22 Jul 2, 2018
567d961
Rename .react.js -> .jsx, import css files
mfix22 Jul 2, 2018
39686d1
Fix indentation
mfix22 Jul 2, 2018
97b206d
Better preview header spacing
mfix22 Jul 2, 2018
95894eb
Bold SQL preview header
mfix22 Jul 2, 2018
d8fb7b2
Move new deps to devDependencies
mfix22 Jul 3, 2018
de9f645
Make SchedulerPreview
mfix22 Jul 3, 2018
2ce012a
test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…
mfix22 Jul 3, 2018
9f8e97e
adapt scheduler test to additional sql element in query modal
briandennis Jul 3, 2018
10492dd
Fix scheduler-table styling issues
jakedex Jul 3, 2018
428ef5f
add className prop type to SQL
briandennis Jul 3, 2018
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
14 changes: 14 additions & 0 deletions app/actions/sessions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
);
}

export function getScheduledQueries() {
return dispatch => {
return dispatch(apiThunk(
'queries',
'GET',
'scheduledQueriesRequest'
)).then((json => {
dispatch(setScheduledQueries(json));
return json;
}));
};
}

export function connect(connectionId) {
return apiThunk(
`connections/${connectionId}/connect`,
Expand Down
34 changes: 31 additions & 3 deletions app/components/Settings/Settings.react.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
constructor(props) {
super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
getApacheDrillS3Keys,
getElasticsearchMappings,
getTables,
getScheduledQueries,
getS3Keys,
getSettings,
initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
s3KeysRequest,
selectedTab,
selectedIndex,
tablesRequest
tablesRequest,
scheduledQueriesRequest
} = this.props;
if (connectionsRequest && !connectionsRequest.status) {
initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
getSettings();
}

if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
getScheduledQueries();
}

const connectionObject = connections[selectedTab] || {};
if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
setIndex,
setTable,
selectedTable,
selectedScheduledQueries,
getScheduledQueries,
selectedIndex,
setTab,
tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
<TabList>
<Tab>Connection</Tab>
<Tab disabled={queryPanelDisabled}>Query</Tab>
<Tab>Schedule</Tab>
{isOnPrem() || <Tab
className="test-ssl-tab react-tabs__tab"
>
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
)}
</TabPanel>

<TabPanel>
<Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
</TabPanel>

{isOnPrem() || <TabPanel>
{this.props.connectRequest.status === 200 ? (
<div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
deleteConnectionsRequests,
previewTableRequests,
tablesRequests,
scheduledQueries,
scheduledQueriesRequest,
elasticsearchMappingsRequests,
selectedTables,
selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
const selectedTable = selectedTables[selectedConnectionId] || null;
const selectedIndex = selectedIndecies[selectedConnectionId] || null;
const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

let previewTableRequest = {};
if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
previewTableRequest,
tablesRequest: tablesRequests[selectedConnectionId] || {},
scheduledQueriesRequest: scheduledQueriesRequest || {},
elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
schemaRequest: schemaRequests[selectedConnectionId],
queryRequest: queryRequests[selectedConnectionId],
selectedTable,
selectedScheduledQueries,
selectedIndex,
selectedConnectionId,
settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
function boundGetTables() {
return dispatch(Actions.getTables(selectedConnectionId));
}
function boundGetScheduledQueries() {
return dispatch(Actions.getScheduledQueries(selectedConnectionId));
}
function boundGetElasticsearchMappings() {
return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
}
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
updateConnection: boundUpdateConnection,
getTables: boundGetTables,
getScheduledQueries: boundGetScheduledQueries,
getElasticsearchMappings: boundGetElasticsearchMappings,
setTable: boundSetTable,
setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
s3KeysRequest: PropTypes.object,
selectedTab: PropTypes.string,
selectedIndex: PropTypes.any,
selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
query: PropTypes.string,
refreshInterval: PropTypes.number
})),
scheduledQueriesRequest: PropTypes.object,
getScheduledQueries: PropTypes.func,
tablesRequest: PropTypes.object,
deleteTab: PropTypes.func,
getSqlSchema: PropTypes.func,
Expand Down
52 changes: 52 additions & 0 deletions app/components/Settings/scheduler.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
color: #119DFF;
}

.default .hljs {
color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
border-top: 1px solid #c8d4e3;
cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
border-top: none;
}

.sql-preview pre {
white-space: pre-wrap;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Aug 29, 2025. It is now read-only.

Add scheduled query browser#472
 Merged

n-riesco
merged 34 commits into

from

Jul 3, 2018
 Merged


Add scheduled query browser
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


34 commits


Select commit
Hold shift + click to select a range
adf348d

Add scheduler


mfix22 Jun 25, 2018
5f338ad

Add sort fns


mfix22 Jun 25, 2018
a7591a4

Move info to props and use defaultProps for mock


mfix22 Jun 25, 2018
72f6fc8

Create scheduled query button


mfix22 Jun 26, 2018
0608d45

Number bug fix


mfix22 Jun 26, 2018
3ddfde1

Fix search and sort


mfix22 Jun 26, 2018
5aa210e

Use rowGetter


mfix22 Jun 26, 2018
c666552

Use selectors


mfix22 Jun 26, 2018
29d7f0a

Remove stage 2 and 3 code


mfix22 Jun 26, 2018
a2fd188

fetch scheduled queries and add to store


briandennis Jun 27, 2018
9bc1a55

Add PropTypes


mfix22 Jun 27, 2018
d96e543

Fix column resize issue


mfix22 Jun 27, 2018
108793b

save all queries in the store and filter by connection in Settings co…


briandennis Jun 27, 2018
96ff033

Use react-click-outside, preview modal


mfix22 Jun 27, 2018
664f395

Create modal factory, lint


mfix22 Jun 28, 2018
c106d88

Extract Modal, Row, Column components to own files


mfix22 Jun 28, 2018
0d73275

add SQL syntax highlighting in schedule tab


briandennis Jun 28, 2018
5b73177

misc style fixes, add modal close button


jakedex Jun 29, 2018
453f04e

add tests for Scheduler, update Scheduler/Modal with fixes found testing


briandennis Jun 29, 2018
cfc1919

Review Comments #1:


mfix22 Jul 2, 2018
bf5f4c6

.js extensions


mfix22 Jul 2, 2018
4c34df3

Word wrap SQL preview


mfix22 Jul 2, 2018
a7089ab

Add Layout description comment


mfix22 Jul 2, 2018
8c2ea91

Comment react-data-grid formatters


mfix22 Jul 2, 2018
567d961

Rename .react.js -> .jsx, import css files


mfix22 Jul 2, 2018
39686d1

Fix indentation


mfix22 Jul 2, 2018
97b206d

Better preview header spacing


mfix22 Jul 2, 2018
95894eb

Bold SQL preview header


mfix22 Jul 2, 2018
d8fb7b2

Move new deps to devDependencies


mfix22 Jul 3, 2018
de9f645

Make SchedulerPreview


mfix22 Jul 3, 2018
2ce012a

test/app/components/Settings/Scheduler/Scheduler.test.js -> test/app…


mfix22 Jul 3, 2018
9f8e97e

adapt scheduler test to additional sql element in query modal


briandennis Jul 3, 2018
10492dd

Fix scheduler-table styling issues


jakedex Jul 3, 2018
428ef5f

add className prop type to SQL


briandennis Jul 3, 2018

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


14 changes: 14 additions & 0 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const mergeTabMap = createAction('MERGE_TAB_MAP');
export const setTab = createAction('SET_TAB');
export const setTable = createAction('SET_TABLE');
export const setIndex = createAction('SET_INDEX');
export const setScheduledQueries = createAction('SET_SCHEDULED_QUERIES');
export const mergeConnections = createAction('MERGE_CONNECTIONS');
export const updateConnection = createAction('UPDATE_CREDENTIAL');
export const deleteConnection = createAction('DELETE_CREDENTIAL');
Expand DownExpand Up@@ -137,6 +138,19 @@ export function editConnections(connectionObject, connectionId) {
 );
}

export function getScheduledQueries() {
 return dispatch => {
 return dispatch(apiThunk(
 'queries',
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 return json;
 }));
 };
}

export function connect(connectionId) {
 return apiThunk(
 `connections/${connectionId}/connect`,
Expand Down

34 changes: 31 additions & 3 deletions
app/components/Settings/Settings.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propOr, reduce} from 'ramda';
import {contains, dissoc, flip, head, hasIn, isEmpty, keys, merge, propEq, propOr, reduce} from 'ramda';
import {connect} from 'react-redux';
import ReactToolTip from 'react-tooltip';
import classnames from 'classnames';
Expand All@@ -13,10 +13,10 @@ import DialectSelector from './DialectSelector/DialectSelector.react';
import ConnectButton from './ConnectButton/ConnectButton.react';
import Preview from './Preview/Preview.react';
import {Link} from '../Link.react';
import Scheduler from './scheduler.jsx';
import {DIALECTS, FAQ, PREVIEW_QUERY, SQL_DIALECTS_USING_EDITOR} from '../../constants/constants.js';
import {isElectron, isOnPrem} from '../../utils/utils';


class Settings extends Component {
 constructor(props) {
 super(props);
Expand DownExpand Up@@ -169,6 +169,7 @@ class Settings extends Component {
 getApacheDrillS3Keys,
 getElasticsearchMappings,
 getTables,
 getScheduledQueries,
 getS3Keys,
 getSettings,
 initialize,
Expand All@@ -181,7 +182,8 @@ class Settings extends Component {
 s3KeysRequest,
 selectedTab,
 selectedIndex,
 tablesRequest
 tablesRequest,
 scheduledQueriesRequest
 } = this.props;
 if (connectionsRequest && !connectionsRequest.status) {
 initialize();
Expand All@@ -199,6 +201,10 @@ class Settings extends Component {
 getSettings();
 }

 if (connectRequest.status === 200 && !scheduledQueriesRequest.status) {
 getScheduledQueries();
 }

 const connectionObject = connections[selectedTab] || {};
 if (contains(connectionObject.dialect, SQL_DIALECTS_USING_EDITOR)) {
 if (connectRequest.status === 200 && !tablesRequest.status) {
Expand DownExpand Up@@ -268,6 +274,8 @@ class Settings extends Component {
 setIndex,
 setTable,
 selectedTable,
 selectedScheduledQueries,
 getScheduledQueries,
 selectedIndex,
 setTab,
 tablesRequest,
Expand DownExpand Up@@ -327,6 +335,7 @@ class Settings extends Component {
 <TabList>
 <Tab>Connection</Tab>
 <Tab disabled={queryPanelDisabled}>Query</Tab>
 <Tab>Schedule</Tab>
 {isOnPrem() || <Tab
 className="test-ssl-tab react-tabs__tab"
 >
Expand DownExpand Up@@ -378,6 +387,10 @@ class Settings extends Component {
 )}
 </TabPanel>

 <TabPanel>
 <Scheduler queries={selectedScheduledQueries} refreshQueries={getScheduledQueries} />
 </TabPanel>

 {isOnPrem() || <TabPanel>
 {this.props.connectRequest.status === 200 ? (
 <div className="big-whitespace-tab">
Expand DownExpand Up@@ -497,6 +510,8 @@ function mapStateToProps(state) {
 deleteConnectionsRequests,
 previewTableRequests,
 tablesRequests,
 scheduledQueries,
 scheduledQueriesRequest,
 elasticsearchMappingsRequests,
 selectedTables,
 selectedIndecies,
Expand All@@ -513,6 +528,7 @@ function mapStateToProps(state) {
 const connectionsHaveBeenSaved = Boolean(selectedConnectionId);
 const selectedTable = selectedTables[selectedConnectionId] || null;
 const selectedIndex = selectedIndecies[selectedConnectionId] || null;
 const selectedScheduledQueries = scheduledQueries.filter(propEq('connectionId', selectedConnectionId));

 let previewTableRequest = {};
 if (previewTableRequests[selectedConnectionId] &&
Expand All@@ -533,6 +549,7 @@ function mapStateToProps(state) {
 deleteConnectionsRequest: deleteConnectionsRequests[selectedConnectionId] || {},
 previewTableRequest,
 tablesRequest: tablesRequests[selectedConnectionId] || {},
 scheduledQueriesRequest: scheduledQueriesRequest || {},
 elasticsearchMappingsRequest: elasticsearchMappingsRequests[selectedConnectionId] || {},
 s3KeysRequest: s3KeysRequests[selectedConnectionId] || {},
 apacheDrillStorageRequest: apacheDrillStorageRequests[selectedConnectionId] || {},
Expand All@@ -546,6 +563,7 @@ function mapStateToProps(state) {
 schemaRequest: schemaRequests[selectedConnectionId],
 queryRequest: queryRequests[selectedConnectionId],
 selectedTable,
 selectedScheduledQueries,
 selectedIndex,
 selectedConnectionId,
 settingsRequest,
Expand DownExpand Up@@ -586,6 +604,9 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 function boundGetTables() {
 return dispatch(Actions.getTables(selectedConnectionId));
 }
 function boundGetScheduledQueries() {
 return dispatch(Actions.getScheduledQueries(selectedConnectionId));
 }
 function boundGetElasticsearchMappings() {
 return dispatch(Actions.getElasticsearchMappings(selectedConnectionId));
 }
Expand DownExpand Up@@ -679,6 +700,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 setConnectionNeedToBeSaved: boundSetConnectionNeedToBeSaved,
 updateConnection: boundUpdateConnection,
 getTables: boundGetTables,
 getScheduledQueries: boundGetScheduledQueries,
 getElasticsearchMappings: boundGetElasticsearchMappings,
 setTable: boundSetTable,
 setIndex: boundSetIndex,
Expand DownExpand Up@@ -733,6 +755,12 @@ Settings.propTypes = {
 s3KeysRequest: PropTypes.object,
 selectedTab: PropTypes.string,
 selectedIndex: PropTypes.any,
 selectedScheduledQueries: PropTypes.arrayOf(PropTypes.shape({
 query: PropTypes.string,
 refreshInterval: PropTypes.number
 })),
 scheduledQueriesRequest: PropTypes.object,
 getScheduledQueries: PropTypes.func,
 tablesRequest: PropTypes.object,
 deleteTab: PropTypes.func,
 getSqlSchema: PropTypes.func,
Expand Down

52 changes: 52 additions & 0 deletions
app/components/Settings/scheduler.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
/* SQL token highlighting */
.default .hljs-keyword,
.default .hljs-selector-tag {
 color: #ab63fa;
}

.default .hljs-number,
.default .hljs-meta,
.default .hljs-built_in,
.default .hljs-builtin-name,
.default .hljs-literal,
.default .hljs-type,
.default .hljs-params {
 color: #00cc96;
}

.default .hljs-string,
.default .hljs-symbol,
.default .hljs-bullet {
 color: #119DFF;
}

.default .hljs {
 color: #585260;
}

.bold .hljs-keyword,
.bold .hljs-selector-tag {
 font-weight: bold;
}

/* custom ReactDataGrid styles for scheduled queries table */
.scheduler-table .react-grid-Row--odd .react-grid-Cell {
 background: #fff;
}

.scheduler-table .react-grid-Row--odd:hover .react-grid-Cell {
 background-color: #f9f9f9;
}

.scheduler-table .react-grid-Row {
 border-top: 1px solid #c8d4e3;
 cursor: pointer;
}

.scheduler-table .react-grid-Row:first-child {
 border-top: none;
}

.sql-preview pre {
 white-space: pre-wrap;
}
Loading