Merge branch 'master' into Overview

Author: ananya-agarwal

.github/workflows/pr-comments.yml

@@ -1,13 +1,11 @@
 name: PR Comments
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - master
 
 permissions:
-  contents: write
-  checks: write
   pull-requests: write
 
 jobs:
@@ -67,7 +65,7 @@ jobs:
           remove-link-from-badge: true
           default-branch: master
 
-  ut-files-comment:
+  python-ut-files-comment:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code

apps/beeswax/src/beeswax/common.py

@@ -125,7 +125,7 @@ def compute_check(x):
     # Pick the most probable compute object
     selected_compute = (cluster if compute_check(cluster)
                         else compute if compute_check(compute)
-                        else connector if compute_check(connector) else None)
+                        else connector if compute_check(connector) else cluster)
 
     # If found, we will attempt to reload it, first by id then by name
     if selected_compute:
@@ -134,8 +134,11 @@ def compute_check(x):
         if c:
           return c.to_dict()
 
-      if selected_compute.get('name'):
-        c = Compute.objects.filter(name=selected_compute['name']).first()
+      # Compute name is sometimes passed in the type and dialect fields.
+      # So, we will attempt to load compute using name, type and dialect as name.
+      compute_name = selected_compute.get('name', selected_compute.get('type', selected_compute.get('dialect')))
+      if compute_name:
+        c = Compute.objects.filter(name=compute_name).first()
         if c:
           return c.to_dict()