From ffec6808d648f21092642100fd7ad6dba01e9b0a Mon Sep 17 00:00:00 2001 From: jacovinus Date: Mon, 28 Feb 2022 19:26:54 +0100 Subject: [PATCH 1/5] feat: multi label selection on chart --- src/plugins/charts/ChartLabelList.js | 2 +- src/plugins/charts/index.js | 129 ++++++++++++++++++--------- 2 files changed, 88 insertions(+), 43 deletions(-) diff --git a/src/plugins/charts/ChartLabelList.js b/src/plugins/charts/ChartLabelList.js index 059dd536..52973365 100644 --- a/src/plugins/charts/ChartLabelList.js +++ b/src/plugins/charts/ChartLabelList.js @@ -30,7 +30,7 @@ const ChartLabel = styled("div")` margin: 2px; padding: 4px; cursor: pointer; - opacity: ${(props) => (!props.isVisible ? "1" : ".75")}; + opacity: ${(props) => (!props.isVisible ? "1" : ".5")}; border-radius: 3px; height:20px !important; &:hover { diff --git a/src/plugins/charts/index.js b/src/plugins/charts/index.js index a2553c6b..9d5a187a 100644 --- a/src/plugins/charts/index.js +++ b/src/plugins/charts/index.js @@ -10,6 +10,7 @@ import * as moment from "moment"; import { useState, useEffect, useRef } from "react"; import { format } from "date-fns"; import { ChartLabelList } from "./ChartLabelList"; +import { nanoid } from "nanoid"; function ClokiChart({ matrixData }) { const APP_NAME = "cloki_view"; @@ -22,6 +23,7 @@ function ClokiChart({ matrixData }) { const [allData, getAllData] = useState(getDataParsed(false)); const [labels, setLabels] = useState([]); const [element, setElement] = useState(chartRef.current); + // set it to local storage const options = { xaxis: { @@ -42,8 +44,7 @@ function ClokiChart({ matrixData }) { legend: { show: false, }, - - + interaction: { redrawOverlayInterval: 1, }, @@ -89,9 +90,7 @@ function ClokiChart({ matrixData }) { if (previousPoint !== item.dataIndex) { $q("#tooltip").remove(); const tooltipTemplate = ` -
+

${moment(item.datapoint[0]).format( "YYYY-MM-DDTHH:mm:ss.SSSZ" )}

