From ab37250d5da02e9081a097bbcf3dcdbdeaea5121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C4=B1dvan=20Akca?= <akca.ridvann@gmail.com>
Date: Fri, 12 Apr 2024 16:46:21 +0200
Subject: [PATCH] fix: expose missing createdAt and updatedAt fields from flow

---
 packages/backend/src/serializers/flow.js                        | 2 ++
 packages/backend/src/serializers/flow.test.js                   | 2 ++
 .../backend/test/mocks/rest/api/v1/executions/get-execution.js  | 2 ++
 .../backend/test/mocks/rest/api/v1/executions/get-executions.js | 2 ++
 packages/backend/test/mocks/rest/api/v1/flows/get-flow.js       | 2 ++
 packages/backend/test/mocks/rest/api/v1/flows/get-flows.js      | 2 ++
 packages/web/src/propTypes/propTypes.js                         | 1 +
 7 files changed, 13 insertions(+)

diff --git a/packages/backend/src/serializers/flow.js b/packages/backend/src/serializers/flow.js
index 7cc16e2a..04adc112 100644
--- a/packages/backend/src/serializers/flow.js
+++ b/packages/backend/src/serializers/flow.js
@@ -6,6 +6,8 @@ const flowSerializer = (flow) => {
     name: flow.name,
     active: flow.active,
     status: flow.status,
+    createdAt: flow.createdAt.getTime(),
+    updatedAt: flow.updatedAt.getTime(),
   };
 
   if (flow.steps?.length > 0) {
diff --git a/packages/backend/src/serializers/flow.test.js b/packages/backend/src/serializers/flow.test.js
index 299d2451..65dc9399 100644
--- a/packages/backend/src/serializers/flow.test.js
+++ b/packages/backend/src/serializers/flow.test.js
@@ -27,6 +27,8 @@ describe('flowSerializer', () => {
       name: flow.name,
       active: flow.active,
       status: flow.status,
+      createdAt: flow.createdAt.getTime(),
+      updatedAt: flow.updatedAt.getTime(),
     };
 
     expect(flowSerializer(flow)).toEqual(expectedPayload);
diff --git a/packages/backend/test/mocks/rest/api/v1/executions/get-execution.js b/packages/backend/test/mocks/rest/api/v1/executions/get-execution.js
index 5346ea54..3957e9d8 100644
--- a/packages/backend/test/mocks/rest/api/v1/executions/get-execution.js
+++ b/packages/backend/test/mocks/rest/api/v1/executions/get-execution.js
@@ -9,6 +9,8 @@ const getExecutionMock = async (execution, flow, steps) => {
       name: flow.name,
       active: flow.active,
       status: flow.active ? 'published' : 'draft',
+      createdAt: flow.createdAt.getTime(),
+      updatedAt: flow.updatedAt.getTime(),
       steps: steps.map((step) => ({
         id: step.id,
         type: step.type,
diff --git a/packages/backend/test/mocks/rest/api/v1/executions/get-executions.js b/packages/backend/test/mocks/rest/api/v1/executions/get-executions.js
index 3620b4a2..21d36376 100644
--- a/packages/backend/test/mocks/rest/api/v1/executions/get-executions.js
+++ b/packages/backend/test/mocks/rest/api/v1/executions/get-executions.js
@@ -10,6 +10,8 @@ const getExecutionsMock = async (executions, flow, steps) => {
       name: flow.name,
       active: flow.active,
       status: flow.active ? 'published' : 'draft',
+      createdAt: flow.createdAt.getTime(),
+      updatedAt: flow.updatedAt.getTime(),
       steps: steps.map((step) => ({
         id: step.id,
         type: step.type,
diff --git a/packages/backend/test/mocks/rest/api/v1/flows/get-flow.js b/packages/backend/test/mocks/rest/api/v1/flows/get-flow.js
index 193855ac..54032e1c 100644
--- a/packages/backend/test/mocks/rest/api/v1/flows/get-flow.js
+++ b/packages/backend/test/mocks/rest/api/v1/flows/get-flow.js
@@ -4,6 +4,8 @@ const getFlowMock = async (flow, steps) => {
     id: flow.id,
     name: flow.name,
     status: flow.active ? 'published' : 'draft',
+    createdAt: flow.createdAt.getTime(),
+    updatedAt: flow.updatedAt.getTime(),
     steps: steps.map((step) => ({
       appKey: step.appKey,
       iconUrl: step.iconUrl,
diff --git a/packages/backend/test/mocks/rest/api/v1/flows/get-flows.js b/packages/backend/test/mocks/rest/api/v1/flows/get-flows.js
index 321db577..0509aec3 100644
--- a/packages/backend/test/mocks/rest/api/v1/flows/get-flows.js
+++ b/packages/backend/test/mocks/rest/api/v1/flows/get-flows.js
@@ -7,6 +7,8 @@ const getFlowsMock = async (flows, steps) => {
       id: flow.id,
       name: flow.name,
       status: flow.active ? 'published' : 'draft',
+      createdAt: flow.createdAt.getTime(),
+      updatedAt: flow.updatedAt.getTime(),
       steps: flowSteps.map((step) => ({
         appKey: step.appKey,
         iconUrl: step.iconUrl,
diff --git a/packages/web/src/propTypes/propTypes.js b/packages/web/src/propTypes/propTypes.js
index 96aa0cf2..29629d23 100644
--- a/packages/web/src/propTypes/propTypes.js
+++ b/packages/web/src/propTypes/propTypes.js
@@ -241,6 +241,7 @@ export const FlowPropType = PropTypes.shape({
     PropTypes.instanceOf(Date),
   ]),
   updatedAt: PropTypes.oneOfType([
+    PropTypes.number,
     PropTypes.string,
     PropTypes.instanceOf(Date),
   ]),