Switch API for /builds/<id>/dynamic_analysis/<id> to GraphQL

app/Http/Controllers/DynamicAnalysisController.php

@@ -20,12 +20,16 @@ public function viewDynamicAnalysis(int $buildid): View
     public function viewDynamicAnalysisFile(int $buildid, int $fileid): View
     {
         $this->setBuildById($buildid);
+
+        $da = \App\Models\DynamicAnalysis::find($fileid);
+
         return $this->vue(
-            'view-dynamic-analysis-file',
+            'build-dynamic-analysis-id-page',
             'Dynamic Analysis',
             [
-                'buildid' => $buildid,
-                'fileid' => $fileid,
+                'build-id' => $buildid,
+                'dynamic-analysis-id' => $fileid,
+                'link' => url("queryTests.php?project={$this->project->Name}&filtercount=1&showfilters=1&field1=testname&compare1=61&value1={$da?->name}&date={$this->date}"),
             ],
         );
     }
@@ -234,6 +238,8 @@ public function apiViewDynamicAnalysisFile(): JsonResponse
         $DA_response['href'] = "queryTests.php?project={$this->project->Name}&filtercount=1&showfilters=1&field1=testname&compare1=61&value1={$DA->Name}&date={$this->date}";
         $response['dynamicanalysis'] = $DA_response;
 
+        $response['deprecated'] = 'This endpoint will be removed in the next major version of CDash.';
+
         $pageTimer->end($response);
         return response()->json(cast_data_for_JSON($response));
     }

app/Models/DynamicAnalysis.php

@@ -2,7 +2,9 @@
 
 namespace App\Models;
 
+use Database\Factories\DynamicAnalysisFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -22,6 +24,9 @@
  */
 class DynamicAnalysis extends Model
 {
+    /** @use HasFactory<DynamicAnalysisFactory> */
+    use HasFactory;
+
     protected $table = 'dynamicanalysis';
 
     public $timestamps = false;

app/Policies/DynamicAnalysisPolicy.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\DynamicAnalysis;
+use App\Models\User;
+use Illuminate\Support\Facades\Gate;
+
+class DynamicAnalysisPolicy
+{
+    public function view(?User $user, DynamicAnalysis $dynamicAnalysis): bool
+    {
+        return Gate::check('view', $dynamicAnalysis->build?->project);
+    }
+}

app/cdash/tests/CMakeLists.txt

@@ -393,6 +393,8 @@ add_browser_test(/Browser/Pages/BuildConfigurePageTest)
 
 add_browser_test(/Browser/Pages/BuildCoveragePageTest)
 
+add_browser_test(/Browser/Pages/BuildDynamicAnalysisIdPageTest)
+
 add_php_test(image)
 set_tests_properties(image PROPERTIES DEPENDS /CDash/XmlHandler/UpdateHandler)
 

database/factories/DynamicAnalysisFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\DynamicAnalysis;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+
+/**
+ * @extends Factory<DynamicAnalysis>
+ */
+class DynamicAnalysisFactory extends Factory
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'status' => 'passed',
+            'checker' => Str::uuid()->toString(),
+            'name' => Str::uuid()->toString(),
+            'path' => Str::uuid()->toString(),
+            'fullcommandline' => Str::uuid()->toString(),
+            'log' => Str::uuid()->toString(),
+        ];
+    }
+}

graphql/schema.graphql

@@ -68,6 +68,12 @@ type Query {
     "Search by primary key."
     id: ID @eq
   ): BuildCommand @find @canResolved(ability: "view", action: RETURN_VALUE, returnValue: null)
+
+  "Find a single dynamic analysis by ID."
+  dynamicAnalysis(
+    "Search by primary key."
+    id: ID @eq
+  ): DynamicAnalysis @find @canResolved(ability: "view", action: RETURN_VALUE, returnValue: null)
 }
 
 

resources/js/vue/app.js

@@ -19,7 +19,7 @@ const Monitor = Vue.defineAsyncComponent(() => import('./components/Monitor'));
 const TestDetails = Vue.defineAsyncComponent(() => import('./components/TestDetails'));
 const HeaderNav = Vue.defineAsyncComponent(() => import('./components/page-header/HeaderNav.vue'));
 const ViewDynamicAnalysis = Vue.defineAsyncComponent(() => import('./components/ViewDynamicAnalysis.vue'));
