Skip to content
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.

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

Update all dependencies #186

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
8863f95
- problem with mysql
WhoamiHF Feb 13, 2024
505733a
- fixed problem with mysql
WhoamiHF Feb 17, 2024
1cd789f
- problem with language and account dropper
WhoamiHF Mar 6, 2024
761938b
Small fix in installation
Mnaukal Mar 7, 2024
53a843c
Fix dropdown
Mnaukal Mar 7, 2024
2ca414f
Remove CoreUI
Mnaukal Mar 7, 2024
6a222b9
Add Sidebar
Mnaukal Mar 7, 2024
d1aac41
Fix Buffer (base64-url)
Mnaukal Mar 7, 2024
680fd1a
Update alert close button
Mnaukal Mar 7, 2024
82212dc
- fixed Uncaught TypeError: jqModal.modal is not a function
WhoamiHF Mar 18, 2024
83c9383
- fixed sample 2
WhoamiHF Mar 20, 2024
a149fe8
- updated elastic search
WhoamiHF Apr 10, 2024
c1789bd
- problem with fetching data for custom panels
WhoamiHF May 13, 2024
8474aaa
Update modal buttons
Mnaukal May 14, 2024
05df119
Installable
May 20, 2024
3f43a76
Installable - replaced absolute path used for testing with relative
May 20, 2024
9da9390
Installable - fixed loading of scss
May 22, 2024
602de59
- removed node-sass
WhoamiHF May 23, 2024
d28d46a
- removed node-sass
WhoamiHF May 23, 2024
9fef72a
Remove checkcss
Mnaukal May 28, 2024
61b6843
Fix modals.js (revert unnecessary changes)
Mnaukal May 28, 2024
e360736
Update sidebar styles
Mnaukal May 28, 2024
7e61abe
Hopefully fixed `setFlashMessage` reloading panels
Mnaukal May 29, 2024
c7e02e3
Second attempt to fix `setFlashMessage` reloading panels
Mnaukal May 29, 2024
a9d1cd0
Fix breadcrumbs and sidebar for panels
Mnaukal May 29, 2024
1417c77
Fix zoom in line chart
Mnaukal May 29, 2024
ba8d109
Fix bugs in ScatterPlotBase.js
Mnaukal May 29, 2024
8a89c44
Small style fixes
Mnaukal May 30, 2024
408b0b6
Collapse sidebar on narrow screens
Mnaukal May 30, 2024
662fb82
Fix recursion error (brush+zoom) in HistogramChart.js
Mnaukal May 30, 2024
5022c79
Allow CTRL+S to save template/task code
Mnaukal May 30, 2024
628133c
Add example application for embedding
Mnaukal May 31, 2024
99674ba
- Working querying executed-workflows with characteristics
Jun 9, 2024
0bf8d47
Revert "- Working querying executed-workflows with characteristics"
Mnaukal Jun 12, 2024
25b5a2c
Fix login redirect
Mnaukal Jun 12, 2024
a78d915
Cleanup
Mnaukal Jun 12, 2024
d3b8f18
Add source maps to simplify debugging
Mnaukal Jun 12, 2024
61f35bc
Fix hiding flash message on page change
Mnaukal Jun 12, 2024
fd9de92
Fix permanent links
Mnaukal Jun 13, 2024
2f13a26
Mark TODOs in the code
Mnaukal Jun 13, 2024
f2ac034
Fix bug in job creation (when selecting default built-in task)
Mnaukal Jun 14, 2024
574c70d
Add example of builtin template, fix SubRoute
Mnaukal Jun 26, 2024
e756b06
Fix title in example builtin template
Mnaukal Jun 27, 2024
36e96c1
Fix navigation blocking when form is not saved
Mnaukal Jun 27, 2024
4f6a18b
Clean up unnecessary code after navigation blocking fix (36e96c1)
Mnaukal Jun 27, 2024
b5511f0
Remove debugging `console.log`s
Mnaukal Aug 23, 2024
6a8d13f
Clean up imports
Mnaukal Aug 23, 2024
d55d689
Remove resolved TODO
Mnaukal Aug 23, 2024
fb73ffe
Set min-height of top menu
Mnaukal Aug 23, 2024
bab0e88
Create .gitattributes to set the correct line endings for Shell scripts
Mnaukal Aug 23, 2024
0d7582f
Add basic Docker support to ivis-core
Mnaukal Aug 23, 2024
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
24,987 changes: 10,400 additions & 14,587 deletions client/package-lock.json

