From 88ff5a7cae67152e4e6745100bff41af2efc05f6 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil.renaud@hashicorp.com>
Date: Fri, 14 Mar 2025 12:37:39 -0400
Subject: [PATCH] [ui] Scope selection for Sentinel Policies (#25390)

* An option to select, and column etc. to view, sentinel policy scope

* Flake potential: Seed(1) had a couple jobs with the same ModifyIndex

* More de-flaking
---
 .changelog/25390.txt                          |  3 +++
 ui/app/components/sentinel-policy-editor.hbs  | 12 ++++++++++
 ui/app/components/sentinel-policy-editor.js   |  4 ++++
 .../administration/sentinel-policies/index.js |  5 ++++
 .../sentinel-policies/index.hbs               |  1 +
 ui/mirage/factories/sentinel-policy.js        |  2 +-
 ui/mirage/scenarios/default.js                | 15 ++++++++++++
 ui/tests/acceptance/job-detail-test.js        |  6 ++++-
 ui/tests/acceptance/jobs-list-test.js         |  3 ++-
 ui/tests/acceptance/sentinel-policies-test.js | 24 +++++++++++++++++++
 ui/tests/acceptance/task-detail-test.js       |  2 ++
 11 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/25390.txt

diff --git a/.changelog/25390.txt b/.changelog/25390.txt
new file mode 100644
index 000000000..e755c2434
--- /dev/null
+++ b/.changelog/25390.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Added a scope selector for sentinel policy page
+```
diff --git a/ui/app/components/sentinel-policy-editor.hbs b/ui/app/components/sentinel-policy-editor.hbs
index 723b5a52a..99931e7fd 100644
--- a/ui/app/components/sentinel-policy-editor.hbs
+++ b/ui/app/components/sentinel-policy-editor.hbs
@@ -77,6 +77,18 @@
 		</Hds::Form::Radio::Group>
 	</div>
 
+  <div>
+    <Hds::Form::Radio::Group @layout="horizontal" @name="method-demo1" {{on "change" this.updatePolicyScope}} as |G|>
+      <G.Legend>Scope</G.Legend>
+      <G.RadioField @id="submit-job" checked={{eq @policy.scope "submit-job"}} data-test-scope="submit-job" as |F|>
+        <F.Label>Submit Job</F.Label>
+      </G.RadioField>
+      <G.RadioField @id="submit-host-volume" checked={{eq @policy.scope "submit-host-volume"}} data-test-scope="submit-host-volume" as |F|>
+        <F.Label>Submit Host Volume</F.Label>
+      </G.RadioField>
+    </Hds::Form::Radio::Group>
+  </div>
+
 	<footer>
 		{{#if (can "update sentinel-policy")}}
 		<Hds::Button
diff --git a/ui/app/components/sentinel-policy-editor.js b/ui/app/components/sentinel-policy-editor.js
index 379b80145..2ba9797c8 100644
--- a/ui/app/components/sentinel-policy-editor.js
+++ b/ui/app/components/sentinel-policy-editor.js
@@ -30,6 +30,10 @@ export default class SentinelPolicyEditorComponent extends Component {
     this.policy.set('enforcementLevel', id);
   }
 
+  @action updatePolicyScope({ target: { id } }) {
+    this.policy.set('scope', id);
+  }
+
   @action async save(e) {
     if (e instanceof Event) {
       e.preventDefault(); // code-mirror "command+enter" submits the form, but doesnt have a preventDefault()
diff --git a/ui/app/controllers/administration/sentinel-policies/index.js b/ui/app/controllers/administration/sentinel-policies/index.js
index d418eae88..aecb1215a 100644
--- a/ui/app/controllers/administration/sentinel-policies/index.js
+++ b/ui/app/controllers/administration/sentinel-policies/index.js
@@ -43,6 +43,11 @@ export default class SentinelPoliciesIndexController extends Controller {
         label: 'Enforcement Level',
         isSortable: true,
       },
+      {
+        key: 'scope',
+        label: 'Scope',
+        isSortable: true,
+      },
       {
         key: 'delete',
         label: 'Delete',
diff --git a/ui/app/templates/administration/sentinel-policies/index.hbs b/ui/app/templates/administration/sentinel-policies/index.hbs
index f1ca6a872..bed89fc76 100644
--- a/ui/app/templates/administration/sentinel-policies/index.hbs
+++ b/ui/app/templates/administration/sentinel-policies/index.hbs
@@ -46,6 +46,7 @@ SPDX-License-Identifier: BUSL-1.1
         </B.Td>
         <B.Td data-test-sentinel-policy-description>{{B.data.description}}</B.Td>
         <B.Td data-test-sentinel-policy-enforcement>{{B.data.enforcementLevel}}</B.Td>
+        <B.Td data-test-sentinel-policy-scope>{{B.data.scope}}</B.Td>
         {{#if (can "destroy sentinel-policy")}}
           <B.Td>
             <TwoStepButton
diff --git a/ui/mirage/factories/sentinel-policy.js b/ui/mirage/factories/sentinel-policy.js
index e471c6500..44e1ab71b 100644
--- a/ui/mirage/factories/sentinel-policy.js
+++ b/ui/mirage/factories/sentinel-policy.js
@@ -22,6 +22,6 @@ export default Factory.extend({
 
   main = rule { false }`,
 
-  scope: 'submit-job',
+  scope: pickOne(['submit-job', 'submit-host-volume']),
   enforcementLevel: pickOne(['advisory', 'soft-mandatory', 'hard-mandatory']),
 });
