Skip to content

Update webpack dev server configuration options, fixes for perspective 2.0+ #2350

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

Merged
texodus merged 2 commits into from
Aug 31, 2023
Merged

Update webpack dev server configuration options, fixes for perspective 2.0+ #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d3fbd3
Update webpack dev server configuration options, fixes for perspective
timkpaine Aug 24, 2023
436214f
Make workspace example configuration slightly more interesting again
timkpaine Aug 24, 2023
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 examples/promo/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
],
},
devServer: {
contentBase: [
static: [
path.join(__dirname, "dist"),
path.join(__dirname, "../../node_modules/superstore-arrow"),
],
Expand Down
1 change: 1 addition & 0 deletions examples/workspace-editing-python/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import perspective from "@finos/perspective";
import "@finos/perspective-workspace";
import "@finos/perspective-viewer";
import "@finos/perspective-viewer-datagrid";
import "@finos/perspective-viewer-d3fc";

Expand Down
1 change: 1 addition & 0 deletions examples/workspace-editing-python/src/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛

@import "~@finos/perspective-workspace/dist/theme/pro.less";
@import "~@finos/perspective-viewer/dist/css/themes.css";
Copy link
Member

@texodus texodus Aug 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This should be @import "~@finos/perspective-viewer/dist/css/pro.css";, since we don't support theming yet in workspaces.


body {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion examples/workspace-editing-python/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
],
},
devServer: {
contentBase: [
static: [
path.join(__dirname, "dist"),
path.join(__dirname, "../../node_modules/superstore-arrow"),
],
Expand Down
19 changes: 16 additions & 3 deletions examples/workspace/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import perspective from "@finos/perspective";
import "@finos/perspective-workspace";
import "@finos/perspective-viewer";
import "@finos/perspective-viewer-datagrid";
import "@finos/perspective-viewer-d3fc";

Expand All @@ -37,18 +38,30 @@ const DEFAULT_LAYOUT = {
},
},
viewers: {
One: { table: "superstore", editable: true },
One: {
table: "superstore",
title: "Test Widget I",
editable: true,
linked: true,
},
Two: {
table: "superstore",
title: "Test Widget II (modified)",
linked: true,
},
Three: {
table: "superstore",
name: "Test Widget III (modified)",
title: "Test Widget III (modified)",
group_by: ["State"],
columns: ["Sales", "Profit"],
linked: true,
},
Four: {
table: "superstore",
name: "Test Widget IV (modified)",
title: "Test Widget IV (modified)",
group_by: ["Category", "Sub-Category"],
columns: ["Sales", "Profit"],
linked: true,
},
},
};
Expand Down
1 change: 1 addition & 0 deletions examples/workspace/src/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛

@import "~@finos/perspective-workspace/dist/css/pro-dark.css";
@import "~@finos/perspective-viewer/dist/css/themes.css";
Copy link
Member

@texodus texodus Aug 31, 2023

Choose a reason for hiding this comment

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

"


body {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion examples/workspace/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = {
],
},
devServer: {
contentBase: [
static: [
path.join(__dirname, "dist"),
path.join(__dirname, "../../node_modules/superstore-arrow"),
],
Expand Down