Merge branch 'chore/dependabot_updates' into dependabot/npm_and_yarn/…

…typescript-eslint/eslint-plugin-7.14.1
metrico · Jun 25, 2024 · a9f956f · a9f956f
2 parents 95a83fe + e46d1f7
commit a9f956f
Show file tree

Hide file tree

Showing 89 changed files with 4,233 additions and 3,863 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules/*
 dist
-server
+server
+*.cookie
diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/main/.gitignore b/packages/main/.gitignore
@@ -22,4 +22,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-*.env
+*.env
+#turbo generated cookie files
+*.cookie
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -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",
@@ -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",
@@ -86,6 +86,6 @@
     "scss": "^0.2.4",
     "typescript": "^5.4.5",
     "vite": "^5.3.1",
-    "vitest": "^0.32.4"
+    "vitest": "^1.6.0"
   }
 }
diff --git a/packages/main/plugins/Aggregation/index.tsx b/packages/main/plugins/Aggregation/index.tsx
@@ -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}}`;

diff --git a/packages/main/plugins/Raggix/index.tsx b/packages/main/plugins/Raggix/index.tsx
@@ -214,7 +214,7 @@ const Raggix: React.FC = (props: any) => {
         }, recurrentValue);
 
         return () => clearInterval(interval);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+
     }, []);
 
     useEffect(() => {
@@ -235,7 +235,7 @@ const Raggix: React.FC = (props: any) => {
                 setLogs(data);
             });
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+
     }, [isRecurrent, actTimestamp]);
 
     return (

diff --git a/packages/main/sections/Panel/index.tsx b/packages/main/sections/Panel/index.tsx
@@ -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

diff --git a/packages/main/sections/Queries/hooks.tsx b/packages/main/sections/Queries/hooks.tsx
@@ -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
+
     }, []);
diff --git a/packages/main/src/components/DataViews/components/Charts/ChartTools.tsx b/packages/main/src/components/DataViews/components/Charts/ChartTools.tsx
@@ -11,7 +11,7 @@ interface ChartToolsProps {
     handleNoLimitData: (e: any) => void;
     handleLimitData: (e: any) => void;
     isSpliced: boolean;
-    onSetChartType: Function;
+    onSetChartType: any;
 }
 
 export default function ChartTools({

diff --git a/packages/main/src/components/DataViews/components/Charts/UseTooltip.ts b/packages/main/src/components/DataViews/components/Charts/UseTooltip.ts
@@ -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({

diff --git a/packages/main/src/components/DataViews/components/Charts/actions/setChartType.ts b/packages/main/src/components/DataViews/components/Charts/actions/setChartType.ts
@@ -1,4 +1,4 @@
-export const setChartType = ( chartType : any) => (dispatch: Function) => {
+export const setChartType = ( chartType : any) => (dispatch: any) => {
     dispatch({
         type: 'SET_CHART_TYPE',
         chartType

diff --git a/packages/main/src/components/DataViews/components/Charts/helpers/index.tsx b/packages/main/src/components/DataViews/components/Charts/helpers/index.tsx
@@ -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()
@@ -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) {

diff --git a/packages/main/src/components/DataViews/components/Charts/hooks/index.ts b/packages/main/src/components/DataViews/components/Charts/hooks/index.ts
@@ -68,7 +68,7 @@ export const useMatrixData = (
             }
         }
         return parsed;
-           // eslint-disable-next-line react-hooks/exhaustive-deps
+
     }, [spliced, data]);
 };
 
@@ -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]);
 };
 

diff --git a/packages/main/src/components/DataViews/components/LabelsLinks/setLabelLinks.ts b/packages/main/src/components/DataViews/components/LabelsLinks/setLabelLinks.ts
@@ -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',

diff --git a/packages/main/src/components/DataViews/components/QueryBuilder/InputSelect.tsx b/packages/main/src/components/DataViews/components/QueryBuilder/InputSelect.tsx
@@ -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) => {

diff --git a/packages/main/src/components/DataViews/components/QueryBuilder/helpers/index.tsx b/packages/main/src/components/DataViews/components/QueryBuilder/helpers/index.tsx
@@ -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") {
@@ -210,8 +210,8 @@ export const apiRequest = async (
     url: string,
     options: any,
     basicAuth: any,
-    setLoading: Function,
-    setResponse: Function
+    setLoading,
+    setResponse
 ) => {
     setLoading(true);
     try {
@@ -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);

diff --git a/packages/main/src/components/DataViews/components/QueryBuilder/hooks/index.tsx b/packages/main/src/components/DataViews/components/QueryBuilder/hooks/index.tsx
@@ -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";
@@ -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]);
 };
 
@@ -78,7 +77,7 @@ export const useCurrentDataSource = (
         }
 
         return current;
-          // eslint-disable-next-line react-hooks/exhaustive-deps
+
     }, [id, dataSources]);
 };
 

diff --git a/packages/main/src/components/DataViews/components/QueryBuilder/hooks/useLogLabels.tsx b/packages/main/src/components/DataViews/components/QueryBuilder/hooks/useLogLabels.tsx
@@ -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);

diff --git a/packages/main/src/components/DataViews/components/Table/VectorTable/VectorTable.tsx b/packages/main/src/components/DataViews/components/Table/VectorTable/VectorTable.tsx
@@ -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) => {
@@ -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(() => {

diff --git a/packages/main/src/components/DataViews/components/Table/VectorTable/styles/index.ts b/packages/main/src/components/DataViews/components/Table/VectorTable/styles/index.ts
@@ -98,7 +98,7 @@ export const TableStyles = styled.div`
     }
 `;
 
-export const getStyles = (props: any, align = "left") => [
+export const getStyles = (props: any ) => [
     props,
     {
         style: {

diff --git a/packages/main/src/components/DataViews/components/Traces/Jaeger-ui/src/ScrollManager.tsx b/packages/main/src/components/DataViews/components/Traces/Jaeger-ui/src/ScrollManager.tsx
@@ -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;
     }

diff --git a/packages/main/src/components/DataViews/components/Traces/Jaeger-ui/src/Theme.tsx b/packages/main/src/components/DataViews/components/Traces/Jaeger-ui/src/Theme.tsx
@@ -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();
-  }
 }
diff --git a/...ataViews/components/Traces/Jaeger-ui/src/TracePageHeader/SpanGraph/render-into-canvas.tsx b/...ataViews/components/Traces/Jaeger-ui/src/TracePageHeader/SpanGraph/render-into-canvas.tsx
@@ -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;

diff --git a/...mponents/DataViews/components/Traces/Jaeger-ui/src/TracePageHeader/TracePageSearchBar.tsx b/...mponents/DataViews/components/Traces/Jaeger-ui/src/TracePageHeader/TracePageSearchBar.tsx
@@ -12,60 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { css } from "@emotion/css";
-import cx from "classnames";
 import { memo, Dispatch, SetStateAction } from "react";
 import React from 'react';
 
 
 import UiFindInput from "../common/UiFindInput";
-import { ubFlexAuto, ubJustifyEnd } from "../uberUtilityStyles";
+import { ubJustifyEnd } from "../uberUtilityStyles";
 import Button from '@mui/material/Button';
 
-// export const getStyles = (theme) => {
-//   return {
-//     TracePageSearchBar: css`
-//       label: TracePageSearchBar;
-//       float: right;
-//       position: sticky;
-//       top: 8px;
-//       right: 0;
-//       z-index: ${theme.zIndex.navbarFixed};
-//       background: ${theme.colors.background.primary};
-//       margin-top: 8px;
-//       margin-bottom: -48px;
-//       padding: 8px;
-//       margin-right: 2px;
-//       border-radius: 4px;
-//       box-shadow: ${theme.shadows.z2};
-//     `,
-//     TracePageSearchBarBar: css`
-//       label: TracePageSearchBarBar;
-//       max-width: 20rem;
-//       transition: max-width 0.5s;
-//       &:focus-within {
-//         max-width: 100%;
-//       }
-//     `,
-//     TracePageSearchBarSuffix: css`
-//       label: TracePageSearchBarSuffix;
-//       opacity: 0.6;
-//     `,
-//     TracePageSearchBarBtn: css`
-//       label: TracePageSearchBarBtn;
-//       transition: 0.2s;
-//       margin-left: 8px;
-//     `,
-//     TracePageSearchBarBtnDisabled: css`
-//       label: TracePageSearchBarBtnDisabled;
-//       opacity: 0.5;
-//     `,
-//     TracePageSearchBarLocateBtn: css`
-//       label: TracePageSearchBarLocateBtn;
-//       padding: 1px 8px 4px;
-//     `,
-//   };
-// };
 
 type TracePageSearchBarProps = {
     navigable: boolean;