From 51c32c48931b09f5ad24a247a8602cf3d747347c Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Thu, 13 Apr 2023 11:59:31 +0200
Subject: [PATCH] Chore: Bring back null value handling

---
 .../src/content-manager/components/DynamicTable/index.js   | 1 -
 .../CellContent/ReviewWorkflowsStage/getTableColumn.js     | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
index 8bf3a59356..721dbd8fb5 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
@@ -1,7 +1,6 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { Typography } from '@strapi/design-system';
 import { DynamicTable as Table, useStrapiApp } from '@strapi/helper-plugin';
 import { useSelector } from 'react-redux';
 
diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js
index 0d8dc800b4..926eb8f984 100644
--- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js
+++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { Typography } from '@strapi/design-system';
 
 import ReviewWorkflowsStage from '.';
 import getTrad from '../../../../../../../admin/src/content-manager/utils/getTrad';
@@ -32,6 +33,12 @@ export default (layout) => {
       sortable: false,
     },
     cellFormatter({ strapi_reviewWorkflows_stage }) {
+      // if entities are created e.g. through lifecycle methods
+      // they may not have a stage assigned
+      if (!strapi_reviewWorkflows_stage) {
+        return <Typography textColor="neutral800">-</Typography>;
+      }
+
       return <ReviewWorkflowsStage name={strapi_reviewWorkflows_stage.name} />;
     },
   };