From d34060557872f9b507f2757ac2885c9dbee18f97 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Wed, 22 Jan 2025 17:48:27 +0100
Subject: [PATCH] Fix View Picker broken (#9798)

In this PR:
- fixing a regression introduced in a recent PR (#9735)
- fixing a typing issue in ViewPicker @ehconitin FYI
---
 .../twenty-front/src/modules/views/hooks/useSetViewInUrl.ts    | 2 +-
 .../views/view-picker/components/ViewPickerListContent.tsx     | 3 +--
 .../views/view-picker/components/ViewPickerOptionDropdown.tsx  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts b/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
index 01e0397ff..a9bd6d9a2 100644
--- a/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
@@ -6,7 +6,7 @@ export const useSetViewInUrl = () => {
   const setViewInUrl = (viewId: string) => {
     setSearchParams(() => {
       const searchParams = new URLSearchParams();
-      searchParams.set('view', viewId);
+      searchParams.set('viewId', viewId);
       return searchParams;
     });
   };
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index aae3dc2d7..0d6155d2e 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -11,7 +11,6 @@ import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-sta
 import { useChangeView } from '@/views/hooks/useChangeView';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useUpdateView } from '@/views/hooks/useUpdateView';
-import { View } from '@/views/types/View';
 import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown';
 import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
 import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
@@ -85,7 +84,7 @@ export const ViewPickerListContent = () => {
                 isDragDisabled={viewsOnCurrentObject.length === 1}
                 itemComponent={
                   <ViewPickerOptionDropdown
-                    view={view as View}
+                    view={{ ...view, __typename: 'View' }}
                     handleViewSelect={handleViewSelect}
                     isIndexView={isIndexView}
                     onEdit={handleEditViewButtonClick}
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index 9cd3fdab1..1827f2a2d 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -20,7 +20,7 @@ import {
 
 type ViewPickerOptionDropdownProps = {
   isIndexView: boolean;
-  view: View;
+  view: Pick<View, 'id' | 'name' | 'icon' | '__typename'>;
   onEdit: (event: React.MouseEvent<HTMLElement>, viewId: string) => void;
   handleViewSelect: (viewId: string) => void;
 };