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

Fixed bug for refectch activities and create activity on the currently filtered user. (#1493)

Browse Source 
* Fixed bug for refectch activities and create activity on the currently filtered user.

* Refactor optimistif effect

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-09-11 08:02:51 +02:00
committed by GitHub
parent 08727aafe5
commit 9be069bedc
37 changed files with 363 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
View File

@ -27,7 +27,7 @@ export function ShowPageAddButton({
const openCreateActivity = useOpenCreateActivityDrawer();
function handleSelect(type: ActivityType) {
openCreateActivity(type, [entity]);
openCreateActivity({ type, targetableEntities: [entity] });
closeDropdownButton();
}

2
front/src/modules/ui/navbar/components/NavCollapseButton.tsx
View File

@ -9,7 +9,7 @@ import {
import { isNavbarOpenedState } from '@/ui/layout/states/isNavbarOpenedState';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
const StyledCollapseButton = styled.button<{
const StyledCollapseButton = styled.div<{
hide: boolean;
}>`
align-items: center;

13
front/src/modules/ui/table/components/GenericEntityTableData.tsx
View File

@ -1,7 +1,7 @@
import { useEffect } from 'react';
import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
import { OptimisticEffect } from '@/apollo/optimistic-effect/types/OptimisticEffect';
import { OptimisticEffectDefinition } from '@/apollo/optimistic-effect/types/OptimisticEffectDefinition';
import { useSetEntityTableData } from '@/ui/table/hooks/useSetEntityTableData';
import { FilterDefinition } from '@/ui/view-bar/types/FilterDefinition';
import { SortOrder } from '~/generated/graphql';
@ -9,7 +9,7 @@ import { SortOrder } from '~/generated/graphql';
export function GenericEntityTableData({
useGetRequest,
getRequestResultKey,
getRequestOptimisticEffect,
getRequestOptimisticEffectDefinition,
orderBy = [
{
createdAt: SortOrder.Desc,
@ -22,7 +22,7 @@ export function GenericEntityTableData({
}: {
useGetRequest: any;
getRequestResultKey: string;
getRequestOptimisticEffect: (variables: any) => OptimisticEffect<any, any>;
getRequestOptimisticEffectDefinition: OptimisticEffectDefinition<any>;
orderBy?: any;
whereFilters?: any;
filterDefinitionArray: FilterDefinition[];
@ -37,9 +37,10 @@ export function GenericEntityTableData({
onCompleted: (data: any) => {
const entities = data[getRequestResultKey] ?? [];
setEntityTableData(entities, filterDefinitionArray);
registerOptimisticEffect(
getRequestOptimisticEffect({ orderBy, where: whereFilters }),
);
registerOptimisticEffect({
variables: { orderBy, where: whereFilters },
definition: getRequestOptimisticEffectDefinition,
});
},
});