mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename fieldId and objectId into fieldMetadataId and objectMetadataId (#2421)

Browse Source 
* Rename fieldId and objectId into fieldMetadataId and objectMetadataId

* Fix tests
This commit is contained in:
Charles Bochet
2023-11-10 14:35:18 +01:00
committed by GitHub
parent 57cfd4db45
commit 618513afcd
136 changed files with 544 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
front/src/modules/views/hooks/internal/useViewFields.ts
View File

@ -16,7 +16,7 @@ export const useViewFields = (viewScopeId: string) => {
const persistViewFields = useRecoilCallback(
({ snapshot }) =>
async (viewFieldsToPersist: ViewField[], viewId?: string) => {
const { viewObjectId, currentViewId, savedViewFieldsByKey } =
const { viewObjectMetadataId, currentViewId, savedViewFieldsByKey } =
getViewScopedStateValuesFromSnapshot({
snapshot,
viewScopeId,
@ -25,7 +25,7 @@ export const useViewFields = (viewScopeId: string) => {
const viewIdToPersist = viewId ?? currentViewId;
if (!currentViewId || !savedViewFieldsByKey || !viewObjectId) {
if (!currentViewId || !savedViewFieldsByKey || !viewObjectMetadataId) {
return;
}
@ -40,7 +40,7 @@ export const useViewFields = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewField.fieldId,
fieldMetadataId: viewField.fieldMetadataId,
viewId: viewIdToPersist,
isVisible: viewField.isVisible,
size: viewField.size,
@ -76,18 +76,18 @@ export const useViewFields = (viewScopeId: string) => {
};
const viewFieldsToCreate = viewFieldsToPersist.filter(
(viewField) => !savedViewFieldsByKey[viewField.fieldId],
(viewField) => !savedViewFieldsByKey[viewField.fieldMetadataId],
);
const viewFieldsToUpdate = viewFieldsToPersist.filter(
(viewFieldToPersit) =>
savedViewFieldsByKey[viewFieldToPersit.fieldId] &&
(savedViewFieldsByKey[viewFieldToPersit.fieldId].size !==
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId] &&
(savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId].size !==
viewFieldToPersit.size ||
savedViewFieldsByKey[viewFieldToPersit.fieldId].position !==
viewFieldToPersit.position ||
savedViewFieldsByKey[viewFieldToPersit.fieldId].isVisible !==
viewFieldToPersit.isVisible),
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
.position !== viewFieldToPersit.position ||
savedViewFieldsByKey[viewFieldToPersit.fieldMetadataId]
.isVisible !== viewFieldToPersit.isVisible),
);
await _createViewFields(viewFieldsToCreate);

25
front/src/modules/views/hooks/internal/useViewFilters.ts
View File

@ -53,7 +53,7 @@ export const useViewFilters = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewFilter.fieldId,
fieldMetadataId: viewFilter.fieldMetadataId,
viewId: viewId ?? currentViewId,
value: viewFilter.value,
displayValue: viewFilter.displayValue,
@ -102,19 +102,23 @@ export const useViewFilters = (viewScopeId: string) => {
};
const filtersToCreate = currentViewFilters.filter(
(filter) => !savedViewFiltersByKey[filter.fieldId],
(filter) => !savedViewFiltersByKey[filter.fieldMetadataId],
);
await createViewFilters(filtersToCreate);
const filtersToUpdate = currentViewFilters.filter(
(filter) =>
savedViewFiltersByKey[filter.fieldId] &&
(savedViewFiltersByKey[filter.fieldId].operand !== filter.operand ||
savedViewFiltersByKey[filter.fieldId].value !== filter.value),
savedViewFiltersByKey[filter.fieldMetadataId] &&
(savedViewFiltersByKey[filter.fieldMetadataId].operand !==
filter.operand ||
savedViewFiltersByKey[filter.fieldMetadataId].value !==
filter.value),
);
await updateViewFilters(filtersToUpdate);
const filterKeys = currentViewFilters.map((filter) => filter.fieldId);
const filterKeys = currentViewFilters.map(
(filter) => filter.fieldMetadataId,
);
const filterKeysToDelete = Object.keys(savedViewFiltersByKey).filter(
(previousFilterKey) => !filterKeys.includes(previousFilterKey),
);
@ -159,12 +163,13 @@ export const useViewFilters = (viewScopeId: string) => {
}
const existingSavedFilterId =
savedViewFiltersByKey[filterToUpsert.fieldId]?.id;
savedViewFiltersByKey[filterToUpsert.fieldMetadataId]?.id;
set(currentViewFiltersState, (filters) => {
const newViewFilters = produce(filters, (filtersDraft) => {
const existingFilterIndex = filtersDraft.findIndex(
(filter) => filter.fieldId === filterToUpsert.fieldId,
(filter) =>
filter.fieldMetadataId === filterToUpsert.fieldMetadataId,
);
if (existingFilterIndex === -1) {
@ -189,7 +194,7 @@ export const useViewFilters = (viewScopeId: string) => {
const removeViewFilter = useRecoilCallback(
({ snapshot, set }) =>
(fieldId: string) => {
(fieldMetadataId: string) => {
const { currentViewId, currentViewFilters, onViewFiltersChange } =
getViewScopedStateValuesFromSnapshot({
snapshot,
@ -201,7 +206,7 @@ export const useViewFilters = (viewScopeId: string) => {
}
const newViewFilters = currentViewFilters.filter((filter) => {
return filter.fieldId !== fieldId;
return filter.fieldMetadataId !== fieldMetadataId;
});
set(currentViewFiltersState, newViewFilters);
onViewFiltersChange?.(newViewFilters);

4
front/src/modules/views/hooks/internal/useViewScopedStates.ts
View File

@ -46,7 +46,7 @@ export const useViewScopedStates = (args?: { customViewScopeId?: string }) => {
savedViewSortsByKeySelector,
savedViewSortsState,
viewEditModeState,
viewObjectIdState,
viewObjectMetadataIdState,
viewTypeState,
viewsState,
} = getViewScopedStates({
@ -77,7 +77,7 @@ export const useViewScopedStates = (args?: { customViewScopeId?: string }) => {
savedViewSortsByKeySelector,
savedViewSortsState,
viewEditModeState,
viewObjectIdState,
viewObjectMetadataIdState,
viewTypeState,
viewsState,
};

19
front/src/modules/views/hooks/internal/useViewSorts.ts
View File

@ -54,7 +54,7 @@ export const useViewSorts = (viewScopeId: string) => {
mutation: createOneMutation,
variables: {
input: {
fieldId: viewSort.fieldId,
fieldMetadataId: viewSort.fieldMetadataId,
viewId: viewId ?? currentViewId,
direction: viewSort.direction,
},
@ -99,19 +99,20 @@ export const useViewSorts = (viewScopeId: string) => {
};
const sortsToCreate = currentViewSorts.filter(
(sort) => !savedViewSortsByKey[sort.fieldId],
(sort) => !savedViewSortsByKey[sort.fieldMetadataId],
);
await createViewSorts(sortsToCreate);
const sortsToUpdate = currentViewSorts.filter(
(sort) =>
savedViewSortsByKey[sort.fieldId] &&
savedViewSortsByKey[sort.fieldId].direction !== sort.direction,
savedViewSortsByKey[sort.fieldMetadataId] &&
savedViewSortsByKey[sort.fieldMetadataId].direction !==
sort.direction,
);
await updateViewSorts(sortsToUpdate);
const sortKeys = currentViewSorts.map((sort) => sort.fieldId);
const sortKeys = currentViewSorts.map((sort) => sort.fieldMetadataId);
const sortKeysToDelete = Object.keys(savedViewSortsByKey).filter(
(previousSortKey) => !sortKeys.includes(previousSortKey),
);
@ -155,12 +156,12 @@ export const useViewSorts = (viewScopeId: string) => {
}
const existingSavedSortId =
savedViewSortsByKey[sortToUpsert.fieldId]?.id;
savedViewSortsByKey[sortToUpsert.fieldMetadataId]?.id;
set(currentViewSortsState, (sorts) => {
const newViewSorts = produce(sorts, (sortsDraft) => {
const existingSortIndex = sortsDraft.findIndex(
(sort) => sort.fieldId === sortToUpsert.fieldId,
(sort) => sort.fieldMetadataId === sortToUpsert.fieldMetadataId,
);
if (existingSortIndex === -1) {
@ -182,7 +183,7 @@ export const useViewSorts = (viewScopeId: string) => {
const removeViewSort = useRecoilCallback(
({ snapshot, set }) =>
(fieldId: string) => {
(fieldMetadataId: string) => {
const { currentViewId, onViewSortsChange, currentViewSorts } =
getViewScopedStateValuesFromSnapshot({
snapshot,
@ -194,7 +195,7 @@ export const useViewSorts = (viewScopeId: string) => {
}
const newViewSorts = currentViewSorts.filter((filter) => {
return filter.fieldId !== fieldId;
return filter.fieldMetadataId !== fieldMetadataId;
});
set(currentViewSortsState, newViewSorts);
onViewSortsChange?.(newViewSorts);

11
front/src/modules/views/hooks/internal/useViews.ts
View File

@ -19,14 +19,13 @@ export const useViews = (scopeId: string) => {
const createView = useRecoilCallback(
({ snapshot }) =>
async (view: Pick<View, 'id' | 'name'>) => {
const { viewObjectId, viewType } = getViewScopedStateValuesFromSnapshot(
{
const { viewObjectMetadataId, viewType } =
getViewScopedStateValuesFromSnapshot({
snapshot,
viewScopeId: scopeId,
},
);
});
if (!viewObjectId || !viewType) {
if (!viewObjectMetadataId || !viewType) {
return;
}
await apolloClient.mutate({
@ -34,7 +33,7 @@ export const useViews = (scopeId: string) => {
variables: {
input: {
...view,
objectId: viewObjectId,
objectMetadataId: viewObjectMetadataId,
type: viewType,
},
},

6
front/src/modules/views/hooks/useView.ts
View File

@ -37,7 +37,7 @@ export const useView = (props?: UseViewProps) => {
availableFilterDefinitionsState,
availableSortDefinitionsState,
entityCountInCurrentViewState,
viewObjectIdState,
viewObjectMetadataIdState,
viewTypeState,
} = useViewScopedStates({
customViewScopeId: scopeId,
@ -72,7 +72,7 @@ export const useView = (props?: UseViewProps) => {
);
const setViewEditMode = useSetRecoilState(viewEditModeState);
const setViewObjectId = useSetRecoilState(viewObjectIdState);
const setViewObjectMetadataId = useSetRecoilState(viewObjectMetadataIdState);
const setViewType = useSetRecoilState(viewTypeState);
const [_, setSearchParams] = useSearchParams();
@ -267,7 +267,7 @@ export const useView = (props?: UseViewProps) => {
handleViewNameSubmit,
setViewEditMode,
setViewObjectId,
setViewObjectMetadataId,
setViewType,
setEntityCountInCurrentView,
setAvailableFieldDefinitions,