Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f0bd77b
feat: refactor bootstrap css customizations
alexsielicki Jun 10, 2025
4e46bd3
style: prettier formatting
alexsielicki Jun 10, 2025
30f3c3e
style: prettier
alexsielicki Jun 10, 2025
caa1106
feat: update projects list
alexsielicki Jun 10, 2025
e248b32
feat: theme update to models listing
alexsielicki Jun 10, 2025
72b56f7
style: prettier
alexsielicki Jun 10, 2025
6f2153e
fix: alignment and update to bootstrap 5
alexsielicki Jun 11, 2025
0ca1e87
feat: updates to navbar, login form, layouts
alexsielicki Jun 11, 2025
cfe9055
feat: add color variables
alexsielicki Jun 25, 2025
3344b78
fix: update SCSS warning handling for Bootstrap 5 deprecations
alexsielicki Jun 27, 2025
19ab75b
feat: refactor slick-slycat theme to use SCSS variables for improved …
alexsielicki Jun 27, 2025
e2e71c0
build: update package-lock.json with dependency version upgrades and …
alexsielicki Jun 30, 2025
638b4e9
build: upgrade packages
alexsielicki Jul 9, 2025
25ed2bf
Merge branch 'master' into theme-refresh
alexsielicki Aug 11, 2025
3857144
build: update npm packages
alexsielicki Aug 11, 2025
356d241
feat: allow clicking anywhere on project to open it, not just title
alexsielicki Aug 26, 2025
fe5ceaf
feat: move model components into their own folder
alexsielicki Aug 26, 2025
4f84be5
feat: allow clicking anywhere on model to open it, not just title
alexsielicki Aug 26, 2025
b6ee13c
feat: use new button style in PS models
alexsielicki Aug 26, 2025
d72439e
style: prettier
alexsielicki Aug 26, 2025
5e9b141
feat: switch button styles in TS and VS models
alexsielicki Aug 26, 2025
cfa06d2
feat: restyle controls buttons
alexsielicki Aug 27, 2025
1e543bd
feat: remove bottom marking and webkit specific css
alexsielicki Aug 27, 2025
f3788d1
feat: lighten graysby 10% for night colormaps to better work with lig…
alexsielicki Aug 28, 2025
5c81604
feat: update model type pills to look less like buttons
alexsielicki Aug 28, 2025
2a6506e
style: prettier
alexsielicki Aug 28, 2025
6f2331e
feat: rename create bookmark
alexsielicki Sep 2, 2025
8544296
feat: redesign nav bar menus and bookmarks dropdown
alexsielicki Sep 12, 2025
b3f1228
refactor: convert template components from class to function
alexsielicki Sep 12, 2025
1128686
feat: refresh templates list, iterate on model and project listings
alexsielicki Sep 12, 2025
8592e71
feat: redesign template list to use accordion. Implement template edi…
alexsielicki Sep 16, 2025
ed8fc9c
build: update packages. swap in new free fontawesome library for old one
alexsielicki Sep 19, 2025
7767f64
feat: use latest fontawesome icons
alexsielicki Sep 19, 2025
e78ae1d
update icons to use new fontawesome syntax
alexsielicki Sep 19, 2025
0a929ab
feat: decrease top and bottom margins
alexsielicki Sep 19, 2025
f770647
feat: move add bookmark element to top li
alexsielicki Sep 19, 2025
5f3ed67
build: update fontawesome libraries
alexsielicki Sep 22, 2025
82f0879
build: upgrade node to version 22 (lts). Closes #1287
alexsielicki Sep 24, 2025
b5af090
improve wording and colors
alexsielicki Sep 25, 2025
96c523c
fix: update all fontawesome 4 icons to version 5
alexsielicki Sep 25, 2025
51023da
fix: update all fontawesome icons from version 5 to 6
alexsielicki Sep 25, 2025
48cbf2e
fix: make close button work again after model reload
alexsielicki Sep 25, 2025
8ed0101
fix: update scatterplot pin buttons to version 7
alexsielicki Sep 26, 2025
e509c57
fix: update playback buttons to version 7
alexsielicki Sep 26, 2025
43e4960
feat: update template list to new button colors and icons
alexsielicki Sep 26, 2025
b5cc32b
update controlsbuttons to use full fontawesome class names
alexsielicki Sep 26, 2025
f41318b
Update spinner to work with Bootstrap 5
alexsielicki Sep 30, 2025
2cbbcde
Update spinner to functional component
alexsielicki Sep 30, 2025
1ddfaeb
refactor: create new Icon react component and use it across react code
alexsielicki Oct 2, 2025
ccc4f2d
refactor: use new icon component
alexsielicki Oct 2, 2025
29d0e8f
Merge branch 'master' into theme-refresh
alexsielicki Oct 2, 2025
40b69fc
build: update packages
alexsielicki Oct 2, 2025
cacb4af
fix: use flex for input path layout so that it doesn't wrap
alexsielicki Oct 2, 2025
6bc054e
refactor: swap in more react Icon components
alexsielicki Oct 2, 2025
64dcbc9
refactor: move table injection component
alexsielicki Oct 2, 2025
a495de4
refactor: rename table ingestion component
alexsielicki Oct 2, 2025
74764b3
refactor: create css module for TableIngestion component to fix styli…
alexsielicki Oct 3, 2025
b182851
fix: adjust alignment of remote browser controls
alexsielicki Oct 3, 2025
1c002e8
fix: adjust alignment of new icons
alexsielicki Oct 3, 2025
19b143a
refactor: convert TableIngestion to TypeScript
alexsielicki Oct 3, 2025
918a067
fix: improve lastSelected tracking
alexsielicki Oct 3, 2025
065f230
refine bookmarks to deal with spacing and layout in edge cases
alexsielicki Oct 3, 2025
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
3 changes: 1 addition & 2 deletions docker/compose/slycat-compose/slycat-client/DockerFile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM node:18
FROM node:22
# :lts-alpine
# see https://github.com/sass/node-sass/issues/3077 locking down to node 15 until this is resolved
WORKDIR /usr/src/slycat
RUN git config --global http.sslVerify false
RUN git clone --depth 1 https://github.com/sandialabs/slycat.git
Expand Down
3 changes: 1 addition & 2 deletions docker/compose/slycat-compose/slycat-test-client/DockerFile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM node:18
FROM node:22
# :lts-alpine
# see https://github.com/sass/node-sass/issues/3077 locking down to node 15 until this is resolved
WORKDIR /usr/src/slycat
RUN git config --global http.sslVerify false
RUN git clone --depth 1 https://github.com/sandialabs/slycat.git
Expand Down
4,251 changes: 2,364 additions & 1,887 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
"license": "MIT",
"dependencies": {
"@asielick/knockout-projections": "^1",
"@fortawesome/fontawesome-svg-core": "^6",
"@fortawesome/free-solid-svg-icons": "^6",
"@fortawesome/react-fontawesome": "^0",
"@fortawesome/fontawesome-free": "^7",
"@fortawesome/fontawesome-svg-core": "^7.0.1",
"@fortawesome/free-brands-svg-icons": "^7.0.1",
"@fortawesome/free-regular-svg-icons": "^7.0.1",
"@fortawesome/free-solid-svg-icons": "^7.0.1",
"@fortawesome/react-fontawesome": "^3.0.2",
"@reduxjs/toolkit": "^2",
"bootstrap": "^5",
"buffer": "6.0.3",
Expand All @@ -32,7 +35,6 @@
"d3fc": "^15.2.6",
"d3v7": "npm:d3@^7.8.5",
"deep-equal": "^2",
"font-awesome": "4.7.0",
"he": "1.2.0",
"jquery": "^3",
"jquery-knob": "1.2.11",
Expand All @@ -44,8 +46,8 @@
"lodash": "4.17.21",
"papaparse": "^5",
"parse-css-color": "^0.2.1",
"react": "^18",
"react-dom": "^18",
"react": "^19",
"react-dom": "^19",
"react-redux": "^9",
"redux": "^5",
"redux-logger": "3.0.6",
Expand All @@ -59,7 +61,7 @@
"three-trackballcontrols": "0.9.0",
"urijs": "1.19.11",
"uuid": "^11",
"vtk.js": "^33",
"vtk.js": "^34",
"wslink": "^2",
"zipinfo.js": "1.0.0"
},
Expand All @@ -82,25 +84,25 @@
"@types/d3": "^3",
"@types/d3v7": "npm:@types/d3@^7.4.0",
"@types/he": "^1.2.3",
"@types/jest": "^29",
"@types/jest": "^30",
"@types/jquery": "^3.5.5",
"@types/jsdom": "^21",
"@types/lodash": "^4.14.191",
"@types/node": "^22",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-test-renderer": "^18",
"@types/node": "^24",
"@types/react": "^19",
"@types/react-dom": "^19",
"@types/react-test-renderer": "^19",
"@types/redux-watch": "^1.1.2",
"@types/sinon": "^17",
"@types/sortablejs": "^1.15.8",
"@types/uuid": "^10",
"autoprefixer": "^10.1.0",
"babel-jest": "^29",
"babel-loader": "^9",
"babel-jest": "^30",
"babel-loader": "^10",
"babel-plugin-module-resolver": "^5",
"babelify": "^10.0.0",
"clean-webpack-plugin": "^4",
"copy-webpack-plugin": "^12",
"copy-webpack-plugin": "^13",
"css-loader": "^7",
"eslint": "^9",
"eslint-plugin-react": "^7.22.0",
Expand All @@ -109,17 +111,17 @@
"html-loader": "^5",
"html-webpack-plugin": "^5.0.0-beta.4",
"imports-loader": "^5",
"jest": "^29",
"jest": "^30",
"jest-fetch-mock": "^3.0.1",
"less": "^4.0.0",
"less-loader": "^12",
"node-fetch-polyfill": "^2.0.6",
"prettier": "^3",
"react-test-renderer": "^18",
"react-test-renderer": "^19",
"sass": "^1",
"sass-loader": "^16",
"shader-loader": "^1.3.1",
"sinon": "^19",
"sinon": "^21",
"style-loader": "^4",
"typed-css-modules": "^0.9.1",
"typescript": "^5",
Expand All @@ -128,7 +130,7 @@
"url-loader": "^4.1.1",
"webpack": "^5.11.1",
"webpack-bundle-analyzer": "^4.3.0",
"webpack-cli": "^5",
"webpack-cli": "^6",
"webpack-dev-server": "^5",
"webpack-merge": "^6",
"webpack-node-modules-list": "^0.4.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ exports[`when we load the RemoteFileBrowser we expect the component to render 1`
>
<i
aria-hidden="true"
className="fa fa-level-up"
className="fas fa-turn-up"
/>
</button>
</div>
Expand Down
14 changes: 3 additions & 11 deletions web-server/__tests__/spinner.test.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@

