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

FieldDisplay & FieldInput (#1708)

Browse Source 
* Removed view field duplicate types

* wip

* wip 2

* wip 3

* Unified state for fields

* Renaming

* Wip

* Post merge

* Post post merge

* wip

* Delete unused file

* Boolean and Probability

* Finished InlineCell

* Renamed EditableCell to TableCell

* Finished double texts

* Finished MoneyField

* Fixed bug inline cell click outside

* Fixed hotkey scope

* Final fixes

* Phone

* Fix url and number input validation

* Fix

* Fix position

* wip refactor activity editor

* Fixed activity editor

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-09-27 18:18:02 +02:00
committed by GitHub
parent d9feabbc63
commit cbadcba188
290 changed files with 3152 additions and 4481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
front/src/modules/views/hooks/useBoardViewFields.ts
View File

@ -5,10 +5,8 @@ import { availableBoardCardFieldsScopedState } from '@/ui/board/states/available
import { boardCardFieldsScopedState } from '@/ui/board/states/boardCardFieldsScopedState';
import { savedBoardCardFieldsFamilyState } from '@/ui/board/states/savedBoardCardFieldsFamilyState';
import { savedBoardCardFieldsByKeyFamilySelector } from '@/ui/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector';
import type {
ViewFieldDefinition,
ViewFieldMetadata,
} from '@/ui/editable-field/types/ViewField';
import { BoardFieldDefinition } from '@/ui/board/types/BoardFieldDefinition';
import { FieldMetadata } from '@/ui/field/types/FieldMetadata';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
import { currentViewIdScopedState } from '@/ui/view-bar/states/currentViewIdScopedState';
@ -23,23 +21,23 @@ import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
const toViewFieldInput = (
objectId: 'company' | 'person',
fieldDefinition: ViewFieldDefinition<ViewFieldMetadata>,
columDefinition: BoardFieldDefinition<FieldMetadata>,
) => ({
key: fieldDefinition.key,
name: fieldDefinition.name,
index: fieldDefinition.index,
isVisible: fieldDefinition.isVisible ?? true,
key: columDefinition.key,
name: columDefinition.name,
index: columDefinition.index,
isVisible: columDefinition.isVisible ?? true,
objectId,
});
export const useBoardViewFields = ({
objectId,
fieldDefinitions,
viewFieldDefinition,
skipFetch,
RecoilScopeContext,
}: {
objectId: 'company' | 'person';
fieldDefinitions: ViewFieldDefinition<ViewFieldMetadata>[];
viewFieldDefinition: BoardFieldDefinition<FieldMetadata>[];
skipFetch?: boolean;
RecoilScopeContext: RecoilScopeContext;
}) => {
@ -67,14 +65,14 @@ export const useBoardViewFields = ({
const [updateViewFieldMutation] = useUpdateViewFieldMutation();
const createViewFields = (
fields: ViewFieldDefinition<ViewFieldMetadata>[],
viewFieldDefinitions: BoardFieldDefinition<FieldMetadata>[],
viewId = currentViewId,
) => {
if (!viewId || !fields.length) return;
if (!viewId || !viewFieldDefinitions.length) return;
return createViewFieldsMutation({
variables: {
data: fields.map((field) => ({
data: viewFieldDefinitions.map((field) => ({
...toViewFieldInput(objectId, field),
viewId,
})),
@ -83,12 +81,12 @@ export const useBoardViewFields = ({
};
const updateViewFields = (
fields: ViewFieldDefinition<ViewFieldMetadata>[],
viewFieldDefinitions: BoardFieldDefinition<FieldMetadata>[],
) => {
if (!currentViewId || !fields.length) return;
if (!currentViewId || !viewFieldDefinitions.length) return;
return Promise.all(
fields.map((field) =>
viewFieldDefinitions.map((field) =>
updateViewFieldMutation({
variables: {
data: {
@ -114,13 +112,13 @@ export const useBoardViewFields = ({
onCompleted: async (data) => {
if (!data.viewFields.length) {
// Populate if empty
await createViewFields(fieldDefinitions);
await createViewFields(viewFieldDefinition);
return refetch();
}
const nextFields = data.viewFields
.map<ViewFieldDefinition<ViewFieldMetadata> | null>((viewField) => {
const fieldDefinition = fieldDefinitions.find(
.map<BoardFieldDefinition<FieldMetadata> | null>((viewField) => {
const fieldDefinition = viewFieldDefinition.find(
({ key }) => viewField.key === key,
);
@ -134,7 +132,7 @@ export const useBoardViewFields = ({
}
: null;
})
.filter<ViewFieldDefinition<ViewFieldMetadata>>(assertNotNull);
.filter<BoardFieldDefinition<FieldMetadata>>(assertNotNull);
if (!isDeeplyEqual(boardCardFields, nextFields)) {
setSavedBoardCardFields(nextFields);
@ -142,7 +140,7 @@ export const useBoardViewFields = ({
}
if (!availableBoardCardFields.length) {
setAvailableBoardCardFields(fieldDefinitions);
setAvailableBoardCardFields(viewFieldDefinition);
}
},
});