From 2787ec0e08fc2116aba6a9e1a36881d283b0e30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nuno=20G=C3=B3is?= <github@nunogois.com>
Date: Fri, 10 Nov 2023 11:40:45 +0000
Subject: [PATCH] 5.6.6 (#5320)

Includes https://github.com/Unleash/unleash/pull/5317

---------

Co-authored-by: sjaanus <sellinjaanus@gmail.com>
---
 .../Project/ProjectForm/ProjectForm.tsx       | 26 +++++++++----------
 .../project/Project/hooks/useProjectForm.ts   |  2 +-
 src/lib/db/project-store.ts                   |  4 ++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx b/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx
index c30ed7d292..3e1f513894 100644
--- a/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx
+++ b/frontend/src/component/project/Project/ProjectForm/ProjectForm.tsx
@@ -184,8 +184,8 @@ const ProjectForm: React.FC<IProjectForm> = ({
                 }
             />
             <ConditionallyRender
-                condition={mode === 'Edit' && Boolean(setFeatureLimit)}
-                show={
+                condition={mode === 'Edit'}
+                show={() => (
                     <>
                         <Box
                             sx={{
@@ -202,17 +202,15 @@ const ProjectForm: React.FC<IProjectForm> = ({
                             Leave it empty if you don’t want to add a limit
                         </StyledSubtitle>
                         <StyledInputContainer>
-                            {featureLimit && setFeatureLimit && (
-                                <StyledInput
-                                    label={'Limit'}
-                                    name='value'
-                                    type={'number'}
-                                    value={featureLimit}
-                                    onChange={(e) =>
-                                        setFeatureLimit(e.target.value)
-                                    }
-                                />
-                            )}
+                            <StyledInput
+                                label={'Limit'}
+                                name='value'
+                                type={'number'}
+                                value={featureLimit!}
+                                onChange={(e) =>
+                                    setFeatureLimit!(e.target.value)
+                                }
+                            />
                             <ConditionallyRender
                                 condition={
                                     featureCount !== undefined &&
@@ -226,7 +224,7 @@ const ProjectForm: React.FC<IProjectForm> = ({
                             />
                         </StyledInputContainer>
                     </>
-                }
+                )}
             />
             <ConditionallyRender
                 condition={mode === 'Create' && isEnterprise()}
diff --git a/frontend/src/component/project/Project/hooks/useProjectForm.ts b/frontend/src/component/project/Project/hooks/useProjectForm.ts
index 6d9e57903a..c90ab2d145 100644
--- a/frontend/src/component/project/Project/hooks/useProjectForm.ts
+++ b/frontend/src/component/project/Project/hooks/useProjectForm.ts
@@ -82,7 +82,7 @@ const useProjectForm = (
 
     const getFeatureLimitAsNumber = () => {
         if (featureLimit === '') {
-            return undefined;
+            return null;
         }
         return Number(featureLimit);
     };
diff --git a/src/lib/db/project-store.ts b/src/lib/db/project-store.ts
index c419307c09..fdf01d431f 100644
--- a/src/lib/db/project-store.ts
+++ b/src/lib/db/project-store.ts
@@ -244,8 +244,9 @@ class ProjectStore implements IProjectStore {
         const settingsRow = await this.db(SETTINGS_TABLE)
             .insert({
                 project: project.id,
-                project_mode: project.mode,
                 default_stickiness: project.defaultStickiness,
+                feature_limit: project.featureLimit,
+                project_mode: project.mode,
             })
             .returning('*');
         return this.mapRow({ ...row[0], ...settingsRow[0] });
@@ -265,6 +266,7 @@ class ProjectStore implements IProjectStore {
             await this.db(TABLE)
                 .where({ id: data.id })
                 .update(this.fieldToRow(data));
+
             if (
                 data.defaultStickiness !== undefined ||
                 data.featureLimit !== undefined