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

Scheduled query browser (Stage 2)#476

Merged
n-riesco merged 24 commits into from
Jul 9, 2018
Merged

Scheduled query browser (Stage 2) #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
498420c
Scheduled query browser (Stage 2)
mfix22 Jul 4, 2018
65e53b3
Fix tests
mfix22 Jul 5, 2018
3c4480b
Scheduler -> scheduler
mfix22 Jul 5, 2018
be70c9d
Rename component files
mfix22 Jul 5, 2018
2096fa4
Move getHighlightMode to constants
mfix22 Jul 5, 2018
fd8d17d
Move .scheduleButton to code-editor.css
mfix22 Jul 5, 2018
a9c4d5a
Dispatch scheduled query actions directly w/o redux-actions
mfix22 Jul 5, 2018
863870b
scheduleQuery -> openScheduler, remove unused button
mfix22 Jul 5, 2018
538c041
Address review:
mfix22 Jul 5, 2018
bdaafc7
<Tab disabled={queryPanelDisabled}
mfix22 Jul 5, 2018
26e257c
lowercase Scheduler/ imports
mfix22 Jul 5, 2018
6403926
Move create-modal styles to css file
mfix22 Jul 5, 2018
f7aa830
Remove filename input, generate 8 digit grid name
mfix22 Jul 5, 2018
5eebf5b
Remove 'Create Scheduled Query' button for dialects using editor
mfix22 Jul 5, 2018
706c067
Extract login-modal styles to CSS file
mfix22 Jul 5, 2018
9360312
Add loading and error states for create
mfix22 Jul 5, 2018
e07b8b4
Preview modal loading and error states
mfix22 Jul 5, 2018
cab0265
Error message from server in modal
mfix22 Jul 5, 2018
fea40e4
Prefill filename from generateFilename()
mfix22 Jul 5, 2018
87a8bc2
Pull out intervalType
mfix22 Jul 5, 2018
c61dc54
this.state.filename :+1:
mfix22 Jul 6, 2018
508ca66
Don't call create update delete w/o log in
mfix22 Jul 6, 2018
013c64b
Remove buttons completely when not logged in
mfix22 Jul 6, 2018
f5c8a19
Fix bool proptypes warning
mfix22 Jul 6, 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
76 changes: 74 additions & 2 deletions app/actions/sessions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
'GET',
'scheduledQueriesRequest'
)).then((json => {
dispatch(setScheduledQueries(json));
dispatch({
type: 'SET_SCHEDULED_QUERIES',
payload: json
});
return json;
}));
};
}

export function createScheduledQuery(connectionId, payload = {}) {
return (dispatch) => {
return dispatch(apiThunk(
'queries',
'POST',
'createScheduledQueryRequest',
payload.filename,
{
requestor: payload.requestor,
uids: payload.uids,
fid: payload.fid,
filename: payload.filename,
refreshInterval: payload.refreshInterval,
query: payload.query,
connectionId
}
)).then((res) => {
dispatch({
type: 'CREATE_SCHEDULED_QUERY',
payload: res
});
return res;
});
};
}

export function updateScheduledQuery(connectionId, payload = {}) {
return (dispatch) => {
const body = {
requestor: payload.requestor,
uids: payload.uids,
fid: payload.fid,
filename: payload.filename,
refreshInterval: payload.refreshInterval,
query: payload.query,
connectionId
};

return dispatch(apiThunk(
'queries',
'POST',
'createScheduledQueryRequest',
payload.filename,
body
)).then((res) => {
dispatch({
type: 'UPDATE_SCHEDULED_QUERY',
payload: body
});
return res;
});
};
}

export function deleteScheduledQuery(fid) {
return (dispatch) => {
return dispatch(apiThunk(
`queries/${fid}`,
'DELETE',
'createScheduledQueryRequest'
)).then((res) => {
dispatch({
type: 'DELETE_SCHEDULED_QUERY',
payload: fid
});
return res;
});
};
}

