Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

7336 create contextstore #7374

Merged
merged 15 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions packages/twenty-front/src/effect-components/PageChangeEffect.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { useEffect, useState } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import {
useLocation,
useNavigate,
useParams,
useSearchParams,
} from 'react-router-dom';
import { useRecoilValue, useSetRecoilState } from 'recoil';
import { IconCheckbox } from 'twenty-ui';

import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
Expand All @@ -12,6 +17,10 @@ import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCapt
import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';
import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
import { CommandType } from '@/command-menu/types/Command';
import { contextStoreCurrentObjectMetadataIdState } from '@/context-store/states/contextStoreCurrentObjectMetadataIdState';
import { contextStoreCurrentViewIdState } from '@/context-store/states/contextStoreCurrentViewIdState';
import { contextStoreTargetedRecordIdsState } from '@/context-store/states/contextStoreTargetedRecordIdsState';
import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
import { AppBasePath } from '@/types/AppBasePath';
Expand Down Expand Up @@ -49,6 +58,29 @@ export const PageChangeEffect = () => {
activityObjectNameSingular: CoreObjectNameSingular.Task,
});

const [searchParams] = useSearchParams();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extract this to another ComponentEffect: ContextStorePageChangeEffect.tsx

const { objectNameSingular, objectNamePlural } = useParams();

const objectMetadataItem = useRecoilValue(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

every page

objectMetadataItemFamilySelector(
objectNameSingular
? { objectName: objectNameSingular, objectNameType: 'singular' }
: objectNamePlural
? { objectName: objectNamePlural, objectNameType: 'plural' }
: { objectName: '', objectNameType: 'singular' },
),
);

const setContextStoreCurrentViewId = useSetRecoilState(
contextStoreCurrentViewIdState,
);
const setContextStoreCurrentObjectMetadataId = useSetRecoilState(
contextStoreCurrentObjectMetadataIdState,
);
const setContextStoreTargetedRecordIds = useSetRecoilState(
contextStoreTargetedRecordIdsState,
);

useEffect(() => {
cleanRecoilState();
}, [cleanRecoilState]);
Expand All @@ -67,6 +99,20 @@ export const PageChangeEffect = () => {
}
}, [navigate, pageChangeEffectNavigateLocation]);

useEffect(() => {
const viewId = searchParams.get('view');
setContextStoreCurrentViewId(viewId);
setContextStoreTargetedRecordIds([]);
}, [
searchParams,
setContextStoreCurrentViewId,
setContextStoreTargetedRecordIds,
]);

useEffect(() => {
setContextStoreCurrentObjectMetadataId(objectMetadataItem?.id ?? null);
}, [objectMetadataItem, setContextStoreCurrentObjectMetadataId]);

