Merge pull request #34 from itk-dev/feature/cleanup-2025-10-23

Cleaned up and fixed issues

Author: sinejespersen

Taskfile.yml

@@ -108,6 +108,13 @@ tasks:
     desc: Load app fixtures
     prompt: This will reset your database. Continue?
     cmds:
+      # Reset database (and IDs!) by migrating down and up.
+      - task: console
+        vars:
+          TASK_ARGS: doctrine:migrations:migrate first --no-interaction
+      - task: console
+        vars:
+          TASK_ARGS: doctrine:migrations:migrate --no-interaction
       - task: console
         vars:
           TASK_ARGS: hautelook:fixtures:load --no-interaction
@@ -182,6 +189,7 @@ tasks:
       - git -C api checkout .
       - git -C api checkout main
       - git -C api pull
+      - git -C api log --oneline -10
       # Check that our patch can be applied.
       - git -C api apply --check < patches/Process_Dashboard_API.patch
 
@@ -221,6 +229,7 @@ tasks:
           - /api/v1/auth/me
           - /api/v1/processes/
           - /api/v1/processes/1
+          - /api/v1/runs/?process_id=1&run_status=failed
         task: api:get
         vars:
           API_PATH: "{{.ITEM}}"

api

@@ -3,17 +3,19 @@ App\Entity\DataSource:
     label: API mock
     url: http://api:8000
     options: |-
-      auth:
-        header:
+      client_options:
+        headers:
           x-api-key: a-not-so-secret-key
 
   data_source_api_2:
     label: API mock (the same, but another)
     url: http://api:8000
     options: |-
-      auth:
-        header:
+      client_options:
+        headers:
           x-api-key: a-not-so-secret-key
+        verify_peer: false
+        verify_host: false
 
 App\Entity\ProcessOverviewGroup:
   process_overview_group_1:
@@ -42,7 +44,7 @@ App\Entity\ProcessOverview:
           #   data: meta.klinik
       data:
         default_query:
-          status: failed
+          run_status: failed
         page_size: 7
       search:
         minimum_search_query_length: 3
@@ -77,11 +79,13 @@ App\Entity\ProcessOverview:
           - label: Name
             data: meta.name
       data:
+        title: Failed processes
         default_query:
-          status: failed
+          run_status: failed
         page_size: 3
       search:
         minimum_search_query_length: 2
+
   process_overview_4:
     label: En anden proces (pending)
     group: "@process_overview_group_2"
@@ -94,8 +98,28 @@ App\Entity\ProcessOverview:
           - label: Name
             data: meta.name
       data:
+        title: Pending processes
+        default_query:
+          run_status: pending
+        page_size: 5
+      search:
+        minimum_search_query_length: 3
+
+  process_overview_5:
+    label: En anden proces (completed)
+    group: "@process_overview_group_2"
+    dataSource: "@data_source_api_2"
+    processId: 3
+    options: |-
+      metadata_columns:
+          - label: Barn
+            data: meta.cpr
+          - label: Name
+            data: meta.name
+      data:
+        title: Completed processes
         default_query:
-          status: pending
+          run_status: completed
         page_size: 5
       search:
         minimum_search_query_length: 3

fixtures/process_overview.yaml

@@ -43,9 +43,12 @@ def create_data(self, seed: int = 19750523) -> None:
             number_of_processes = fake.pyint(50, 200)
             for _ in range(number_of_processes):
                 meta = {
-                    "cpr": "string",
-                    "name": "string",
-                    "branch": "string",
+                    "description": fake.sentence(5),
+                    "run_metadata_schema": {
+                        "cpr": "string",
+                        "name": "string",
+                        "branch": "string",
+                    }
                 }
                 process = Process(
                     name=fake.sentence(4),

scripts/api/fixtures.py

@@ -82,10 +82,8 @@ private function buildOptions(DataSource $dataSource): array
         $options = [];
 
         $dataSourceOptions = $this->getOptions($dataSource);
-        if ($header = ($dataSourceOptions['auth']['header'] ?? null)) {
-            foreach ($header as $name => $value) {
-                $options['headers'][$name] = $value;
-            }
+        if ($clientOptions = ($dataSourceOptions['client_options'] ?? null)) {
+            $options += $clientOptions;
         }
 
         return $options;

src/DataSourceHelper.php

@@ -122,7 +122,6 @@ function (array $step) use ($overview) {
                 'data' => [
                     'columns' => array_merge($metadataColumns, $stepColumns),
                     'rows' => $rows,
-                    'data' => $data,
                 ],
                 'links' => $links,
                 'meta' => $meta,

src/ProcessOverviewHelper.php

@@ -1,7 +1,7 @@
 <fieldset class="process-details">
     <legend>{{ 'Details for {process}'|trans({process: process.name}) }}</legend>
 
-    {% set meta = process.meta|default(null) %}
+    {% set meta = process.meta.run_metadata_schema|default(null) %}
     {% if meta %}
         <section class="meta">
             <header>