diff --git a/applications/client/src/components/Dropdown.tsx b/applications/client/src/components/Dropdown.tsx index 95fb0645..d71c56c3 100644 --- a/applications/client/src/components/Dropdown.tsx +++ b/applications/client/src/components/Dropdown.tsx @@ -1,8 +1,7 @@ import type { Intent, MaybeElement } from '@blueprintjs/core'; -import { Button } from '@blueprintjs/core'; -import { MenuItem2 } from '@blueprintjs/popover2'; +import { Button, MenuItem } from '@blueprintjs/core'; import type { ItemRenderer } from '@blueprintjs/select'; -import { Select2 } from '@blueprintjs/select'; +import { Select } from '@blueprintjs/select'; import { css } from '@emotion/react'; import { Txt } from '@redeye/ui-styles'; import type { FC } from 'react'; @@ -12,7 +11,7 @@ const renderSort: ItemRenderer<{ key: string; label: string }> = (item, { handle return null; } return ( - = ({ icon, disabled, }) => ( - = ({ disabled={disabled} small /> - + ); const valueStyle = css` diff --git a/applications/client/src/components/Forms/SettingsForm.tsx b/applications/client/src/components/Forms/SettingsForm.tsx index 247eeccc..545d84eb 100644 --- a/applications/client/src/components/Forms/SettingsForm.tsx +++ b/applications/client/src/components/Forms/SettingsForm.tsx @@ -1,5 +1,5 @@ import { Classes, FormGroup, Switch } from '@blueprintjs/core'; -import { TimezoneSelect } from '@blueprintjs/datetime2'; +import { TimezoneSelect } from '@blueprintjs/datetime'; import { css } from '@emotion/react'; import { SortDirection, useStore } from '@redeye/client/store'; import { sortOptions } from '@redeye/client/views'; diff --git a/applications/client/src/components/Forms/UsernameInput.tsx b/applications/client/src/components/Forms/UsernameInput.tsx index a6533171..5bd00064 100644 --- a/applications/client/src/components/Forms/UsernameInput.tsx +++ b/applications/client/src/components/Forms/UsernameInput.tsx @@ -1,7 +1,6 @@ -import { Classes } from '@blueprintjs/core'; -import { MenuItem2 } from '@blueprintjs/popover2'; +import { Classes, MenuItem } from '@blueprintjs/core'; import type { ItemPredicate, SuggestProps } from '@blueprintjs/select'; -import { Suggest2, getCreateNewItem } from '@blueprintjs/select'; +import { Suggest, getCreateNewItem } from '@blueprintjs/select'; import { Add16, User16 } from '@carbon/icons-react'; import { ClassNames, css } from '@emotion/react'; import { CarbonIcon, createState, escapeRegExpChars } from '@redeye/client/components'; @@ -52,7 +51,7 @@ export const UsernameInput = observer( {({ css: classCss }) => ( // for the popoverProps.className - ( } as any } inputProps={{ - value: state.query, + // value: state.query, // not needed in bp5 onBlur: () => updateUser(state.query), type: 'text', name: 'username', @@ -88,12 +87,11 @@ export const UsernameInput = observer( placeholder: 'user', leftIcon: , large: true, - fill: true, }} itemRenderer={(user, { handleClick, modifiers }) => { if (!modifiers.matchesPredicate) return null; return ( - ( ); }} createNewItemRenderer={(_, isActive: boolean) => ( - } text="New User" disabled={disableCreateUser || store.graphqlStore.globalOperators.has(state.query)} diff --git a/applications/client/src/views/Campaign/Explore/Panels/Beacon/BeaconRow.tsx b/applications/client/src/views/Campaign/Explore/Panels/Beacon/BeaconRow.tsx index b412e5b9..93b14b8d 100644 --- a/applications/client/src/views/Campaign/Explore/Panels/Beacon/BeaconRow.tsx +++ b/applications/client/src/views/Campaign/Explore/Panels/Beacon/BeaconRow.tsx @@ -149,7 +149,7 @@ export const BeaconRow = observer(({ beacon, ...props }) => { {beacon != null && !store.appMeta.blueTeam && ( + // } /> diff --git a/applications/client/src/views/Campaign/Explore/Panels/BulkEdit.tsx b/applications/client/src/views/Campaign/Explore/Panels/BulkEdit.tsx index 0bddad65..e21c6c08 100644 --- a/applications/client/src/views/Campaign/Explore/Panels/BulkEdit.tsx +++ b/applications/client/src/views/Campaign/Explore/Panels/BulkEdit.tsx @@ -1,4 +1,4 @@ -import { Button, Intent, Menu, Position } from '@blueprintjs/core'; +import { Button, Intent, Menu, Position, MenuItem } from '@blueprintjs/core'; import { Edit16, View16, ViewOff16 } from '@carbon/icons-react'; import { css } from '@emotion/react'; import type { UseCreateState } from '@redeye/client/components'; @@ -10,7 +10,6 @@ import { useCallback } from 'react'; import type { ComponentProps } from 'react'; import type { UseMutationResult } from '@tanstack/react-query'; import { InfoType } from '@redeye/client/types'; -import { MenuItem2 } from '@blueprintjs/popover2'; import { ToggleHiddenDialog } from './Meta'; type HostRowProps = ComponentProps<'div'> & { @@ -135,7 +134,7 @@ export const BulkEdit = observer( content={ {store.settings.showHidden && ( - } @@ -147,7 +146,7 @@ export const BulkEdit = observer( } /> )} - } diff --git a/applications/client/src/views/Campaign/Explore/Panels/Meta/BeaconMeta.tsx b/applications/client/src/views/Campaign/Explore/Panels/Meta/BeaconMeta.tsx index f7e729db..0a07cf51 100644 --- a/applications/client/src/views/Campaign/Explore/Panels/Meta/BeaconMeta.tsx +++ b/applications/client/src/views/Campaign/Explore/Panels/Meta/BeaconMeta.tsx @@ -1,5 +1,5 @@ import { Button, InputGroup, MenuItem } from '@blueprintjs/core'; -import { DateInput2 } from '@blueprintjs/datetime2'; +import { DateInput } from '@blueprintjs/datetime'; import { CarbonIcon, dateTimeFormat, isDefined } from '@redeye/client/components'; import { createState } from '@redeye/client/components/mobx-create-state'; import type { @@ -20,7 +20,7 @@ import { observer } from 'mobx-react-lite'; import moment from 'moment-timezone'; import { useEffect } from 'react'; import type { ItemRenderer } from '@blueprintjs/select'; -import { Select2 } from '@blueprintjs/select'; +import { Select } from '@blueprintjs/select'; import { CaretDown16 } from '@carbon/icons-react'; import { draft, model, Model, prop } from 'mobx-keystone'; import type { NodeColor } from '@redeye/client/views'; @@ -210,7 +210,7 @@ export const BeaconMeta = observer((props) => { {beacon?.meta[0]?.maybeCurrent?.pid} Time of Death
- {
Type - { rightIcon={} fill /> - + Graph Appearance diff --git a/applications/client/src/views/Campaign/Explore/Panels/Meta/ServerMeta.tsx b/applications/client/src/views/Campaign/Explore/Panels/Meta/ServerMeta.tsx index 07ebc93d..5b7433f6 100644 --- a/applications/client/src/views/Campaign/Explore/Panels/Meta/ServerMeta.tsx +++ b/applications/client/src/views/Campaign/Explore/Panels/Meta/ServerMeta.tsx @@ -1,5 +1,5 @@ -import { Button, InputGroup } from '@blueprintjs/core'; -import { Select2 } from '@blueprintjs/select'; +import { Button, InputGroup, MenuItem } from '@blueprintjs/core'; +import { Select } from '@blueprintjs/select'; import type { ItemRenderer } from '@blueprintjs/select'; import { CaretDown16 } from '@carbon/icons-react'; import { CarbonIcon } from '@redeye/client/components'; @@ -12,7 +12,6 @@ import type { NodeColor } from '@redeye/client/views'; import { nodeColor, ToggleHiddenDialog } from '@redeye/client/views'; import { useMutation } from '@tanstack/react-query'; import { observer } from 'mobx-react-lite'; -import { MenuItem2 } from '@blueprintjs/popover2'; import { Flex } from '@redeye/ui-styles'; import { draft, Model, model, prop } from 'mobx-keystone'; import { @@ -110,13 +109,7 @@ export const ServerMeta = observer((props) => { return null; } return ( - + ); }; @@ -142,7 +135,7 @@ export const ServerMeta = observer((props) => { } /> Type - { rightIcon={} fill /> - + Graph Appearance diff --git a/applications/client/src/views/Campaign/Explore/Panels/Meta/components/NodeColorSelect.tsx b/applications/client/src/views/Campaign/Explore/Panels/Meta/components/NodeColorSelect.tsx index bf18fb73..ad7979d1 100644 --- a/applications/client/src/views/Campaign/Explore/Panels/Meta/components/NodeColorSelect.tsx +++ b/applications/client/src/views/Campaign/Explore/Panels/Meta/components/NodeColorSelect.tsx @@ -1,7 +1,7 @@ import type { ButtonProps } from '@blueprintjs/core'; import { Button, MenuItem } from '@blueprintjs/core'; -import type { ItemRenderer, Select2Props } from '@blueprintjs/select'; -import { Select2 } from '@blueprintjs/select'; +import type { ItemRenderer, SelectProps } from '@blueprintjs/select'; +import { Select } from '@blueprintjs/select'; import { CaretDown16 } from '@carbon/icons-react'; import { CarbonIcon } from '@redeye/client/components'; import type { NodeColor, NodeIconProps } from '@redeye/client/views/Campaign/Graph'; @@ -10,8 +10,8 @@ import { largePopoverClassName } from '@redeye/ui-styles'; import { observer } from 'mobx-react-lite'; import { NodePreview } from './NodePreview'; -type NodeColorSelectProps = Partial> & { - onItemSelect: Select2Props['onItemSelect']; +type NodeColorSelectProps = Partial> & { + onItemSelect: SelectProps['onItemSelect']; buttonProps?: ButtonProps; nodeIconProps?: NodeIconProps; value?: NodeColor; @@ -31,7 +31,7 @@ export const NodeColorSelect = observer( ); return ( - ( {...props} >