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

Fix/object record and metadata naming (#2763)

Browse Source 
* Fixed object-record and object-metadata naming

* Fix post merge

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-11-29 13:45:57 +01:00
committed by GitHub
parent 3617abb0e6
commit d855a42eca
99 changed files with 614 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
front/src/modules/favorites/hooks/useFavorites.ts
View File

@ -9,8 +9,8 @@ import { Favorite } from '@/favorites/types/Favorite';
import { mapFavorites } from '@/favorites/utils/mapFavorites';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { getRecordOptimisticEffectDefinition } from '@/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { PaginatedObjectTypeResults } from '@/object-record/types/PaginatedObjectTypeResults';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { PaginatedRecordTypeResults } from '@/object-record/types/PaginatedRecordTypeResults';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
import { favoritesState } from '../states/favoritesState';
@ -25,9 +25,9 @@ export const useFavorites = ({
const [favorites, setFavorites] = useRecoilState(favoritesState);
const {
updateOneMutation,
createOneMutation,
deleteOneMutation,
updateOneRecordMutation: updateOneFavoriteMutation,
createOneRecordMutation: createOneFavoriteMutation,
deleteOneRecordMutation: deleteOneFavoriteMutation,
objectMetadataItem: favoriteObjectMetadataItem,
} = useObjectMetadataItem({
objectNamePlural: 'favorites',
@ -46,11 +46,11 @@ export const useFavorites = ({
const apolloClient = useApolloClient();
useFindManyObjectRecords({
useFindManyRecords({
objectNamePlural: 'favorites',
onCompleted: useRecoilCallback(
({ snapshot, set }) =>
async (data: PaginatedObjectTypeResults<Required<Favorite>>) => {
async (data: PaginatedRecordTypeResults<Required<Favorite>>) => {
const favorites = snapshot.getLoadable(favoritesState).getValue();
const queriedFavorites = mapFavorites(
@ -87,7 +87,7 @@ export const useFavorites = ({
const targetObjectName = favoriteTargetObjectMetadataItem.nameSingular;
const result = await apolloClient.mutate({
mutation: createOneMutation,
mutation: createOneFavoriteMutation,
variables: {
input: {
[`${targetObjectName}Id`]: favoriteTargetObjectId,
@ -114,7 +114,7 @@ export const useFavorites = ({
},
[
apolloClient,
createOneMutation,
createOneFavoriteMutation,
currentWorkspaceMember?.id,
favoriteTargetObjectMetadataItem,
triggerOptimisticEffects,
@ -127,7 +127,7 @@ export const useFavorites = ({
const favoritesStateFromSnapshot = snapshot.getLoadable(favoritesState);
const favorites = favoritesStateFromSnapshot.getValue();
const result = await apolloClient.mutate({
mutation: updateOneMutation,
mutation: updateOneFavoriteMutation,
variables: {
input: {
position: favoriteToUpdate?.position,
@ -146,7 +146,7 @@ export const useFavorites = ({
);
}
},
[apolloClient, updateOneMutation],
[apolloClient, updateOneFavoriteMutation],
);
const deleteFavorite = useRecoilCallback(
@ -159,7 +159,7 @@ export const useFavorites = ({
)?.id;
await apolloClient.mutate({
mutation: deleteOneMutation,
mutation: deleteOneFavoriteMutation,
variables: {
idToDelete: idToDelete,
},
@ -172,7 +172,7 @@ export const useFavorites = ({
favorites.filter((favorite: Favorite) => favorite.id !== idToDelete),
);
},
[apolloClient, deleteOneMutation, performOptimisticEvict],
[apolloClient, deleteOneFavoriteMutation, performOptimisticEvict],
);
const computeNewPosition = (destIndex: number, sourceIndex: number) => {