From ca3a1cfed980cc8dc3abda52142b03553e075fee Mon Sep 17 00:00:00 2001 From: IDONTSUDO Date: Tue, 13 Aug 2024 16:35:32 +0300 Subject: [PATCH] progress --- ui/src/core/extensions/object.ts | 3 --- ui/src/core/helper/validate.ts | 3 --- ...bridge_repository.ts => core_ros_ws_bridge_repository.ts} | 5 +---- .../features/calculation/data/calculation_http_repository.ts | 5 +---- .../features/calculation/presentation/calculation_screen.tsx | 2 +- .../features/calculation/presentation/calculation_store.tsx | 1 - ui/src/features/dataset/dataset_http_repository.ts | 2 +- ui/src/features/dataset/dataset_screen.tsx | 3 +-- ui/src/features/scene_manager/data/scene_http_repository.ts | 3 +-- ui/src/features/simulations/simulations_store.ts | 4 ++-- ui/src/index.tsx | 1 + 11 files changed, 9 insertions(+), 23 deletions(-) rename ui/src/core/repository/{ros_ws_bridge_repository.ts => core_ros_ws_bridge_repository.ts} (92%) diff --git a/ui/src/core/extensions/object.ts b/ui/src/core/extensions/object.ts index 69317fb..5c47695 100644 --- a/ui/src/core/extensions/object.ts +++ b/ui/src/core/extensions/object.ts @@ -1,6 +1,3 @@ -export const ObjectExtensionsIsKeyExists = (obj: any, keys: string[]): boolean => { - return true; -}; export const ObjectIsNotEmpty = (obj: Object | undefined) => { if (obj === undefined) { return false; diff --git a/ui/src/core/helper/validate.ts b/ui/src/core/helper/validate.ts index f570767..e69de29 100644 --- a/ui/src/core/helper/validate.ts +++ b/ui/src/core/helper/validate.ts @@ -1,3 +0,0 @@ -export function validateRequired(value: string) { - return value ? undefined : "required"; -} diff --git a/ui/src/core/repository/ros_ws_bridge_repository.ts b/ui/src/core/repository/core_ros_ws_bridge_repository.ts similarity index 92% rename from ui/src/core/repository/ros_ws_bridge_repository.ts rename to ui/src/core/repository/core_ros_ws_bridge_repository.ts index 5e45b18..167316d 100644 --- a/ui/src/core/repository/ros_ws_bridge_repository.ts +++ b/ui/src/core/repository/core_ros_ws_bridge_repository.ts @@ -3,11 +3,8 @@ import { MessageReader } from '@foxglove/rosmsg2-serialization'; import { parse as parseMessageDefinition } from '@foxglove/rosmsg'; import { TypedEvent } from "../helper/typed_event"; -export class RosWsBridgeRepository extends TypedEvent { +export class CoreRosWsBridgeRepository extends TypedEvent { client?: FoxgloveClient; - constructor() { - super(); - } connect(topic: string) { const client = new FoxgloveClient({ ws: new WebSocket(`ws://localhost:8765`, [FoxgloveClient.SUPPORTED_SUBPROTOCOL]), diff --git a/ui/src/features/calculation/data/calculation_http_repository.ts b/ui/src/features/calculation/data/calculation_http_repository.ts index 23034c9..90e4695 100644 --- a/ui/src/features/calculation/data/calculation_http_repository.ts +++ b/ui/src/features/calculation/data/calculation_http_repository.ts @@ -1,7 +1,4 @@ -import { Result } from "../../../core/helper/result"; -import { ValidationModel } from "../../../core/model/validation_model"; -import { HttpError, HttpMethod, CoreHttpRepository } from "../../../core/repository/core_http_repository"; -import { IDatasetModel } from "../../dataset/dataset_model"; +import { HttpMethod, CoreHttpRepository } from "../../../core/repository/core_http_repository"; import { CalculationModel } from "../model/calculation_model"; export interface ISkils { diff --git a/ui/src/features/calculation/presentation/calculation_screen.tsx b/ui/src/features/calculation/presentation/calculation_screen.tsx index 91c36c4..ad3fb35 100644 --- a/ui/src/features/calculation/presentation/calculation_screen.tsx +++ b/ui/src/features/calculation/presentation/calculation_screen.tsx @@ -13,7 +13,7 @@ import { FormBuilder } from "../../../core/ui/form_builder/form_builder"; import { match } from "ts-pattern"; import { TemplateModelCard } from "./ui/template_model_card"; import { Icon } from "../../../core/ui/icons/icons"; -import { FormBuilderValidationModel, scene } from "../../dataset/dataset_model"; +import { FormBuilderValidationModel } from "../../dataset/dataset_model"; interface IItem { name: string; diff --git a/ui/src/features/calculation/presentation/calculation_store.tsx b/ui/src/features/calculation/presentation/calculation_store.tsx index 6b900af..830adbb 100644 --- a/ui/src/features/calculation/presentation/calculation_store.tsx +++ b/ui/src/features/calculation/presentation/calculation_store.tsx @@ -3,7 +3,6 @@ import { NavigateFunction } from "react-router-dom"; import { HttpError } from "../../../core/repository/core_http_repository"; import { Drawer, UiDrawerFormState } from "../../../core/store/base_store"; import { CalculationHttpRepository } from "../data/calculation_http_repository"; -import { IDatasetModel } from "../../dataset/dataset_model"; import { message } from "antd"; import { UUID } from "../../all_projects/data/project_http_repository"; import { CalculationModel } from "../model/calculation_model"; diff --git a/ui/src/features/dataset/dataset_http_repository.ts b/ui/src/features/dataset/dataset_http_repository.ts index 728a941..26ad50a 100644 --- a/ui/src/features/dataset/dataset_http_repository.ts +++ b/ui/src/features/dataset/dataset_http_repository.ts @@ -1,6 +1,6 @@ import { Result } from "../../core/helper/result"; import { HttpError, HttpMethod, CoreHttpRepository } from "../../core/repository/core_http_repository"; -import { DataSetModel, Dataset, IDatasetModel, ProcessStatus } from "./dataset_model"; +import { DataSetModel, Dataset, IDatasetModel } from "./dataset_model"; export class DataSetHttpRepository extends CoreHttpRepository { featureApi = `/datasets`; diff --git a/ui/src/features/dataset/dataset_screen.tsx b/ui/src/features/dataset/dataset_screen.tsx index f6a1deb..dc73e58 100644 --- a/ui/src/features/dataset/dataset_screen.tsx +++ b/ui/src/features/dataset/dataset_screen.tsx @@ -7,7 +7,6 @@ import { MainPage } from "../../core/ui/pages/main_page"; import { CardDataSet, CardDataSetType } from "./card_dataset"; import { CoreInput } from "../../core/ui/input/input"; import { CoreButton } from "../../core/ui/button/button"; -import { ListItem } from "./list_item"; export const DatasetsScreenPath = "/dataset"; @@ -16,7 +15,7 @@ export const DataSetScreen: React.FunctionComponent = observer(() => { React.useEffect(() => { store.init(); - }, [store]); + }, []); return ( <> = new RosWsBridgeRepository(); + rosWsUrdfTransfomsListner: CoreRosWsBridgeRepository = new CoreRosWsBridgeRepository(); coreThreeRepository?: CoreThreeRepository; constructor() { diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 01eff66..b487f65 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -22,3 +22,4 @@ root.render( ); + \ No newline at end of file