File API fixes

Author: mgubaidullin

karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java

@@ -38,9 +38,6 @@ public class ProjectFileResource {
     @Inject
     KaravanCache karavanCache;
 
-    @Inject
-    CodeService codeService;
-
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/{projectId}")
@@ -129,16 +126,19 @@ public void delete(@PathParam("project") String project,
 
     @POST
     @Produces(MediaType.APPLICATION_JSON)
-    @Path("/copy/{project}")
-    public Response copy(@PathParam("project") String project, JsonObject copy) throws Exception {
-        var projectId = URLDecoder.decode(project, StandardCharsets.UTF_8);
-        var from = copy.getString("from");
-        var to = copy.getString("to");
-        var tofile = karavanCache.getProjectFile(projectId, to);
-        if (tofile == null) {
-            var file = karavanCache.getProjectFile(projectId, from);
+    @Path("/copy")
+    public Response copy(JsonObject copy) throws Exception {
+        var fromProjectId = copy.getString("fromProjectId");
+        var fromFilename = copy.getString("fromFilename");
+        var toProjectId = copy.getString("toProjectId");
+        var toFilename = copy.getString("toFilename");
+        var overwrite = copy.getBoolean("overwrite", false);
+        var tofile = karavanCache.getProjectFile(toProjectId, toFilename);
+        if (overwrite || tofile == null) {
+            var file = karavanCache.getProjectFile(fromProjectId, fromFilename);
             var copyFile = file.copy();
-            copyFile.setName(to);
+            copyFile.setProjectId(toProjectId);
+            copyFile.setName(toFilename);
             karavanCache.saveProjectFile(copyFile, false, false);
             return Response.ok().build();
         } else {

karavan-app/src/main/webui/src/api/KaravanApi.tsx

@@ -208,30 +208,6 @@ export class KaravanApi {
         });
     }
 
-    static async getProjectDeploymentStatus(projectId: string, env: string, after: (status?: DeploymentStatus) => void) {
-        instance.get('/ui/status/deployment/' + projectId + "/" + env)
-            .then(res => {
-                if (res.status === 200) {
-                    after(res.data);
-                } else if (res.status === 204) {
-                    after(undefined);
-                }
-            }).catch(err => {
-            ErrorEventBus.sendApiError(err);
-        });
-    }
-
-    static async getProjectCamelStatus(projectId: string, env: string, after: (status: CamelStatus) => void) {
-        instance.get('/ui/status/camel/' + projectId + "/" + env)
-            .then(res => {
-                if (res.status === 200) {
-                    after(res.data);
-                }
-            }).catch(err => {
-            ErrorEventBus.sendApiError(err);
-        });
-    }
-
     static async getAllCamelContextStatuses(after: (statuses: CamelStatus[]) => void) {
         instance.get('/ui/status/camel/context')
             .then(res => {
@@ -390,6 +366,15 @@ export class KaravanApi {
         });
     }
 
+    static async copyProjectFile(fromProjectId: string, fromFilename: string, toProjectId: string, toFilename: string, overwrite: boolean, after: (res: AxiosResponse<any>) => void) {
+        instance.post('/ui/file/copy', {fromProjectId: fromProjectId, fromFilename: fromFilename, toProjectId: toProjectId, toFilename: toFilename, overwrite: overwrite})
+            .then(res => {
+                after(res);
+            }).catch(err => {
+            after(err);
+        });
+    }
+
     static async push(params: {}, after: (res: AxiosResponse<any>) => void) {
         instance.post('/ui/git', params)
             .then(res => {