@@ -112,7 +111,7 @@ function ClokiChart({ matrixData }) { item.pageY, tooltipTemplate, labelLength - ); + ); } } else { $q("#tooltip").remove(); @@ -190,12 +189,14 @@ function ClokiChart({ matrixData }) { data: formatTs(m.values), label: formatLabel(m.metric), isVisible: true, + id: nanoid(), })); } else { return [...matrixData].map((m) => ({ data: formatTs(m.values), label: formatLabel(m.metric), isVisible: true, + id: nanoid(), })); } } @@ -204,8 +205,15 @@ function ClokiChart({ matrixData }) { * Set chart types */ function setBarChart() { + + const lSelected = JSON.parse(localStorage.getItem("labelsSelected")) || []; + + + const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; + + const chartBarSeries = { series: barSeries, }; @@ -222,11 +230,12 @@ function ClokiChart({ matrixData }) { setChartType("bar"); setTypeToLocal("bar"); } catch (e) { - console.log(data,e); + console.log(data, e); } } function setPointsChart() { + const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; const chartPointsSeries = { @@ -247,11 +256,16 @@ function ClokiChart({ matrixData }) { } } function setLineChart() { + const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; + const labelsSelected = (localStorage.getItem("labelsSelected"))||[] + + const chartLineSeries = { series: lineSeries, }; + try { let plot = $q.plot( element, @@ -316,22 +330,43 @@ function ClokiChart({ matrixData }) { */ function onLabelClick(e, v) { - const dataSet = e.map((m) => { - if (m.isVisible) { - return { - ...m, - lines: { ...m.lines, show: false }, - bars: { ...m.bars, show: false }, - points: { ...m.points, show: false }, - }; - } else { - return m; - } - }); - if (dataSet.length > 0 && !v.isVisible) { + + + let newList = []; + const lSelected = JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.some(({ id }) => id === v.id)) { + const filtered = lSelected.filter((f) => f.id !== v.id); + localStorage.setItem("labelsSelected", JSON.stringify(filtered)); + newList = filtered; + } else { + newList = lSelected.concat(v); + localStorage.setItem("labelsSelected", JSON.stringify(newList)); + } + + if (newList.length > 0) { + const ids = newList.map((m) => m.id); + const { lines, bars, points } = getSeriesFromChartType(chartType); + let dataSelected = e.map((series) => { + if (!ids.includes(series.id)) { + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + }; + } else { + return { + ...series, + bars, + lines, + points, + }; + } + }); + let plot = $q.plot( element, - dataSet, + dataSelected, $q.extend(true, {}, chartOptions, { series: getSeriesFromChartType(chartType), @@ -340,15 +375,28 @@ function ClokiChart({ matrixData }) { const colorLabels = plot.getData(); setLabels(colorLabels); + } else { + console.log("inhere!!!!!"); const data = isSpliced ? chartData : allData; + const { lines, bars, points } = getSeriesFromChartType(chartType); + const newData = data.map((series) => { + console.log(series.bars); + return { + ...series, + bars, + lines, + points, + }; + }); let plot = $q.plot( element, - data, + newData, $q.extend(true, {}, chartOptions, { series: getSeriesFromChartType(chartType), }) ); + const colorLabels = plot.getData(); setLabels(colorLabels); } @@ -356,13 +404,11 @@ function ClokiChart({ matrixData }) { // Init useEffect(() => { - setElement(chartRef.current); setLabels(chartData.map(({ label }) => label)); $q(chartRef.current).bind("plotselected", setRanges); setChartData(getDataParsed(isSpliced)); - - + localStorage.setItem("labelsSelected", JSON.stringify([])); }, []); // On data update or splicing / showing all data @@ -382,24 +428,23 @@ function ClokiChart({ matrixData }) { } function drawChart(data) { - if(data?.length){ - try { - let plot = $q.plot( - chartRef.current, - data, - $q.extend(true, {}, chartOptions, { - series: getSeriesFromChartType(chartType), - }) - ); - // get generated colors - const colorLabels = plot.getData(); - setLabels(colorLabels); - $q(chartRef.current).UseTooltip(); - } catch (e) { - console.log("error drawing chart",data); + if (data?.length) { + try { + let plot = $q.plot( + chartRef.current, + data, + $q.extend(true, {}, chartOptions, { + series: getSeriesFromChartType(chartType), + }) + ); + // get generated colors + const colorLabels = plot.getData(); + setLabels(colorLabels); + $q(chartRef.current).UseTooltip(); + } catch (e) { + console.log("error drawing chart", data); + } } - } - } const handleNoLimitData = (e) => { From 85353b0b5f1e152f944d9e0b30ce160b4c6312e7 Mon Sep 17 00:00:00 2001 From: jacovinus Date: Tue, 1 Mar 2022 12:05:08 +0100 Subject: [PATCH 2/5] fix: label multi select --- src/actions/loadLogs.js | 3 +- src/plugins/charts/ChartLabelList.js | 16 +- src/plugins/charts/index.js | 256 +++++++++++++++++++++------ 3 files changed, 210 insertions(+), 65 deletions(-) diff --git a/src/actions/loadLogs.js b/src/actions/loadLogs.js index d06a8120..c12ea9f8 100644 --- a/src/actions/loadLogs.js +++ b/src/actions/loadLogs.js @@ -103,7 +103,8 @@ export default function loadLogs() { } if (type === "matrix") { - dispatch(setMatrixData(result || [])); + const idResult = result.map( m => ({...m,id:nanoid()})) + dispatch(setMatrixData(idResult || [])); dispatch(setLoading(false)); } dispatch(setLoading(false)); diff --git a/src/plugins/charts/ChartLabelList.js b/src/plugins/charts/ChartLabelList.js index 52973365..63a0d97f 100644 --- a/src/plugins/charts/ChartLabelList.js +++ b/src/plugins/charts/ChartLabelList.js @@ -27,8 +27,8 @@ const ChartLabel = styled("div")` font-family: sans-serif; display: flex; align-items: center; - margin: 2px; - padding: 4px; + + padding-right: 10px; cursor: pointer; opacity: ${(props) => (!props.isVisible ? "1" : ".5")}; border-radius: 3px; @@ -38,18 +38,6 @@ const ChartLabel = styled("div")` } `; -const SearchButton = styled(FindReplaceIcon)` - color: orange; - font-size: 16px; - background: #222; - padding: 2px; - border-radius: 2px; - margin-left: 2px; - opacity: 0.5; - &:hover { - opacity: 1; - } -`; const ColorLabel = styled("div")` height: 4px; diff --git a/src/plugins/charts/index.js b/src/plugins/charts/index.js index 9d5a187a..239d38db 100644 --- a/src/plugins/charts/index.js +++ b/src/plugins/charts/index.js @@ -10,7 +10,6 @@ import * as moment from "moment"; import { useState, useEffect, useRef } from "react"; import { format } from "date-fns"; import { ChartLabelList } from "./ChartLabelList"; -import { nanoid } from "nanoid"; function ClokiChart({ matrixData }) { const APP_NAME = "cloki_view"; @@ -182,22 +181,19 @@ function ClokiChart({ matrixData }) { } function getDataParsed(spliced) { + const parsed = [...matrixData].map((m) => ({ + data: formatTs(m.values), + label: formatLabel(m.metric), + isVisible: true, + id:m.id + })); + if (spliced) { - const chartD = [...matrixData]; - const spliced = chartD.splice(0, 20); - return spliced.map((m) => ({ - data: formatTs(m.values), - label: formatLabel(m.metric), - isVisible: true, - id: nanoid(), - })); + + const splicedData = parsed.splice(0, 20); + return splicedData } else { - return [...matrixData].map((m) => ({ - data: formatTs(m.values), - label: formatLabel(m.metric), - isVisible: true, - id: nanoid(), - })); + return parsed } } /** @@ -205,14 +201,38 @@ function ClokiChart({ matrixData }) { * Set chart types */ function setBarChart() { - - const lSelected = JSON.parse(localStorage.getItem("labelsSelected")) || []; - - - const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; + let newData = []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.length > 0) { + const { lines, bars, points } = getSeriesFromChartType("bar"); + const ids = lSelected.map((m) => m.id); + const dataMapped = data.map((series) => { + if (!ids.includes(series.id)) { + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + isVisible: true, + }; + } else { + return { + ...series, + bars, + lines, + points, + isVisible: false, + }; + } + }); + newData = dataMapped; + } else { + newData = data; + } const chartBarSeries = { series: barSeries, @@ -221,7 +241,7 @@ function ClokiChart({ matrixData }) { try { let plot = $q.plot( element, - data, + newData, $q.extend(true, {}, chartOptions, chartBarSeries) ); @@ -235,16 +255,46 @@ function ClokiChart({ matrixData }) { } function setPointsChart() { - const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; const chartPointsSeries = { series: pointSeries, }; + + let newData = []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.length > 0) { + const { lines, bars, points } = getSeriesFromChartType("points"); + const ids = lSelected.map((m) => m.id); + const dataMapped = data.map((series) => { + if (!ids.includes(series.id)) { + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + isVisible: true, + }; + } else { + return { + ...series, + bars, + lines, + points, + isVisible: false, + }; + } + }); + newData = dataMapped; + } else { + newData = data; + } + try { let plot = $q.plot( element, - data, + newData, $q.extend(true, {}, chartOptions, chartPointsSeries) ); const colorLabels = plot.getData(); @@ -256,11 +306,38 @@ function ClokiChart({ matrixData }) { } } function setLineChart() { - const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; - const labelsSelected = (localStorage.getItem("labelsSelected"))||[] + let newData = []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.length > 0) { + const { lines, bars, points } = getSeriesFromChartType("line"); + const ids = lSelected.map((m) => m.id); + const dataMapped = data.map((series) => { + if (!ids.includes(series.id)) { + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + isVisible: true, + }; + } else { + return { + ...series, + bars, + lines, + points, + isVisible: false, + }; + } + }); + newData = dataMapped; + } else { + newData = data; + } const chartLineSeries = { series: lineSeries, @@ -269,7 +346,7 @@ function ClokiChart({ matrixData }) { try { let plot = $q.plot( element, - data, + newData, $q.extend(true, {}, chartOptions, chartLineSeries) ); const colorLabels = plot.getData(); @@ -280,23 +357,51 @@ function ClokiChart({ matrixData }) { console.log(e); } } - /** - * - * Chart from selection (Set start and end times and redraw) - */ + function setRanges(event, ranges) { const element = $q(chartRef.current); const data = isSpliced ? chartData : allData; + event.preventDefault(); + let newData = []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.length > 0) { + const { lines, bars, points } = getSeriesFromChartType(chartType); + const ids = lSelected.map((m) => m.id); + const dataMapped = data.map((series) => { + if (!ids.includes(series.id)) { + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + isVisible: true, + }; + } else { + return { + ...series, + bars, + lines, + points, + isVisible: false, + }; + } + }); + newData = dataMapped; + } else { + newData = data; + } + try { let plot = $q.plot( element, - data, + newData, $q.extend(true, {}, chartOptions, { xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to }, - series: getSeriesFromChartType(chartType), }) + ); setTimeout(() => { const fromTime = ranges.xaxis.from; @@ -330,10 +435,10 @@ function ClokiChart({ matrixData }) { */ function onLabelClick(e, v) { - - let newList = []; - const lSelected = JSON.parse(localStorage.getItem("labelsSelected")) || []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.some(({ id }) => id === v.id)) { const filtered = lSelected.filter((f) => f.id !== v.id); localStorage.setItem("labelsSelected", JSON.stringify(filtered)); @@ -363,7 +468,7 @@ function ClokiChart({ matrixData }) { }; } }); - + let plot = $q.plot( element, dataSelected, @@ -375,13 +480,10 @@ function ClokiChart({ matrixData }) { const colorLabels = plot.getData(); setLabels(colorLabels); - } else { - console.log("inhere!!!!!"); const data = isSpliced ? chartData : allData; const { lines, bars, points } = getSeriesFromChartType(chartType); const newData = data.map((series) => { - console.log(series.bars); return { ...series, bars, @@ -399,6 +501,7 @@ function ClokiChart({ matrixData }) { const colorLabels = plot.getData(); setLabels(colorLabels); + $q(chartRef.current).UseTooltip(); } } @@ -420,14 +523,65 @@ function ClokiChart({ matrixData }) { }, [matrixData, isSpliced]); function drawChartFromData() { - if (isSpliced) { - drawChart(chartData); + const data = isSpliced ? chartData : allData + const element = $q(chartRef.current); + + + let newData = []; + const lSelected = + JSON.parse(localStorage.getItem("labelsSelected")) || []; + if (lSelected.length > 0) { + const { lines, bars, points } = getSeriesFromChartType(chartType); + const ids = lSelected.map((m) => m.id); + const dataMapped = data.map((series) => { + if (!ids.includes(series.id)) { + + return { + ...series, + lines: { ...series.lines, show: false }, + bars: { ...series.bars, show: false }, + points: { ...series.points, show: false }, + isVisible: true, + }; + } else { + return { + ...series, + bars, + lines, + points, + isVisible: false, + }; + } + }); + newData = dataMapped; } else { - drawChart(allData); + newData = data; } + + try { + let plot = $q.plot( + element, + newData, + $q.extend(true, {}, chartOptions, { + series: getSeriesFromChartType(chartType), + }) + ); + + const colorLabels = plot.getData(); + setLabels(colorLabels); + $q(chartRef.current).UseTooltip(); + + } catch(e) { + console.log(e) + } + } function drawChart(data) { + + + + if (data?.length) { try { let plot = $q.plot( @@ -463,6 +617,7 @@ function ClokiChart({ matrixData }) { alignItems: "center", fontSize: ".95rem", cursor: "pointer", + margin:"0px 23px" }} >
{isSpliced ? (
{matrixData.length > 20 ? "Showing: 20 Series, Show All " @@ -487,7 +643,7 @@ function ClokiChart({ matrixData }) { ) : (
{"Showing: "} {matrixData.length} @@ -508,10 +664,10 @@ function ClokiChart({ matrixData }) { margin: "3px", background: chartType === "bar" ? "#333" : "black", color: "#ddd", - padding: "3px 6px", + padding: "4px 10px", borderRadius: "2px", cursor: "pointer", - fontSize: "1em", + fontSize: "13px", }} onClick={setBarChart} > @@ -524,10 +680,10 @@ function ClokiChart({ matrixData }) { margin: "3px", background: chartType === "line" ? "#333" : "black", color: "#ddd", - padding: "3px 6px", + padding: "4px 10px", borderRadius: "2px", cursor: "pointer", - fontSize: "1em", + fontSize: "13px", }} > {"line chart"} @@ -540,10 +696,10 @@ function ClokiChart({ matrixData }) { background: chartType === "points" ? "#333" : "black", color: "#ddd", - padding: "3px 6px", + padding: "4px 10px", borderRadius: "2px", cursor: "pointer", - fontSize: "1em", + fontSize: "13px", }} > {"points chart"} From 4685326b43e574ba2846252fe0e010c45f82cf2f Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Tue, 1 Mar 2022 17:30:23 +0000 Subject: [PATCH 3/5] ci: version bump to v0.5.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf431598..4e972f3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cloki-view", - "version": "0.4.4", + "version": "0.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cloki-view", - "version": "0.4.4", + "version": "0.5.0", "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", diff --git a/package.json b/package.json index c8b29894..68bc4617 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "url": "git+ssh://git@github.com/metrico/cloki-view.git" }, "author": "joel@qxip.net", - "version": "0.4.4", + "version": "0.5.0", "private": false, "dependencies": { "@emotion/react": "^11.7.1", From 4648dcbfd18cfd5fb28653ef8f64b442c34a02b0 Mon Sep 17 00:00:00 2001 From: jacovinus Date: Tue, 1 Mar 2022 19:46:07 +0100 Subject: [PATCH 4/5] fix EOF --- src/actions/LoadLabels.js | 1 - src/actions/index.js | 2 +- src/actions/loadLabelValues.js | 2 +- src/actions/setApiError.js | 2 +- src/actions/setApiUrl.js | 2 +- src/actions/setIsSubmit.js | 2 +- src/actions/setLabelValues.js | 2 +- src/actions/setLabels.js | 2 +- src/actions/setLabelsBrowserOpen.js | 2 +- src/actions/setLoading.js | 2 +- src/actions/setLogs.js | 2 +- src/actions/setMatrixData.js | 2 +- src/actions/setQuery.js | 1 - src/actions/setQueryLimit.js | 2 +- src/actions/setQueryStep.js | 2 +- src/actions/setRangeOpen.js | 2 +- src/actions/setStartTime.js | 2 +- src/actions/setStopTime.js | 2 +- src/actions/setTimeRangeLabel.js | 2 +- src/actions/setUrlQueryParams.js | 2 +- 20 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/actions/LoadLabels.js b/src/actions/LoadLabels.js index 0de3da27..8065dcd4 100644 --- a/src/actions/LoadLabels.js +++ b/src/actions/LoadLabels.js @@ -46,7 +46,6 @@ export default function loadLabels(apiUrl) { } } - }).catch(error => { console.log(error) diff --git a/src/actions/index.js b/src/actions/index.js index 1c322fee..bbc9d601 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -8,4 +8,4 @@ export * from "./setTimeRangeLabel" export * from "./setApiUrl"; export * from "./setQuery"; export * from "./setIsSubmit"; -export * from "./setMatrixData"; \ No newline at end of file +export * from "./setMatrixData"; diff --git a/src/actions/loadLabelValues.js b/src/actions/loadLabelValues.js index 9e914398..036b9052 100644 --- a/src/actions/loadLabelValues.js +++ b/src/actions/loadLabelValues.js @@ -67,4 +67,4 @@ export default function loadLaebelValues(label, labelList, apiUrl) { } -} \ No newline at end of file +} diff --git a/src/actions/setApiError.js b/src/actions/setApiError.js index a9031b0c..6b9fb8d6 100644 --- a/src/actions/setApiError.js +++ b/src/actions/setApiError.js @@ -3,4 +3,4 @@ export const setApiError = (apiErrors) => (dispatch) => { type: 'SET_API_ERRORS', apiErrors }) -} \ No newline at end of file +} diff --git a/src/actions/setApiUrl.js b/src/actions/setApiUrl.js index fc8d88d8..b3ed8e1e 100644 --- a/src/actions/setApiUrl.js +++ b/src/actions/setApiUrl.js @@ -3,4 +3,4 @@ export const setApiUrl = ( apiUrl ) => (dispatch) => { type: 'SET_API_URL', apiUrl:apiUrl.trim() }) -} \ No newline at end of file +} diff --git a/src/actions/setIsSubmit.js b/src/actions/setIsSubmit.js index 73813af8..7c3cd2ce 100644 --- a/src/actions/setIsSubmit.js +++ b/src/actions/setIsSubmit.js @@ -3,4 +3,4 @@ export const setIsSubmit = (isSubmit) => (dispatch)=>{ type: 'SET_IS_SUBMIT', isSubmit }) -} \ No newline at end of file +} diff --git a/src/actions/setLabelValues.js b/src/actions/setLabelValues.js index c80745b4..d0c0fa5f 100644 --- a/src/actions/setLabelValues.js +++ b/src/actions/setLabelValues.js @@ -3,4 +3,4 @@ export default (labelValues) => (dispatch) => { type: 'SET_LABEL_VALUES', labelValues }); -} \ No newline at end of file +} diff --git a/src/actions/setLabels.js b/src/actions/setLabels.js index f649c03f..8a839e50 100644 --- a/src/actions/setLabels.js +++ b/src/actions/setLabels.js @@ -3,4 +3,4 @@ export default (labels) => (dispatch) => { type: 'SET_LABELS', labels: labels }); -} \ No newline at end of file +} diff --git a/src/actions/setLabelsBrowserOpen.js b/src/actions/setLabelsBrowserOpen.js index 9f071d0e..08577548 100644 --- a/src/actions/setLabelsBrowserOpen.js +++ b/src/actions/setLabelsBrowserOpen.js @@ -3,4 +3,4 @@ export const setLabelsBrowserOpen = ( labelsBrowserOpen) => (dispatch) => { type: 'SET_BROWSER_OPEN', labelsBrowserOpen }) -} \ No newline at end of file +} diff --git a/src/actions/setLoading.js b/src/actions/setLoading.js index 691b5eb9..11cd1b01 100644 --- a/src/actions/setLoading.js +++ b/src/actions/setLoading.js @@ -3,4 +3,4 @@ export default (loading) => (dispatch) => { type: 'SET_LOADING', loading }); -} \ No newline at end of file +} diff --git a/src/actions/setLogs.js b/src/actions/setLogs.js index 5eb5f169..7ced90c6 100644 --- a/src/actions/setLogs.js +++ b/src/actions/setLogs.js @@ -3,4 +3,4 @@ export default (logs) => (dispatch) => { type: 'SET_LOGS', logs }); -} \ No newline at end of file +} diff --git a/src/actions/setMatrixData.js b/src/actions/setMatrixData.js index afb1906b..6b78bf04 100644 --- a/src/actions/setMatrixData.js +++ b/src/actions/setMatrixData.js @@ -5,4 +5,4 @@ const setMatrixData = (matrixData) => (dispatch) => { }) } -export default setMatrixData; \ No newline at end of file +export default setMatrixData; diff --git a/src/actions/setQuery.js b/src/actions/setQuery.js index f17767ef..cc9e3a51 100644 --- a/src/actions/setQuery.js +++ b/src/actions/setQuery.js @@ -4,4 +4,3 @@ query }) } - diff --git a/src/actions/setQueryLimit.js b/src/actions/setQueryLimit.js index 121b340b..e8af27d4 100644 --- a/src/actions/setQueryLimit.js +++ b/src/actions/setQueryLimit.js @@ -3,4 +3,4 @@ export const setQueryLimit = (limit) => (dispatch) => { type: 'SET_QUERY_LIMIT', limit }); -} \ No newline at end of file +} diff --git a/src/actions/setQueryStep.js b/src/actions/setQueryStep.js index 5c7a4416..6bc6a526 100644 --- a/src/actions/setQueryStep.js +++ b/src/actions/setQueryStep.js @@ -3,4 +3,4 @@ export const setQueryStep = (step) => (dispatch)=>{ type: 'SET_QUERY_STEP', step }) -} \ No newline at end of file +} diff --git a/src/actions/setRangeOpen.js b/src/actions/setRangeOpen.js index f71b6f0b..c4685419 100644 --- a/src/actions/setRangeOpen.js +++ b/src/actions/setRangeOpen.js @@ -3,4 +3,4 @@ export const setRangeOpen = ( rangeOpen ) => (dispatch) => { type: 'SET_RANGE_OPEN', rangeOpen }) -} \ No newline at end of file +} diff --git a/src/actions/setStartTime.js b/src/actions/setStartTime.js index e09c38b7..8b349e56 100644 --- a/src/actions/setStartTime.js +++ b/src/actions/setStartTime.js @@ -3,4 +3,4 @@ export const setStartTime = (start) => (dispatch) => { type: 'SET_START_TIME', start }); -} \ No newline at end of file +} diff --git a/src/actions/setStopTime.js b/src/actions/setStopTime.js index 09e268d7..119d9ae8 100644 --- a/src/actions/setStopTime.js +++ b/src/actions/setStopTime.js @@ -3,4 +3,4 @@ export const setStopTime = (stop) => (dispatch) => { type: 'SET_STOP_TIME', stop }); -} \ No newline at end of file +} diff --git a/src/actions/setTimeRangeLabel.js b/src/actions/setTimeRangeLabel.js index 12821d75..febccaf3 100644 --- a/src/actions/setTimeRangeLabel.js +++ b/src/actions/setTimeRangeLabel.js @@ -3,4 +3,4 @@ export const setTimeRangeLabel = (label) => (dispatch) => { type: 'SET_TIME_RANGE_LABEL', label }); -} \ No newline at end of file +} diff --git a/src/actions/setUrlQueryParams.js b/src/actions/setUrlQueryParams.js index 6437875f..48dc7fe9 100644 --- a/src/actions/setUrlQueryParams.js +++ b/src/actions/setUrlQueryParams.js @@ -4,4 +4,4 @@ export const setUrlQueryParams = (urlQueryParams) => (dispatch) => { urlQueryParams }) -} \ No newline at end of file +} From 133bda29613cf37e8edf42984c98d9a99accec75 Mon Sep 17 00:00:00 2001 From: Automated Version Bump Date: Tue, 1 Mar 2022 18:50:38 +0000 Subject: [PATCH 5/5] ci: version bump to v0.5.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e972f3d..095c8b2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cloki-view", - "version": "0.5.0", + "version": "0.5.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cloki-view", - "version": "0.5.0", + "version": "0.5.1", "dependencies": { "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", diff --git a/package.json b/package.json index 68bc4617..e01c9752 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "url": "git+ssh://git@github.com/metrico/cloki-view.git" }, "author": "joel@qxip.net", - "version": "0.5.0", + "version": "0.5.1", "private": false, "dependencies": { "@emotion/react": "^11.7.1",