fix: Organisation id not numeric in organisation settings (#3929)

Flagsmith · May 11, 2024 · 9e3746b · 9e3746b
1 parent 132ef77
commit 9e3746b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/frontend/common/stores/account-store.js b/frontend/common/stores/account-store.js
@@ -302,11 +302,13 @@ const controller = {
       store.model = user
       if (user && user.organisations) {
         store.organisation = user.organisations[0]
-        const cookiedID = API.getCookie('organisation')
-        const pathID = matchPath(document.location.pathname, {
-          path: '/organisation/:organisationId',
-          strict: false,
-        })?.params?.organisationId
+        const cookiedID = parseInt(API.getCookie('organisation'))
+        const pathID = parseInt(
+          matchPath(document.location.pathname, {
+            path: '/organisation/:organisationId',
+            strict: false,
+          })?.params?.organisationId,
+        )
         const orgId = pathID || cookiedID
         if (orgId) {
           const foundOrganisation = user.organisations.find(

diff --git a/frontend/web/components/ProjectsPage.tsx b/frontend/web/components/ProjectsPage.tsx
@@ -16,7 +16,9 @@ const ProjectsPage: FC<ProjectsPageType> = ({ match }) => {
       {() => {
         return (
           <div className='app-container container'>
-            <ProjectManageWidget organisationId={match.params.organisationId} />
+            <ProjectManageWidget
+              organisationId={parseInt(match.params.organisationId)}
+            />
           </div>
         )
       }}