diff --git a/src/components/SideDialog/index.js b/src/components/SideDialog/index.js index e8617229..d571fb92 100644 --- a/src/components/SideDialog/index.js +++ b/src/components/SideDialog/index.js @@ -1,18 +1,8 @@ -/* This example requires Tailwind CSS v2.0+ */ -import { Fragment, useEffect, useState } from "react"; +import { Fragment } from "react"; import { Dialog, Transition } from "@headlessui/react"; import { XIcon } from "@heroicons/react/outline"; import moment from "moment"; -function isJsonString(str) { - try { - JSON.parse(str); - } catch (e) { - return false; - } - return true; -} - const removeMeta = (data) => { let res = { ...data }; delete res.p_tags; @@ -21,8 +11,6 @@ const removeMeta = (data) => { }; export default function SideDialog({ open, setOpen, data }) { - const [log, setLog] = useState({}); - return ( @@ -71,7 +59,6 @@ export default function SideDialog({ open, setOpen, data }) {
- {/* Replace with your content */}
{data.p_tags?.split("^").map((tag, index) => ( diff --git a/src/page/Dashboard/DateRangeSeletor.js b/src/page/Dashboard/DateRangeSeletor.js index d2e79699..0b5931e3 100644 --- a/src/page/Dashboard/DateRangeSeletor.js +++ b/src/page/Dashboard/DateRangeSeletor.js @@ -1,8 +1,7 @@ import moment from "moment"; import { useState, useEffect, useRef } from "react"; import DatePicker from "./DatePicker"; -import { SelectorIcon } from "@heroicons/react/solid"; -import { CalculatorIcon, ClockIcon } from "@heroicons/react/outline"; +import { ClockIcon } from "@heroicons/react/outline"; const FORMAT = "DD-MM-YYYY HH:mm"; @@ -32,7 +31,7 @@ const DateRangeSelector = ({ const [isOpen, setIsOpen] = useState(false); const [fromInput, setFromInput] = useState( - moment().subtract(10, "minutes").format(FORMAT), + moment().subtract(10, "minutes").format(FORMAT) ); const [toInput, setToInput] = useState(moment().format(FORMAT)); diff --git a/src/page/Dashboard/index.js b/src/page/Dashboard/index.js index 7341b1ce..f904aace 100644 --- a/src/page/Dashboard/index.js +++ b/src/page/Dashboard/index.js @@ -1,5 +1,5 @@ import moment from "moment"; -import { useState, Fragment, useRef, useCallback, useEffect } from "react"; +import { useState, Fragment, useEffect } from "react"; import Layout from "../../components/Layout"; import SideDialog from "../../components/SideDialog"; import { Listbox, Transition } from "@headlessui/react"; @@ -31,7 +31,7 @@ function hasSubArray(master, sub) { ( (i) => (v) => (i = master.indexOf(v, i) + 1) - )(0), + )(0) ); } @@ -46,8 +46,8 @@ const Dashboard = () => { now.getHours(), now.getMinutes(), 0, - 0, - ), + 0 + ) ); return moment(start); @@ -80,22 +80,17 @@ const Dashboard = () => { const [open, setOpen] = useState(false); const [clickedRow, setClickedRow] = useState({}); - const [timeZone, setTimeZone] = useState("UTC"); const [searchOpen, setSearchOpen] = useState(false); const [query, setQuery] = useState(""); const [searchQuery, setSearchQuery] = useState(""); - const [labelSelected, setLabelSelected] = useState([]); const [searchSelected, setSearchSelected] = useState({}); const [interval, setInterval] = useState(null); const [range, setRange] = useState(0); const [selectedLogSchema, setSelectedLogSchema] = useState([]); const [availableTags, setAvailableTags] = useState([]); const [selectedTags, setSelectedTags] = useState([]); - // const [dateRangeValues, setDateRangeValues] = useState(getRange); const [startTime, setStartTime] = useState( - getCurrentTime().subtract(10, "minutes"), - // .utcOffset("+00:00") - // .format("YYYY-MM-DDThh:mm:ss), + getCurrentTime().subtract(10, "minutes") ); const addAvailableTags = (label) => { @@ -171,7 +166,7 @@ const Dashboard = () => { setSelectedLogSchema([ ...allFields.filter( - (field) => field !== "p_metadata" && field !== "p_tags", + (field) => field !== "p_metadata" && field !== "p_tags" ), ]); }, @@ -206,7 +201,7 @@ const Dashboard = () => { refetchOnWindowFocus: false, refetchInterval: interval === null || range === 7 ? false : interval * 1000, - }, + } ); const { fetchNextPage } = logQueries; @@ -228,10 +223,6 @@ const Dashboard = () => { }; }, [fetchNextPage]); - const timeZoneChange = (e) => { - setTimeZone(e.target.value); - }; - const getFilteredArray = (data, searchString, key) => { if (!data) { return []; @@ -243,7 +234,7 @@ const Dashboard = () => { data[key] .toLowerCase() .replace(/\s+/g, "") - .includes(searchQuery.toLowerCase().replace(/\s+/g, "")), + .includes(searchQuery.toLowerCase().replace(/\s+/g, "")) ); } }; @@ -304,7 +295,7 @@ const Dashboard = () => { {getFilteredArray( logStream?.data?.data, query, - "name", + "name" ).length === 0 && query !== "" ? (
No log streams found @@ -313,7 +304,7 @@ const Dashboard = () => { getFilteredArray( logStream?.data?.data, query, - "name", + "name" ).map((stream, index) => ( { />
- {/* setSearchQuery("")} - > - - {getFilteredArray( - logQueries?.data?.data, - searchQuery, - "log", - ).length === 0 && searchQuery !== "" ? ( -
- Nothing found. -
- ) : ( - getFilteredArray( - logQueries?.data?.data, - searchQuery, - "log", - ) && - getFilteredArray( - logQueries?.data?.data, - searchQuery, - "log", - )?.map((data, index) => ( - - `relative cursor-default select-none py-2 pl-10 pr-4 ${ - active - ? "bg-bluePrimary text-white" - : "text-gray-900" - }` - } - value={data} - > - {({ selected, active }) => ( - <> - - {data.log} - - {selected ? ( - - - ) : null} - - )} - - )) - )} -
-
*/}
@@ -602,12 +525,6 @@ const Dashboard = () => {
- {/* console.log('skhd',e)} /> */} - - {/*
- -
*/} -
@@ -661,7 +578,7 @@ const Dashboard = () => { (data, index) => hasSubArray( data.p_tags?.split("^"), - selectedTags, + selectedTags ) && (searchQuery === "" || JSON.stringify(data) @@ -681,14 +598,12 @@ const Dashboard = () => { {data[schema] || ""} ))} - {data.p_tags - ?.split("^") - .forEach((tag) => { - addAvailableTags(tag); - })} + {data.p_tags?.split("^").forEach((tag) => { + addAvailableTags(tag); + })} - ), - ), + ) + ) )}