#1612 Fixed spline integration and schema, removed redundant code

menas-web/pom.xml

@@ -1,14 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+  ~ Copyright 2018 ABSA Group Limited
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>menas-web</artifactId>
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent</artifactId>
         <groupId>za.co.absa.enceladus</groupId>
+        <artifactId>parent</artifactId>
         <version>2.12.0-AWS-SNAPSHOT</version>
     </parent>
 
@@ -35,11 +47,6 @@
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>webjars-locator-core</artifactId>
-            <version>${webjars.locator.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -124,6 +131,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+
         <!-- GSON -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

menas-web/src/main/scala/za/co/absa/enceladus/menas/web/MvcConfig.scala

@@ -15,9 +15,8 @@
 
 package za.co.absa.enceladus.menas.web
 
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.{Bean, Configuration}
-import org.springframework.web.servlet.config.annotation.{CorsRegistry, ResourceHandlerRegistry, WebMvcConfigurer}
+import org.springframework.web.servlet.config.annotation.{ResourceHandlerRegistry, WebMvcConfigurer}
 import org.webjars.WebJarAssetLocator
 
 @Configuration

menas-web/ui/components/schema/schemaDetail.controller.js

@@ -184,7 +184,7 @@ sap.ui.define([
         };
 
         jQuery.ajax({
-          url: "api/schema/registry",
+          url: window.apiUrl + "/api/schema/registry",
           type: 'POST',
           data: $.param(data),
           contentType: 'application/x-www-form-urlencoded',
@@ -216,7 +216,7 @@ sap.ui.define([
       };
 
       jQuery.ajax({
-        url: "api/schema/remote",
+        url: window.apiUrl + "/api/schema/remote",
         type: 'POST',
         data: $.param(data),
         contentType: 'application/x-www-form-urlencoded',
@@ -384,7 +384,7 @@ sap.ui.define([
 
     checkRegistryIntegration: function () {
       jQuery.ajax({
-        url: "api/schema/features",
+        url: window.apiUrl + "/api/schema/features",
         type: 'GET',
         context: this,
         complete: this.handleRegistryIntegrationResponse

menas-web/ui/service/RestDAO.js

@@ -30,13 +30,14 @@ class RestClient {
     return jqXHR.then(this.identity(jqXHR), this.handleExpiredSession);
   }
 
-  static getSync(url, shouldUseCache = false) {
+  static getSync(url, shouldUseCache = false, isWeb = false) {
+    let requestUrl = isWeb ? url : window.apiUrl + "/" + url;
     let request = {
       headers: {
         "X-CSRF-TOKEN": localStorage.getItem("csrfToken"),
         "JWT": localStorage.getItem("jwtToken")
       },
-      url: window.apiUrl + "/" + url,
+      url: requestUrl,
       async: false
     };
     const jqXHR = shouldUseCache ? RestClient.cache(request) : $.ajax(request);
@@ -233,7 +234,11 @@ class ConfigRestClient {
   }
 
   static getLineageExecutionIdApiTemplate() {
-    return RestClient.get(`metadata/lineageExecutionIdApiTemplate`)
+    let request = {
+      url: `lineageExecutionIdApiTemplate`,
+      async: true
+    };
+    return $.ajax(request);
   }
 
 }

menas-web/ui/service/RunRestDAO.js

@@ -48,7 +48,7 @@ class RunRestDAO {
       .replace("%s", outputPath)
       .replace("%s", applicationId);
 
-    RestClient.getSync(url).then((response) => {
+    RestClient.getSync(url, false, true).then((response) => {
       this._totalCount = response.totalCount;
       if (this._totalCount > 0) {
         this._executionEventId = response.items[0].executionEventId;

menas/src/main/scala/za/co/absa/enceladus/menas/WebSecurityConfig.scala

@@ -34,9 +34,7 @@ import za.co.absa.enceladus.menas.auth.kerberos.MenasKerberosAuthentication
 class WebSecurityConfig @Autowired()(beanFactory: BeanFactory,
                                      jwtAuthFilter: JwtAuthenticationFilter,
                                      @Value("${menas.auth.mechanism:}")
-                                     authMechanism: String,
-                                     @Value("${menas.version}")
-                                     menasVersion: String) {
+                                     authMechanism: String) {
 
   private val logger = LoggerFactory.getLogger(this.getClass)