Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ jobs:
- name: Install latest nightly rust
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-04-07
toolchain: nightly-2023-10-12
targets: wasm32-unknown-unknown
components: rustfmt, clippy, rust-src

Expand Down Expand Up @@ -325,8 +325,11 @@ jobs:
###############
# WebAssembly #
###############

- name: WebAssembly Lint
run: yarn lint
env:
PSP_PROJECT: js

- name: WebAssembly Build
run: yarn build_js --ci
Expand Down Expand Up @@ -524,6 +527,7 @@ jobs:
run: yarn lint
env:
PYTHON_VERSION: ${{ matrix.python-version }}
PSP_PROJECT: python

##########################################################################################################################
##########################################################################################################################
Expand Down Expand Up @@ -650,7 +654,7 @@ jobs:
- name: Install latest nightly rust
uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2023-04-07
toolchain: nightly-2023-10-12
targets: wasm32-unknown-unknown
components: rustfmt, clippy, rust-src

Expand Down
7 changes: 7 additions & 0 deletions .vscode/settings.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
"rust-analyzer.linkedProjects": [
"${workspaceFolder}/rust/perspective-viewer/Cargo.toml"
],
"rust-analyzer.rustfmt.overrideCommand": [
"cargo",
"run",
"-p",
"perspective-lint",
"--release"
],
"rust-analyzer.check.command": "clippy",
"playwright.env": {
"TZ": "UTC"
Expand Down
22 changes: 22 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Create default VSCode settings.json",
"command": "cp",
"args": ["-n", "settings.default.json", "settings.json"],
"options": {
"cwd": "${workspaceFolder}/.vscode"
},
"group": "build",
"problemMatcher": [],
"presentation": {
"reveal": "never",
"panel": "dedicated"
},
"runOptions": {
"runOn": "folderOpen"
}
}
]
}
3 changes: 3 additions & 0 deletions rust/perspective-viewer/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ runner = 'wasm-bindgen-test-runner'

[future-incompat-report]
frequency = 'never'

[unstable]
bindeps = true
126 changes: 110 additions & 16 deletions rust/perspective-viewer/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion rust/perspective-viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ include = [
]

[workspace]
members = ["tasks/bundle", "tasks/bootstrap-runtime", "tasks/bootstrap"]
members = [
"tasks/bundle",
"tasks/bootstrap-runtime",
"tasks/bootstrap",
"tasks/lint",
]

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
17 changes: 3 additions & 14 deletions rust/perspective-viewer/src/rust/components/column_dropdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use yew::prelude::*;
use super::column_selector::InPlaceColumn;
use super::modal::*;
use crate::utils::WeakScope;
use crate::*;

static CSS: &str = include_str!(concat!(env!("OUT_DIR"), "/css/column-dropdown.css"));

Expand Down Expand Up @@ -121,8 +120,7 @@ impl Component for ColumnDropDown {
let body = html! {
if let Some(ref values) = self.values {
if !values.is_empty() {
{
for values
{ for values
.iter()
.enumerate()
.map(|(idx, value)| {
Expand All @@ -147,8 +145,7 @@ impl Component for ColumnDropDown {
<span onmousedown={ click }>{ row }</span>
}
}
})
}
}) }
} else {
<span class="no-results">{ "Invalid Column" }</span>
}
Expand All @@ -160,14 +157,6 @@ impl Component for ColumnDropDown {
self.width, self.width
);

html_template! {
<style>
{ &CSS }
</style>
<style>
{ position }
</style>
{ body }
}
html! { <><style >{ &CSS }</style><style >{ position }</style>{ body }</> }
}
}
Loading