export function connect(connectionId) {
return apiThunk(
`connections/${connectionId}/connect`,
Expand Down
58 changes: 32 additions & 26 deletions app/components/Settings/Preview/Preview.react.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
getSqlSchema: PropTypes.func,

runSqlQuery: PropTypes.func,
openScheduler: PropTypes.func,
previewTableRequest: PropTypes.object,
queryRequest: PropTypes.object,
elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

dialect={dialect}
runQuery={this.runQuery}
openScheduler={this.props.openScheduler}
schemaRequest={schemaRequest}
isLoading={isLoading}
/>
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
</TabPanel>

<TabPanel>
<div className="export-options-container">
<div style={{margin: '20px 0'}}>
<button
className="btn btn-outline"
onClick={() => this.fetchDatacache(
JSON.stringify(this.state.plotlyJSON),
'plot'
)}
>
Send chart to Chart Studio
</button>
<button
className="btn btn-outline"
onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
>
Send CSV to Chart Studio
</button>
{!isOnPrem() &&
<button
className="btn btn-outline"
onClick={() => window.open(
`data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
)}
>
Download CSV
</button>}
<div className="export-options-container" style={{ marginTop: 20 }}>
<div className="container-title">CHART STUDIO</div>
<div className="export-options-group">
<button
className="btn btn-outline"
onClick={() => this.fetchDatacache(
JSON.stringify(this.state.plotlyJSON),
'plot'
)}
>
Upload Chart
</button>
<button
className="btn btn-outline"
onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
>
Upload Dataset
</button>
</div>
<div className="container-title">MY COMPUTER</div>
<div className="export-options-group">
{!isOnPrem() &&
<button
className="btn btn-outline"
onClick={() => window.open(
`data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
)}
>
Download CSV
</button>}
</div>
<div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down
7 changes: 7 additions & 0 deletions app/components/Settings/Preview/code-editor.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
z-index: 9;
}

.scheduleButton {
bottom: 18px;
position: absolute;
right: 136px;
z-index: 10;
}
26 changes: 13 additions & 13 deletions app/components/Settings/Preview/code-editor.jsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

dialect: PropTypes.string,
runQuery: PropTypes.func,
openScheduler: PropTypes.func,
schemaRequest: PropTypes.object,
isLoading: PropTypes.bool
}
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
value,
dialect,
runQuery,
isLoading
isLoading,
openScheduler
} = this.props;

const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
maxConstraints
} = this.state;

