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

Various fixes (#11448)

Browse Source 
# Scrollbar fix

Fixes https://github.com/twentyhq/twenty/issues/11403

<img width="1512" alt="image"
src="https://github.com/user-attachments/assets/b13fe0f2-8c61-4ea8-9ea1-e61e571a90da"
/>

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
Charles Bochet
2025-04-09 01:03:43 +02:00
committed by GitHub
parent ab63214efa
commit b6e344e7be
41 changed files with 265 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/modules/context-store/components/MainContextStoreProvider.tsx
View File

@ -4,6 +4,7 @@ import { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
import { prefetchIndexViewIdFromObjectMetadataItemFamilySelector } from '@/prefetch/states/selector/prefetchIndexViewIdFromObjectMetadataItemFamilySelector';
import { AppPath } from '@/types/AppPath';
import { useShowAuthModal } from '@/ui/layout/hooks/useShowAuthModal';
import { useParams, useSearchParams } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import { isDefined } from 'twenty-shared/utils';
@ -62,9 +63,10 @@ export const MainContextStoreProvider = () => {
);
const viewId = getViewId(viewIdQueryParam, indexViewId, lastVisitedViewId);
const showAuthModal = useShowAuthModal();
const shouldComputeContextStore =
isRecordIndexPage || isRecordShowPage || isSettingsPage;
(isRecordIndexPage || isRecordShowPage || isSettingsPage) && !showAuthModal;
if (!shouldComputeContextStore) {
return null;

9
packages/twenty-front/src/modules/context-store/components/MainContextStoreProviderEffect.tsx
View File

@ -61,13 +61,12 @@ export const MainContextStoreProviderEffect = ({
);
useEffect(() => {
if (!objectMetadataItem) {
setContextStoreCurrentObjectMetadataItemId(undefined);
return;
if (contextStoreCurrentObjectMetadataItemId !== objectMetadataItem?.id) {
setContextStoreCurrentObjectMetadataItemId(objectMetadataItem?.id);
}
if (contextStoreCurrentObjectMetadataItemId !== objectMetadataItem.id) {
setContextStoreCurrentObjectMetadataItemId(objectMetadataItem.id);
if (!objectMetadataItem) {
return;
}
setLastVisitedViewForObjectMetadataNamePlural({