fix: Minor changes in namings

Author: pxor

src/common/config.nim

@@ -28,6 +28,7 @@ type
     shortcutMap* {.defaultVal: ShortcutMap().}: ShortcutMap
     defaultBuild*: string
     showMinimap*: bool
+    baseUrl*: string
     downloadApi*: string
     uploadApi*: string
     deleteApi*: string

src/config/default_config.yaml

@@ -55,9 +55,11 @@ defaultBuild: ""
 showMinimap: true
 
 # for now local setup
-downloadApi: http://localhost:55500/api/codetracer/download
-uploadApi: http://localhost:55500/api/codetracer/upload
-deleteApi: http://localhost:55500/api/codetracer/delete
+baseUrl: http://localhost:55500/api/codetracer
+
+downloadApi: /download
+uploadApi: /upload
+deleteApi: /delete
 
 # # you can use KEY+OTHER
 # # use PageUp, PageDown, CTRL, ALT, SHIFT

src/ct/online_sharing/security_upload.nim

@@ -71,7 +71,7 @@ proc uploadEncyptedZip*(file: string): (string, int) =
   data.addFiles({"file": file & ".enc"}, mimeDb = mimes)
 
   try:
-    response = client.postContent(fmt"{config.uploadApi}", multipart=data)
+    response = client.postContent(fmt"{config.baseUrl}{config.uploadApi}", multipart=data)
     exitCode = 0
   except CatchableError as e:
     echo fmt"error: can't upload to API: {e.msg}"

src/ct/online_sharing/trace_manager.nim

@@ -63,7 +63,7 @@ proc downloadTraceCommand*(traceRegistryId: string) =
     var exitCode = 0
 
     try:
-      client.downloadFile(fmt"{config.downloadApi}?DownloadId={downloadId}", localPath)
+      client.downloadFile(fmt"{config.baseUrl}{config.downloadApi}?DownloadId={downloadId}", localPath)
 
       decryptZip(localPath, password, zipPath)
 
@@ -102,7 +102,7 @@ proc deleteTraceCommand*(id: int, controlId: string) =
   var client = newHttpClient()
 
   try:
-    discard client.getContent(fmt"{config.deleteApi}?ControlId={controlId}")
+    discard client.getContent(fmt"{config.baseUrl}{config.deleteApi}?ControlId={controlId}")
 
     updateField(id, "remoteShareDownloadId", "", test)
     updateField(id, "remoteShareControlId", "", test)

src/frontend/index.nim

@@ -820,7 +820,7 @@ proc onUploadTraceFile(sender: js, response: UploadTraceArg) {.async.} =
         expireTime: splitData[2]
       )
       mainWindow.webContents.send(
-        "CODETRACER::uploaded-trace-received",
+        "CODETRACER::upload-trace-file-received",
         js{
           "argId": j(response.trace.program & ":" & $response.trace.id),
           "value": uploadData
@@ -864,7 +864,7 @@ proc onDeleteOnlineTraceFile(sender: js, response: DeleteTraceArg) {.async.} =
   )
 
   mainWindow.webContents.send(
-    "CODETRACER::deleted-online-trace-received",
+    "CODETRACER::delete-online-trace-file-received",
     js{
       "argId": j($response.traceId & ":" & response.controlId),
       "value": res.isOk
@@ -1387,6 +1387,9 @@ when not defined(server):
       app.quit(0)
 
 
+const NO_LIMIT = (-1)
+
+
 proc init(data: var ServerData, config: Config, layout: js, helpers: Helpers) {.async.} =
   debugPrint "index: init"
   let bypass = true
@@ -1492,7 +1495,7 @@ proc init(data: var ServerData, config: Config, layout: js, helpers: Helpers) {.
       save: save
     }
   else:
-    let recentTraces = await app.findRecentTracesWithCodetracer(limit=(-1))
+    let recentTraces = await app.findRecentTracesWithCodetracer(limit=NO_LIMIT)
     mainWindow.webContents.send "CODETRACER::welcome-screen", js{
       home: paths.home.cstring,
       layout: layout,

src/frontend/renderer.nim

@@ -488,10 +488,10 @@ proc onContextStartHistory*(sender: js, response: jsobject(inState=bool, express
 proc onLoadParsedExprsReceived*(sender: js, response: jsobject(argId=cstring, value=JsAssoc[cstring, seq[FlowExpression]])) =
   jsAsFunction[proc(response: JsAssoc[cstring, seq[FlowExpression]]): void](data.network.futures["load-parsed-exprs"][response.argId])(response.value)
 
-proc onUploadedTraceReceived*(sender: js, response: jsobject(argId=cstring, value=UploadedTraceData)) =
+proc onUploadTraceFileReceived*(sender: js, response: jsobject(argId=cstring, value=UploadedTraceData)) =
   jsAsFunction[proc(response: UploadedTraceData): void](data.network.futures["upload-trace-file"][response.argId])(response.value)
 
-proc onDeletedOnlineTraceReceived*(sender: js, response: jsobject(argId=cstring, value=bool)) =
+proc onDeleteOnlineTraceFileReceived*(sender: js, response: jsobject(argId=cstring, value=bool)) =
   jsAsFunction[proc(response: bool): void](data.network.futures["delete-online-trace-file"][response.argId])(response.value)
 
 # TODO: make some kind of dsl?

src/frontend/styles/components/welcome_screen.styl

@@ -516,4 +516,4 @@
 .new-online-trace-form
   input
     padding-left: 8px
-    background-image: none
+    background-image: none

src/frontend/ui_js.nim

@@ -1106,8 +1106,8 @@ proc configureIPC(data: Data) =
 
     "follow-history"
 
-    "uploaded-trace-received"
-    "deleted-online-trace-received"
+    "upload-trace-file-received"
+    "delete-online-trace-file-received"
 
   duration("configureIPCRun")