diff --git a/ui/mirage/scenarios/default.js b/ui/mirage/scenarios/default.js
index 4d03a6d31..8bafd27b7 100644
--- a/ui/mirage/scenarios/default.js
+++ b/ui/mirage/scenarios/default.js
@@ -685,6 +685,21 @@ function policiesTestCluster(server, options = { sentinel: false }) {
       scope: 'submit-job',
     });
 
+    server.create('sentinel-policy', {
+      id: 'host-volume-policy',
+      name: 'host-volume-policy',
+      description: 'A sentinel policy generated by Mirage',
+      enforcementLevel: 'soft-mandatory',
+      policy: `
+has_tag = func() {
+print("volume is missing tag")
+tag = volume.parameters["tag"] else 0
+return tag is not 0
+}
+main = rule { has_tag() }
+      `,
+      scope: 'submit-host-volume',
+    });
     server.createList('sentinel-policy', 5);
   }
 
diff --git a/ui/tests/acceptance/job-detail-test.js b/ui/tests/acceptance/job-detail-test.js
index c044af8dd..4c4ed4552 100644
--- a/ui/tests/acceptance/job-detail-test.js
+++ b/ui/tests/acceptance/job-detail-test.js
@@ -167,7 +167,11 @@ moduleForJobWithClientStatus(
 moduleForJob(
   'Acceptance | job detail (periodic)',
   'children',
-  () => server.create('job', 'periodic', { shallow: true }),
+  () =>
+    server.create('job', 'periodic', {
+      shallow: true,
+      withPreviousStableVersion: true,
+    }),
   {
     'the default sort is submitTime descending': async function (job, assert) {
       const mostRecentLaunch = server.db.jobs
diff --git a/ui/tests/acceptance/jobs-list-test.js b/ui/tests/acceptance/jobs-list-test.js
index 3a9ceee49..bef3f4f8d 100644
--- a/ui/tests/acceptance/jobs-list-test.js
+++ b/ui/tests/acceptance/jobs-list-test.js
@@ -52,7 +52,7 @@ module('Acceptance | jobs list', function (hooks) {
   });
 
   test('/jobs should list the first page of jobs sorted by modify index', async function (assert) {
-    faker.seed(1);
+    faker.seed(2);
     const jobsCount = JobsList.pageSize + 1;
     server.createList('job', jobsCount, { createAllocations: true });
 
@@ -2087,6 +2087,7 @@ function testFacet(
   });
 
   test(`selecting multiple options in the ${label} facet results in a broader search`, async function (assert) {
+    faker.seed(2);
     const selection = [];
 
     await beforeEach();
diff --git a/ui/tests/acceptance/sentinel-policies-test.js b/ui/tests/acceptance/sentinel-policies-test.js
index 90aff92e7..1d606ec44 100644
--- a/ui/tests/acceptance/sentinel-policies-test.js
+++ b/ui/tests/acceptance/sentinel-policies-test.js
@@ -106,6 +106,30 @@ module('Acceptance | sentinel policies', function (hooks) {
       .hasText('hard-mandatory');
   });
 
+  test('Edit Sentinel Policy: Scope', async function (assert) {
+    const policy = server.db.sentinelPolicies.findBy(
+      (sp) => sp.name === 'host-volume-policy'
+    );
+    await click('[data-test-sentinel-policy-name="host-volume-policy"]');
+    assert.equal(
+      currentURL(),
+      `/administration/sentinel-policies/${policy.id}`
+    );
+
+    await click('[data-test-scope="submit-host-volume"]');
+    await click('button[data-test-save-policy]');
+    assert.dom('.flash-message.alert-success').exists();
+
+    await Administration.visitSentinelPolicies();
+    const policyRow = find(
+      '[data-test-sentinel-policy-name="host-volume-policy"]'
+    ).closest('[data-test-sentinel-policy-row]');
+    assert.dom(policyRow).exists();
+    assert
+      .dom(policyRow.querySelector('[data-test-sentinel-policy-scope]'))
+      .hasText('submit-host-volume');
+  });
+
   test('New Sentinel Policy from Scratch', async function (assert) {
     await click('[data-test-create-sentinel-policy]');
     assert.equal(currentURL(), '/administration/sentinel-policies/new');
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index 063219657..e44a25019 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -12,6 +12,7 @@ import a11yAudit from 'nomad-ui/tests/helpers/a11y-audit';
 import Task from 'nomad-ui/tests/pages/allocations/task/detail';
 import Layout from 'nomad-ui/tests/pages/layout';
 import moment from 'moment';
+import faker from 'faker';
 let allocation;
 let task;
 
@@ -213,6 +214,7 @@ module('Acceptance | task detail', function (hooks) {
   });
 
   test('when a task group has metadata, the metadata table is shown', async function (assert) {
+    faker.seed(2);
     const job = server.create('job', {
       createAllocations: false,
     });