diff --git a/docs/charts.rst b/docs/charts.rst index 4896d9d794..d5a753c735 100644 --- a/docs/charts.rst +++ b/docs/charts.rst @@ -24,7 +24,7 @@ A window layer "Display chart" is shown in which you can customize the chart wit Chart implementation -------------------- -Charts in phpMyAdmin are drawn using `jqPlot `_ jQuery library. +Charts in phpMyAdmin are drawn using the `Chart.js `_ library. Examples -------- diff --git a/package.json b/package.json index b80fc9dc3d..d459c72774 100644 --- a/package.json +++ b/package.json @@ -57,10 +57,8 @@ "ts-loader": "^9.4.2", "typescript": "~5.3.2", "u2f-api-polyfill": "0.4.4", - "updated-jqplot": "1.0.9", "webpack": "^5.76.3", - "webpack-cli": "^5.0.1", - "webpack-concat-files-plugin": "^0.5.2" + "webpack-cli": "^5.0.1" }, "devDependencies": { "@types/jest": "^29.5.0", diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss index abdee5f283..2d1ddb8ec8 100644 --- a/public/themes/bootstrap/scss/_common.scss +++ b/public/themes/bootstrap/scss/_common.scss @@ -1541,17 +1541,6 @@ body .ui-widget { z-index: 801; } -// over-riding jqplot-yaxis class -.jqplot-yaxis { - left: 0 !important; - min-width: 25px; - width: auto; -} - -.jqplot-axis { - overflow: hidden; -} - div#page_content div { &#tableslistcontainer { margin-top: 1em; diff --git a/public/themes/bootstrap/scss/_jqplot.scss b/public/themes/bootstrap/scss/_jqplot.scss deleted file mode 100644 index f3d92f879b..0000000000 --- a/public/themes/bootstrap/scss/_jqplot.scss +++ /dev/null @@ -1,275 +0,0 @@ -/* jqPlot */ - -// rules for the plot target div. These will be cascaded down to all plot elements according to css rules -.jqplot-target { - position: relative; - color: #222; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 1em; -} - -// rules applied to all axes -.jqplot-axis { - font-size: 0.75em; -} - -.jqplot-xaxis { - margin-top: 10px; -} - -.jqplot-x2axis { - margin-bottom: 10px; -} - -.jqplot-yaxis { - margin-right: 10px; -} - -.jqplot-y2axis, -.jqplot-y3axis, -.jqplot-y4axis, -.jqplot-y5axis, -.jqplot-y6axis, -.jqplot-y7axis, -.jqplot-y8axis, -.jqplot-y9axis, -.jqplot-yMidAxis { - margin-left: 10px; - margin-right: 10px; -} - -// rules applied to all axis tick divs -.jqplot-axis-tick, -.jqplot-xaxis-tick, -.jqplot-yaxis-tick, -.jqplot-x2axis-tick, -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick, -.jqplot-yMidAxis-tick { - position: absolute; - white-space: pre; -} - -.jqplot-xaxis-tick { - top: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: top; -} - -.jqplot-x2axis-tick { - bottom: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: bottom; -} - -.jqplot-yaxis-tick { - right: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: right; - - &.jqplot-breakTick { - right: -20px; - margin-right: 0; - padding: 1px 5px 1px; - z-index: 2; - font-size: 1.5em; - } -} - -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick { - left: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: left; -} - -.jqplot-yMidAxis-tick { - text-align: center; - white-space: nowrap; -} - -.jqplot-xaxis-label { - margin-top: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-x2axis-label { - margin-bottom: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yaxis-label { - margin-right: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yMidAxis-label { - font-size: 11pt; - position: absolute; -} - -.jqplot-y2axis-label, -.jqplot-y3axis-label, -.jqplot-y4axis-label, -.jqplot-y5axis-label, -.jqplot-y6axis-label, -.jqplot-y7axis-label, -.jqplot-y8axis-label, -.jqplot-y9axis-label { - font-size: 11pt; - margin-left: 10px; - position: absolute; -} - -.jqplot-meterGauge-tick { - font-size: 0.75em; - color: #999; -} - -.jqplot-meterGauge-label { - font-size: 1em; - color: #999; -} - -table { - &.jqplot-table-legend { - margin-top: 12px; - margin-bottom: 12px; - margin-left: 12px; - margin-right: 12px; - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } - - &.jqplot-cursor-legend { - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } -} - -td { - &.jqplot-table-legend { - vertical-align: middle; - } - - &.jqplot-seriesToggle { - &:hover, - &:active { - cursor: pointer; - } - } -} - -.jqplot-table-legend .jqplot-series-hidden { - text-decoration: line-through; -} - -div { - &.jqplot-table-legend-swatch-outline { - border: 1px solid #ccc; - padding: 1px; - } - - &.jqplot-table-legend-swatch { - width: 0; - height: 0; - border-top-width: 5px; - border-bottom-width: 5px; - border-left-width: 6px; - border-right-width: 6px; - border-top-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-right-style: solid; - } -} - -.jqplot-title { - top: 0; - left: 0; - padding-bottom: 0.5em; - font-size: 1.2em; -} - -table.jqplot-cursor-tooltip { - border: 1px solid #ccc; - font-size: 0.75em; -} - -.jqplot-cursor-tooltip, -.jqplot-highlighter-tooltip, -.jqplot-canvasOverlay-tooltip { - border: 1px solid #ccc; - font-size: 1em; - white-space: nowrap; - background: rgba(208, 208, 208, 0.8); - padding: 1px; -} - -.jqplot-point-label { - font-size: 0.75em; - z-index: 2; -} - -td.jqplot-cursor-legend-swatch { - vertical-align: middle; - text-align: center; -} - -div.jqplot-cursor-legend-swatch { - width: 1.2em; - height: 0.7em; -} - -.jqplot-error { - // Styles added to the plot target container when there is an error go here. - text-align: center; -} - -.jqplot-error-message { - // Styling of the custom error message div goes here. - position: relative; - top: 46%; - display: inline-block; -} - -div { - &.jqplot-bubble-label { - font-size: 0.8em; - padding-left: 2px; - padding-right: 2px; - color: rgb(20%, 20%, 20%); - - &.jqplot-bubble-label-highlight { - background: rgba(90%, 90%, 90%, 0.7); - } - } - - &.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); - } -} diff --git a/public/themes/bootstrap/scss/theme.scss b/public/themes/bootstrap/scss/theme.scss index c198a90e3a..cf19f32943 100644 --- a/public/themes/bootstrap/scss/theme.scss +++ b/public/themes/bootstrap/scss/theme.scss @@ -5,7 +5,6 @@ @import "navigation"; @import "designer"; @import "codemirror"; -@import "jqplot"; @import "icons"; @import "reboot"; @import "tables"; diff --git a/public/themes/metro/scss/_jqplot.scss b/public/themes/metro/scss/_jqplot.scss deleted file mode 100644 index b2f5c3ce00..0000000000 --- a/public/themes/metro/scss/_jqplot.scss +++ /dev/null @@ -1,276 +0,0 @@ -// Styles for jqPlot for the Metro theme - -// rules for the plot target div. -// These will be cascaded down to all plot elements according to css rules -.jqplot-target { - position: relative; - color: #222; - font-family: $font-family-base; - font-size: 1em; -} - -// rules applied to all axes -.jqplot-axis { - font-size: 0.75em; -} - -.jqplot-xaxis { - margin-top: 10px; -} - -.jqplot-x2axis { - margin-bottom: 10px; -} - -.jqplot-yaxis { - margin-right: 10px; -} - -.jqplot-y2axis, -.jqplot-y3axis, -.jqplot-y4axis, -.jqplot-y5axis, -.jqplot-y6axis, -.jqplot-y7axis, -.jqplot-y8axis, -.jqplot-y9axis, -.jqplot-yMidAxis { - margin-left: 10px; - margin-right: 10px; -} - -// rules applied to all axis tick divs -.jqplot-axis-tick, -.jqplot-xaxis-tick, -.jqplot-yaxis-tick, -.jqplot-x2axis-tick, -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick, -.jqplot-yMidAxis-tick { - position: absolute; - white-space: pre; -} - -.jqplot-xaxis-tick { - top: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: top; -} - -.jqplot-x2axis-tick { - bottom: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: bottom; -} - -.jqplot-yaxis-tick { - right: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: right; - - &.jqplot-breakTick { - right: -20px; - margin-right: 0; - padding: 1px 5px 1px; - z-index: 2; - font-size: 1.5em; - } -} - -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick { - left: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: left; -} - -.jqplot-yMidAxis-tick { - text-align: center; - white-space: nowrap; -} - -.jqplot-xaxis-label { - margin-top: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-x2axis-label { - margin-bottom: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yaxis-label { - margin-right: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yMidAxis-label { - font-size: 11pt; - position: absolute; -} - -.jqplot-y2axis-label, -.jqplot-y3axis-label, -.jqplot-y4axis-label, -.jqplot-y5axis-label, -.jqplot-y6axis-label, -.jqplot-y7axis-label, -.jqplot-y8axis-label, -.jqplot-y9axis-label { - font-size: 11pt; - margin-left: 10px; - position: absolute; -} - -.jqplot-meterGauge-tick { - font-size: 0.75em; - color: #999; -} - -.jqplot-meterGauge-label { - font-size: 1em; - color: #999; -} - -table { - &.jqplot-table-legend { - margin-top: 12px; - margin-bottom: 12px; - margin-left: 12px; - margin-right: 12px; - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } - - &.jqplot-cursor-legend { - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } -} - -td { - &.jqplot-table-legend { - vertical-align: middle; - } - - &.jqplot-seriesToggle { - &:hover, - &:active { - cursor: pointer; - } - } -} - -.jqplot-table-legend .jqplot-series-hidden { - text-decoration: line-through; -} - -div { - &.jqplot-table-legend-swatch-outline { - border: 1px solid #ccc; - padding: 1px; - } - - &.jqplot-table-legend-swatch { - width: 0; - height: 0; - border-top-width: 5px; - border-bottom-width: 5px; - border-left-width: 6px; - border-right-width: 6px; - border-top-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-right-style: solid; - } -} - -.jqplot-title { - top: 0; - left: 0; - padding-bottom: 0.5em; - font-size: 1.2em; -} - -table.jqplot-cursor-tooltip { - border: 1px solid #ccc; - font-size: 0.75em; -} - -.jqplot-cursor-tooltip, -.jqplot-highlighter-tooltip, -.jqplot-canvasOverlay-tooltip { - border: 1px solid #ccc; - font-size: 0.75em; - white-space: nowrap; - background: rgba(208, 208, 208, 0.5); - padding: 1px; -} - -.jqplot-point-label { - font-size: 0.75em; - z-index: 2; -} - -td.jqplot-cursor-legend-swatch { - vertical-align: middle; - text-align: center; -} - -div.jqplot-cursor-legend-swatch { - width: 1.2em; - height: 0.7em; -} - -// Styles added to the plot target container when there is an error go here. -.jqplot-error { - text-align: center; -} - -// Styling of the custom error message div goes here. -.jqplot-error-message { - position: relative; - top: 46%; - display: inline-block; -} - -div { - &.jqplot-bubble-label { - font-size: 0.8em; - padding-left: 2px; - padding-right: 2px; - color: rgb(20%, 20%, 20%); - - &.jqplot-bubble-label-highlight { - background: rgba(90%, 90%, 90%, 0.7); - } - } - - &.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); - } -} diff --git a/public/themes/metro/scss/theme.scss b/public/themes/metro/scss/theme.scss index aabb76d49b..5ec6f3b1a6 100644 --- a/public/themes/metro/scss/theme.scss +++ b/public/themes/metro/scss/theme.scss @@ -7,7 +7,6 @@ @import "navigation"; @import "designer"; @import "codemirror"; -@import "jqplot"; @import "icons"; @import "reboot"; @import "tables"; diff --git a/public/themes/original/scss/theme.scss b/public/themes/original/scss/theme.scss index b4eced3cb6..db7087abde 100644 --- a/public/themes/original/scss/theme.scss +++ b/public/themes/original/scss/theme.scss @@ -5,7 +5,6 @@ @import "navigation"; @import "../../pmahomme/scss/designer"; @import "../../pmahomme/scss/codemirror"; -@import "../../pmahomme/scss/jqplot"; @import "icons"; @import "reboot"; @import "tables"; diff --git a/public/themes/pmahomme/scss/_common.scss b/public/themes/pmahomme/scss/_common.scss index 875b2acccd..6c16869424 100644 --- a/public/themes/pmahomme/scss/_common.scss +++ b/public/themes/pmahomme/scss/_common.scss @@ -1752,17 +1752,6 @@ body #ui-datepicker-div { z-index: 801; } -// over-riding jqplot-yaxis class -.jqplot-yaxis { - left: 0 !important; - min-width: 25px; - width: auto; -} - -.jqplot-axis { - overflow: hidden; -} - div#page_content div { &#tableslistcontainer { margin-top: 1em; diff --git a/public/themes/pmahomme/scss/_jqplot.scss b/public/themes/pmahomme/scss/_jqplot.scss deleted file mode 100644 index f3d92f879b..0000000000 --- a/public/themes/pmahomme/scss/_jqplot.scss +++ /dev/null @@ -1,275 +0,0 @@ -/* jqPlot */ - -// rules for the plot target div. These will be cascaded down to all plot elements according to css rules -.jqplot-target { - position: relative; - color: #222; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 1em; -} - -// rules applied to all axes -.jqplot-axis { - font-size: 0.75em; -} - -.jqplot-xaxis { - margin-top: 10px; -} - -.jqplot-x2axis { - margin-bottom: 10px; -} - -.jqplot-yaxis { - margin-right: 10px; -} - -.jqplot-y2axis, -.jqplot-y3axis, -.jqplot-y4axis, -.jqplot-y5axis, -.jqplot-y6axis, -.jqplot-y7axis, -.jqplot-y8axis, -.jqplot-y9axis, -.jqplot-yMidAxis { - margin-left: 10px; - margin-right: 10px; -} - -// rules applied to all axis tick divs -.jqplot-axis-tick, -.jqplot-xaxis-tick, -.jqplot-yaxis-tick, -.jqplot-x2axis-tick, -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick, -.jqplot-yMidAxis-tick { - position: absolute; - white-space: pre; -} - -.jqplot-xaxis-tick { - top: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: top; -} - -.jqplot-x2axis-tick { - bottom: 0; - // initial position untill tick is drawn in proper place - left: 15px; - vertical-align: bottom; -} - -.jqplot-yaxis-tick { - right: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: right; - - &.jqplot-breakTick { - right: -20px; - margin-right: 0; - padding: 1px 5px 1px; - z-index: 2; - font-size: 1.5em; - } -} - -.jqplot-y2axis-tick, -.jqplot-y3axis-tick, -.jqplot-y4axis-tick, -.jqplot-y5axis-tick, -.jqplot-y6axis-tick, -.jqplot-y7axis-tick, -.jqplot-y8axis-tick, -.jqplot-y9axis-tick { - left: 0; - // initial position untill tick is drawn in proper place - top: 15px; - text-align: left; -} - -.jqplot-yMidAxis-tick { - text-align: center; - white-space: nowrap; -} - -.jqplot-xaxis-label { - margin-top: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-x2axis-label { - margin-bottom: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yaxis-label { - margin-right: 10px; - font-size: 11pt; - position: absolute; -} - -.jqplot-yMidAxis-label { - font-size: 11pt; - position: absolute; -} - -.jqplot-y2axis-label, -.jqplot-y3axis-label, -.jqplot-y4axis-label, -.jqplot-y5axis-label, -.jqplot-y6axis-label, -.jqplot-y7axis-label, -.jqplot-y8axis-label, -.jqplot-y9axis-label { - font-size: 11pt; - margin-left: 10px; - position: absolute; -} - -.jqplot-meterGauge-tick { - font-size: 0.75em; - color: #999; -} - -.jqplot-meterGauge-label { - font-size: 1em; - color: #999; -} - -table { - &.jqplot-table-legend { - margin-top: 12px; - margin-bottom: 12px; - margin-left: 12px; - margin-right: 12px; - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } - - &.jqplot-cursor-legend { - background-color: rgba(255, 255, 255, 0.6); - border: 1px solid #ccc; - position: absolute; - font-size: 0.75em; - } -} - -td { - &.jqplot-table-legend { - vertical-align: middle; - } - - &.jqplot-seriesToggle { - &:hover, - &:active { - cursor: pointer; - } - } -} - -.jqplot-table-legend .jqplot-series-hidden { - text-decoration: line-through; -} - -div { - &.jqplot-table-legend-swatch-outline { - border: 1px solid #ccc; - padding: 1px; - } - - &.jqplot-table-legend-swatch { - width: 0; - height: 0; - border-top-width: 5px; - border-bottom-width: 5px; - border-left-width: 6px; - border-right-width: 6px; - border-top-style: solid; - border-bottom-style: solid; - border-left-style: solid; - border-right-style: solid; - } -} - -.jqplot-title { - top: 0; - left: 0; - padding-bottom: 0.5em; - font-size: 1.2em; -} - -table.jqplot-cursor-tooltip { - border: 1px solid #ccc; - font-size: 0.75em; -} - -.jqplot-cursor-tooltip, -.jqplot-highlighter-tooltip, -.jqplot-canvasOverlay-tooltip { - border: 1px solid #ccc; - font-size: 1em; - white-space: nowrap; - background: rgba(208, 208, 208, 0.8); - padding: 1px; -} - -.jqplot-point-label { - font-size: 0.75em; - z-index: 2; -} - -td.jqplot-cursor-legend-swatch { - vertical-align: middle; - text-align: center; -} - -div.jqplot-cursor-legend-swatch { - width: 1.2em; - height: 0.7em; -} - -.jqplot-error { - // Styles added to the plot target container when there is an error go here. - text-align: center; -} - -.jqplot-error-message { - // Styling of the custom error message div goes here. - position: relative; - top: 46%; - display: inline-block; -} - -div { - &.jqplot-bubble-label { - font-size: 0.8em; - padding-left: 2px; - padding-right: 2px; - color: rgb(20%, 20%, 20%); - - &.jqplot-bubble-label-highlight { - background: rgba(90%, 90%, 90%, 0.7); - } - } - - &.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); - } -} diff --git a/public/themes/pmahomme/scss/theme.scss b/public/themes/pmahomme/scss/theme.scss index d6cbaf437b..ba1bb9ba50 100644 --- a/public/themes/pmahomme/scss/theme.scss +++ b/public/themes/pmahomme/scss/theme.scss @@ -5,7 +5,6 @@ @import "navigation"; @import "designer"; @import "codemirror"; -@import "jqplot"; @import "icons"; @import "reboot"; @import "tables"; diff --git a/resources/js/global.d.ts b/resources/js/global.d.ts index e1807611ef..419113b058 100644 --- a/resources/js/global.d.ts +++ b/resources/js/global.d.ts @@ -48,6 +48,5 @@ interface JQuery { interface JQueryStatic { timepicker: any; tablesorter: any; - jqplot: any; uiTableFilter: any; } diff --git a/resources/js/src/chart.ts b/resources/js/src/chart.ts deleted file mode 100644 index c25ca300e2..0000000000 --- a/resources/js/src/chart.ts +++ /dev/null @@ -1,741 +0,0 @@ -import $ from 'jquery'; - -/** - * Chart type enumerations - */ -var ChartType = { - LINE: 'line', - SPLINE: 'spline', - AREA: 'area', - BAR: 'bar', - COLUMN: 'column', - PIE: 'pie', - TIMELINE: 'timeline', - SCATTER: 'scatter' -}; - -/** - * Column type enumeration - */ -var ColumnType = { - STRING: 'string', - NUMBER: 'number', - BOOLEAN: 'boolean', - DATE: 'date' -}; - -/** - * Abstract chart factory which defines the contract for chart factories - */ -var ChartFactory = function () { -}; - -ChartFactory.prototype = { - createChart: function () { - throw new Error('createChart must be implemented by a subclass'); - } -}; - -/** - * Abstract chart which defines the contract for charts - * - * @param elementId - * id of the div element the chart is drawn in - */ -var AbstractChart = function (elementId = undefined) { - this.elementId = elementId; -}; - -AbstractChart.prototype = { - draw: function () { - throw new Error('draw must be implemented by a subclass'); - }, - redraw: function () { - throw new Error('redraw must be implemented by a subclass'); - }, - destroy: function () { - throw new Error('destroy must be implemented by a subclass'); - }, - toImageString: function () { - throw new Error('toImageString must be implemented by a subclass'); - } -}; - -/** - * Abstract representation of charts that operates on DataTable where,
- * - * Line chart, area chart, bar chart, column chart are typical examples. - * - * @param elementId - * id of the div element the chart is drawn in - */ -var BaseChart = function (elementId = undefined) { - AbstractChart.call(this, elementId); -}; - -BaseChart.prototype = new AbstractChart(); -BaseChart.prototype.constructor = BaseChart; -BaseChart.prototype.validateColumns = function (dataTable) { - var columns = dataTable.getColumns(); - if (columns.length < 2) { - throw new Error('Minimum of two columns are required for this chart'); - } - - for (var i = 1; i < columns.length; i++) { - if (columns[i].type !== ColumnType.NUMBER) { - throw new Error('Column ' + (i + 1) + ' should be of type \'Number\''); - } - } - - return true; -}; - -/** - * Abstract pie chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var PieChart = function (elementId) { - BaseChart.call(this, elementId); -}; - -PieChart.prototype = new BaseChart(); -PieChart.prototype.constructor = PieChart; -PieChart.prototype.validateColumns = function (dataTable) { - var columns = dataTable.getColumns(); - if (columns.length > 2) { - throw new Error('Pie charts can draw only one series'); - } - - return BaseChart.prototype.validateColumns.call(this, dataTable); -}; - -/** - * Abstract timeline chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var TimelineChart = function (elementId) { - BaseChart.call(this, elementId); -}; - -TimelineChart.prototype = new BaseChart(); -TimelineChart.prototype.constructor = TimelineChart; -TimelineChart.prototype.validateColumns = function (dataTable) { - var result = BaseChart.prototype.validateColumns.call(this, dataTable); - if (result) { - var columns = dataTable.getColumns(); - if (columns[0].type !== ColumnType.DATE) { - throw new Error('First column of timeline chart need to be a date column'); - } - } - - return result; -}; - -/** - * Abstract scatter chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var ScatterChart = function (elementId) { - BaseChart.call(this, elementId); -}; - -ScatterChart.prototype = new BaseChart(); -ScatterChart.prototype.constructor = ScatterChart; -ScatterChart.prototype.validateColumns = function (dataTable) { - var result = BaseChart.prototype.validateColumns.call(this, dataTable); - if (result) { - var columns = dataTable.getColumns(); - if (columns[0].type !== ColumnType.NUMBER) { - throw new Error('First column of scatter chart need to be a numeric column'); - } - } - - return result; -}; - -/** - * The data table contains column information and data for the chart. - */ -var DataTable = function () { - var columns = []; - var data = null; - - this.addColumn = function (type, name) { - columns.push({ - 'type': type, - 'name': name - }); - }; - - this.getColumns = function () { - return columns; - }; - - this.setData = function (rows) { - data = rows; - fillMissingValues(); - }; - - this.getData = function () { - return data; - }; - - var fillMissingValues = function () { - if (columns.length === 0) { - throw new Error('Set columns first'); - } - - var row; - for (var i = 0; i < data.length; i++) { - row = data[i]; - if (row.length > columns.length) { - row.splice(columns.length - 1, row.length - columns.length); - } else if (row.length < columns.length) { - for (var j = row.length; j < columns.length; j++) { - row.push(null); - } - } - } - }; -}; - -/** ***************************************************************************** - * JQPlot specific code - ******************************************************************************/ - -/** - * Abstract JQplot chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotChart = function (elementId = undefined) { - AbstractChart.call(this, elementId); - this.plot = null; - this.validator = null; -}; - -JQPlotChart.prototype = new AbstractChart(); -JQPlotChart.prototype.constructor = JQPlotChart; -JQPlotChart.prototype.draw = function (data, options) { - if (this.validator.validateColumns(data)) { - this.plot = $.jqplot(this.elementId, this.prepareData(data), this - .populateOptions(data, options)); - } -}; - -JQPlotChart.prototype.destroy = function () { - if (this.plot !== null) { - this.plot.destroy(); - } -}; - -JQPlotChart.prototype.redraw = function (options) { - if (this.plot !== null) { - this.plot.replot(options); - } -}; - -JQPlotChart.prototype.toImageString = function () { - if (this.plot !== null) { - // @ts-ignore - return $('#' + this.elementId).jqplotToImageStr({}); - } -}; - -JQPlotChart.prototype.populateOptions = function () { - throw new Error('populateOptions must be implemented by a subclass'); -}; - -JQPlotChart.prototype.prepareData = function () { - throw new Error('prepareData must be implemented by a subclass'); -}; - -/** - * JQPlot line chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotLineChart = function (elementId = undefined) { - JQPlotChart.call(this, elementId); - this.validator = BaseChart.prototype; -}; - -JQPlotLineChart.prototype = new JQPlotChart(); -JQPlotLineChart.prototype.constructor = JQPlotLineChart; - -JQPlotLineChart.prototype.populateOptions = function (dataTable, options) { - var columns = dataTable.getColumns(); - var optional = { - axes: { - xaxis: { - label: columns[0].name, - renderer: $.jqplot.CategoryAxisRenderer, - ticks: [] - }, - yaxis: { - label: (columns.length === 2 ? columns[1].name : 'Values'), - labelRenderer: $.jqplot.CanvasAxisLabelRenderer - } - }, - highlighter: { - show: true, - tooltipAxes: 'y', - formatString: '%d' - }, - series: [] - }; - $.extend(true, optional, options); - - if (optional.series.length === 0) { - for (var i = 1; i < columns.length; i++) { - optional.series.push({ - label: columns[i].name.toString() - }); - } - } - - if (optional.axes.xaxis.ticks.length === 0) { - var data = dataTable.getData(); - for (var j = 0; j < data.length; j++) { - optional.axes.xaxis.ticks.push(data[j][0] !== null ? data[j][0].toString() : null); - } - } - - return optional; -}; - -JQPlotLineChart.prototype.prepareData = function (dataTable) { - var data = dataTable.getData(); - var row; - var retData = []; - var retRow; - for (var i = 0; i < data.length; i++) { - row = data[i]; - for (var j = 1; j < row.length; j++) { - retRow = retData[j - 1]; - if (retRow === undefined) { - retRow = []; - retData[j - 1] = retRow; - } - - retRow.push(row[j]); - } - } - - return retData; -}; - -/** - * JQPlot spline chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotSplineChart = function (elementId) { - JQPlotLineChart.call(this, elementId); -}; - -JQPlotSplineChart.prototype = new JQPlotLineChart(); -JQPlotSplineChart.prototype.constructor = JQPlotSplineChart; - -JQPlotSplineChart.prototype.populateOptions = function (dataTable, options) { - var optional = {}; - var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable, - options); - var compulsory = { - seriesDefaults: { - rendererOptions: { - smooth: true - } - } - }; - $.extend(true, optional, opt, compulsory); - - return optional; -}; - -/** - * JQPlot scatter chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotScatterChart = function (elementId) { - JQPlotChart.call(this, elementId); - this.validator = ScatterChart.prototype; -}; - -JQPlotScatterChart.prototype = new JQPlotChart(); -JQPlotScatterChart.prototype.constructor = JQPlotScatterChart; - -JQPlotScatterChart.prototype.populateOptions = function (dataTable, options) { - var columns = dataTable.getColumns(); - var optional = { - axes: { - xaxis: { - label: columns[0].name - }, - yaxis: { - label: (columns.length === 2 ? columns[1].name : 'Values'), - labelRenderer: $.jqplot.CanvasAxisLabelRenderer - } - }, - highlighter: { - show: true, - tooltipAxes: 'xy', - formatString: '%d, %d' - }, - series: [] - }; - for (var i = 1; i < columns.length; i++) { - optional.series.push({ - label: columns[i].name.toString() - }); - } - - var compulsory = { - seriesDefaults: { - showLine: false, - markerOptions: { - size: 7, - style: 'x' - } - } - }; - - $.extend(true, optional, options, compulsory); - - return optional; -}; - -JQPlotScatterChart.prototype.prepareData = function (dataTable) { - var data = dataTable.getData(); - var row; - var retData = []; - var retRow; - for (var i = 0; i < data.length; i++) { - row = data[i]; - if (row[0]) { - for (var j = 1; j < row.length; j++) { - retRow = retData[j - 1]; - if (retRow === undefined) { - retRow = []; - retData[j - 1] = retRow; - } - - retRow.push([row[0], row[j]]); - } - } - } - - return retData; -}; - -/** - * JQPlot timeline chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotTimelineChart = function (elementId) { - JQPlotLineChart.call(this, elementId); - this.validator = TimelineChart.prototype; -}; - -JQPlotTimelineChart.prototype = new JQPlotLineChart(); -JQPlotTimelineChart.prototype.constructor = JQPlotTimelineChart; - -JQPlotTimelineChart.prototype.populateOptions = function (dataTable, options) { - var optional = { - axes: { - xaxis: { - tickOptions: { - formatString: '%b %#d, %y' - } - } - } - }; - var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable, options); - var compulsory = { - axes: { - xaxis: { - renderer: $.jqplot.DateAxisRenderer - } - } - }; - $.extend(true, optional, opt, compulsory); - - return optional; -}; - -JQPlotTimelineChart.prototype.prepareData = function (dataTable) { - var data = dataTable.getData(); - var row; - var d; - var retData = []; - var retRow; - for (var i = 0; i < data.length; i++) { - row = data[i]; - d = row[0]; - for (var j = 1; j < row.length; j++) { - retRow = retData[j - 1]; - if (retRow === undefined) { - retRow = []; - retData[j - 1] = retRow; - } - - // See https://github.com/phpmyadmin/phpmyadmin/issues/14395 for the block - if (d !== null && typeof d === 'object') { - retRow.push([d.getTime(), row[j]]); - } else if (typeof d === 'string') { - d = new Date(d); - retRow.push([d.getTime(), row[j]]); - } - } - } - - return retData; -}; - -/** - * JQPlot area chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotAreaChart = function (elementId) { - JQPlotLineChart.call(this, elementId); -}; - -JQPlotAreaChart.prototype = new JQPlotLineChart(); -JQPlotAreaChart.prototype.constructor = JQPlotAreaChart; - -JQPlotAreaChart.prototype.populateOptions = function (dataTable, options) { - var optional = { - seriesDefaults: { - fillToZero: true - } - }; - var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable, - options); - var compulsory = { - seriesDefaults: { - fill: true - } - }; - $.extend(true, optional, opt, compulsory); - - return optional; -}; - -/** - * JQPlot column chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotColumnChart = function (elementId) { - JQPlotLineChart.call(this, elementId); -}; - -JQPlotColumnChart.prototype = new JQPlotLineChart(); -JQPlotColumnChart.prototype.constructor = JQPlotColumnChart; - -JQPlotColumnChart.prototype.populateOptions = function (dataTable, options) { - var optional = { - seriesDefaults: { - fillToZero: true - } - }; - var opt = JQPlotLineChart.prototype.populateOptions.call(this, dataTable, - options); - var compulsory = { - seriesDefaults: { - renderer: $.jqplot.BarRenderer - } - }; - $.extend(true, optional, opt, compulsory); - - return optional; -}; - -/** - * JQPlot bar chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotBarChart = function (elementId) { - JQPlotLineChart.call(this, elementId); -}; - -JQPlotBarChart.prototype = new JQPlotLineChart(); -JQPlotBarChart.prototype.constructor = JQPlotBarChart; - -JQPlotBarChart.prototype.populateOptions = function (dataTable, options) { - var columns = dataTable.getColumns(); - var optional = { - axes: { - yaxis: { - label: columns[0].name, - labelRenderer: $.jqplot.CanvasAxisLabelRenderer, - renderer: $.jqplot.CategoryAxisRenderer, - ticks: [] - }, - xaxis: { - label: (columns.length === 2 ? columns[1].name : 'Values'), - labelRenderer: $.jqplot.CanvasAxisLabelRenderer - } - }, - highlighter: { - show: true, - tooltipAxes: 'x', - formatString: '%d' - }, - series: [], - seriesDefaults: { - fillToZero: true - } - }; - var compulsory = { - seriesDefaults: { - renderer: $.jqplot.BarRenderer, - rendererOptions: { - barDirection: 'horizontal' - } - } - }; - $.extend(true, optional, options, compulsory); - - if (optional.axes.yaxis.ticks.length === 0) { - var data = dataTable.getData(); - for (var i = 0; i < data.length; i++) { - optional.axes.yaxis.ticks.push(data[i][0].toString()); - } - } - - if (optional.series.length === 0) { - for (var j = 1; j < columns.length; j++) { - optional.series.push({ - label: columns[j].name.toString() - }); - } - } - - return optional; -}; - -/** - * JQPlot pie chart - * - * @param elementId - * id of the div element the chart is drawn in - */ -var JQPlotPieChart = function (elementId) { - JQPlotChart.call(this, elementId); - this.validator = PieChart.prototype; -}; - -JQPlotPieChart.prototype = new JQPlotChart(); -JQPlotPieChart.prototype.constructor = JQPlotPieChart; - -JQPlotPieChart.prototype.populateOptions = function (dataTable, options) { - var optional = { - highlighter: { - show: true, - tooltipAxes: 'xy', - formatString: '%s, %d', - useAxesFormatters: false - }, - legend: { - renderer: $.jqplot.EnhancedPieLegendRenderer, - }, - }; - var compulsory = { - seriesDefaults: { - shadow: false, - renderer: $.jqplot.PieRenderer, - rendererOptions: { sliceMargin: 1, showDataLabels: true } - } - }; - $.extend(true, optional, options, compulsory); - - return optional; -}; - -JQPlotPieChart.prototype.prepareData = function (dataTable) { - var data = dataTable.getData(); - var row; - var retData = []; - for (var i = 0; i < data.length; i++) { - row = data[i]; - retData.push([row[0], row[1]]); - } - - return [retData]; -}; - -/** - * Chart factory that returns JQPlotCharts - */ -var JQPlotChartFactory = function () { -}; - -JQPlotChartFactory.prototype = new ChartFactory(); -JQPlotChartFactory.prototype.createChart = function (type, elementId) { - var chart = null; - switch (type) { - case ChartType.LINE: - chart = new JQPlotLineChart(elementId); - break; - case ChartType.SPLINE: - chart = new JQPlotSplineChart(elementId); - break; - case ChartType.TIMELINE: - chart = new JQPlotTimelineChart(elementId); - break; - case ChartType.AREA: - chart = new JQPlotAreaChart(elementId); - break; - case ChartType.BAR: - chart = new JQPlotBarChart(elementId); - break; - case ChartType.COLUMN: - chart = new JQPlotColumnChart(elementId); - break; - case ChartType.PIE: - chart = new JQPlotPieChart(elementId); - break; - case ChartType.SCATTER: - chart = new JQPlotScatterChart(elementId); - break; - } - - return chart; -}; - -declare global { - interface Window { - ChartType: typeof ChartType; - ColumnType: typeof ColumnType; - DataTable: typeof DataTable; - JQPlotChartFactory: typeof JQPlotChartFactory; - } -} - -window.ChartType = ChartType; -window.ColumnType = ColumnType; -window.DataTable = DataTable; -window.JQPlotChartFactory = JQPlotChartFactory; diff --git a/resources/js/src/modules/chart.ts b/resources/js/src/modules/chart.ts new file mode 100644 index 0000000000..592cac7baa --- /dev/null +++ b/resources/js/src/modules/chart.ts @@ -0,0 +1,55 @@ +/** + * Column type enumeration + */ +export const ColumnType = { + STRING: 'string', + NUMBER: 'number', + BOOLEAN: 'boolean', + DATE: 'date' +}; + +/** + * The data table contains column information and data for the chart. + */ +export const DataTable = function () { + const columns = []; + let data = null; + + this.addColumn = function (type, name) { + columns.push({ + 'type': type, + 'name': name + }); + }; + + this.getColumns = function () { + return columns; + }; + + this.setData = function (rows) { + data = rows; + fillMissingValues(); + }; + + this.getData = function () { + return data; + }; + + const fillMissingValues = function () { + if (columns.length === 0) { + throw new Error('Set columns first'); + } + + let row; + for (let i = 0; i < data.length; i++) { + row = data[i]; + if (row.length > columns.length) { + row.splice(columns.length - 1, row.length - columns.length); + } else if (row.length < columns.length) { + for (let j = row.length; j < columns.length; j++) { + row.push(null); + } + } + } + }; +}; diff --git a/resources/js/src/table/chart.ts b/resources/js/src/table/chart.ts index c44c1c59de..f6d32050b4 100644 --- a/resources/js/src/table/chart.ts +++ b/resources/js/src/table/chart.ts @@ -3,6 +3,7 @@ import { AJAX } from '../modules/ajax.ts'; import { Functions } from '../modules/functions.ts'; import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts'; import { escapeHtml } from '../modules/functions/escape.ts'; +import { ColumnType, DataTable } from '../modules/chart.ts'; var chartData = {}; var tempChartTitle; @@ -72,20 +73,20 @@ function queryChart (data, columnNames, settings) { }; // create the data table and add columns - var dataTable = new window.DataTable(); + const dataTable = new DataTable(); if (settings.type === 'timeline') { - dataTable.addColumn(window.ColumnType.DATE, columnNames[settings.mainAxis]); + dataTable.addColumn(ColumnType.DATE, columnNames[settings.mainAxis]); } else if (settings.type === 'scatter') { - dataTable.addColumn(window.ColumnType.NUMBER, columnNames[settings.mainAxis]); + dataTable.addColumn(ColumnType.NUMBER, columnNames[settings.mainAxis]); } else { - dataTable.addColumn(window.ColumnType.STRING, columnNames[settings.mainAxis]); + dataTable.addColumn(ColumnType.STRING, columnNames[settings.mainAxis]); } var i; var values = []; if (settings.seriesColumn === null) { $.each(settings.selectedSeries, function (index, element) { - dataTable.addColumn(window.ColumnType.NUMBER, columnNames[element]); + dataTable.addColumn(ColumnType.NUMBER, columnNames[element]); }); // set data to the data table @@ -131,7 +132,7 @@ function queryChart (data, columnNames, settings) { } $.each(seriesNames, function (seriesName) { - dataTable.addColumn(window.ColumnType.NUMBER, seriesName); + dataTable.addColumn(ColumnType.NUMBER, seriesName); }); var valueMap = {}; diff --git a/resources/js/src/table/zoom_plot_jqplot.ts b/resources/js/src/table/zoom_search.ts similarity index 99% rename from resources/js/src/table/zoom_plot_jqplot.ts rename to resources/js/src/table/zoom_search.ts index 687985b8c6..bf85d5e5e8 100644 --- a/resources/js/src/table/zoom_plot_jqplot.ts +++ b/resources/js/src/table/zoom_search.ts @@ -109,7 +109,7 @@ function getType (field) { /** * Unbind all event handlers before tearing down a page */ -AJAX.registerTeardown('table/zoom_plot_jqplot.js', function () { +AJAX.registerTeardown('table/zoom_search.js', function () { $('#tableid_0').off('change'); $('#tableid_1').off('change'); $('#tableid_2').off('change'); @@ -120,7 +120,7 @@ AJAX.registerTeardown('table/zoom_plot_jqplot.js', function () { $('button.button-reset').off('click'); }); -AJAX.registerOnload('table/zoom_plot_jqplot.js', function () { +AJAX.registerOnload('table/zoom_search.js', function () { let currentChart = null; var searchedDataKey = null; var xLabel = ($('#tableid_0').val() as string); diff --git a/src/Controllers/JavaScriptMessagesController.php b/src/Controllers/JavaScriptMessagesController.php index 8b336326b6..8ef1d2778d 100644 --- a/src/Controllers/JavaScriptMessagesController.php +++ b/src/Controllers/JavaScriptMessagesController.php @@ -464,7 +464,7 @@ final class JavaScriptMessagesController implements InvocableController 'strHideFindNReplaceCriteria' => __('Hide find and replace criteria'), 'strShowFindNReplaceCriteria' => __('Show find and replace criteria'), - /* For table/zoom_plot_jqplot.js */ + /* For table/zoom_search.js */ 'strDisplayHelp' => '
  • ' . __('Each point represents a data row.') . '
  • ' diff --git a/src/Controllers/Server/Status/MonitorController.php b/src/Controllers/Server/Status/MonitorController.php index bdc80a4218..81a391ce9c 100644 --- a/src/Controllers/Server/Status/MonitorController.php +++ b/src/Controllers/Server/Status/MonitorController.php @@ -41,16 +41,7 @@ final class MonitorController extends AbstractController implements InvocableCon 'vendor/chartjs-adapter-date-fns.bundle.js', 'vendor/jquery/jquery.tablesorter.js', 'jquery.sortable-table.js', - 'vendor/jqplot/jquery.jqplot.js', - 'vendor/jqplot/plugins/jqplot.pieRenderer.js', - 'vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js', - 'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js', - 'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', - 'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js', - 'vendor/jqplot/plugins/jqplot.highlighter.js', - 'vendor/jqplot/plugins/jqplot.cursor.js', 'server/status/monitor.js', - 'chart.js',// Needed by createProfilingChart in server/status/monitor.js ]); $form = [ diff --git a/src/Controllers/Table/ChartController.php b/src/Controllers/Table/ChartController.php index 9130c61ca8..fa1fee9681 100644 --- a/src/Controllers/Table/ChartController.php +++ b/src/Controllers/Table/ChartController.php @@ -69,20 +69,9 @@ final class ChartController implements InvocableController } $this->response->addScriptFiles([ - 'chart.js', - 'table/chart.js', - 'vendor/jqplot/jquery.jqplot.js', - 'vendor/jqplot/plugins/jqplot.barRenderer.js', - 'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js', - 'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js', - 'vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js', - 'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js', - 'vendor/jqplot/plugins/jqplot.pointLabels.js', - 'vendor/jqplot/plugins/jqplot.pieRenderer.js', - 'vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js', - 'vendor/jqplot/plugins/jqplot.highlighter.js', 'vendor/chart.umd.js', 'vendor/chartjs-adapter-date-fns.bundle.js', + 'table/chart.js', ]); $urlParams = []; diff --git a/src/Controllers/Table/ZoomSearchController.php b/src/Controllers/Table/ZoomSearchController.php index 4ce8ed0d36..a13bdb983f 100644 --- a/src/Controllers/Table/ZoomSearchController.php +++ b/src/Controllers/Table/ZoomSearchController.php @@ -129,7 +129,7 @@ final class ZoomSearchController implements InvocableController 'vendor/chartjs-plugin-zoom.js', 'makegrid.js', 'sql.js', - 'table/zoom_plot_jqplot.js', + 'table/zoom_search.js', 'table/select.js', 'table/change.js', 'gis_data_editor.js', diff --git a/webpack.config.cjs b/webpack.config.cjs index ad9b3d9fdc..de9b1f1a31 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -2,7 +2,6 @@ const path = require('path'); const webpack = require('webpack'); const autoprefixer = require('autoprefixer'); const CopyPlugin = require('copy-webpack-plugin'); -const WebpackConcatPlugin = require('webpack-concat-files-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const RtlCssPlugin = require('rtlcss-webpack-plugin'); @@ -18,7 +17,6 @@ module.exports = [ mode: 'none', devtool: 'source-map', entry: { - 'chart': rootPath + '/resources/js/src/chart.ts', 'codemirror/addon/lint/sql-lint': rootPath + '/resources/js/src/codemirror/addon/lint/sql-lint.ts', 'console': { import: rootPath + '/resources/js/src/console.ts', library: { name: 'Console', type: 'window', export: 'Console' } }, 'datetimepicker': rootPath + '/resources/js/src/datetimepicker.ts', @@ -68,7 +66,7 @@ module.exports = [ 'table/select': rootPath + '/resources/js/src/table/select.ts', 'table/structure': rootPath + '/resources/js/src/table/structure.ts', 'table/tracking': rootPath + '/resources/js/src/table/tracking.ts', - 'table/zoom_plot_jqplot': rootPath + '/resources/js/src/table/zoom_plot_jqplot.ts', + 'table/zoom_search': rootPath + '/resources/js/src/table/zoom_search.ts', 'transformations/image_upload': rootPath + '/resources/js/src/transformations/image_upload.ts', 'transformations/json': rootPath + '/resources/js/src/transformations/json.ts', 'transformations/json_editor': rootPath + '/resources/js/src/transformations/json_editor.ts', @@ -148,16 +146,6 @@ module.exports = [ { from: rootPath + '/node_modules/jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.js', to: publicPath + '/js/vendor/jquery/jquery-ui-timepicker-addon.js' }, { from: rootPath + '/node_modules/ol/ol.css', to: publicPath + '/js/vendor/openlayers/theme/ol.css' }, { from: rootPath + '/node_modules/locutus.sprintf/src/php/strings/sprintf.browser.js', to: publicPath + '/js/vendor/sprintf.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.pieRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.pieRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.barRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.barRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.pointLabels.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.pointLabels.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.enhancedPieLegendRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.dateAxisRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.dateAxisRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.categoryAxisRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.canvasTextRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.canvasTextRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.canvasAxisLabelRenderer.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.cursor.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.cursor.js' }, - { from: rootPath + '/node_modules/updated-jqplot/build/plugins/jqplot.highlighter.js', to: publicPath + '/js/vendor/jqplot/plugins/jqplot.highlighter.js' }, { from: rootPath + '/node_modules/chart.js/dist/chart.umd.js', to: publicPath + '/js/vendor/chart.umd.js' }, { from: rootPath + '/node_modules/chart.js/dist/chart.umd.js.map', to: publicPath + '/js/vendor/chart.umd.js.map' }, { from: rootPath + '/node_modules/chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.js', to: publicPath + '/js/vendor/chartjs-adapter-date-fns.bundle.js' }, @@ -165,34 +153,6 @@ module.exports = [ { from: rootPath + '/node_modules/hammerjs/hammer.js', to: publicPath + '/js/vendor/hammer.js' }, ], }), - new WebpackConcatPlugin({ - bundles: [ - { - dest: publicPath + '/js/vendor/jqplot/jquery.jqplot.js', - src: [ - rootPath + '/node_modules/updated-jqplot/build/jqplot.core.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.axisLabelRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.axisTickRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.canvasGridRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.divTitleRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.linePattern.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.lineRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.linearAxisRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.linearTickGenerator.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.markerRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.shadowRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.shapeRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.tableLegendRenderer.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.themeEngine.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.toImage.js', - rootPath + '/node_modules/updated-jqplot/build/jsdate.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.sprintf.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.effects.core.js', - rootPath + '/node_modules/updated-jqplot/build/jqplot.effects.blind.js', - ], - }, - ], - }), ], }, { diff --git a/yarn.lock b/yarn.lock index 02a44d9b43..9e1840ce5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1519,14 +1519,6 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/graceful-fs@^4.1.3": version "4.1.9" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4" @@ -1609,11 +1601,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - "@types/minimist@^1.2.2": version "1.2.5" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" @@ -2910,7 +2897,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: +fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -3163,20 +3150,6 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globby@^10.0.1: - version "10.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" - integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg== - dependencies: - "@types/glob" "^7.1.1" - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.0.3" - glob "^7.1.3" - ignore "^5.1.1" - merge2 "^1.2.3" - slash "^3.0.0" - globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -3305,7 +3278,7 @@ ieee754@^1.1.12: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.2.0, ignore@^5.2.4: version "5.3.1" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== @@ -4224,7 +4197,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -5004,7 +4977,7 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: +schema-utils@^3.1.1, schema-utils@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -5126,11 +5099,6 @@ sort-object@^0.3.2: sort-asc "^0.1.0" sort-desc "^0.1.1" -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" @@ -5579,11 +5547,6 @@ update-browserslist-db@^1.0.16: escalade "^3.1.2" picocolors "^1.0.1" -updated-jqplot@1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/updated-jqplot/-/updated-jqplot-1.0.9.tgz#3daeda1a74ea991256749364dc9225af038280b7" - integrity sha512-lUEHhik5B3fXIOH+LaSM5TRU5cIuUivLT2mNmuFFjfhdGE9UGLJmzuuEddi3yLLo62ZwAh1YX2FvJH1CAa09lw== - uri-js@^4.2.2, uri-js@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -5672,15 +5635,6 @@ webpack-cli@^5.0.1: rechoir "^0.8.0" webpack-merge "^5.7.3" -webpack-concat-files-plugin@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/webpack-concat-files-plugin/-/webpack-concat-files-plugin-0.5.2.tgz#cb988b6566c4e19fa284a8ab27d5beb90320dc4c" - integrity sha512-bnsTzDTI5Ur1JaeLs6yeKlNdfRukJR9tgdZIIwy4c5Uyy0kJ0UhrOX42COG42vFZhwAZfo+tzU2/awhKoZw3Ug== - dependencies: - globby "^10.0.1" - schema-utils "^3.0.0" - webpack-sources "^1.4.3" - webpack-merge@^5.7.3: version "5.10.0" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" @@ -5690,14 +5644,6 @@ webpack-merge@^5.7.3: flat "^5.0.2" wildcard "^2.0.0" -webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"