-const ViewDynamicAnalysisFile = Vue.defineAsyncComponent(() => import('./components/ViewDynamicAnalysisFile.vue'));
+const BuildDynamicAnalysisIdPage = Vue.defineAsyncComponent(() => import('./components/BuildDynamicAnalysisIdPage.vue'));
 const ProjectsPage = Vue.defineAsyncComponent(() => import('./components/ProjectsPage.vue'));
 const SubProjectDependencies = Vue.defineAsyncComponent(() => import('./components/SubProjectDependencies.vue'));
 const BuildTestsPage = Vue.defineAsyncComponent(() => import('./components/BuildTestsPage.vue'));
@@ -47,7 +47,7 @@ const cdash_components = {
   TestDetails,
   HeaderNav,
   ViewDynamicAnalysis,
-  ViewDynamicAnalysisFile,
+  BuildDynamicAnalysisIdPage,
   ProjectsPage,
   SubProjectDependencies,
   BuildTestsPage,

resources/js/vue/components/BuildDynamicAnalysisIdPage.vue

@@ -0,0 +1,109 @@
+<template>
+  <div class="tw-flex tw-flex-col tw-w-full tw-gap-4">
+    <build-summary-card :build-id="buildId" />
+
+    <loading-indicator :is-loading="!dynamicAnalysis">
+      <div class="tw-border-base-300 tw-bg-base-200 tw-border tw-rounded tw-p-2 tw-flex tw-flex-row tw-w-full tw-gap-1">
+        <div class="tw-font-mono tw-link tw-link-hover">
+          <a :href="link">
+            {{ dynamicAnalysis.name }}
+          </a>
+        </div>
+        <div class="tw-flex-grow" />
+        <span
+          class="tw-badge"
+          :class="statusColor"
+        />
+        <span>{{ status }}</span>
+      </div>
+
+      <code-box :text="dynamicAnalysis.log" />
+    </loading-indicator>
+  </div>
+</template>
+
+<script>
+import gql from 'graphql-tag';
+import BuildSummaryCard from './shared/BuildSummaryCard.vue';
+import LoadingIndicator from './shared/LoadingIndicator.vue';
+import {
+  faCircleExclamation,
+  faTriangleExclamation,
+} from '@fortawesome/free-solid-svg-icons';
+import CodeBox from './shared/CodeBox.vue';
+
+export default {
+  components: {CodeBox, LoadingIndicator, BuildSummaryCard},
+  props: {
+    buildId: {
+      type: Number,
+      required: true,
+    },
+
+    dynamicAnalysisId: {
+      type: Number,
+      required: true,
+    },
+
+    link: {
+      type: String,
+      required: true,
+    },
+  },
+
+  apollo: {
+    dynamicAnalysis: {
+      query: gql`
+        query($dynamicAnalysisId: ID) {
+          dynamicAnalysis(id: $dynamicAnalysisId) {
+            id
+            name
+            status
+            log
+          }
+        }
+      `,
+      variables() {
+        return {
+          dynamicAnalysisId: this.dynamicAnalysisId,
+        };
+      },
+    },
+  },
+
+  computed: {
+    FA() {
+      return {
+        faCircleExclamation,
+        faTriangleExclamation,
+      };
+    },
+
+    status() {
+      switch (this.dynamicAnalysis.status) {
+      case 'passed':
+        return 'Passed';
+      case 'notrun':
+        return 'Not Run';
+      case 'failed':
+        return 'Failed';
+      default:
+        return this.dynamicAnalysis.status;
+      }
+    },
+
+    statusColor() {
+      switch (this.dynamicAnalysis.status) {
+      case 'passed':
+        return 'tw-bg-green-400';
+      case 'notrun':
+        return 'tw-bg-orange-400';
+      case 'failed':
+        return 'tw-bg-red-400';
+      default:
+        return this.dynamicAnalysis.status;
+      }
+    },
+  },
+};
+</script>