Skip to content

Commit

Permalink
wip: fixed conflit
Browse files Browse the repository at this point in the history
  • Loading branch information
alonbraymok committed Nov 12, 2024
1 parent db7e79e commit 0baabe0
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 138 deletions.
72 changes: 0 additions & 72 deletions frontend/webapp/components/overview/filters/index.tsx

This file was deleted.

1 change: 0 additions & 1 deletion frontend/webapp/components/overview/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './add-entity';
export * from './filters';
export * from './monitors-legend';
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const DestinationFilterComponent: React.FC<FilterComponentProps> = ({ selectedTa
<div>
<Input placeholder='Search...' icon='/icons/common/search.svg' value={searchTerm} onChange={handleSearchChange} />
</div>
<Dropdown options={DROPDOWN_OPTIONS} value={selectedTag} onSelect={onTagSelect} />
<Dropdown options={DROPDOWN_OPTIONS} value={selectedTag} onSelect={onTagSelect} onDeselect={function (option: DropdownOption): void {}} />
</InputAndDropdownContainer>

<MonitorButtonsContainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import { Search } from './search';
import { Filters } from './filters';
import styled from 'styled-components';
import { Divider, TabList } from '@/reuseable-components';
import { AddEntity, Filters, MonitorsLegend } from '@/components';
import { AddEntity, MonitorsLegend } from '@/components';

const MenuContainer = styled.div`
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion frontend/webapp/reuseable-components/dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface DropdownProps {
tooltip?: string;
placeholder?: string;
options: DropdownOption[];
value: DropdownOption | undefined;
value: DropdownOption | DropdownOption[] | undefined;
onSelect: (option: DropdownOption) => void;
onDeselect: (option: DropdownOption) => void;
isMulti?: boolean;
Expand Down
32 changes: 0 additions & 32 deletions tests/common/ui-tests/run_cypress_tests.sh

This file was deleted.

21 changes: 0 additions & 21 deletions tests/common/ui-tests/start_odigos_ui.sh

This file was deleted.

9 changes: 0 additions & 9 deletions tests/common/ui-tests/stop_ui_and_clean.sh

This file was deleted.

0 comments on commit 0baabe0

Please sign in to comment.