Large diffs are not rendered by default.

136 changes: 70 additions & 66 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,86 +8,90 @@
"watch-js": "webpack --watch",
"css": "npm-run-all --sequential css-compile css-minify",
"css-compile": "sass --quiet-deps --style expanded --source-map --embed-sources --precision 6 src/scss/ivis.scss dist/ivis.css",
"css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/ivis.min.css dist/ivis.css",
"css-minify": "cleancss -O1 --source-map --source-map-inline-sources --output dist/ivis.min.css dist/ivis.css",
"watch-css": "nodemon --watch src/scss -e scss -x \"npm run css\"",
"watch": "node pre-build.js && npm-run-all --parallel watch-css watch-js",
"build": "node pre-build.js && npm-run-all --parallel css js"
},
"author": "Tomas Bures",
"license": "MIT",
"dependencies": {
"@coreui/coreui": "^2.1.16",
"@fortawesome/fontawesome-free": "^5.15.4",
"ansi-to-react": "^4.0.0-alpha.0",
"axios": "^0.21.2",
"@fortawesome/fontawesome-free": "^6.5.1",
"@popperjs/core": "^2.11.8",
"ansi-to-react": "^6.1.6",
"axios": "^1.6.7",
"base64-url": "^2.3.3",
"bootstrap": "^4.6.0",
"bootstrap": "^5.0.0",
"buffer": "^6.0.3",
"core-js": "^3.35.1",
"cors": "^2.8.5",
"cubic-spline": "^3.0.3",
"d3-array": "^2.12.1",
"d3-axis": "^1.0.12",
"d3-brush": "^1.1.6",
"d3-color": "^1.4.1",
"d3-ease": "^1.0.7",
"d3-format": "^1.4.5",
"d3-interpolate": "^1.4.0",
"d3-regression": "^1.3.9",
"d3-scale": "^2.1.2",
"d3-scale-chromatic": "^1.5.0",
"d3-selection": "^1.4.2",
"d3-shape": "^1.3.7",
"d3-time": "^1.1.0",
"d3-time-format": "^2.2.3",
"d3-transition": "^1.3.2",
"d3-zoom": "^1.8.3",
"datatables.net": "^1.11.3",
"datatables.net-bs4": "^1.10.25",
"fast-deep-equal": "^2.0.1",
"i18next": "^13.0.1",
"i18next-browser-languagedetector": "^2.2.4",
"immutable": "^4.0.0-rc.14",
"jquery": "^3.6.0",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
"d3-brush": "^3.0.0",
"d3-color": "^3.1.0",
"d3-ease": "^3.0.1",
"d3-format": "^3.1.0",
"d3-interpolate": "^3.0.1",
"d3-regression": "^1.3.10",
"d3-scale": "^4.0.2",
"d3-scale-chromatic": "^3.0.0",
"d3-selection": "^3.0.0",
"d3-shape": "^3.2.0",
"d3-time": "^3.1.0",
"d3-time-format": "^4.1.0",
"d3-transition": "^3.0.1",
"d3-zoom": "^3.0.0",
"datatables.net": "^1.13.8",
"datatables.net-bs5": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"i18next": "^23.8.2",
"i18next-browser-languagedetector": "^7.2.0",
"immutable": "^5.0.0-beta.5",
"jquery": "^3.7.1",
"lodash": "^4.17.21",
"lz-string": "^1.4.4",
"mathjs": "^8.0.1",
"memoize-one": "^5.2.1",
"memoizee": "^0.4.14",
"moment": "^2.29.1",
"popper.js": "^1.16.1",
"prop-types": "^15.6.2",
"react": "^16.14.0",
"react-ace": "^6.6.0",
"lz-string": "^1.5.0",
"mathjs": "^12.3.1",
"memoize-one": "^6.0.0",
"memoizee": "^0.4.15",
"moment": "^2.30.1",
"prop-types": "^15.8.1",
"react": "^17.0.0",
"react-ace": "^10.1.0",
"react-color": "^2.19.3",
"react-csv": "^2.0.3",
"react-day-picker": "^7.4.10",
"react-dom": "^16.14.0",
"react-dropzone": "^8.2.0",
"react-i18next": "^9.0.1",
"react-router-dom": "^4.3.1",
"react-csv": "^2.2.2",
"react-day-picker": "^8.10.0",
"react-dom": "^17.0.0",
"react-dropzone": "^14.2.3",
"react-i18next": "^14.0.4",
"react-router-dom": "^6.22.0",
"shallowequal": "^1.1.0",
"url-parse": "^1.5.3"
"url-parse": "^1.5.10",
"util": "^0.12.5"
},
"devDependencies": {
"@babel/cli": "^7.14.8",
"@babel/core": "^7.15.0",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-decorators": "^7.14.5",
"@babel/plugin-proposal-function-bind": "^7.14.5",
"@babel/plugin-proposal-private-methods": "^7.14.5",
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
"@babel/preset-env": "^7.15.0",
"@babel/preset-react": "^7.14.5",
"babel-loader": "^8.2.2",
"clean-css-cli": "^4.3.0",
"css-loader": "^2.1.1",
"file-loader": "^3.0.1",
"nodemon": "^1.19.4",
"@babel/cli": "^7.23.9",
"@babel/core": "^7.23.9",
"@babel/plugin-proposal-decorators": "^7.23.9",
"@babel/plugin-proposal-function-bind": "^7.23.3",
"@babel/plugin-transform-class-properties": "^7.23.3",
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@babel/plugin-transform-private-methods": "^7.23.3",
"@babel/plugin-transform-private-property-in-object": "^7.23.4",
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"babel-loader": "^9.1.3",
"clean-css-cli": "^5.6.3",
"css-loader": "^5.2.7",
"file-loader": "^6.2.0",
"nodemon": "^3.0.3",
"npm-run-all": "^4.1.5",
"raw-loader": "^1.0.0",
"sass": "^1.38.2",
"sass-loader": "^10.1.0",
"style-loader": "^0.23.1",
"url-loader": "^1.1.2",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.12"
"raw-loader": "^4.0.2",
"sass": "^1.70.0",
"sass-loader": "^10.5.2",
"style-loader": "^2.0.0",
"url-loader": "^4.1.1",
"webpack": "^5.90.0",
"webpack-cli": "^5.1.4"
}
}
3 changes: 2 additions & 1 deletion client/src/MainMenuAnonymous.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {getLanguageChooser} from "./lib/page";
import {withComponentMixins} from "./lib/decorator-helpers";
import {withTranslation} from "./lib/i18n";


