Revert "Merge remote-tracking branch 'origin/feature-wg-134' into feature-latest-sqa-ticket"

WebGde/WebContent/config.js

@@ -62,8 +62,3 @@ var REASON_LIST = "Reason1,Reason2,Reason3,Reason4"
 
 //KEYCLOAK CONFIG
 const REDIRECT_URL = 'http://auth-server/auth/realms/GFS/protocol/openid-connect/logout?redirect_uri=encodedRedirectUri';
-
-//Temporary variables for dev
-var LOCAL_DOMAIN = "http://localhost:8080"
-var LOCAL_FETCH_URL = LOCAL_DOMAIN + "/WebGde/svc/gfs-rest/fetch-local"
-var LOCAL_FETCH_TEST_URL = "http://localhost:8080/Sample_API/testservice/file"

WebGde/WebContent/src/accessFile/accessFile.js

@@ -172,21 +172,6 @@ async function accessFile() {
             if (img != null ? img.startsWith("http") : false) {
                 response = await fetch(img);
                 gfsFileName = getGfsFileName(response.headers.get("content-disposition"));
-            } else if (img != null ? img.startsWith("file") : false){
-                console.log('file');
-                const payload = {
-                    dir: img
-                };
-                
-                response = await fetch(`${GFS_URL}/fetch-local`, {
-                    method: 'POST',
-                    headers: {
-                      'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify(payload)
-                })
-                gfsFileName = getGfsFileName(response.headers.get("content-disposition"));
-                
             } else {
                 let formData = new FormData();
                 formData.append("data", JSON.stringify({

WebGde/src/main/java/com/svi/webgde/restservice/object/Request.java

-package com.svi.webgde.restservice.object;
-
-public class Request {
-	private String dir;
-
-    public String getDir() {
-        return dir;
-    }
-
-    public void setDir(String dir) {
-        this.dir = dir;
-    }
-}

WebGde/src/main/java/com/svi/webgde/restservice/services/GDEWebServices.java

@@ -32,7 +32,6 @@ import org.json.simple.JSONArray;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
 import com.svi.template.restservice.globals.AppConfig;
-import com.svi.training.services.Request;
 import com.svi.webgde.restservice.object.XMLContents;
 import com.svi.webgde.restservice.utils.XMLUtil;
 
@@ -99,7 +98,7 @@ public class GDEWebServices {
 
 		return Response.ok(json.toString()).build();
 	}
-
+	
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
@@ -225,7 +224,7 @@ public class GDEWebServices {
 		}
 		return Response.ok("Success").build();
 	}
-
+	
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
@@ -236,20 +235,20 @@ public class GDEWebServices {
 		} catch (Exception e) {
 			return Response.status(500).entity("Fail").build();
 		}
-
+		
 	}
-
+	
 	@POST
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
 	@Path("/update-exception")
 	public Response updateException(XMLContents xml) {
-
+		
 		try {
 			File file = new File(xml.getOutputDir());
-			if (file.exists()) {
+			if(file.exists()) {
 				XMLUtil.updateExceptionRmrk(xml);
-			} else {
+			}else {
 				XMLUtil.generateXML(xml);
 			}
 
@@ -261,23 +260,5 @@ public class GDEWebServices {
 		return Response.ok("Success").build();
 	}
 	
-	@POST
-	@Path("/fetch-local")
-	@Consumes(MediaType.APPLICATION_JSON)
-	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-	public Response getFile(Request request) {
-	    // extract file path from file:// URL format
-		String filePath = request.getDir().substring("file://".length());
-
-	    // read file from local file system
-	    File file = new File(filePath);
-	    if (!file.exists()) {
-	        return Response.status(Response.Status.NOT_FOUND).build();
-	    }
 
-	    // return file contents in blob format with filename in content-disposition header
-	    ResponseBuilder response = Response.ok(file);
-	    response.header("content-disposition", "attachment; filename = " + file.getName());
-	    return response.build();
-	}
 }