From a1181fab47a66af04337f30b2dc97dd9039ee058 Mon Sep 17 00:00:00 2001
From: Jamie Howard <jamie.howard@strapi.io>
Date: Wed, 6 Mar 2024 14:17:19 +0000
Subject: [PATCH] fix(admin): wip allow empty list view configuration

---
 packages/core/admin/admin/src/components/Form.tsx               | 2 +-
 .../pages/ListConfiguration/components/Settings.tsx             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/components/Form.tsx b/packages/core/admin/admin/src/components/Form.tsx
index 748672547e4..eaded284054 100644
--- a/packages/core/admin/admin/src/components/Form.tsx
+++ b/packages/core/admin/admin/src/components/Form.tsx
@@ -547,7 +547,7 @@ const reducer = <TFormValues extends FormValues = FormValues>(
         draft.values = setIn(
           state.values,
           action.payload.field,
-          newValue.length > 0 ? newValue : undefined
+          Array.isArray(newValue) ? newValue : undefined
         );
 
         break;
diff --git a/packages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx b/packages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx
index 90b6bacb965..64b3019a7b3 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx
+++ b/packages/core/admin/admin/src/content-manager/pages/ListConfiguration/components/Settings.tsx
@@ -82,7 +82,7 @@ const Settings = () => {
 
   React.useEffect(() => {
     if (sortOptionsSorted.findIndex((opt) => opt.value === currentSortBy) === -1) {
-      onChange('settings.defaultSortBy', sortOptionsSorted[0].value);
+      onChange('settings.defaultSortBy', sortOptionsSorted[0]?.value);
     }
   }, [currentSortBy, onChange, sortOptionsSorted]);