From d806fe189a3dd8340e0eeaede3ae416de3281c84 Mon Sep 17 00:00:00 2001 From: sumeet_detect Date: Fri, 2 Dec 2022 20:03:27 +0530 Subject: [PATCH 1/3] dt-v2.2.0: Disable Propagation --- .../objects-side-bar/object-item-menu.tsx | 28 +++++++++---------- .../standard-workspace/standard-workspace.tsx | 2 +- .../standard3D-workspace.tsx | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-menu.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-menu.tsx index bb25fdcb16bd..f9ccb63e6ab9 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-menu.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-menu.tsx @@ -78,19 +78,19 @@ function MakeCopyItem(props: ItemProps): JSX.Element { ); } -function PropagateItem(props: ItemProps): JSX.Element { - const { toolProps, ...rest } = props; - const { propagateShortcut, propagate } = toolProps; - return ( - - - - - - ); -} +// function PropagateItem(props: ItemProps): JSX.Element { +// const { toolProps, ...rest } = props; +// const { propagateShortcut, propagate } = toolProps; +// return ( +// +// +// +// +// +// ); +// } function SwitchOrientationItem(props: ItemProps): JSX.Element { const { toolProps, ...rest } = props; @@ -231,7 +231,7 @@ export default function ItemMenu(props: Props): JSX.Element { {!readonly && } - {!readonly && } + {/* {!readonly && } */} {is2D && !readonly && [ShapeType.POLYGON, ShapeType.POLYLINE, ShapeType.CUBOID].includes(shapeType) && ( )} diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx index 75adab1514d7..6fcd9890a49a 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/standard-workspace.tsx @@ -21,7 +21,7 @@ export default function StandardWorkspaceComponent(): JSX.Element { } /> - + {/* */} diff --git a/cvat-ui/src/components/annotation-page/standard3D-workspace/standard3D-workspace.tsx b/cvat-ui/src/components/annotation-page/standard3D-workspace/standard3D-workspace.tsx index b9394fd220b2..b1083ea6311f 100644 --- a/cvat-ui/src/components/annotation-page/standard3D-workspace/standard3D-workspace.tsx +++ b/cvat-ui/src/components/annotation-page/standard3D-workspace/standard3D-workspace.tsx @@ -20,7 +20,7 @@ export default function StandardWorkspace3DComponent(): JSX.Element { } /> - + {/* */} From a6a4691804c8f4bedc62c0a2e7863f3c5eb5836d Mon Sep 17 00:00:00 2001 From: sumeet_detect Date: Fri, 2 Dec 2022 20:06:11 +0530 Subject: [PATCH 2/3] Fix: cvat_ui build fail fix --- Dockerfile.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ui b/Dockerfile.ui index a6dd25992ecd..1faa4941581b 100644 --- a/Dockerfile.ui +++ b/Dockerfile.ui @@ -1,5 +1,4 @@ FROM node:lts-slim AS cvat-ui - ARG http_proxy ARG https_proxy ARG no_proxy @@ -33,7 +32,8 @@ COPY cvat-core/ /tmp/cvat-core/ COPY cvat-canvas3d/ /tmp/cvat-canvas3d/ COPY cvat-canvas/ /tmp/cvat-canvas/ COPY cvat-ui/ /tmp/cvat-ui/ -RUN npm run build:cvat-ui +# RUN npm run build:cvat-ui +RUN NODE_OPTIONS='--openssl-legacy-provider' npm run build:cvat-ui FROM nginx:mainline-alpine # Replace default.conf configuration to remove unnecessary rules From 3fdc8323ffd8c77169a4910af25ed3e580c46c0f Mon Sep 17 00:00:00 2001 From: sumeet_detect Date: Thu, 8 Dec 2022 14:09:37 +0530 Subject: [PATCH 3/3] Add override docker file --- .gitignore | 1 - docker-compose.override.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 docker-compose.override.yml diff --git a/.gitignore b/.gitignore index 8e22339a1769..8961b70e347b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ /letsencrypt-webroot/ # Ignore temporary files -docker-compose.override.yml __pycache__ *.pyc ._* diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 000000000000..e3d35e760073 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,15 @@ +version: '3.3' + +services: + cvat: + environment: + CVAT_SHARE_URL: 'Mounted from ${CVAT_MOUNT:-/home/ubuntu/dtpl-ai-data-labelling} host directory' + volumes: + - cvat_share:/home/django/share:ro + +volumes: + cvat_share: + driver_opts: + type: none + device: ${CVAT_MOUNT:-/home/ubuntu/dtpl-ai-data-labelling} + o: bind \ No newline at end of file