@withComponentMixins([
withTranslation
])
Expand All @@ -14,7 +15,7 @@ export default class MainMenu extends Component {
}

render() {
const t = this.props.t;
const t = this.context;

return (
<ul className="navbar-nav ivis-navbar-nav-right">
Expand Down
3 changes: 2 additions & 1 deletion client/src/MainMenuAuthenticated.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import {
} from "./lib/bootstrap-components";
import {getUrl} from "./lib/urls";
import {withComponentMixins} from "./lib/decorator-helpers";
import {withTranslation} from "./lib/i18n";
import ivisConfig
from "ivisConfig";
import {withTranslation} from "./lib/i18n";

@withComponentMixins([
withTranslation,
Expand Down Expand Up @@ -56,6 +56,7 @@ export default class MainMenu extends Component {

const workspaces = [];
for (const ws of this.props.resolved.workspacesVisible) {
console.log(ws.id);
workspaces.push(
<NavLink key={ws.id} to={'/workspaces/' + ws.id + (ws.default_panel ? '/' + ws.default_panel : '')}>{ws.name}</NavLink>
);
Expand Down
1 change: 1 addition & 0 deletions client/src/account/API.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {Button} from '../lib/bootstrap-components';
import {getUrl} from "../lib/urls";
import {Panel} from "../lib/panel";
import {withComponentMixins} from "../lib/decorator-helpers";

import {withTranslation} from "../lib/i18n";

@withComponentMixins([
Expand Down
2 changes: 1 addition & 1 deletion client/src/ivis/AnimationControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React, {Component} from "react";
import PropTypes from "prop-types";
import {select, mouse} from "d3-selection";
import {select} from "d3-selection";
import {scaleLinear, scaleTime} from "d3-scale";
import {format} from "d3-format";
import {interpolateString} from "d3-interpolate";
Expand Down
11 changes: 8 additions & 3 deletions client/src/ivis/AnimationControls.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@import "node_modules/@coreui/coreui/scss/variables";

@import "node_modules/@coreui/coreui/scss/bootstrap/mixins";
@import "../../node_modules/bootstrap/scss/_functions";
@import '../../node_modules/bootstrap/scss/variables';
@import '../../node_modules/bootstrap/scss/variables-dark';
@import '../../node_modules/bootstrap/scss/mixins';
@import "../../node_modules/bootstrap/scss/maps";
@import "../../node_modules/bootstrap/scss/utilities";
@import "../../node_modules/bootstrap/scss/helpers";
@import "../../node_modules/bootstrap/scss/utilities/api";

.label {
user-select: none;
Expand Down
5 changes: 3 additions & 2 deletions client/src/ivis/AreaChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ import tooltipStyles
from "./Tooltip.scss";
import {format as d3Format} from "d3-format";
import {withComponentMixins} from "../lib/decorator-helpers";
import {withTranslation} from "../lib/i18n";

import {PropType_d3Color} from "../lib/CustomPropTypes";
import {withTranslation} from "../lib/i18n";

function getSignalValuesForDefaultTooltip(tooltipContent, sigSetConf, sigConf, sigSetCid, sigCid, signalData) {
const numberFormat = d3Format('.3f');
Expand All @@ -32,7 +33,7 @@ function getSignalValuesForDefaultTooltip(tooltipContent, sigSetConf, sigConf, s
}

@withComponentMixins([
withTranslation
withTranslation,
])
export class AreaChart extends Component {
constructor(props){
Expand Down
23 changes: 12 additions & 11 deletions client/src/ivis/BarChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ import * as d3Selection from "d3-selection";
import * as d3Array from "d3-array";
import * as d3Zoom from "d3-zoom";
import * as d3Scheme from "d3-scale-chromatic";
import {event as d3Event, select} from "d3-selection";
import {select} from "d3-selection";
import PropTypes from "prop-types";
import {withErrorHandling} from "../lib/error-handling";
import {withComponentMixins} from "../lib/decorator-helpers";
import {withTranslation} from "../lib/i18n";

import {PropType_d3Color, PropType_d3Color_Required, PropType_NumberInRange} from "../lib/CustomPropTypes";
import {Tooltip} from "./Tooltip";
import {areZoomTransformsEqual, extentWithMargin, transitionInterpolate, wheelDelta} from "./common";
import styles from "./CorrelationCharts.scss";
import {withTranslation} from "../lib/i18n";

class TooltipContent extends Component {
constructor(props) {
Expand Down Expand Up @@ -203,15 +204,15 @@ export class StaticBarChart extends Component {
createChartZoom(xSize, ySize) {
const self = this;

const handleZoom = function () {
const handleZoom = function (event) {
// noinspection JSUnresolvedVariable
if (self.props.withTransition && d3Event.sourceEvent && d3Event.sourceEvent.type === "wheel") {
transitionInterpolate(select(self), self.state.zoomTransform, d3Event.transform, setZoomTransform, () => {
if (self.props.withTransition && event.sourceEvent && event.sourceEvent.type === "wheel") {
transitionInterpolate(select(self), self.state.zoomTransform, event.transform, setZoomTransform, () => {
self.deselectBars();
});
} else {
// noinspection JSUnresolvedVariable
setZoomTransform(d3Event.transform);
setZoomTransform(event.transform);
}
};

Expand Down Expand Up @@ -240,14 +241,14 @@ export class StaticBarChart extends Component {
.scaleExtent([this.props.zoomLevelMin, this.props.zoomLevelMax])
.translateExtent(zoomExtent)
.extent(zoomExtent)
.on("zoom", handleZoom)
.on("zoom", (event) => handleZoom(event))
.on("end", handleZoomEnd)
.on("start", handleZoomStart)
.wheelDelta(wheelDelta(2))
.filter(() => {
if (d3Event.type === "wheel" && !d3Event.shiftKey)
.filter((event) => {
if (event.type === "wheel" && !event.shiftKey)
return false;
return !d3Event.ctrlKey && !d3Event.button;
return !event.ctrlKey && !event.button;
});
this.svgContainerSelection.call(this.zoom);
}
Expand Down Expand Up @@ -285,7 +286,7 @@ export class StaticBarChart extends Component {
}
}

const containerPos = d3Selection.mouse(self.containerNode);
const containerPos = d3Selection.pointer(self.containerNode);
const mousePosition = {x: containerPos[0], y: containerPos[1]};

self.setState({
Expand Down
7 changes: 4 additions & 3 deletions client/src/ivis/BoxPlot.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ import {DataAccessSession} from "./DataAccess";
import {withAsyncErrorHandler, withErrorHandling} from "../lib/error-handling";
import PropTypes from "prop-types";
import {withComponentMixins} from "../lib/decorator-helpers";
import {withTranslation} from "../lib/i18n";

import {Tooltip} from "./Tooltip";
import {ConfigDifference, extentWithMargin, timeIntervalDifference} from "./common";
import {PropType_d3Color, PropType_NumberInRange} from "../lib/CustomPropTypes";
import commonStyles from "./commons.scss";
import {withTranslation} from "../lib/i18n";

function compareConfigs(conf1, conf2) {
let diffResult = ConfigDifference.NONE;
Expand Down Expand Up @@ -381,8 +382,8 @@ export class BoxPlot extends Component {
createChartCursor(xSize, ySize, xScale, yScale, signalSetsData) {
const self = this;

const mouseMove = function () {
const containerPos = d3Selection.mouse(self.containerNode);
const mouseMove = function (event) {
const containerPos = d3Selection.pointer(event,self.containerNode);
const y = containerPos[1] - self.props.margin.top;
const x = containerPos[0] - self.props.margin.left;

Expand Down
3 changes: 2 additions & 1 deletion client/src/ivis/BubblePlot.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import React, {Component} from "react";
import {withErrorHandling} from "../lib/error-handling";
import PropTypes from "prop-types";
import {withComponentMixins} from "../lib/decorator-helpers";
import {withTranslation} from "../lib/i18n";

import {ScatterPlotBase} from "./ScatterPlotBase";
import {PropType_d3Color_Required} from "../lib/CustomPropTypes";
import {dotShapeNames} from "./dot_shapes";
import {withTranslation} from "../lib/i18n";

@withComponentMixins([
withTranslation,
Expand Down
3 changes: 3 additions & 0 deletions client/src/ivis/CorrelationCharts.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
@import "../../node_modules/bootstrap/scss/_functions";
@import "../scss/variables";

@import "../../node_modules/bootstrap/scss/_variables";

.scatterPlotToolbar {
max-width: 300px;
float: right;
Expand Down
Loading
Loading