move logic to allow for testing

Security-Onion-Solutions · Mar 27, 2023 · 989821c · 989821c
1 parent e7ed8bf
commit 989821c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/html/index.html b/html/index.html
@@ -2975,7 +2975,7 @@ <h4 v-if="metricsEnabled">{{ i18n.gridEps }} {{ gridEps | formatCount }}</h4>
                                     <v-icon>fa-chart-line</v-icon>
                                   </v-btn>
                                 </a>
-                                <v-btn v-if="canTest(item)" id="test-minion" icon :title="i18n.nodeTest" @click="showTestConfirm(item.id + '_' + item.role.replace('so-', ''))">
+                                <v-btn v-if="canTest(item)" id="test-minion" icon :title="i18n.nodeTest" @click="showTestConfirm(item.id + '_' + item.role)">
                                   <v-icon>fa-file-import</v-icon>
                                 </v-btn>
                               </div>

diff --git a/html/js/routes/grid.js b/html/js/routes/grid.js
@@ -158,7 +158,7 @@ routes.push({ path: '/grid', name: 'grid', component: {
       return false;
     },
     async gridMemberTest() {
-      const nodeId = this.hideTestConfirm();
+      const nodeId = this.hideTestConfirm().replace('_so-', '_');
       this.$root.startLoading();
       try {
         await this.$root.papi.post('gridmembers/' + nodeId + "/test");

diff --git a/html/js/routes/grid.test.js b/html/js/routes/grid.test.js
@@ -109,7 +109,7 @@ test('canTest', () => {
 test('gridMemberTest', async () => {
 	resetPapi();
 	const mock = mockPapi("post");
-	comp.selectedId = '123';
+	comp.selectedId = 'fwd01_so-sensor';
 	await comp.gridMemberTest();
-	expect(mock).toHaveBeenCalledWith('gridmembers/123/test');
+	expect(mock).toHaveBeenCalledWith('gridmembers/fwd01_sensor/test');
 });