twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-11-26 13:42:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor fix - reset single entity search (#7420)

Browse Source 
minor follow up fix #7285

---------

Co-authored-by: Félix Malfait <felix@twenty.com>
This commit is contained in:
nitin 2024-10-04 02:01:03 +05:30 committed by GitHub
parent a946c6a33d
commit e3ed574420
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/generated-metadata/graphql.ts
View File

@ -992,6 +992,7 @@ export type RelationDefinition = {
/** Relation definition type */
export enum RelationDefinitionType {
ManyToMany = 'MANY_TO_MANY',
ManyToOne = 'MANY_TO_ONE',
OneToMany = 'ONE_TO_MANY',
OneToOne = 'ONE_TO_ONE'
@ -999,6 +1000,7 @@ export enum RelationDefinitionType {
/** Type of the relation */
export enum RelationMetadataType {
ManyToMany = 'MANY_TO_MANY',
ManyToOne = 'MANY_TO_ONE',
OneToMany = 'ONE_TO_MANY',
OneToOne = 'ONE_TO_ONE'

1
packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
View File

@ -93,7 +93,6 @@ export const RecordBoardColumnHeader = () => {
newRecord,
handleNewButtonClick,
handleCreateSuccess,
handleEntitySelect,
} = useColumnNewCardActions(columnDefinition.id);
const { isOpportunitiesCompanyFieldDisabled } =

7
packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAddNewCard.ts
View File

@ -1,6 +1,7 @@
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
import { recordBoardNewRecordByColumnIdSelector } from '@/object-record/record-board/states/selectors/recordBoardNewRecordByColumnIdSelector';
import { useEntitySelectSearch } from '@/object-record/relation-picker/hooks/useEntitySelectSearch';
import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
@ -17,6 +18,9 @@ export const useAddNewCard = () => {
const columnContext = useContext(RecordBoardColumnContext);
const { createOneRecord, selectFieldMetadataItem } =
useContext(RecordBoardContext);
const { resetSearchFilter } = useEntitySelectSearch({
relationPickerScopeId: 'relation-picker',
});
const {
goBackToPreviousHotkeyScope,
@ -132,11 +136,12 @@ export const useAddNewCard = () => {
company: null,
},
);
resetSearchFilter();
if (isOpportunity === true) {
goBackToPreviousHotkeyScope();
}
},
[getColumnDefinitionId, goBackToPreviousHotkeyScope],
[getColumnDefinitionId, goBackToPreviousHotkeyScope, resetSearchFilter],
);
const handleCreate = (

8
packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
View File

@ -1,5 +1,6 @@
import {
IconComponent,
IllustrationIconManyToMany,
IllustrationIconOneToMany,
IllustrationIconOneToOne,
} from 'twenty-ui';
@ -34,4 +35,11 @@ export const RELATION_TYPES: Record<
imageSrc: OneToManySvg,
isImageFlipped: true,
},
// Not supported yet
[RelationDefinitionType.ManyToMany]: {
label: 'Belongs to many',
Icon: IllustrationIconManyToMany,
imageSrc: OneToManySvg,
isImageFlipped: true,
},
};

6
packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
View File

@ -66,7 +66,11 @@ const StyledInputsContainer = styled.div`
`;
const RELATION_TYPE_OPTIONS = Object.entries(RELATION_TYPES)
.filter(([value]) => 'ONE_TO_ONE' !== value && 'MANY_TO_MANY' !== value)
.filter(
([value]) =>
RelationDefinitionType.OneToOne !== value &&
RelationDefinitionType.ManyToMany !== value,
)
.map(([value, { label, Icon }]) => ({
label,
value: value as RelationType,