Skip to content

Commit 207fca7

Browse files
authored
Cleanup the house (#4591)
1 parent 524a615 commit 207fca7

34 files changed

+112
-136
lines changed

ui/src/features/data-collection/gallery/annotation-state-icon.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { CanceledIcon, CheckCircleOutlined } from '@geti/ui/icons';
55

6-
import { AnnotationState } from '../../../routes/data-collection/provider';
6+
import { AnnotationState } from '../../../routes/dataset/provider';
77

88
import classes from './annotation-state-icon.module.scss';
99

ui/src/features/data-collection/gallery/gallery.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { AriaComponentsListBox, GridLayout, ListBoxItem, Size, View, Virtualizer } from '@geti/ui';
55

6-
import { useSelectedData } from '../../../routes/data-collection/provider';
6+
import { useSelectedData } from '../../../routes/dataset/provider';
77
import { CheckboxInput } from '../checkbox-input';
88
import { response } from '../mock-response';
99
import { AnnotationStateIcon } from './annotation-state-icon.component';

ui/src/features/data-collection/toolbar/toolbar.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { Button, Divider, Flex, Heading, Text } from '@geti/ui';
55

6-
import { useSelectedData } from '../../../routes/data-collection/provider';
6+
import { useSelectedData } from '../../../routes/dataset/provider';
77
import { CheckboxInput } from '../checkbox-input';
88
import { response } from '../mock-response';
99
import { toggleMultipleSelection, updateSelectedKeysTo } from './util';

ui/src/features/data-collection/toolbar/util.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { describe, expect, it } from 'vitest';
55

6-
import { MediaState } from '../../../routes/data-collection/provider';
6+
import { MediaState } from '../../../routes/dataset/provider';
77
import { toggleMultipleSelection, updateSelectedKeysTo } from './util';
88

99
describe('toggleMultipleSelection', () => {

ui/src/features/data-collection/toolbar/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { Key, Selection } from '@geti/ui';
55

6-
import { AnnotationState, MediaState } from '../../../routes/data-collection/provider';
6+
import { AnnotationState, MediaState } from '../../../routes/dataset/provider';
77

88
export const toggleMultipleSelection =
99
(items: Key[]) =>
File renamed without changes.

ui/src/routes/live-feed/debug-trigger.tsx renamed to ui/src/features/inference/debug-trigger.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Content, Dialog, DialogTrigger } from '@adobe/react-spectrum';
77
import { ActionButton, Button, Divider, Flex, Item, Picker } from '@geti/ui';
88

99
import { $api } from '../../api/client';
10-
import { useWebRTCConnection } from '../../components/stream/web-rtc-connection-provider';
10+
import { useWebRTCConnection } from './stream/web-rtc-connection-provider';
1111

1212
const DebugTooltip = () => {
1313
const modelsQuery = $api.useSuspenseQuery('get', '/api/models');

ui/src/routes/live-feed/live-feed.tsx renamed to ui/src/features/inference/stream-container.tsx

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
// Copyright (C) 2025 Intel Corporation
2-
// SPDX-License-Identifier: Apache-2.0
3-
41
import { useEffect, useState } from 'react';
52

6-
import { Button, Flex, Grid, Loading, toast, View } from '@geti/ui';
3+
import { Button, Flex, Loading, toast, View } from '@geti/ui';
74
import { Play } from '@geti/ui/icons';
85

9-
import { useWebRTCConnection } from '../../components/stream/web-rtc-connection-provider';
10-
import { Stream } from './../../components/stream/stream';
11-
import { Aside } from './aside';
12-
import { Toolbar } from './toolbar';
6+
import { Stream } from './stream/stream';
7+
import { useWebRTCConnection } from './stream/web-rtc-connection-provider';
138

14-
import classes from './live-feed.module.css';
9+
import classes from './inference.module.css';
1510

1611
export const StreamContainer = () => {
1712
const [size, setSize] = useState({ height: 608, width: 892 });
@@ -55,22 +50,3 @@ export const StreamContainer = () => {
5550
</View>
5651
);
5752
};
58-
59-
export const LiveFeed = () => {
60-
return (
61-
<Grid
62-
areas={['toolbar aside', 'canvas aside']}
63-
UNSAFE_style={{
64-
gridTemplateRows: 'var(--spectrum-global-dimension-size-800, 4rem) auto',
65-
gridTemplateColumns: 'auto min-content',
66-
height: '100%',
67-
overflow: 'hidden',
68-
gap: '1px',
69-
}}
70-
>
71-
<Toolbar />
72-
<StreamContainer />
73-
<Aside />
74-
</Grid>
75-
);
76-
};

ui/src/components/stream/stream.tsx renamed to ui/src/features/inference/stream/stream.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import { Dispatch, RefObject, SetStateAction, useCallback, useEffect, useRef } from 'react';
55

6-
import { useWebRTCConnection } from '../../components/stream/web-rtc-connection-provider';
7-
import { ZoomTransform } from '../zoom/zoom-transform';
6+
import { ZoomTransform } from '../../../components/zoom/zoom-transform';
7+
import { useWebRTCConnection } from './web-rtc-connection-provider';
88

99
const useSetTargetSizeBasedOnVideo = (
1010
setSize: Dispatch<SetStateAction<{ width: number; height: number }>>,

0 commit comments

Comments
 (0)