rebase dev
This commit is contained in:
parent
9ee8cbd24a
commit
453d2ef11d
5 changed files with 18 additions and 21 deletions
|
|
@ -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';
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -17,7 +17,7 @@ const FilterListHeader = ({
|
|||
showEventsOrder = false,
|
||||
orderProps = {},
|
||||
onChangeOrder,
|
||||
actions = []
|
||||
actions = [],
|
||||
}: FilterListHeaderProps) => {
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
|
|
@ -27,10 +27,7 @@ const FilterListHeader = ({
|
|||
</Space>
|
||||
<div className="ml-auto flex items-center gap-2">
|
||||
{showEventsOrder && onChangeOrder && (
|
||||
<EventsOrder
|
||||
orderProps={orderProps}
|
||||
onChange={onChangeOrder}
|
||||
/>
|
||||
<EventsOrder orderProps={orderProps} onChange={onChangeOrder} />
|
||||
)}
|
||||
{actions.map((action, index) => (
|
||||
<div key={index}>{action}</div>
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ class SearchStore {
|
|||
async fetchSessions(
|
||||
force: boolean = false,
|
||||
bookmarked: boolean = false
|
||||
): Promise<void> => {
|
||||
): Promise<void> {
|
||||
if (this.searchInProgress) return;
|
||||
const filter = this.instance.toSearch();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue