Skip to content

Commit b1420c2

Browse files
benfdkingbenfdking
committed
temp
1 parent cbce27b commit b1420c2

File tree

23 files changed

+3727
-3108
lines changed

23 files changed

+3727
-3108
lines changed

‎js/packages/proto/src/generated/quary/service/v1/dashboard_file.ts

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/packages/proto/src/generated/quary/service/v1/wasm_rust_rpc_calls.ts

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/packages/quary-extension-bus/src/globalViewState.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { SqlLanguage } from './config'
22
import { ProjectDag } from '@quary/proto/quary/service/v1/project_dag'
3-
import { ListAssetsResponse_Asset } from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
3+
import {
4+
ListAssetsResponse_Asset,
5+
ReturnDashboardWithSqlResponse
6+
} from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
47
import { Project } from '@quary/proto/quary/service/v1/project'
58
import { TestRunner } from '@quary/proto/quary/service/v1/test_runner'
69
import { ConnectionConfig } from '@quary/proto/quary/service/v1/connection_config'
@@ -97,6 +100,10 @@ export type View =
97100
type: 'chartEditor'
98101
data: ChartEditorData
99102
}
103+
| {
104+
type: 'dashboardEditor'
105+
data: DashboardEditorData
106+
}
100107

101108
export type ChartEditorData = {
102109
title: string
@@ -119,6 +126,10 @@ export type ChartEditorData = {
119126
}
120127
}
121128

129+
export type DashboardEditorData = {
130+
dashboardFile: ReturnDashboardWithSqlResponse
131+
}
132+
122133
export type SqlDocumentationResultsView =
123134
| {
124135
type: 'notYetRun'

‎js/packages/quary-extension-ui/src/App.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ function App() {
110110
case 'chartEditor': {
111111
return <ChartEditorView data={view.data} />
112112
}
113+
case 'dashboardEditor': {
114+
return (
115+
<div>Dashboard editor {JSON.stringify(view.data.dashboardFile)} </div>
116+
)
117+
}
113118
default:
114119
return <div>Invalid view type {JSON.stringify(view)}</div>
115120
}

‎js/packages/quary-extension/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
"filenamePattern": "*.chart.yaml"
2828
}
2929
]
30+
},
31+
{
32+
"viewType": "quary.dashboardFile",
33+
"displayName": "Dashboard File",
34+
"selector": [
35+
{
36+
"filenamePattern": "*.dashboard.yaml"
37+
}
38+
]
3039
}
3140
],
3241
"commands": [

‎js/packages/quary-extension/src/web/chartCustomEditor.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import {
77
} from '@shared/globalViewState'
88
import { ChartFile } from '@quary/proto/quary/service/v1/chart_file'
99
import { Err, ErrorCodes, isErr, Ok, QuaryError, Result } from '@shared/result'
10-
import { ListAssetsResponse_Asset_AssetType } from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
10+
import {
11+
ListAssetsRequest_AssetsToSkip,
12+
ListAssetsResponse_Asset_AssetType,
13+
} from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
1114
import { disposeAll } from './dispose'
1215
import { HTML_STRING } from './panels'
1316
import { getServices, PreInitServices, preInitSetup } from './services'
@@ -277,9 +280,8 @@ export class ChartEditorProvider
277280
}
278281
const returned = await services.rust.list_assets({
279282
projectRoot: setupValues.value.projectRoot,
280-
assetsToSkip: {
281-
charts: true,
282-
},
283+
assetsToSkip:
284+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
283285
})
284286
if (isErr(returned)) {
285287
return returned

‎js/packages/quary-extension/src/web/commands.ts

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
/* eslint-disable camelcase */
22
import * as vscode from 'vscode'
3+
import { ExtensionContext, QuickPickItem } from 'vscode'
34
import {
4-
isErr,
5-
Result,
6-
Ok,
7-
Err,
85
collectResults,
6+
Err,
97
ErrorCodes,
8+
isErr,
109
isQuaryError,
10+
Ok,
11+
Result,
1112
} from '@shared/result'
12-
import { ExtensionContext, QuickPickItem } from 'vscode'
1313
import type { Analytics } from '@june-so/analytics-node'
14-
import { ListAssetsResponse_Asset_AssetType } from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
14+
import {
15+
ListAssetsRequest_AssetsToSkip,
16+
ListAssetsResponse_Asset_AssetType,
17+
} from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
1518
import { TestRunner } from '@quary/proto/quary/service/v1/test_runner'
1619
import {
1720
getPreInitServices,
@@ -115,9 +118,8 @@ export const returnCommands = (
115118
// Check if the active file is a model
116119
const assets = await services.rust.list_assets({
117120
projectRoot,
118-
assetsToSkip: {
119-
charts: true,
120-
},
121+
assetsToSkip:
122+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
121123
})
122124
if (isErr(assets)) {
123125
return assets
@@ -313,9 +315,8 @@ export const returnCommands = (
313315
const { projectRoot } = details.value
314316
const assets = await services.rust.list_assets({
315317
projectRoot,
316-
assetsToSkip: {
317-
charts: true,
318-
},
318+
assetsToSkip:
319+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
319320
})
320321
if (isErr(assets)) {
321322
return assets
@@ -473,9 +474,8 @@ export const returnCommands = (
473474
// Check if the active file is a model
474475
const assets = await services.rust.list_assets({
475476
projectRoot,
476-
assetsToSkip: {
477-
charts: true,
478-
},
477+
assetsToSkip:
478+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
479479
})
480480
if (isErr(assets)) {
481481
return assets
@@ -523,9 +523,8 @@ export const returnCommands = (
523523
// Check if the active file is a model
524524
const assets = await services.rust.list_assets({
525525
projectRoot,
526-
assetsToSkip: {
527-
charts: true,
528-
},
526+
assetsToSkip:
527+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
529528
})
530529
if (isErr(assets)) {
531530
return assets

‎js/packages/quary-extension/src/web/commandsExecuteSQL.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/* eslint-disable camelcase */
2+
import * as vscode from 'vscode'
23
import { ExtensionContext } from 'vscode'
34
import { Err, ErrorCodes, isErr, Ok, Result } from '@shared/result'
45
import * as Papa from 'papaparse'
56
import { useCallBackBackEnd } from '@shared/callBacks'
6-
import * as vscode from 'vscode'
7-
import { ListAssetsResponse_Asset } from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
7+
import {
8+
ListAssetsRequest_AssetsToSkip,
9+
ListAssetsResponse_Asset,
10+
} from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
811
import { queryResultToColumnsValues } from '@shared/shared'
912
import { rustWithoutDatabaseWasmServices } from './servicesRustWasm'
1013
import { getPreInitServices, Services } from './services'
@@ -33,9 +36,8 @@ const getModelDetails = async ({
3336
> => {
3437
const assetsResponse = await services.rust.list_assets({
3538
projectRoot,
36-
assetsToSkip: {
37-
charts: true,
38-
},
39+
assetsToSkip:
40+
ListAssetsRequest_AssetsToSkip.ASSETS_TO_SKIP_CHARTS_AND_DASHBOARDS,
3941
})
4042
if (isErr(assetsResponse)) {
4143
return assetsResponse

0 commit comments

Comments
 (0)