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

Chore/dependabot updates #444

Merged
merged 26 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0346ecd
chore: bump @mui/x-charts from 7.7.0 to 7.7.1
dependabot[bot] Jun 24, 2024
8c5a068
chore: bump slate-history from 0.93.0 to 0.100.0
dependabot[bot] Jun 24, 2024
8b5621c
chore: bump @types/node from 20.14.5 to 20.14.8
dependabot[bot] Jun 24, 2024
995d36e
Merge pull request #443 from metrico/dependabot/npm_and_yarn/types/no…
jacovinus Jun 24, 2024
de93f09
chore: bump vitest from 0.32.4 to 1.6.0
dependabot[bot] Jun 24, 2024
52eed55
chore: bump @types/node from 20.14.5 to 20.14.8
dependabot[bot] Jun 24, 2024
58ecbcb
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 24, 2024
4319a9f
Merge pull request #442 from metrico/dependabot/npm_and_yarn/vitest-1…
jacovinus Jun 24, 2024
2dc4fa4
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 24, 2024
6533423
Merge pull request #440 from metrico/dependabot/npm_and_yarn/slate-hi…
jacovinus Jun 24, 2024
50105dd
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 24, 2024
6ba4f3a
Merge pull request #439 from metrico/dependabot/npm_and_yarn/mui/x-ch…
jacovinus Jun 24, 2024
1cb2202
chore: update pnpm-lock
jacovinus Jun 24, 2024
187529d
fix: gitignore
jacovinus Jun 24, 2024
fdc93ef
fix: link patterns lint
jacovinus Jun 24, 2024
c0c923e
fix: lint checks
jacovinus Jun 24, 2024
65e3f7d
chore: bump react-router-dom from 6.23.1 to 6.24.0
dependabot[bot] Jun 25, 2024
95a83fe
chore: bump @typescript-eslint/eslint-plugin from 7.13.1 to 7.14.1
dependabot[bot] Jun 25, 2024
ac933c7
chore: bump @typescript-eslint/parser from 7.13.1 to 7.14.1
dependabot[bot] Jun 25, 2024
b0519a0
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 25, 2024
e46d1f7
Merge pull request #445 from metrico/dependabot/npm_and_yarn/react-ro…
jacovinus Jun 25, 2024
a9f956f
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 25, 2024
2dc0350
Merge pull request #446 from metrico/dependabot/npm_and_yarn/typescri…
jacovinus Jun 25, 2024
4701c7d
Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…
jacovinus Jun 25, 2024
196eb5c
Merge pull request #448 from metrico/dependabot/npm_and_yarn/typescri…
jacovinus Jun 25, 2024
22991b4
fix: update pnpm-lock
jacovinus Jun 25, 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/node_modules/*
dist
server
server
*.cookie
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@types/node": "^20.14.2",
"@types/node": "^20.14.8",
"@types/react": "^18.3.3",
"jsdom": "24.1.0",
"turbo": "^1.13.4",
Expand Down
4 changes: 3 additions & 1 deletion packages/main/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?
*.env
*.env
#turbo generated cookie files
*.cookie
12 changes: 6 additions & 6 deletions packages/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.20",
"@mui/styles": "^5.15.20",
"@mui/x-charts": "7.7.0",
"@mui/x-charts": "7.7.1",
"@szhsin/react-menu": "^4.1.0",
"@tanstack/match-sorter-utils": "^8.15.1",
"@tanstack/react-table": "^8.17.3",
Expand Down Expand Up @@ -54,13 +54,13 @@
"react-flot": "^1.3.0",
"react-redux": "^8.1.3",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.23.1",
"react-router-dom": "^6.24.0",
"react-select": "^5.8.0",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
"reselect": "^5.1.1",
"slate": "^0.103.0",
"slate-history": "^0.93.0",
"slate-history": "^0.100.0",
"slate-react": "^0.105.0",
"tss-react": "^4.9.10",
"zod": "^3.23.8",
Expand All @@ -72,8 +72,8 @@
"@types/jest": "^29.5.12",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
Expand All @@ -86,6 +86,6 @@
"scss": "^0.2.4",
"typescript": "^5.4.5",
"vite": "^5.3.1",
"vitest": "^0.32.4"
"vitest": "^1.6.0"
}
}
4 changes: 2 additions & 2 deletions packages/main/plugins/Aggregation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -705,14 +705,14 @@ const Aggregations: React.FC = (props: any) => {
}, 5000);

return () => clearInterval(interval);
// eslint-disable-next-line react-hooks/exhaustive-deps

}, []);

useEffect(() => {
if (autoRefresh && actTimestamp) {
getAggregations(url, config, setAggrResponse, setLoading);
}
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [autoRefresh, actTimestamp]);

let param = `{{.parameter}}`;
Expand Down
4 changes: 2 additions & 2 deletions packages/main/plugins/Raggix/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const Raggix: React.FC = (props: any) => {
}, recurrentValue);

return () => clearInterval(interval);
// eslint-disable-next-line react-hooks/exhaustive-deps

}, []);

useEffect(() => {
Expand All @@ -235,7 +235,7 @@ const Raggix: React.FC = (props: any) => {
setLogs(data);
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [isRecurrent, actTimestamp]);

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/main/sections/Panel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Panel = (props: PanelProps) => {
window.removeEventListener("resize", onWindowResize);
};

// eslint-disable-next-line react-hooks/exhaustive-deps

}, []);

// set queries container with proportional to client width
Expand Down
2 changes: 1 addition & 1 deletion packages/main/sections/Queries/hooks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export const useIdRefs = (name: string) =>
name?.slice(0, 1)?.toUpperCase() + "-" + String.fromCharCode(x)
);
return alphabet;
// eslint-disable-next-line react-hooks/exhaustive-deps

}, []);
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface ChartToolsProps {
handleNoLimitData: (e: any) => void;
handleLimitData: (e: any) => void;
isSpliced: boolean;
onSetChartType: Function;
onSetChartType: any;
}

export default function ChartTools({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export default function UseTooltip(this: void, plot: any) {
if (plotTimes.includes(plotTime) && plotIsVisible) {
const plotIndex = plotTimes.indexOf(plotTime);
// eslint-disable-next-line
const [_, value] = plotPoints.find(
const [_, value] = plotPoints.find(
//eslint-disable-next-line
([time, _]: [time: any, _: any]) => time === plotTime
);
labelsList.push({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const setChartType = ( chartType : any) => (dispatch: Function) => {
export const setChartType = ( chartType : any) => (dispatch: any) => {
dispatch({
type: 'SET_CHART_TYPE',
chartType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export interface TimeSpan {
export function getTimeSpan(data: any): TimeSpan {
const tsArray = data
.map((tsItem: any) =>
//eslint-disable-next-line
tsItem?.data?.map(([t, v]: [t: any, v: any]) => t)
)
.flat()
Expand Down Expand Up @@ -219,7 +220,7 @@ export function formatLabel(labels: any, isLogsVolume = false, length:number) {
}

if (isLogsVolume && labelResult) {

//eslint-disable-next-line
return Object.entries(labelResult)?.map(([_, value]) => value);

} else if (!isLogsVolume && labelResult) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const useMatrixData = (
}
}
return parsed;
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [spliced, data]);
};

Expand All @@ -81,7 +81,7 @@ export const useChartOptions = ({ tWidth }: { tWidth: number },isLogsVolume=fals
} else {
return CHART_OPTIONS;
}
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [tWidth]);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface labelLinkAddDispatchObj {

export type dispatchFn = (object: labelLinkDispatchObj) => void

export default function setLabelLinks(linkedFields:LabelLink[]):Function {
export default function setLabelLinks(linkedFields:LabelLink[]) {
return function(dispatch:dispatchFn):void{
dispatch({
type: 'SET_LABEL_LINKS',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const InputSelect = forwardRef((props: any, ref: any) => {

useEffect(() => {
updateSelectedOption(setSelectedOption, type, keyVal);
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [labelsLength]);

const onsSelectValueChange = (e: any) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export function selectOperator(keyVal: any, operators: any, type: any) {
};
}

export function updateSelectedOption(cb: Function, type: any, keyVal: any) {
export function updateSelectedOption(cb , type: any, keyVal: any) {
if (type === "metric") {
cb((prev: any) => prev);
} else if (type === "operator") {
Expand Down Expand Up @@ -210,8 +210,8 @@ export const apiRequest = async (
url: string,
options: any,
basicAuth: any,
setLoading: Function,
setResponse: Function
setLoading,
setResponse
) => {
setLoading(true);
try {
Expand All @@ -233,8 +233,8 @@ export const apiRequest = async (
export async function getApiRequest(
dataSource: ApiDataSource,
url: string,
setLoading: Function,
setResponse: Function
setLoading,
setResponse
) {
if (dataSource.type !== "flux" && dataSource.url && dataSource.url !== "") {
const { basicAuth, options } = getAuthAndOptions(dataSource);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useMemo } from "react";
import { useSelector } from "react-redux";
import { OPERATORS } from "../consts";
import { getTimeParsed, multiType } from "../helpers";
import { AxiosResponse } from "axios";
Expand Down Expand Up @@ -49,7 +48,7 @@ export const useDefaultValue = (defaultValue: any, type: any, keyVal: any) => {
}

return { key: defaultValue, label: defaultValue };
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [defaultValue]);
};

Expand Down Expand Up @@ -78,7 +77,7 @@ export const useCurrentDataSource = (
}

return current;
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [id, dataSources]);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function useLogLabels(
useEffect(() => {

getApiRequest(currentDataSource, url, setLoading, setResponse);
// eslint-disable-next-line react-hooks/exhaustive-deps

}, [currentDataSource]);

//const logsResponse = useLogsResponse(response);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useMemo, useState } from "react";
import { useEffect, useState } from "react";
import Table from "@ui/qrynui/Table/Table";
import { TableStyles } from "./styles";
export const VectorTable = (props: any) => {
Expand All @@ -10,7 +10,7 @@ export const VectorTable = (props: any) => {
width,
} = props;

const [cols, setCols] = useState(columnsData)
const [cols, setCols] = useState(columnsData);
const [data, setData] = useState(dataRows);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const TableStyles = styled.div`
}
`;

export const getStyles = (props: any, align = "left") => [
export const getStyles = (props: any ) => [
props,
{
style: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export default class ScrollManager {
const isUp = direction < 0;
const position = xrs.getRowPosition(rowIndex);
if (!position) {
// eslint-disable-next-line no-console
console.warn('Invalid row index');
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,6 @@
* @param hex
* @param base
*/
export function autoColor( hex: string, base?: string) {
if (true) {
export function autoColor( hex: string) {
return hex;
} else {
// if (base) {
// const color = tinycolor(hex);
// return tinycolor
// .mostReadable(
// base,
// [
// color.clone().lighten(25),
// color.clone().lighten(10),
// color,
// color.clone().darken(10),
// color.clone().darken(25),
// ],
// {
// includeFallbackColors: false,
// }
// )
// .toHex8String();
// }
// const color = tinycolor(hex).toHsl();
// color.l = 1 - color.l;
// const newColor = tinycolor(color);
// return newColor.isLight() ? newColor.darken(5).toHex8String() : newColor.lighten(5).toHex8String();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ export default function renderIntoCanvas(
const fillCache: Map<string, string | TNil> = new Map();
const cHeight = items.length < MIN_TOTAL_HEIGHT ? MIN_TOTAL_HEIGHT : Math.min(items.length, MAX_TOTAL_HEIGHT);
const cWidth = window.innerWidth * 2;
// eslint-disable-next-line no-param-reassign
canvas.width = cWidth;
// eslint-disable-next-line no-param-reassign
canvas.height = cHeight;
const itemHeight = Math.min(MAX_ITEM_HEIGHT, Math.max(MIN_ITEM_HEIGHT, cHeight / items.length));
const itemYChange = cHeight / items.length;
Expand Down
Loading
Loading