Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

pass in databricks token for live query #92

Merged
merged 1 commit into from
Jun 26, 2019
Merged

pass in databricks token for live query #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Website/Packages/datax-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-common",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Common UX, styles, utilities, and modules",
"author": "Microsoft",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions Website/Packages/datax-home/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-home",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Home page",
"author": "Microsoft",
"license": "MIT",
Expand Down Expand Up @@ -30,7 +30,7 @@
"css-loader": "1.0.1",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"q": "1.5.1",
"react": "16.6.3",
Expand Down
4 changes: 2 additions & 2 deletions Website/Packages/datax-jobs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-jobs",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Job features",
"author": "Microsoft",
"license": "MIT",
Expand Down Expand Up @@ -30,7 +30,7 @@
"css-loader": "1.0.1",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"q": "1.5.1",
"prop-types": "15.6.2",
Expand Down
4 changes: 2 additions & 2 deletions Website/Packages/datax-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-metrics",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Metric features",
"author": "Microsoft",
"license": "MIT",
Expand Down Expand Up @@ -33,7 +33,7 @@
"d3": "4.10.2",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"q": "1.5.1",
"plotly.js": "1.44.4",
Expand Down
6 changes: 3 additions & 3 deletions Website/Packages/datax-pipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-pipeline",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Pipeline features",
"author": "Microsoft",
"license": "MIT",
Expand Down Expand Up @@ -32,8 +32,8 @@
"css-loader": "1.0.1",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-query": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"datax-query": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"q": "1.5.1",
"promise-polyfill": "8.1.0",
Expand Down
13 changes: 7 additions & 6 deletions Website/Packages/datax-pipeline/src/modules/flowDefinition/flowHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,21 +503,22 @@ export function convertFlowToQueryMetadata(flow, query) {
// return query metadata
let QueryMetadata = {
name: flow.name,
databricksToken: flow.databricksToken,
displayName: flow.displayName,
userName: flow.owner,
refData: flow.referenceData,
inputSchema: flow.input.properties.inputSchemaFile,
normalizationSnippet: flow.input.properties.normalizationSnippet,
outputTemplates: flow.outputTemplates,
functions:flow.functions,
functions: flow.functions,
rules: convertFlowToConfigRules(flow.rules),
eventhubConnection:flow.input.properties.inputEventhubConnection,
inputResourceGroup: flow.input.properties.inputResourceGroup,
eventhubNames: flow.input.properties.inputEventhubName,
eventhubConnection: flow.input.properties.inputEventhubConnection,
inputResourceGroup: flow.input.properties.inputResourceGroup,
eventhubNames: flow.input.properties.inputEventhubName,
inputType: flow.input.type,
seconds: flow.resamplingInputDuration,
query: query,
inputSubscriptionId: flow.input.properties.inputSubscriptionId,
inputSubscriptionId: flow.input.properties.inputSubscriptionId
};
return QueryMetadata;
}
}
4 changes: 2 additions & 2 deletions Website/Packages/datax-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "datax-query",
"version": "1.3.0-SNAPSHOT-5",
"version": "1.3.0-SNAPSHOT-6",
"description": "Query features",
"author": "Microsoft",
"license": "MIT",
Expand Down Expand Up @@ -32,7 +32,7 @@
"css-loader": "1.0.1",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"q": "1.5.1",
"promise-polyfill": "8.1.0",
Expand Down
6 changes: 5 additions & 1 deletion Website/Packages/datax-query/src/modules/query/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const getCodeGenQuery = queryMetadata =>
export const getDiagnosticKernel = queryMetadata =>
servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel', {
name: queryMetadata.name,
databricksToken: queryMetadata.databricksToken,
displayName: queryMetadata.displayName,
userName: queryMetadata.userName,
inputSchema: queryMetadata.inputSchema,
Expand All @@ -38,6 +39,7 @@ export const getDiagnosticKernel = queryMetadata =>
export const refreshDiagnosticKernel = (queryMetadata, kernelId) =>
servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel/refresh', {
kernelId: kernelId,
databricksToken: queryMetadata.databricksToken,
userName: queryMetadata.userName,
name: queryMetadata.name,
displayName: queryMetadata.displayName,
Expand All @@ -58,6 +60,7 @@ export const deleteDiagnosticKernel = deleteDiagnosticKernelOnUnload;
export const executeQuery = (queryMetadata, selectedQuery, kernelId) =>
servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel/executequery', {
name: queryMetadata.name,
databricksToken: queryMetadata.databricksToken,
displayName: queryMetadata.displayName,
query: selectedQuery,
kernelId: kernelId,
Expand All @@ -74,6 +77,7 @@ export const resampleInput = (queryMetadata, kernelId) =>
'inputdata/refreshsampleandkernel',
{
name: queryMetadata.name,
databricksToken: queryMetadata.databricksToken,
displayName: queryMetadata.displayName,
userName: queryMetadata.userName,
kernelId: kernelId,
Expand All @@ -86,4 +90,4 @@ export const resampleInput = (queryMetadata, kernelId) =>
inputType: queryMetadata.inputType,
seconds: queryMetadata.seconds
}
);
);
10 changes: 5 additions & 5 deletions Website/Website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@
"css-loader": "1.0.1",
"file-loader": "2.0.0",
"mini-css-extract-plugin": "0.4.4",
"datax-common": "1.3.0-SNAPSHOT-5",
"datax-home": "1.3.0-SNAPSHOT-5",
"datax-jobs": "1.3.0-SNAPSHOT-5",
"datax-metrics": "1.3.0-SNAPSHOT-5",
"datax-pipeline": "1.3.0-SNAPSHOT-5",
"datax-common": "1.3.0-SNAPSHOT-6",
"datax-home": "1.3.0-SNAPSHOT-6",
"datax-jobs": "1.3.0-SNAPSHOT-6",
"datax-metrics": "1.3.0-SNAPSHOT-6",
"datax-pipeline": "1.3.0-SNAPSHOT-6",
"office-ui-fabric-react": "6.111.2",
"promise-polyfill": "8.1.0",
"prop-types": "15.6.2",
Expand Down