const mode = {
[DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
[DIALECTS.MYSQL]: 'text/x-mysql',
[DIALECTS.SQLITE]: 'text/x-sqlite',
[DIALECTS.MARIADB]: 'text/x-mariadb',
[DIALECTS.ORACLE]: 'text/x-plsql',
[DIALECTS.POSTGRES]: 'text/x-pgsql',
[DIALECTS.REDSHIFT]: 'text/x-pgsql',
[DIALECTS.MSSQL]: 'text/x-mssql'
}[dialect] || 'text/x-sql';
const mode = getHighlightMode(dialect);

const options = {
lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
onChange={onChange}
editorDidMount={editorDidMount}
/>
<button
className="btn btn-secondary scheduleButton"
onClick={openScheduler}
disabled={isLoading}
>
{isLoading ? 'Loading...' : 'Schedule'}
</button>
<a
className="btn btn-primary runButton"
onClick={runQuery}
disabled={!isLoading}
disabled={isLoading}

@n-riescon-riescoJul 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!

>
{isLoading ? 'Loading...' : 'Run'}
</a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
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.

Scheduled query browser (Stage 2)#476
 Merged

n-riesco
merged 24 commits into

from

Jul 9, 2018
 Merged


Scheduled query browser (Stage 2)
#476
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


24 commits


Select commit
Hold shift + click to select a range
498420c

Scheduled query browser (Stage 2)


mfix22 Jul 4, 2018
65e53b3

Fix tests


mfix22 Jul 5, 2018
3c4480b

Scheduler -> scheduler


mfix22 Jul 5, 2018
be70c9d

Rename component files


mfix22 Jul 5, 2018
2096fa4

Move getHighlightMode to constants


mfix22 Jul 5, 2018
fd8d17d

Move .scheduleButton to code-editor.css


mfix22 Jul 5, 2018
a9c4d5a

Dispatch scheduled query actions directly w/o redux-actions


mfix22 Jul 5, 2018
863870b

scheduleQuery -> openScheduler, remove unused button


mfix22 Jul 5, 2018
538c041

Address review:


mfix22 Jul 5, 2018
bdaafc7

<Tab disabled={queryPanelDisabled}


mfix22 Jul 5, 2018
26e257c

lowercase Scheduler/ imports


mfix22 Jul 5, 2018
6403926

Move create-modal styles to css file


mfix22 Jul 5, 2018
f7aa830

Remove filename input, generate 8 digit grid name


mfix22 Jul 5, 2018
5eebf5b

Remove 'Create Scheduled Query' button for dialects using editor


mfix22 Jul 5, 2018
706c067

Extract login-modal styles to CSS file


mfix22 Jul 5, 2018
9360312

Add loading and error states for create


mfix22 Jul 5, 2018
e07b8b4

Preview modal loading and error states


mfix22 Jul 5, 2018
cab0265

Error message from server in modal


mfix22 Jul 5, 2018
fea40e4

Prefill filename from generateFilename()


mfix22 Jul 5, 2018
87a8bc2

Pull out intervalType


mfix22 Jul 5, 2018
c61dc54

this.state.filename :+1:


mfix22 Jul 6, 2018
508ca66

Don't call create update delete w/o log in


mfix22 Jul 6, 2018
013c64b

Remove buttons completely when not logged in


mfix22 Jul 6, 2018
f5c8a19

Fix bool proptypes warning


mfix22 Jul 6, 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


76 changes: 74 additions & 2 deletions
app/actions/sessions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ 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@@ -145,12 +144,85 @@ export function getScheduledQueries() {
 'GET',
 'scheduledQueriesRequest'
 )).then((json => {
 dispatch(setScheduledQueries(json));
 dispatch({
 type: 'SET_SCHEDULED_QUERIES',
 payload: json
 });
 return json;
 }));
 };
}

export function createScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 }
 )).then((res) => {
 dispatch({
 type: 'CREATE_SCHEDULED_QUERY',
 payload: res
 });
 return res;
 });
 };
}

export function updateScheduledQuery(connectionId, payload = {}) {
 return (dispatch) => {
 const body = {
 requestor: payload.requestor,
 uids: payload.uids,
 fid: payload.fid,
 filename: payload.filename,
 refreshInterval: payload.refreshInterval,
 query: payload.query,
 connectionId
 };

 return dispatch(apiThunk(
 'queries',
 'POST',
 'createScheduledQueryRequest',
 payload.filename,
 body
 )).then((res) => {
 dispatch({
 type: 'UPDATE_SCHEDULED_QUERY',
 payload: body
 });
 return res;
 });
 };
}

export function deleteScheduledQuery(fid) {
 return (dispatch) => {
 return dispatch(apiThunk(
 `queries/${fid}`,
 'DELETE',
 'createScheduledQueryRequest'
 )).then((res) => {
 dispatch({
 type: 'DELETE_SCHEDULED_QUERY',
 payload: fid
 });
 return res;
 });
 };
}

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

