From 453d2ef11d748ddd4a93ab4603f06ad266a5fd31 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Mon, 26 May 2025 12:23:56 +0200 Subject: [PATCH] rebase dev --- .../components/FilterSeries/FilterSeries.tsx | 2 +- .../Filters/FilterList/FilterListHeader.tsx | 21 ++++++++----------- frontend/app/mstore/searchStore.ts | 2 +- frontend/app/mstore/types/search.ts | 2 +- frontend/yarn.lock | 12 +++++------ 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx b/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx index a59072905..b1f7ae678 100644 --- a/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx +++ b/frontend/app/components/Dashboard/components/FilterSeries/FilterSeries.tsx @@ -8,7 +8,7 @@ import SeriesName from './SeriesName'; import FilterListHeader from 'Shared/Filters/FilterList/FilterListHeader'; import FilterSelection from 'Shared/Filters/FilterSelection'; import { Filter } from '@/mstore/types/filterConstants'; -import { Plus } from '.store/lucide-react-virtual-9282d60eb0/package'; +import { Plus } from 'lucide-react'; import UnifiedFilterList from 'Shared/Filters/FilterList/UnifiedFilterList'; import { useStore } from '@/mstore'; diff --git a/frontend/app/components/shared/Filters/FilterList/FilterListHeader.tsx b/frontend/app/components/shared/Filters/FilterList/FilterListHeader.tsx index 4f9dcdb99..8bb7fc486 100644 --- a/frontend/app/components/shared/Filters/FilterList/FilterListHeader.tsx +++ b/frontend/app/components/shared/Filters/FilterList/FilterListHeader.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from 'react'; -import { Space, Typography } from '.store/antd-virtual-9dbfadb7f6/package'; +import { Space, Typography } from 'antd'; import EventsOrder from 'Shared/Filters/FilterList/EventsOrder'; interface FilterListHeaderProps { @@ -12,13 +12,13 @@ interface FilterListHeaderProps { } const FilterListHeader = ({ - title, - filterSelection, - showEventsOrder = false, - orderProps = {}, - onChangeOrder, - actions = [] - }: FilterListHeaderProps) => { + title, + filterSelection, + showEventsOrder = false, + orderProps = {}, + onChangeOrder, + actions = [], +}: FilterListHeaderProps) => { return (
@@ -27,10 +27,7 @@ const FilterListHeader = ({
{showEventsOrder && onChangeOrder && ( - + )} {actions.map((action, index) => (
{action}
diff --git a/frontend/app/mstore/searchStore.ts b/frontend/app/mstore/searchStore.ts index e890c16eb..2caf55296 100644 --- a/frontend/app/mstore/searchStore.ts +++ b/frontend/app/mstore/searchStore.ts @@ -442,7 +442,7 @@ class SearchStore { async fetchSessions( force: boolean = false, bookmarked: boolean = false - ): Promise => { + ): Promise { if (this.searchInProgress) return; const filter = this.instance.toSearch(); diff --git a/frontend/app/mstore/types/search.ts b/frontend/app/mstore/types/search.ts index c5668e8d4..5b4fefbf7 100644 --- a/frontend/app/mstore/types/search.ts +++ b/frontend/app/mstore/types/search.ts @@ -165,7 +165,7 @@ export default class Search { private getDateRange( rangeName: string, customStartDate: number, - customEndDate: number + customEndDate: number, roundMinutes?: number, ): { startDate: number; endDate: number } { let endDate = new Date().getTime(); diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 525224386..99138887f 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -11360,12 +11360,12 @@ __metadata: languageName: node linkType: hard -"lucide-react@npm:0.454.0": - version: 0.454.0 - resolution: "lucide-react@npm:0.454.0" +"lucide-react@npm:0.487.0": + version: 0.487.0 + resolution: "lucide-react@npm:0.487.0" peerDependencies: - react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc - checksum: 10c1/74a826345610813f909a52e0c74c4ec374fb3c23fdae598670a7b80001610672afc97b7e887546164e7464e5ba69e2eb386ba1dbfbca73e4cb1f707a9a69dc3c + react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 + checksum: 10c1/8d97b1d7341386b5f5b644fbda5d0918b6253d689681565e3ec43b102ebfe789b446157ca3d338bb9c3135c6203d861f939949326d725b9aa083e1a510980fcf languageName: node linkType: hard @@ -12948,7 +12948,7 @@ __metadata: js-untar: "npm:^2.0.0" jspdf: "npm:^3.0.1" lottie-react: "npm:^2.4.1" - lucide-react: "npm:0.454.0" + lucide-react: "npm:0.487.0" luxon: "npm:^3.6.1" microdiff: "npm:^1.5.0" mini-css-extract-plugin: "npm:^2.9.2"