fixed github tokens being broken (#326)

* fixed github tokens being broken * conditionally removed links
robotframework · Dec 7, 2024 · 54fa5ac · 54fa5ac
1 parent 504e6fa
commit 54fa5ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/public/pyworker/runRobot.py b/public/pyworker/runRobot.py
@@ -10,7 +10,7 @@
 from importlib import import_module, reload
 from io import StringIO
 from pathlib import Path
-                      
+
 def log(message):
     js.postMessage(json.dumps({"std_output": message}))
 
@@ -20,18 +20,21 @@ def log(message):
     try:
         import robot
         from robot.libdocpkg import LibraryDocumentation
+        from robot.conf import RobotSettings
     except ImportError:
         robot = None
 
     if robot is None:
         log(f"Install Robot Framework")
-        rf_version = f"=={version}" if version else ""
-        requirements_list.insert(0, f"robotframework{rf_version}")
+        if not [req for req in requirements_list if req.split('==')[0] == 'robotframework']:
+            rf_version = f"=={version}" if version else ""
+            requirements_list.insert(0, f"robotframework{rf_version}")
         try:
             await micropip.install(requirements_list, keep_going=True)
             time.sleep(1)
             import robot
             from robot.libdocpkg import LibraryDocumentation
+            from robot.conf import RobotSettings
             log(f" = version {robot.__version__}\n")
         except Exception as e:
             js.console.log(f"Installation Exception: {e}")
@@ -111,6 +114,8 @@ def write_file(file):
         js.console.log(f"Files in working dir: {os.listdir('.')}")
         result = -2
 
+        console_links_enabled = "ConsoleLinks" in RobotSettings._cli_opts
+
         try:
             if test_case_name:
                 kwargs = {"test": test_case_name}
@@ -122,9 +127,13 @@ def write_file(file):
             if robot_arguments:
                 log(f"Robot Run Arguments: {robot_args}\n")
                 log(f"\nRunning Robot Framework:\n")
+                if console_links_enabled:
+                    robot_arguments["consolelinks"] = 'off'
             else:
                 log(f"> robot --loglevel TRACE:INFO --exclude EXCL --skip SKIP\n"
                     f"  --removekeywords tag:REMOVE --flattenkeywords tag:FLAT{testcli} .\n")
+                if console_links_enabled:
+                    kwargs["consolelinks"] = 'off'
 
             org_stdout = sys.__stdout__
             org_stderr = sys.__stderr__

diff --git a/src/js/code/index.js b/src/js/code/index.js
@@ -29,7 +29,8 @@ const getProjectFromLiveDir = async(projectDir) => {
 
 const getProject = async(projectUrl) => {
   console.log(`Loading data from ${projectUrl}`)
-  const configFile = await fetch(`${projectUrl}/config.json?token=${Date.now()}`)
+  // const configFile = await fetch(`${projectUrl}/config.json?token=${Date.now()}`)
+  const configFile = await fetch(`${projectUrl}/config.json`)
     .then(response => response.json())
   const project = { name: configFile.name, files: [], description: '' }
   if (configFile.robotVersion) {
@@ -48,7 +49,8 @@ const getProject = async(projectUrl) => {
   }
   for (const file of configFile.files) {
     const { fileName, hidden } = file
-    const content = await fetch(`${projectUrl}/${fileName}?token=${Date.now()}`)
+    // const content = await fetch(`${projectUrl}/${fileName}?token=${Date.now()}`)
+    const content = await fetch(`${projectUrl}/${fileName}`)
       .then(response => response.text())
     project.files.push({
       fileName,