useEffect(() => {
switch (true) {
case isMatchingLocation(AppPath.RecordIndexPage): {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createState } from 'twenty-ui';

export const contextStoreCurrentObjectMetadataIdState = createState<
string | null
>({
key: 'contextStoreCurrentObjectMetadataIdState',
defaultValue: null,
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { createState } from 'twenty-ui';

export const contextStoreCurrentViewIdState = createState<string | null>({
key: 'contextStoreCurrentViewIdState',
defaultValue: null,
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { createState } from 'twenty-ui';

export const contextStoreTargetedRecordIdsState = createState<string[]>({
key: 'contextStoreTargetedRecordIdsState',
defaultValue: [],
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useCallback, useEffect } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { useRecoilValue, useSetRecoilState } from 'recoil';

import { contextStoreTargetedRecordIdsState } from '@/context-store/states/contextStoreTargetedRecordIdsState';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
import { useRecordActionBar } from '@/object-record/record-action-bar/hooks/useRecordActionBar';
Expand Down Expand Up @@ -129,10 +130,18 @@ export const RecordIndexBoardDataLoaderEffect = ({
callback: resetRecordSelection,
});

const setContextStoreTargetedRecordIds = useSetRecoilState(
contextStoreTargetedRecordIdsState,
);

useEffect(() => {
setActionBarEntries?.();
setContextMenuEntries?.();
}, [setActionBarEntries, setContextMenuEntries]);

useEffect(() => {
setContextStoreTargetedRecordIds(selectedRecordIds);
}, [selectedRecordIds, setContextStoreTargetedRecordIds]);

return <></>;
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect } from 'react';
import { useRecoilValue } from 'recoil';
import { useRecoilValue, useSetRecoilState } from 'recoil';

import { contextStoreTargetedRecordIdsState } from '@/context-store/states/contextStoreTargetedRecordIdsState';
import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useRecordActionBar } from '@/object-record/record-action-bar/hooks/useRecordActionBar';
Expand Down Expand Up @@ -34,6 +35,10 @@ export const RecordIndexTableContainerEffect = ({
recordTableId,
});

const setContextStoreTargetedRecordIds = useSetRecoilState(
contextStoreTargetedRecordIdsState,
);

const { objectMetadataItem } = useObjectMetadataItem({
objectNameSingular,
});
Expand Down Expand Up @@ -111,5 +116,9 @@ export const RecordIndexTableContainerEffect = ({
);
}, [setRecordCountInCurrentView, setOnEntityCountChange]);

useEffect(() => {
setContextStoreTargetedRecordIds(selectedRowIds);
}, [selectedRowIds, setContextStoreTargetedRecordIds]);

return <></>;
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilte
import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
import { useSetViewInUrl } from '@/views/hooks/useSetViewInUrl';
import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
import { isUndefined } from '@sniptt/guards';
import { useEffect } from 'react';
Expand Down Expand Up @@ -37,6 +38,7 @@ export const QueryParamsViewIdEffect = () => {
objectMetadataItemId?.id,
lastVisitedObjectMetadataItemId,
);
const { setViewInUrl } = useSetViewInUrl();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should push the viewId from there


// // TODO: scope view bar per view id if possible
// const { resetCurrentView } = useResetCurrentView();
Expand All @@ -59,6 +61,7 @@ export const QueryParamsViewIdEffect = () => {
});
}
setCurrentViewId(lastVisitedViewId);
setViewInUrl(lastVisitedViewId);
return;
}

Expand Down Expand Up @@ -99,6 +102,7 @@ export const QueryParamsViewIdEffect = () => {
setCurrentViewId,
setLastVisitedObjectMetadataItem,
setLastVisitedView,
setViewInUrl,
viewIdQueryParam,
viewsOnCurrentObject,
]);
Expand Down
12 changes: 2 additions & 10 deletions packages/twenty-front/src/modules/views/hooks/useChangeView.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import { useResetUnsavedViewStates } from '@/views/hooks/useResetUnsavedViewStates';
import { useSearchParams } from 'react-router-dom';
import { useSetViewInUrl } from '@/views/hooks/useSetViewInUrl';

export const useChangeView = (viewBarComponentId?: string) => {
const { resetUnsavedViewStates } =
useResetUnsavedViewStates(viewBarComponentId);

const [, setSearchParams] = useSearchParams();

const setViewInUrl = (viewId: string) => {
setSearchParams(() => {
const searchParams = new URLSearchParams();
searchParams.set('view', viewId);
return searchParams;
});
};
const { setViewInUrl } = useSetViewInUrl();

const changeView = async (viewId: string) => {
setViewInUrl(viewId);
Expand Down
15 changes: 15 additions & 0 deletions packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { useSearchParams } from 'react-router-dom';

export const useSetViewInUrl = () => {
bosiraphael marked this conversation as resolved.
Show resolved Hide resolved
const [, setSearchParams] = useSearchParams();

const setViewInUrl = (viewId: string) => {
setSearchParams(() => {
const searchParams = new URLSearchParams();
searchParams.set('view', viewId);
return searchParams;
});
bosiraphael marked this conversation as resolved.
Show resolved Hide resolved
};

return { setViewInUrl };
};
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { PageContainer } from '@/ui/layout/page/PageContainer';
import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
import { RecordShowPageWorkflowHeader } from '@/workflow/components/RecordShowPageWorkflowHeader';
import { RecordShowPageBaseHeader } from '~/pages/object-record/RecordShowPageBaseHeader';
import { RecordShowPageEffect } from '~/pages/object-record/RecordShowPageEffect';
import { RecordShowPageHeader } from '~/pages/object-record/RecordShowPageHeader';

export const RecordShowPage = () => {
Expand Down Expand Up @@ -38,6 +39,7 @@ export const RecordShowPage = () => {
return (
<RecordFieldValueSelectorContextProvider>
<RecordValueSetterEffect recordId={objectRecordId} />
<RecordShowPageEffect recordId={objectRecordId} />
<PageContainer>
<PageTitle title={pageTitle} />
<RecordShowPageHeader
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { contextStoreTargetedRecordIdsState } from '@/context-store/states/contextStoreTargetedRecordIdsState';
import { useEffect } from 'react';
import { useSetRecoilState } from 'recoil';

export const RecordShowPageEffect = ({ recordId }: { recordId: string }) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RecordShowPageContextStoreEffect

const setContextStoreTargetedRecordIds = useSetRecoilState(
contextStoreTargetedRecordIdsState,
);

useEffect(() => {
setContextStoreTargetedRecordIds([recordId]);
}, [recordId, setContextStoreTargetedRecordIds]);

return null;
};
Loading