import React from 'react';
import Spinner,
{SpinnerProps, SpinnerState}
from "components/Spinner";
import Spinner from "components/Spinner";
import { mount } from "enzyme";


describe('when loading a bad marking the UnrecognizedMarkingWarning',() =>{
const render = mount(
<Spinner/>
);
test('we have no props on initial load', () => {
const props = render.props() as SpinnerProps;
expect(props).toMatchSnapshot();
});

test('we no state', () => {
const state = render.state() as SpinnerState;
expect(state).toMatchSnapshot();
test('renders without props and state', () => {
expect(render).toMatchSnapshot();
});

test('we should have a full initialization', () => {
Expand Down
27 changes: 0 additions & 27 deletions web-server/components/ControlsButton.js

This file was deleted.

47 changes: 47 additions & 0 deletions web-server/components/ControlsButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import React from "react";
import Icon, { type IconName } from "components/Icons/Icon";

declare const $: any;

export type ControlsButtonProps = {
hidden?: boolean;
button_type?: string;
button_style?: string;
id?: string;
title?: string;
disabled?: boolean;
click?: React.MouseEventHandler<HTMLButtonElement>;
data_toggle?: string;
data_target?: string;
icon?: IconName;
label?: React.ReactNode;
tooltip?: React.ReactNode | null;
};

const ControlsButton: React.FC<ControlsButtonProps> = (props) => {
// wait until all the jquery stuff is loaded
$(document).ready(function ($: any) {
// enable the tooltip
$('[data-bs-toggle="tooltip"]').tooltip();
});
const renderIcon = () => (props.icon ? <Icon type={props.icon} /> : null);

return props.hidden ? null : (
<button
className={`btn ${props.button_type || "btn-sm"} ${props.button_style}`}
id={props.id}
type="button"
title={props.title}
disabled={props.disabled}
onClick={props.click}
data-bs-toggle={props.data_toggle}
data-bs-target={props.data_target}
>
{renderIcon()}
{props.label}
{props.tooltip !== null && props.tooltip}
</button>
);
};

export default ControlsButton;
Loading