Skip to content

Commit 4860537

Browse files
authored
Merge pull request #68 from baumgold/67-ag-grid-enterprise
#67 allow to optionally use ag-grid enterprise
2 parents 006c4e3 + dbc1956 commit 4860537

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "TableView"
22
uuid = "40c74d1a-b44c-5b06-a7c1-6cbea58ea978"
3-
version = "0.6.5"
3+
version = "0.6.6"
44

55
[deps]
66
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

deps/build.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
version = readchomp(joinpath(@__DIR__, "..", "ag-grid.version"))
2+
distribution = haskey(ENV, "AG_GRID_LICENSE_KEY") ? "enterprise" : "community"
3+
println("building: distribution=$distribution version=$version")
24

35
isdir(joinpath(@__DIR__, "ag-grid-$(version)")) || mkdir(joinpath(@__DIR__, "ag-grid-$(version)"))
46

57
ag_grid_base = joinpath(@__DIR__, "ag-grid-$(version)", "ag-grid.js")
6-
isfile(ag_grid_base) || download("https://cdn.jsdelivr.net/npm/ag-grid-community@$(version)/dist/ag-grid-community.min.noStyle.js", ag_grid_base)
8+
isfile(ag_grid_base) || download("https://cdn.jsdelivr.net/npm/ag-grid-$(distribution)@$(version)/dist/ag-grid-$(distribution).min.noStyle.js", ag_grid_base)
79

810
ag_grid_base_style = joinpath(@__DIR__, "ag-grid-$(version)", "ag-grid.css")
9-
isfile(ag_grid_base_style) || download("https://cdn.jsdelivr.net/npm/ag-grid-community@$(version)/dist/styles/ag-grid.css", ag_grid_base_style)
11+
isfile(ag_grid_base_style) || download("https://cdn.jsdelivr.net/npm/ag-grid-$(distribution)@$(version)/dist/styles/ag-grid.css", ag_grid_base_style)
1012

1113
ag_grid_light = joinpath(@__DIR__, "ag-grid-$(version)", "ag-grid-light.css")
12-
isfile(ag_grid_light) || download("https://cdn.jsdelivr.net/npm/ag-grid-community@$(version)/dist/styles/ag-theme-balham.css", ag_grid_light)
14+
isfile(ag_grid_light) || download("https://cdn.jsdelivr.net/npm/ag-grid-$(distribution)@$(version)/dist/styles/ag-theme-balham.css", ag_grid_light)
1315

1416
ag_grid_dark = joinpath(@__DIR__, "ag-grid-$(version)", "ag-grid-dark.css")
15-
isfile(ag_grid_dark) || download("https://cdn.jsdelivr.net/npm/ag-grid-community@$(version)/dist/styles/ag-theme-balham-dark.css", ag_grid_dark)
17+
isfile(ag_grid_dark) || download("https://cdn.jsdelivr.net/npm/ag-grid-$(distribution)@$(version)/dist/styles/ag-theme-balham-dark.css", ag_grid_dark)

src/TableView.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,16 @@ end
199199

200200
function _showtable_sync!(w, schema, names, types, rows, coldefs, tablelength, id, options)
201201
options[:rowData] = JSONText(table2json(schema, rows, types))
202+
license = get(ENV, "AG_GRID_LICENSE_KEY", nothing)
202203
handler = @js function (RowNumberRenderer, agGrid)
203204
@var gridOptions = $options
204205
@var el = document.getElementById($id)
205206
gridOptions.components = Dict(
206207
"rowNumberRenderer" => RowNumberRenderer
207208
)
209+
if $(license !== nothing)
210+
agGrid.LicenseManager.setLicenseKey($license)
211+
end
208212
this.table = @new agGrid.Grid(el, gridOptions)
209213
gridOptions.columnApi.autoSizeAllColumns()
210214
end
@@ -236,6 +240,7 @@ function _showtable_async!(w, schema, names, types, rows, coldefs, tablelength,
236240
,
237241
"rowCount" => tablelength
238242
)
243+
license = get(ENV, "AG_GRID_LICENSE_KEY", nothing)
239244

240245
handler = @js function (RowNumberRenderer, agGrid)
241246
@var gridOptions = $options
@@ -244,6 +249,9 @@ function _showtable_async!(w, schema, names, types, rows, coldefs, tablelength,
244249
gridOptions.components = Dict(
245250
"rowNumberRenderer" => RowNumberRenderer
246251
)
252+
if $(license !== nothing)
253+
agGrid.LicenseManager.setLicenseKey($license)
254+
end
247255
this.table = @new agGrid.Grid(el, gridOptions)
248256
gridOptions.columnApi.autoSizeAllColumns()
249257
end

0 commit comments

Comments
 (0)