admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix View Picker broken (#9798)

Browse Source 
In this PR:
- fixing a regression introduced in a recent PR (#9735)
- fixing a typing issue in ViewPicker @ehconitin FYI
This commit is contained in:
Charles Bochet
2025-01-22 17:48:27 +01:00
committed by GitHub
parent b662609948
commit d340605578
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
View File

@ -6,7 +6,7 @@ export const useSetViewInUrl = () => {
const setViewInUrl = (viewId: string) => { const setViewInUrl = (viewId: string) => {
setSearchParams(() => { setSearchParams(() => {
const searchParams = new URLSearchParams(); const searchParams = new URLSearchParams();
searchParams.set('view', viewId); searchParams.set('viewId', viewId);
return searchParams; return searchParams;
}); });
}; };

3
packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
View File

@ -11,7 +11,6 @@ import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-sta
import { useChangeView } from '@/views/hooks/useChangeView'; import { useChangeView } from '@/views/hooks/useChangeView';
import { useGetCurrentView } from '@/views/hooks/useGetCurrentView'; import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
import { useUpdateView } from '@/views/hooks/useUpdateView'; import { useUpdateView } from '@/views/hooks/useUpdateView';
import { View } from '@/views/types/View';
import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown'; import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown';
import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode'; import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState'; import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
@ -85,7 +84,7 @@ export const ViewPickerListContent = () => {
isDragDisabled={viewsOnCurrentObject.length === 1} isDragDisabled={viewsOnCurrentObject.length === 1}
itemComponent={ itemComponent={
<ViewPickerOptionDropdown <ViewPickerOptionDropdown
view={view as View} view={{ ...view, __typename: 'View' }}
handleViewSelect={handleViewSelect} handleViewSelect={handleViewSelect}
isIndexView={isIndexView} isIndexView={isIndexView}
onEdit={handleEditViewButtonClick} onEdit={handleEditViewButtonClick}

2
packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
View File

@ -20,7 +20,7 @@ import {
type ViewPickerOptionDropdownProps = { type ViewPickerOptionDropdownProps = {
isIndexView: boolean; isIndexView: boolean;
view: View; view: Pick<View, 'id' | 'name' | 'icon' | '__typename'>;
onEdit: (event: React.MouseEvent<HTMLElement>, viewId: string) => void; onEdit: (event: React.MouseEvent<HTMLElement>, viewId: string) => void;
handleViewSelect: (viewId: string) => void; handleViewSelect: (viewId: string) => void;
}; };