CORE-1901 Allow Agave jobs only in job listings

cyverse-de · Sep 17, 2024 · 9d6ada7 · 9d6ada7
1 parent 407a907
commit 9d6ada7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/apps/persistence/jobs.clj b/src/apps/persistence/jobs.clj
@@ -23,6 +23,7 @@
             [permissions-client.core :as pc]))
 
 (def de-job-type "DE")
+(def agave-job-type "Agave")
 (def tapis-job-type "Tapis")
 (def interactive-job-type "Interactive")
 (def osg-job-type "OSG")

diff --git a/src/apps/service/apps/combined.clj b/src/apps/service/apps/combined.clj
@@ -23,7 +23,7 @@
     jp/combined-client-name)
 
   (getJobTypes [_]
-    (mapcat #(.getJobTypes %) clients))
+    (conj (mapcat #(.getJobTypes %) clients) jp/agave-job-type))
 
   (listSystemIds [_]
     (mapcat #(.listSystemIds %) clients))
@@ -365,4 +365,5 @@
     (.hasAppPermission (util/get-apps-client clients system-id) username system-id app-id required-level))
 
   (supportsJobSharing [_ job-step]
-    (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step)))
+    (and (not= (:job_type job-step) jp/agave-job-type)
+         (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step))))