Merge branch 'release/5.0.1-p1'

release/5.0.1-p1

.github/workflows/build.yml

@@ -5,34 +5,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  set_status_in_progress:
-    name: set_status_in_progress
-    if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-    secrets: inherit
-    with:
-      context: 'tide_build'
-      description: 'Tide Build running...'
-      state: 'pending'
-      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
   tide_build:
     name: tide_build
     secrets: inherit
     uses: dpc-sdp/github-actions/.github/workflows/[email protected]
     with:
       module_build: true
       runner: biggy-tide
-  export_config:
-    name: export_config
-    secrets: inherit
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-  set_status:
-    name: set_status
-    needs: [tide_build]
-    if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
-    secrets: inherit
-    with:
-      context: 'tide_build'
-      description: 'Tide Build'
-      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}

modules/tide_api/src/Plugin/jsonapi/FieldEnhancer/YamlEnhancer.php

@@ -23,14 +23,12 @@ class YamlEnhancer extends ResourceFieldEnhancerBase {
    */
   protected function doUndoTransform($data, Context $context) {
     $data = Yaml::decode($data);
-    $markup_text = $data['markup']['#markup'];
-    $processed_text = $data['processed_text']['#text'];
-
-    if (!empty($processed_text)) {
-      $data['processed_text']['#text'] = $this->processText($processed_text);
+
+    if (!empty($data['markup']['#markup'])) {
+      $data['processed_text']['#text'] = $this->processText($data['markup']['#markup']);
     }
-    if (!empty($markup_text)) {
-      $data['markup']['#markup'] = $this->processText($markup_text);
+    if (!empty($data['markup']['#markup'])) {
+      $data['markup']['#markup'] = $this->processText($data['markup']['#markup']);
     }
 
     return $data;

src/TideSystemInfoService.php

@@ -226,10 +226,12 @@ function ($entityType) {
    */
   public function getPackageVersion($packageName) {
     if (empty($packageName)) {
-      $result = $this->sensorRunner->runSensors([SensorConfig::load('tide_times')]);
-      $value = $result[0]->getValue();
-      $decodedValue = json_decode($value, TRUE);
-      return $decodedValue;
+      if ($this->sensorRunner) {
+        $result = $this->sensorRunner->runSensors([SensorConfig::load('tide_times')]);
+        $value = $result[0]->getValue();
+        $decodedValue = json_decode($value, TRUE);
+        return $decodedValue;
+      }
     }
 
     if (strtolower($packageName) === 'php') {

tide_core.services.yml

@@ -34,4 +34,4 @@ services:
       - '@entity_field.manager'
       - '@logger.factory'
       - '@file_system'
-      - '@monitoring.sensor_runner'
+      - '@?monitoring.sensor_runner'