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

test: improve utils coverage (#4230)

Browse Source 
* test: improve utils coverage

* refactor: review - rename isDefined to isNonNullable, update tests and return statement
This commit is contained in:
Thaïs
2024-02-29 13:03:52 -03:00
committed by GitHub
parent 6ec0e5e995
commit 30df6c10ea
85 changed files with 396 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/modules/object-record/cache/hooks/useReadFindManyRecordsQueryInCache.ts vendored
View File

@ -6,7 +6,7 @@ import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenera
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
import { ObjectRecordQueryResult } from '@/object-record/types/ObjectRecordQueryResult';
import { ObjectRecordQueryVariables } from '@/object-record/types/ObjectRecordQueryVariables';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const useReadFindManyRecordsQueryInCache = ({
objectMetadataItem,
@ -38,7 +38,7 @@ export const useReadFindManyRecordsQueryInCache = ({
const existingRecordConnection =
existingRecordsQueryResult?.[objectMetadataItem.namePlural];
const existingObjectRecords = isDefined(existingRecordConnection)
const existingObjectRecords = isNonNullable(existingRecordConnection)
? getRecordsFromRecordConnection({
recordConnection: existingRecordConnection,
})

4
packages/twenty-front/src/modules/object-record/hooks/__tests__/useMapConnectionToRecords.test.tsx
View File

@ -13,7 +13,7 @@ import {
import { useMapConnectionToRecords } from '@/object-record/hooks/useMapConnectionToRecords';
import { Person } from '@/people/types/Person';
import { getJestHookWrapper } from '~/testing/jest/getJestHookWrapper';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
const Wrapper = getJestHookWrapper({
apolloMocks: [],
@ -184,7 +184,7 @@ describe('useMapConnectionToRecords', () => {
expect(isNonEmptyArray(peopleResult)).toBe(true);
expect(firstPersonResult.id).toBe(firstPersonMock.id);
expect(isDefined(firstPersonsCompanyresult)).toBe(true);
expect(isNonNullable(firstPersonsCompanyresult)).toBe(true);
expect(firstPersonsCompanyresult.id).toEqual(firstPersonsCompanyMock.id);
});
});

4
packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts
View File

@ -4,7 +4,7 @@ import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getDeleteManyRecordsMutationResponseField } from '@/object-record/hooks/useGenerateDeleteManyRecordMutation';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
type useDeleteOneRecordProps = {
@ -56,7 +56,7 @@ export const useDeleteManyRecords = ({
const cachedRecords = records
.map((record) => getRecordFromCache(record.id, cache))
.filter(isDefined);
.filter(isNonNullable);
triggerDeleteRecordsOptimisticEffect({
cache,

8
packages/twenty-front/src/modules/object-record/hooks/useMapConnectionToRecords.ts
View File

@ -8,7 +8,7 @@ import { parseFieldRelationType } from '@/object-metadata/utils/parseFieldRelati
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
import { FieldMetadataType } from '~/generated/graphql';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const useMapConnectionToRecords = () => {
const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
@ -26,7 +26,7 @@ export const useMapConnectionToRecords = () => {
depth: number;
}): ObjectRecord[] => {
if (
!isDefined(objectRecordConnection) ||
!isNonNullable(objectRecordConnection) ||
!isNonEmptyArray(objectMetadataItems)
) {
return [];
@ -79,7 +79,7 @@ export const useMapConnectionToRecords = () => {
if (
!relationFieldMetadataItem ||
!isDefined(relatedObjectMetadataSingularName)
!isNonNullable(relatedObjectMetadataSingularName)
) {
throw new Error(
`Could not find relation object metadata item for object name plural ${relationField.name} in mapConnectionToRecords`,
@ -90,7 +90,7 @@ export const useMapConnectionToRecords = () => {
relationField.name
] as ObjectRecordConnection | undefined | null;
if (!isDefined(relationConnection)) {
if (!isNonNullable(relationConnection)) {
continue;
}

6
packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
View File

@ -1,6 +1,6 @@
import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const ObjectFilterDropdownDateSearchInput = () => {
const {
@ -15,9 +15,9 @@ export const ObjectFilterDropdownDateSearchInput = () => {
selectFilter?.({
fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
value: isDefined(date) ? date.toISOString() : '',
value: isNonNullable(date) ? date.toISOString() : '',
operand: selectedOperandInDropdown,
displayValue: isDefined(date) ? date.toLocaleString() : '',
displayValue: isNonNullable(date) ? date.toLocaleString() : '',
definition: filterDefinitionUsedInDropdown,
});

6
packages/twenty-front/src/modules/object-record/record-board-deprecated/components/RecordBoardDeprecatedInternalEffect.tsx
View File

@ -6,7 +6,7 @@ import { useRecordBoardDeprecatedActionBarEntriesInternal } from '@/object-recor
import { useRecordBoardDeprecatedContextMenuEntriesInternal } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedContextMenuEntriesInternal';
import { useRecordBoardDeprecatedScopedStates } from '@/object-record/record-board-deprecated/hooks/internal/useRecordBoardDeprecatedScopedStates';
import { useUpdateCompanyBoardColumnsInternal } from '@/object-record/record-board-deprecated/hooks/internal/useUpdateCompanyBoardColumnsInternal';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export type RecordBoardDeprecatedInternalEffectProps = {
onFieldsChange: (fields: any) => void;
@ -40,13 +40,13 @@ export const RecordBoardDeprecatedInternalEffect = () => {
}, [opportunities, setSavedOpportunities]);
useEffect(() => {
if (isDefined(fetchMoreOpportunities)) {
if (isNonNullable(fetchMoreOpportunities)) {
fetchMoreOpportunities();
}
}, [fetchMoreOpportunities]);
useEffect(() => {
if (isDefined(fetchMoreCompanies)) {
if (isNonNullable(fetchMoreCompanies)) {
fetchMoreCompanies();
}
}, [fetchMoreCompanies]);

4
packages/twenty-front/src/modules/object-record/record-board/states/selectors/recordBoardColumnsFamilySelectorScopeMap.ts
View File

@ -5,7 +5,7 @@ import { recordBoardColumnsFamilyStateScopeMap } from '@/object-record/record-bo
import { RecordBoardColumnDefinition } from '@/object-record/record-board/types/RecordBoardColumnDefinition';
import { createFamilySelectorScopeMap } from '@/ui/utilities/recoil-scope/utils/createFamilySelectorScopeMap';
import { guardRecoilDefaultValue } from '@/ui/utilities/recoil-scope/utils/guardRecoilDefaultValue';
import { assertNotNull } from '~/utils/assert';
import { isNonNullable } from '~/utils/isNonNullable';
export const recordBoardColumnsFamilySelectorScopeMap =
createFamilySelectorScopeMap<RecordBoardColumnDefinition | undefined, string>(
@ -57,7 +57,7 @@ export const recordBoardColumnsFamilySelectorScopeMap =
}),
);
})
.filter(assertNotNull);
.filter(isNonNullable);
const lastColumn = [...columns].sort(
(a, b) => b.position - a.position,

4
packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
View File

@ -2,7 +2,7 @@ import { Key } from 'ts-key-enum';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const useRegisterInputEvents = <T>({
inputRef,
@ -30,7 +30,7 @@ export const useRegisterInputEvents = <T>({
onClickOutside?.(event, inputValue);
},
enabled: isDefined(onClickOutside),
enabled: isNonNullable(onClickOutside),
});
useScopedHotkeys(

6
packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
View File

@ -17,9 +17,9 @@ import { isFieldSelect } from '@/object-record/record-field/types/guards/isField
import { isFieldSelectValue } from '@/object-record/record-field/types/guards/isFieldSelectValue';
import { isFieldText } from '@/object-record/record-field/types/guards/isFieldText';
import { isFieldUuid } from '@/object-record/record-field/types/guards/isFieldUuid';
import { assertNotNull } from '~/utils/assert';
import { isNonNullable } from '~/utils/isNonNullable';
const isValueEmpty = (value: unknown) => !assertNotNull(value) || value === '';
const isValueEmpty = (value: unknown) => !isNonNullable(value) || value === '';
export const isFieldValueEmpty = ({
fieldDefinition,
@ -46,7 +46,7 @@ export const isFieldValueEmpty = ({
}
if (isFieldSelect(fieldDefinition)) {
return isFieldSelectValue(fieldValue) && !assertNotNull(fieldValue);
return isFieldSelectValue(fieldValue) && !isNonNullable(fieldValue);
}
if (isFieldCurrency(fieldDefinition)) {

8
packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
View File

@ -22,8 +22,8 @@ import { isMatchingFloatFilter } from '@/object-record/record-filter/utils/isMat
import { isMatchingStringFilter } from '@/object-record/record-filter/utils/isMatchingStringFilter';
import { isMatchingUUIDFilter } from '@/object-record/record-filter/utils/isMatchingUUIDFilter';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { isDefined } from '~/utils/isDefined';
import { isEmptyObject } from '~/utils/isEmptyObject';
import { isNonNullable } from '~/utils/isNonNullable';
const isAndFilter = (
filter: ObjectRecordQueryFilter,
@ -102,7 +102,7 @@ export const isRecordMatchingFilter = ({
if (isNotFilter(filter)) {
const filterValue = filter.not;
if (!isDefined(filterValue)) {
if (!isNonNullable(filterValue)) {
throw new Error('Unexpected value for "not" filter : ' + filterValue);
}
@ -117,7 +117,7 @@ export const isRecordMatchingFilter = ({
}
return Object.entries(filter).every(([filterKey, filterValue]) => {
if (!isDefined(filterValue)) {
if (!isNonNullable(filterValue)) {
throw new Error(
'Unexpected value for filter key "' + filterKey + '" : ' + filterValue,
);
@ -129,7 +129,7 @@ export const isRecordMatchingFilter = ({
(field) => field.name === filterKey,
);
if (!isDefined(objectMetadataField)) {
if (!isNonNullable(objectMetadataField)) {
throw new Error(
'Field metadata item "' +
filterKey +

4
packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
View File

@ -11,7 +11,7 @@ import {
import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { Field } from '~/generated/graphql';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { Filter } from '../../object-filter-dropdown/types/Filter';
@ -38,7 +38,7 @@ export const turnObjectDropdownFilterIntoQueryFilter = (
);
}
if (!isDefined(rawUIFilter.value) || rawUIFilter.value === '') {
if (!isNonNullable(rawUIFilter.value) || rawUIFilter.value === '') {
return undefined;
}

4
packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainer.tsx
View File

@ -30,7 +30,7 @@ import {
FileFolder,
useUploadImageMutation,
} from '~/generated/graphql';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
type RecordShowContainerProps = {
objectNameSingular: string;
@ -131,7 +131,7 @@ export const RecordShowContainer = ({
<RecoilScope CustomRecoilScopeContext={ShowPageRecoilScopeContext}>
<ShowPageContainer>
<ShowPageLeftContainer>
{!recordLoading && isDefined(recordFromStore) && (
{!recordLoading && isNonNullable(recordFromStore) && (
<>
<ShowPageSummaryCard
id={objectRecordId}

4
packages/twenty-front/src/modules/object-record/record-show/components/RecordShowContainerEffect.tsx
View File

@ -6,7 +6,7 @@ import { Activity } from '@/activities/types/Activity';
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
import { recordLoadingFamilyState } from '@/object-record/record-store/states/recordLoadingFamilyState';
import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const RecordShowContainer = ({
objectRecordId,
@ -38,7 +38,7 @@ export const RecordShowContainer = ({
const { makeActivityWithoutConnection } = useActivityConnectionUtils();
useEffect(() => {
if (!loading && isDefined(record)) {
if (!loading && isNonNullable(record)) {
const { activity: activityWithoutConnection } =
makeActivityWithoutConnection(record as any);

4
packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItems.tsx
View File

@ -13,7 +13,7 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
import { MenuItemSelect } from '@/ui/navigation/menu-item/components/MenuItemSelect';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { assertNotNull } from '~/utils/assert';
import { isNonNullable } from '~/utils/isNonNullable';
import { EntityForSelect } from '../types/EntityForSelect';
import { RelationPickerHotkeyScope } from '../types/RelationPickerHotkeyScope';
@ -55,7 +55,7 @@ export const SingleEntitySelectMenuItems = ({
const entitiesInDropdown = [selectedEntity, ...entitiesToSelect].filter(
(entity): entity is EntityForSelect =>
assertNotNull(entity) && isNonEmptyString(entity.name),
isNonNullable(entity) && isNonEmptyString(entity.name),
);
useScopedHotkeys(

4
packages/twenty-front/src/modules/object-record/relation-picker/components/SingleEntitySelectMenuItemsWithSearch.tsx
View File

@ -6,7 +6,7 @@ import {
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { useEntitySelectSearch } from '../hooks/useEntitySelectSearch';
@ -42,7 +42,7 @@ export const SingleEntitySelectMenuItemsWithSearch = ({
relationPickerScopeId,
});
const showCreateButton = isDefined(onCreate) && searchFilter !== '';
const showCreateButton = isNonNullable(onCreate) && searchFilter !== '';
const entities = useFilteredSearchEntityQuery({
filters: [

4
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useLimitPerMetadataItem.ts
View File

@ -1,6 +1,6 @@
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
export const useLimitPerMetadataItem = ({
@ -15,7 +15,7 @@ export const useLimitPerMetadataItem = ({
.map(({ nameSingular }) => {
return [`limit${capitalize(nameSingular)}`, limit];
})
.filter(isDefined),
.filter(isNonNullable),
);
return {

4
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray.ts
View File

@ -5,7 +5,7 @@ import { objectMetadataItemsByNamePluralMapSelector } from '@/object-metadata/st
import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
import { ObjectRecordForSelect } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export type MultiObjectRecordQueryResult = {
[namePlural: string]: ObjectRecordConnection;
@ -30,7 +30,7 @@ export const useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArr
const objectMetadataItem =
objectMetadataItemsByNamePluralMap.get(namePlural);
if (!isDefined(objectMetadataItem)) return [];
if (!isNonNullable(objectMetadataItem)) return [];
return objectRecordConnection.edges.map(({ node }) => ({
objectMetadataItem,

6
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery.ts
View File

@ -13,7 +13,7 @@ import {
import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
import { useSearchFilterPerMetadataItem } from '@/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
@ -71,7 +71,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
},
];
})
.filter(isDefined),
.filter(isNonNullable),
);
const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@ -99,7 +99,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndSelectedItemsQuery = ({
...orderByFieldPerMetadataItem,
...limitPerMetadataItem,
},
skip: !isDefined(multiSelectQueryForSelectedIds),
skip: !isNonNullable(multiSelectQueryForSelectedIds),
},
);

6
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchMatchesSearchFilterAndToSelectQuery.ts
View File

@ -14,7 +14,7 @@ import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/us
import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
import { useSearchFilterPerMetadataItem } from '@/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem';
import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
@ -72,7 +72,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
makeAndFilterVariables(searchFilters),
];
})
.filter(isDefined),
.filter(isNonNullable),
);
const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@ -98,7 +98,7 @@ export const useMultiObjectSearchMatchesSearchFilterAndToSelectQuery = ({
...orderByFieldPerMetadataItem,
...limitPerMetadataItem,
},
skip: !isDefined(multiSelectQuery),
skip: !isNonNullable(multiSelectQuery),
});
const {

6
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useMultiObjectSearchSelectedItemsQuery.ts
View File

@ -12,7 +12,7 @@ import {
} from '@/object-record/relation-picker/hooks/useMultiObjectRecordsQueryResultFormattedAsObjectRecordForSelectArray';
import { SelectedObjectRecordId } from '@/object-record/relation-picker/hooks/useMultiObjectSearch';
import { useOrderByFieldPerMetadataItem } from '@/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
export const EMPTY_QUERY = gql`
@ -56,7 +56,7 @@ export const useMultiObjectSearchSelectedItemsQuery = ({
},
];
})
.filter(isDefined),
.filter(isNonNullable),
);
const { orderByFieldPerMetadataItem } = useOrderByFieldPerMetadataItem({
@ -83,7 +83,7 @@ export const useMultiObjectSearchSelectedItemsQuery = ({
...orderByFieldPerMetadataItem,
...limitPerMetadataItem,
},
skip: !isDefined(multiSelectQueryForSelectedIds),
skip: !isNonNullable(multiSelectQueryForSelectedIds),
},
);

4
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useOrderByFieldPerMetadataItem.ts
View File

@ -1,6 +1,6 @@
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { getObjectOrderByField } from '@/object-metadata/utils/getObjectOrderByField';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
import { capitalize } from '~/utils/string/capitalize';
export const useOrderByFieldPerMetadataItem = ({
@ -20,7 +20,7 @@ export const useOrderByFieldPerMetadataItem = ({
},
];
})
.filter(isDefined),
.filter(isNonNullable),
);
return {

4
packages/twenty-front/src/modules/object-record/relation-picker/hooks/useSearchFilterPerMetadataItem.ts
View File

@ -3,7 +3,7 @@ import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/get
import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
import { makeOrFilterVariables } from '@/object-record/utils/makeOrFilterVariables';
import { FieldMetadataType } from '~/generated/graphql';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const useSearchFilterPerMetadataItem = ({
objectMetadataItems,
@ -64,7 +64,7 @@ export const useSearchFilterPerMetadataItem = ({
return [objectMetadataItem.nameSingular, searchFilter] as const;
})
.filter(isDefined),
.filter(isNonNullable),
);
return {

7
packages/twenty-front/src/modules/object-record/utils/getChildRelationArray.ts
View File

@ -1,12 +1,15 @@
import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const getChildRelationArray = ({
childRelation,
}: {
childRelation: any;
}) => {
if (isDefined(childRelation.edges) && Array.isArray(childRelation.edges)) {
if (
isNonNullable(childRelation.edges) &&
Array.isArray(childRelation.edges)
) {
return childRelation.edges.map((edge: ObjectRecordEdge) => edge.node);
} else {
return childRelation;

4
packages/twenty-front/src/modules/object-record/utils/makeAndFilterVariables.ts
View File

@ -1,10 +1,10 @@
import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const makeAndFilterVariables = (
filters: (ObjectRecordQueryFilter | undefined)[],
): ObjectRecordQueryFilter | undefined => {
const definedFilters = filters.filter(isDefined);
const definedFilters = filters.filter(isNonNullable);
if (!definedFilters.length) return undefined;

4
packages/twenty-front/src/modules/object-record/utils/makeOrFilterVariables.ts
View File

@ -1,10 +1,10 @@
import { ObjectRecordQueryFilter } from '@/object-record/record-filter/types/ObjectRecordQueryFilter';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const makeOrFilterVariables = (
filters: (ObjectRecordQueryFilter | undefined)[],
): ObjectRecordQueryFilter | undefined => {
const definedFilters = filters.filter(isDefined);
const definedFilters = filters.filter(isNonNullable);
if (!definedFilters.length) return undefined;

4
packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
View File

@ -5,7 +5,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { isFieldRelationValue } from '@/object-record/record-field/types/guards/isFieldRelationValue';
import { sanitizeLink } from '@/object-record/utils/sanitizeLinkRecordInput';
import { FieldMetadataType } from '~/generated/graphql';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
export const sanitizeRecordInput = ({
objectMetadataItem,
@ -39,7 +39,7 @@ export const sanitizeRecordInput = ({
return [fieldName, fieldValue];
})
.filter(isDefined),
.filter(isNonNullable),
);
if (
objectMetadataItem.nameSingular !== CoreObjectNameSingular.Company ||

8
packages/twenty-front/src/modules/object-record/utils/sortObjectRecordByDateField.ts
View File

@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
import { OrderBy } from '@/object-metadata/types/OrderBy';
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
import { isDefined } from '~/utils/isDefined';
import { isNonNullable } from '~/utils/isNonNullable';
const SORT_BEFORE = -1;
const SORT_AFTER = 1;
@ -14,11 +14,11 @@ export const sortObjectRecordByDateField =
const aDate = a[dateField];
const bDate = b[dateField];
if (!isDefined(aDate) && !isDefined(bDate)) {
if (!isNonNullable(aDate) && !isNonNullable(bDate)) {
return SORT_EQUAL;
}
if (!isDefined(aDate)) {
if (!isNonNullable(aDate)) {
if (sortDirection === 'AscNullsFirst') {
return SORT_BEFORE;
} else if (sortDirection === 'DescNullsFirst') {
@ -32,7 +32,7 @@ export const sortObjectRecordByDateField =
throw new Error(`Invalid sortDirection: ${sortDirection}`);
}
if (!isDefined(bDate)) {
if (!isNonNullable(bDate)) {
if (sortDirection === 'AscNullsFirst') {
return SORT_AFTER;
} else if (sortDirection === 'DescNullsFirst') {