Skip to content
Snippets Groups Projects
Commit 20bde0b4 authored by Xiao Gui's avatar Xiao Gui
Browse files

fix single dataset backend url issue

parent 797eb860
No related branches found
No related tags found
No related merge requests found
...@@ -3,10 +3,10 @@ import { Injectable, OnDestroy, TemplateRef } from "@angular/core"; ...@@ -3,10 +3,10 @@ import { Injectable, OnDestroy, TemplateRef } from "@angular/core";
import { select, Store } from "@ngrx/store"; import { select, Store } from "@ngrx/store";
import { Subscription } from "rxjs"; import { Subscription } from "rxjs";
import { filter } from "rxjs/operators"; import { filter } from "rxjs/operators";
import { AtlasViewerConstantsServices } from "src/atlasViewer/atlasViewer.constantService.service"
import { IDataEntry, ViewerPreviewFile, DATASETS_ACTIONS_TYPES } from "src/services/state/dataStore.store"; import { IDataEntry, ViewerPreviewFile, DATASETS_ACTIONS_TYPES } from "src/services/state/dataStore.store";
import { SHOW_BOTTOM_SHEET } from "src/services/state/uiState.store"; import { SHOW_BOTTOM_SHEET } from "src/services/state/uiState.store";
import { IavRootStoreInterface, REMOVE_NG_LAYER } from "src/services/stateStore.service"; import { IavRootStoreInterface, REMOVE_NG_LAYER } from "src/services/stateStore.service";
import { BACKENDURL } from "src/util/constants";
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class KgSingleDatasetService implements OnDestroy { export class KgSingleDatasetService implements OnDestroy {
...@@ -15,7 +15,6 @@ export class KgSingleDatasetService implements OnDestroy { ...@@ -15,7 +15,6 @@ export class KgSingleDatasetService implements OnDestroy {
public ngLayers: Set<string> = new Set() public ngLayers: Set<string> = new Set()
constructor( constructor(
private constantService: AtlasViewerConstantsServices,
private store$: Store<IavRootStoreInterface>, private store$: Store<IavRootStoreInterface>,
private http: HttpClient, private http: HttpClient,
) { ) {
...@@ -39,14 +38,14 @@ export class KgSingleDatasetService implements OnDestroy { ...@@ -39,14 +38,14 @@ export class KgSingleDatasetService implements OnDestroy {
// TODO deprecate, in favour of web component // TODO deprecate, in favour of web component
public datasetHasPreview({ name }: { name: string } = { name: null }) { public datasetHasPreview({ name }: { name: string } = { name: null }) {
if (!name) { throw new Error('kgSingleDatasetService#datasetHashPreview name must be defined') } if (!name) { throw new Error('kgSingleDatasetService#datasetHashPreview name must be defined') }
const _url = new URL(`datasets/hasPreview`, this.constantService.backendUrl ) const _url = new URL(`${BACKENDURL.replace(/\/$/, '')}/datasets/hasPreview`)
const searchParam = _url.searchParams const searchParam = _url.searchParams
searchParam.set('datasetName', name) searchParam.set('datasetName', name)
return this.http.get(_url.toString()) return this.http.get(_url.toString())
} }
public getInfoFromKg({ kgId, kgSchema = 'minds/core/dataset/v1.0.0' }: Partial<KgQueryInterface>) { public getInfoFromKg({ kgId, kgSchema = 'minds/core/dataset/v1.0.0' }: Partial<KgQueryInterface>) {
const _url = new URL(`datasets/kgInfo`, this.constantService.backendUrl ) const _url = new URL(`${BACKENDURL.replace(/\/$/, '')}/datasets/kgInfo`)
const searchParam = _url.searchParams const searchParam = _url.searchParams
searchParam.set('kgSchema', kgSchema) searchParam.set('kgSchema', kgSchema)
searchParam.set('kgId', kgId) searchParam.set('kgId', kgId)
...@@ -58,7 +57,7 @@ export class KgSingleDatasetService implements OnDestroy { ...@@ -58,7 +57,7 @@ export class KgSingleDatasetService implements OnDestroy {
} }
public getDownloadZipFromKgHref({ kgSchema = 'minds/core/dataset/v1.0.0', kgId }) { public getDownloadZipFromKgHref({ kgSchema = 'minds/core/dataset/v1.0.0', kgId }) {
const _url = new URL(`datasets/downloadKgFiles`, this.constantService.backendUrl) const _url = new URL(`datasets/downloadKgFiles`, BACKENDURL)
const searchParam = _url.searchParams const searchParam = _url.searchParams
searchParam.set('kgSchema', kgSchema) searchParam.set('kgSchema', kgSchema)
searchParam.set('kgId', kgId) searchParam.set('kgId', kgId)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment