Merge remote-tracking branch 'origin/DALA-5170_data_unavailable_statu…

…s_as_status_for_data_requests' into DALA-5170_data_unavailable_status_as_status_for_data_requests
d-fine · Nov 28, 2024 · 891b4c2 · 891b4c2
2 parents b4bbdf2 + 305b4c1
commit 891b4c2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...-service/src/test/kotlin/org/dataland/datalandemailservice/email/TypedEmailContentTest.kt b/...-service/src/test/kotlin/org/dataland/datalandemailservice/email/TypedEmailContentTest.kt
@@ -44,7 +44,7 @@ class TypedEmailContentTest {
                 assertThat(emailContent.textContent).contains(keyword)
             }
             assertFalse(htmlTagPattern.containsMatchIn(emailContent.textContent))
-            saveEmailContent(typedEmailContent::class.simpleName ?: UUID.randomUUID().toString(), emailContent, skip = false)
+            saveEmailContent(typedEmailContent::class.simpleName ?: UUID.randomUUID().toString(), emailContent, skip = true)
         }
     }
 

diff --git a/dataland-frontend/src/components/resources/dataRequest/StatusHistory.vue b/dataland-frontend/src/components/resources/dataRequest/StatusHistory.vue
@@ -18,7 +18,7 @@
   <div v-show="isStatusHistoryVisible">
     <div>
       <DataTable :value="statusHistory" data-test="statusHistoryTable">
-        <Column field="creationTimeStamp" header="Creation Timestamp" style="width: 33%"
+        <Column field="creationTimeStamp" header="Creation Timestamp" style="width: 28%"
           ><template #body="slotProps">
             <span data-test="creationTimestampEntry">
               {{ convertUnixTimeInMsToDateString(slotProps.data.creationTimestamp) }}
@@ -50,7 +50,13 @@
         <Column field="reasonNonSourceable" header="Comment" style="width: 45%"
           ><template #body="slotProps"
             ><div style="display: inline-flex" data-test="reasonNonSourceableEntry">
-              {{ slotProps.data.requestStatusChangeReason }}
+              {{
+                getRequestStatusChangeReason(
+                  slotProps.data.companyId,
+                  slotProps.data.reportingPeriod,
+                  slotProps.data.dataType
+                )
+              }}
             </div></template
           >
         </Column>
@@ -93,6 +99,17 @@ export default defineComponent({
     toggleViewStatusHistory() {
       this.isStatusHistoryVisible = !this.isStatusHistoryVisible;
     },
+    /**
+     * get the requestStatusChangeReason form data table in Backend
+     * @param companyId companyId for search triple
+     * @param reportingPeriod for search triple
+     * @param dataType for search triple
+     */
+    getRequestStatusChangeReason(companyId: String, reportingPeriod: String, dataType: String): String {
+      var requestStatusChangeReason = '';
+      // get Change reason from entry in backend table (which one?)
+      return requestStatusChangeReason;
+    },
   },
 });
 </script>