Removed prefix where not necessary (#6799)

cvat-ai · Sep 5, 2023 · 46dd95c · 46dd95c
1 parent ae30755
commit 46dd95c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TDB
 
 ### Removed
-- TDB
+- Outdated using of hostname when access git/opencv/analytics from UI (<https://github.com/opencv/cvat/pull/6799>)
 
 ### Fixed
 - Zooming canvas when scrooling comments list in an issue (<https://github.com/opencv/cvat/pull/6758>)

diff --git a/cvat-ui/src/components/header/header.tsx b/cvat-ui/src/components/header/header.tsx
@@ -30,7 +30,6 @@ import Modal from 'antd/lib/modal';
 import Text from 'antd/lib/typography/Text';
 import Select from 'antd/lib/select';
 
-import { getCore } from 'cvat-core-wrapper';
 import config from 'config';
 
 import { CVATLogo } from 'icons';
@@ -42,13 +41,10 @@ import { CombinedState } from 'reducers';
 import { usePlugins } from 'utils/hooks';
 import SettingsModal from './settings-modal/settings-modal';
 
-const core = getCore();
-
 interface Tool {
     name: string;
     description: string;
     server: {
-        host: string;
         version: string;
     };
     core: {
@@ -107,7 +103,6 @@ function mapStateToProps(state: CombinedState): StateToProps {
             name: server.name as string,
             description: server.description as string,
             server: {
-                host: core.config.backendAPI.slice(0, -7),
                 version: server.version as string,
             },
             canvas: {
@@ -259,7 +254,7 @@ function HeaderContainer(props: Props): JSX.Element {
                 icon={<ControlOutlined />}
                 key='admin_page'
                 onClick={(): void => {
-                    window.open(`${tool.server.host}/admin`, '_blank');
+                    window.open('/admin', '_blank');
                 }}
             >
                 Admin page
@@ -482,10 +477,10 @@ function HeaderContainer(props: Props): JSX.Element {
                     <Button
                         className={getButtonClassName('analytics')}
                         type='link'
-                        href={`${tool.server.host}/analytics`}
+                        href='/analytics'
                         onClick={(event: React.MouseEvent): void => {
                             event.preventDefault();
-                            window.open(`${tool.server.host}/analytics`, '_blank');
+                            window.open('/analytics', '_blank');
                         }}
                     >
                         Analytics

diff --git a/cvat-ui/src/utils/git-utils.ts b/cvat-ui/src/utils/git-utils.ts
@@ -6,7 +6,6 @@
 import { getCore } from 'cvat-core-wrapper';
 
 const core = getCore();
-const baseURL = core.config.backendAPI.slice(0, -7);
 
 interface GitPlugin {
     name: string;
@@ -47,7 +46,7 @@ function waitForClone({ data: cloneResponse }: any): Promise<void> {
     return new Promise((resolve, reject): void => {
         async function checkCallback(): Promise<void> {
             core.server
-                .request(`${baseURL}/git/repository/check/${cloneResponse.rq_id}`, {
+                .request(`/git/repository/check/${cloneResponse.rq_id}`, {
                     method: 'GET',
                 })
                 .then(({ data }: any): void => {
@@ -89,7 +88,7 @@ async function cloneRepository(this: any, plugin: GitPlugin, createdTask: any):
             }
 
             core.server
-                .request(`${baseURL}/git/repository/create/${createdTask.id}`, {
+                .request(`/git/repository/create/${createdTask.id}`, {
                     method: 'POST',
                     headers: {
                         'Content-type': 'application/json',
@@ -144,7 +143,7 @@ export function registerGitPlugin(): void {
 }
 
 export async function getReposData(tid: number): Promise<ReposData | null> {
-    const response = (await core.server.request(`${baseURL}/git/repository/get/${tid}`, {
+    const response = (await core.server.request(`/git/repository/get/${tid}`, {
         method: 'GET',
     })).data;
 
@@ -166,13 +165,13 @@ export async function getReposData(tid: number): Promise<ReposData | null> {
 export function syncRepos(tid: number): Promise<void> {
     return new Promise((resolve, reject): void => {
         core.server
-            .request(`${baseURL}/git/repository/push/${tid}`, {
+            .request(`/git/repository/push/${tid}`, {
                 method: 'GET',
             })
             .then(({ data: syncResponse }: any): void => {
                 async function checkSync(): Promise<void> {
                     const id = syncResponse.rq_id;
-                    const response = (await core.server.request(`${baseURL}/git/repository/check/${id}`, {
+                    const response = (await core.server.request(`/git/repository/check/${id}`, {
                         method: 'GET',
                     })).data;
 
@@ -200,7 +199,7 @@ export function syncRepos(tid: number): Promise<void> {
 export async function changeRepo(taskId: number, type: string, value: any): Promise<void> {
     return new Promise((resolve, reject): void => {
         core.server
-            .request(`${baseURL}/git/repository/${taskId}`, {
+            .request(`/git/repository/${taskId}`, {
                 method: 'PATCH',
                 headers: {
                     'Content-type': 'application/json',

diff --git a/cvat-ui/src/utils/opencv-wrapper/opencv-wrapper.ts b/cvat-ui/src/utils/opencv-wrapper/opencv-wrapper.ts
@@ -3,15 +3,11 @@
 //
 // SPDX-License-Identifier: MIT
 
-import { getCore } from 'cvat-core-wrapper';
 import HistogramEqualizationImplementation, { HistogramEqualization } from './histogram-equalization';
 import TrackerMImplementation from './tracker-mil';
 import IntelligentScissorsImplementation, { IntelligentScissors } from './intelligent-scissors';
 import { OpenCVTracker } from './opencv-interfaces';
 
-const core = getCore();
-const baseURL = core.config.backendAPI.slice(0, -7);
-
 export interface Segmentation {
     intelligentScissorsFactory: (onChangeToolsBlockerState:(event:string)=>void) => IntelligentScissors;
 }
@@ -64,7 +60,7 @@ export class OpenCVWrapper {
     }
 
     private async inject(): Promise<void> {
-        const response = await fetch(`${baseURL}/assets/opencv.js`);
+        const response = await fetch('/assets/opencv.js');
         if (response.status !== 200) {
             throw new Error(`Response status ${response.status}. ${response.statusText}`);
         }