Read-based checks for viewing templates and write-based checks for sa…

…ving them (#23458)
hashicorp · Jun 28, 2024 · bbd1bb3 · bbd1bb3
1 parent cc01c09
commit bbd1bb3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/.changelog/23458.txt b/.changelog/23458.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fix an issue where access to Job Templates in the UI was restricted to variable.write access
+```
diff --git a/ui/app/templates/components/job-editor.hbs b/ui/app/templates/components/job-editor.hbs
@@ -16,7 +16,7 @@
           Paste or author HCL or JSON to submit to your cluster, or select from a list of templates. A plan will be requested before the job is submitted. You can also attach a job spec by uploading a job file or dragging &amp; dropping a file to the editor.
         </p>
 
-        {{#if (can "write variable" path="*" namespace="*")}}
+        {{#if (can "read variable" path="nomad/job-templates/*" namespace="*")}}
           <Hds::ButtonSet>
             <label
               class="job-spec-upload hds-button hds-button--color-secondary hds-button--size-medium"

diff --git a/ui/app/templates/components/job-editor/edit.hbs b/ui/app/templates/components/job-editor/edit.hbs
@@ -101,14 +101,16 @@
     data-test-plan
     @text="Plan"
   />
-  {{#if @data.job.isNew}}
-    <Hds::Button
-      @text="Save as template"
-      @color="secondary"
-      @route="jobs.run.templates.new"
-      {{on "click" @fns.onSaveAs}}
-      data-test-save-as-template
-    />
+  {{#if (can "write variable" path="nomad/job-templates/*" namespace="*")}}
+    {{#if @data.job.isNew}}
+      <Hds::Button
+        @text="Save as template"
+        @color="secondary"
+        @route="jobs.run.templates.new"
+        {{on "click" @fns.onSaveAs}}
+        data-test-save-as-template
+      />
+    {{/if}}
   {{/if}}
   <Hds::Button
     @text="Save as .nomad.hcl"

diff --git a/ui/app/templates/jobs/run/templates/manage.hbs b/ui/app/templates/jobs/run/templates/manage.hbs
@@ -20,8 +20,11 @@
             <:body as |B|>
                 <B.Tr>
                     <B.Td>
-                        {{#if B.data.isDefaultJobTemplate}}
-                            {{format-template-label B.data.path}}
+                        {{#if (or
+                          B.data.isDefaultJobTemplate
+                          (not (can "write variable" path="nomad/job-templates/*" namespace="*"))
+                        )}}
+                          {{format-template-label B.data.path}}
                         {{else}}
 													<LinkTo @route="jobs.run.templates.template" @model={{concat B.data.path "@" B.data.namespace}} data-test-edit-template={{B.data.path}}>
 														{{format-template-label B.data.path}}