From 560f3d6e25631c043cf56d88472f7e648035be5f Mon Sep 17 00:00:00 2001
From: Steve Reis <stevereis93@gmail.com>
Date: Fri, 26 Aug 2022 10:48:51 +0200
Subject: [PATCH] fix: Remove Ontology and datacatalogue urls
---
api/src/engine/engine.constants.ts | 2 --
api/src/engine/engine.resolver.ts | 9 +--------
api/src/engine/models/configuration.model.ts | 6 ------
api/src/schema.gql | 2 --
4 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/api/src/engine/engine.constants.ts b/api/src/engine/engine.constants.ts
index 52fc05a..5bf24cf 100644
--- a/api/src/engine/engine.constants.ts
+++ b/api/src/engine/engine.constants.ts
@@ -1,4 +1,2 @@
export const ENGINE_MODULE_OPTIONS = 'EngineModuleOption';
export const ENGINE_SKIP_TOS = 'TOS_SKIP';
-export const ENGINE_ONTOLOGY_URL = 'ONTOLOGY_URL';
-export const ENGINE_CONTACT_LINK = 'CONTACT_LINK';
diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts
index 5c1e6d0..2e91dbb 100644
--- a/api/src/engine/engine.resolver.ts
+++ b/api/src/engine/engine.resolver.ts
@@ -8,12 +8,7 @@ import { parseToBoolean } from 'src/common/utils/shared.utils';
import authConfig from 'src/config/auth.config';
import { Md5 } from 'ts-md5';
import { GQLRequest } from '../common/decorators/gql-request.decoractor';
-import {
- ENGINE_CONTACT_LINK,
- ENGINE_MODULE_OPTIONS,
- ENGINE_ONTOLOGY_URL,
- ENGINE_SKIP_TOS,
-} from './engine.constants';
+import { ENGINE_MODULE_OPTIONS, ENGINE_SKIP_TOS } from './engine.constants';
import EngineService from './engine.service';
import { ErrorsInterceptor } from './interceptors/errors.interceptor';
import EngineOptions from './interfaces/engine-options.interface';
@@ -47,8 +42,6 @@ export class EngineResolver {
skipTos: parseToBoolean(this.configSerivce.get(ENGINE_SKIP_TOS)),
enableSSO: parseToBoolean(authConf.enableSSO),
skipAuth: parseToBoolean(authConf.skipAuth, true),
- ontologyUrl: this.configSerivce.get(ENGINE_ONTOLOGY_URL),
- contactLink: this.configSerivce.get(ENGINE_CONTACT_LINK),
};
const version = Md5.hashStr(JSON.stringify(data));
diff --git a/api/src/engine/models/configuration.model.ts b/api/src/engine/models/configuration.model.ts
index e18ed9e..3f4e9a1 100644
--- a/api/src/engine/models/configuration.model.ts
+++ b/api/src/engine/models/configuration.model.ts
@@ -25,9 +25,6 @@ export class Configuration {
})
hasFilters?: boolean;
- @Field({ nullable: true })
- contactLink?: string;
-
@Field()
version: string;
@@ -39,7 +36,4 @@ export class Configuration {
@Field({ nullable: true, defaultValue: true })
enableSSO?: boolean;
-
- @Field({ nullable: true })
- ontologyUrl?: string;
}
diff --git a/api/src/schema.gql b/api/src/schema.gql
index 3a76d04..88e2456 100644
--- a/api/src/schema.gql
+++ b/api/src/schema.gql
@@ -35,12 +35,10 @@ type Configuration {
"""Indicates if filters and formula are enabled"""
hasFilters: Boolean
- contactLink: String
version: String!
skipAuth: Boolean
skipTos: Boolean
enableSSO: Boolean
- ontologyUrl: String
}
type Dataset {
--
GitLab