58 changes: 32 additions & 26 deletions
app/components/Settings/Preview/Preview.react.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ class Preview extends Component {
 getSqlSchema: PropTypes.func,

 runSqlQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 previewTableRequest: PropTypes.object,
 queryRequest: PropTypes.object,
 elasticsearchMappingsRequest: PropTypes.object,
Expand DownExpand Up@@ -347,6 +348,7 @@ class Preview extends Component {

 dialect={dialect}
 runQuery={this.runQuery}
 openScheduler={this.props.openScheduler}
 schemaRequest={schemaRequest}
 isLoading={isLoading}
 />
Expand DownExpand Up@@ -454,32 +456,36 @@ class Preview extends Component {
 </TabPanel>

 <TabPanel>
 <div className="export-options-container">
 <div style={{margin: '20px 0'}}>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Send chart to Chart Studio
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Send CSV to Chart Studio
 </button>
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 <div className="export-options-container" style={{ marginTop: 20 }}>
 <div className="container-title">CHART STUDIO</div>
 <div className="export-options-group">
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(
 JSON.stringify(this.state.plotlyJSON),
 'plot'
 )}
 >
 Upload Chart
 </button>
 <button
 className="btn btn-outline"
 onClick={() => this.fetchDatacache(this.getCSVString(), 'grid')}
 >
 Upload Dataset
 </button>
 </div>
 <div className="container-title">MY COMPUTER</div>
 <div className="export-options-group">
 {!isOnPrem() &&
 <button
 className="btn btn-outline"
 onClick={() => window.open(
 `data:text/csv;base64,${Buffer.from(this.getCSVString()).toString('base64')}`
 )}
 >
 Download CSV
 </button>}
 </div>
 <div style={{width: 650, height: 200, border: '1px solid #dfe8f3',
 fontFamily: '\'Ubuntu Mono\', courier, monospace', paddingTop: 10,
Expand Down

7 changes: 7 additions & 0 deletions
app/components/Settings/Preview/code-editor.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,10 @@
.react-resizable-handle {
 z-index: 9;
}

.scheduleButton {
 bottom: 18px;
 position: absolute;
 right: 136px;
 z-index: 10;
}

26 changes: 13 additions & 13 deletions
app/components/Settings/Preview/code-editor.jsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import 'react-resizable/css/styles.css';

import './code-editor.css';

import {DIALECTS} from '../../../constants/constants';
import {getHighlightMode} from '../../../constants/constants';

const MIN_CONSTRAINTS_HEIGHT = 74;

Expand All@@ -25,6 +25,7 @@ export default class CodeEditor extends React.Component {

 dialect: PropTypes.string,
 runQuery: PropTypes.func,
 openScheduler: PropTypes.func,
 schemaRequest: PropTypes.object,
 isLoading: PropTypes.bool
 }
Expand DownExpand Up@@ -176,7 +177,8 @@ export default class CodeEditor extends React.Component {
 value,
 dialect,
 runQuery,
 isLoading
 isLoading,
 openScheduler
 } = this.props;

 const {
Expand All@@ -186,16 +188,7 @@ export default class CodeEditor extends React.Component {
 maxConstraints
 } = this.state;

 const mode = {
 [DIALECTS.APACHE_SPARK]: 'text/x-sparksql',
 [DIALECTS.MYSQL]: 'text/x-mysql',
 [DIALECTS.SQLITE]: 'text/x-sqlite',
 [DIALECTS.MARIADB]: 'text/x-mariadb',
 [DIALECTS.ORACLE]: 'text/x-plsql',
 [DIALECTS.POSTGRES]: 'text/x-pgsql',
 [DIALECTS.REDSHIFT]: 'text/x-pgsql',
 [DIALECTS.MSSQL]: 'text/x-mssql'
 }[dialect] || 'text/x-sql';
 const mode = getHighlightMode(dialect);

 const options = {
 lineNumbers: true,
Expand All@@ -222,10 +215,17 @@ export default class CodeEditor extends React.Component {
 onChange={onChange}
 editorDidMount={editorDidMount}
 />
 <button
 className="btn btn-secondary scheduleButton"
 onClick={openScheduler}
 disabled={isLoading}
 >
 {isLoading ? 'Loading...' : 'Schedule'}
 </button>
 <a
 className="btn btn-primary runButton"
 onClick={runQuery}
 disabled={!isLoading}
 disabled={isLoading}
@n-riescon-riescoJul 6, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!
 >
 {isLoading ? 'Loading...' : 'Run'}
 </a>
Expand Down
Loading