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

[ESLint rule]: recoil value and setter should be named after their at… (#1402)

Browse Source 
* Override unwanted changes

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Toledodev <rafael.toledo@engenharia.ufjf.br>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>

* Fix the tests

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Toledodev <rafael.toledo@engenharia.ufjf.br>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>

---------

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Toledodev <rafael.toledo@engenharia.ufjf.br>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Charles Bochet <charlesBochet@users.noreply.github.com>
This commit is contained in:
gitstart-twenty
2023-09-05 11:34:11 +03:00
committed by GitHub
parent 0ec4b78aee
commit 878302dd31
52 changed files with 400 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/activities/components/ActivityAssigneePicker.tsx
View File

@ -32,7 +32,7 @@ export function ActivityAssigneePicker({
onSubmit,
onCancel,
}: OwnProps) {
const [searchFilter] = useRecoilScopedState(
const [relationPickerSearchFilter] = useRecoilScopedState(
relationPickerSearchFilterScopedState,
);
const [updateActivity] = useUpdateActivityMutation();
@ -40,7 +40,7 @@ export function ActivityAssigneePicker({
const users = useFilteredSearchEntityQuery({
queryHook: useSearchUserQuery,
selectedIds: activity?.accountOwner?.id ? [activity?.accountOwner?.id] : [],
searchFilter: searchFilter,
searchFilter: relationPickerSearchFilter,
mappingFunction: (user) => ({
entityType: Entity.User,
id: user.id,

4
front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
View File

@ -11,7 +11,7 @@ import {
import { useOpenCreateActivityDrawer } from './useOpenCreateActivityDrawer';
export function useOpenCreateActivityDrawerForSelectedRowIds() {
const selectedEntityIds = useRecoilValue(selectedRowIdsSelector);
const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
const openCreateActivityDrawer = useOpenCreateActivityDrawer();
@ -20,7 +20,7 @@ export function useOpenCreateActivityDrawerForSelectedRowIds() {
entityType: ActivityTargetableEntityType,
) {
const activityTargetableEntityArray: ActivityTargetableEntity[] =
selectedEntityIds.map((id) => ({
selectedRowIds.map((id) => ({
type: entityType,
id,
}));

6
front/src/modules/activities/right-drawer/components/create/RightDrawerCreateActivity.tsx
View File

@ -5,13 +5,13 @@ import { viewableActivityIdState } from '@/activities/states/viewableActivityIdS
import { RightDrawerActivity } from '../RightDrawerActivity';
export function RightDrawerCreateActivity() {
const activityId = useRecoilValue(viewableActivityIdState);
const viewableActivityId = useRecoilValue(viewableActivityIdState);
return (
<>
{activityId && (
{viewableActivityId && (
<RightDrawerActivity
activityId={activityId}
activityId={viewableActivityId}
showComment={false}
autoFillTitle={true}
/>

10
front/src/modules/activities/right-drawer/components/edit/RightDrawerEditActivity.tsx
View File

@ -5,7 +5,13 @@ import { viewableActivityIdState } from '@/activities/states/viewableActivityIdS
import { RightDrawerActivity } from '../RightDrawerActivity';
export function RightDrawerEditActivity() {
const activityId = useRecoilValue(viewableActivityIdState);
const viewableActivityId = useRecoilValue(viewableActivityIdState);
return <>{activityId && <RightDrawerActivity activityId={activityId} />}</>;
return (
<>
{viewableActivityId && (
<RightDrawerActivity activityId={viewableActivityId} />
)}
</>
);
}