Renamed nullable utils into isDefined and isUndefinedOrNull (#4402)
* Renamed nullable utils into isDefined and isUndefinedOrNull
This commit is contained in:
@ -8,7 +8,7 @@ import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
|
||||
import { EditableFilterChip } from '@/views/components/EditableFilterChip';
|
||||
import { useViewBar } from '@/views/hooks/useViewBar';
|
||||
import { ViewFilter } from '@/views/types/ViewFilter';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
|
||||
type EditableFilterDropdownButtonProps = {
|
||||
viewFilterDropdownId: string;
|
||||
@ -40,7 +40,7 @@ export const EditableFilterDropdownButton = ({
|
||||
filterDefinition.fieldMetadataId === viewFilter.fieldMetadataId,
|
||||
);
|
||||
|
||||
if (isNonNullable(filterDefinition)) {
|
||||
if (isDefined(filterDefinition)) {
|
||||
setFilterDefinitionUsedInDropdown(filterDefinition);
|
||||
setSelectedOperandInDropdown(viewFilter.operand);
|
||||
setSelectedFilter(viewFilter);
|
||||
|
||||
@ -7,8 +7,8 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
|
||||
import { useViewBar } from '@/views/hooks/useViewBar';
|
||||
import { GraphQLView } from '@/views/types/GraphQLView';
|
||||
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isNullable } from '~/utils/isNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||
|
||||
import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
|
||||
|
||||
@ -52,11 +52,11 @@ export const ViewBarEffect = () => {
|
||||
newViews[0] ??
|
||||
null;
|
||||
|
||||
if (isNullable(currentView)) return;
|
||||
if (isUndefinedOrNull(currentView)) return;
|
||||
|
||||
setCurrentViewId(currentView.id);
|
||||
|
||||
if (isNonNullable(currentView?.viewFields)) {
|
||||
if (isDefined(currentView?.viewFields)) {
|
||||
loadViewFields(currentView.viewFields, currentView.id);
|
||||
loadViewFilters(currentView.viewFilters, currentView.id);
|
||||
loadViewSorts(currentView.viewSorts, currentView.id);
|
||||
|
||||
@ -5,7 +5,7 @@ import { useRecoilValue } from 'recoil';
|
||||
import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
|
||||
import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
|
||||
import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
|
||||
type ViewBarFilterEffectProps = {
|
||||
filterDropdownId: string;
|
||||
@ -32,11 +32,11 @@ export const ViewBarFilterEffect = ({
|
||||
} = useFilterDropdown({ filterDropdownId });
|
||||
|
||||
useEffect(() => {
|
||||
if (isNonNullable(availableFilterDefinitions)) {
|
||||
if (isDefined(availableFilterDefinitions)) {
|
||||
setAvailableFilterDefinitions(availableFilterDefinitions);
|
||||
}
|
||||
|
||||
if (isNonNullable(onFilterSelect)) {
|
||||
if (isDefined(onFilterSelect)) {
|
||||
setOnFilterSelect(() => onFilterSelect);
|
||||
}
|
||||
}, [
|
||||
|
||||
@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
|
||||
import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
|
||||
import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
|
||||
import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
|
||||
type ViewBarSortEffectProps = {
|
||||
sortDropdownId: string;
|
||||
@ -26,10 +26,10 @@ export const ViewBarSortEffect = ({
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (isNonNullable(availableSortDefinitions)) {
|
||||
if (isDefined(availableSortDefinitions)) {
|
||||
setAvailableSortDefinitions(availableSortDefinitions);
|
||||
}
|
||||
if (isNonNullable(onSortSelect)) {
|
||||
if (isDefined(onSortSelect)) {
|
||||
setOnSortSelect(() => onSortSelect);
|
||||
}
|
||||
}, [
|
||||
|
||||
@ -20,7 +20,7 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
|
||||
import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
|
||||
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
|
||||
import { groupArrayItemsBy } from '~/utils/array/groupArrayItemsBy';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
|
||||
type ViewFieldsVisibilityDropdownSectionProps = {
|
||||
fields: Omit<ColumnDefinition<FieldMetadata>, 'size'>[];
|
||||
@ -69,7 +69,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
|
||||
Icon: field.isVisible ? IconMinus : IconPlus,
|
||||
onClick: () => onVisibilityChange(field),
|
||||
},
|
||||
].filter(isNonNullable);
|
||||
].filter(isDefined);
|
||||
|
||||
return iconButtons.length ? iconButtons : undefined;
|
||||
};
|
||||
@ -134,7 +134,7 @@ export const ViewFieldsVisibilityDropdownSection = ({
|
||||
/>
|
||||
)}
|
||||
</DropdownMenuItemsContainer>
|
||||
{isNonNullable(openToolTipIndex) &&
|
||||
{isDefined(openToolTipIndex) &&
|
||||
createPortal(
|
||||
<AppTooltip
|
||||
anchorSelect={`.${title}-${
|
||||
|
||||
@ -20,7 +20,7 @@ import { MOBILE_VIEWPORT } from '@/ui/theme/constants/MobileViewport';
|
||||
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
|
||||
import { VIEWS_DROPDOWN_ID } from '@/views/constants/ViewsDropdownId';
|
||||
import { useViewBar } from '@/views/hooks/useViewBar';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
|
||||
import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
|
||||
|
||||
@ -161,7 +161,7 @@ export const ViewsDropdownButton = ({
|
||||
handleDeleteViewButtonClick(event, view.id),
|
||||
}
|
||||
: null,
|
||||
].filter(isNonNullable)}
|
||||
].filter(isDefined)}
|
||||
onClick={() => handleViewSelect(view.id)}
|
||||
LeftIcon={IconList}
|
||||
text={view.name}
|
||||
|
||||
@ -15,8 +15,8 @@ import { useGenerateFindManyRecordsQuery } from '@/object-record/hooks/useGenera
|
||||
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
|
||||
import { ViewFilter } from '@/views/types/ViewFilter';
|
||||
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isNullable } from '~/utils/isNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||
|
||||
const filterQueryParamsSchema = z.object({
|
||||
filter: z.record(
|
||||
@ -71,7 +71,7 @@ export const useFiltersFromQueryParams = () => {
|
||||
field: fieldMetadataItem,
|
||||
});
|
||||
|
||||
if (isNullable(filterDefinition)) return null;
|
||||
if (isUndefinedOrNull(filterDefinition)) return null;
|
||||
|
||||
const relationObjectMetadataNameSingular =
|
||||
fieldMetadataItem.toRelationMetadata?.fromObjectMetadata
|
||||
@ -97,7 +97,7 @@ export const useFiltersFromQueryParams = () => {
|
||||
|
||||
if (
|
||||
isNonEmptyString(relationObjectMetadataNamePlural) &&
|
||||
isNonNullable(relationObjectMetadataItem) &&
|
||||
isDefined(relationObjectMetadataItem) &&
|
||||
Array.isArray(filterValueFromURL)
|
||||
) {
|
||||
const queryResult = await apolloClient.query<
|
||||
@ -144,7 +144,7 @@ export const useFiltersFromQueryParams = () => {
|
||||
},
|
||||
),
|
||||
)
|
||||
).filter(isNonNullable);
|
||||
).filter(isDefined);
|
||||
},
|
||||
[
|
||||
apolloClient,
|
||||
|
||||
@ -8,7 +8,7 @@ import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
|
||||
import { savedViewSortsScopedFamilyState } from '@/views/states/savedViewSortsScopedFamilyState';
|
||||
import { ViewSort } from '@/views/types/ViewSort';
|
||||
import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
|
||||
import { isNullable } from '~/utils/isNullable';
|
||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||
|
||||
import { useViewScopedStates } from './useViewScopedStates';
|
||||
|
||||
@ -43,7 +43,7 @@ export const useViewSorts = (viewScopeId: string) => {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isNullable(currentViewSorts)) {
|
||||
if (isUndefinedOrNull(currentViewSorts)) {
|
||||
return;
|
||||
}
|
||||
if (!savedViewSortsByKey) {
|
||||
|
||||
@ -9,8 +9,8 @@ import { ViewField } from '@/views/types/ViewField';
|
||||
import { ViewFilter } from '@/views/types/ViewFilter';
|
||||
import { ViewSort } from '@/views/types/ViewSort';
|
||||
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isNullable } from '~/utils/isNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||
|
||||
import { ViewScopeInternalContext } from '../scopes/scope-internal-context/ViewScopeInternalContext';
|
||||
import { currentViewFieldsScopedFamilyState } from '../states/currentViewFieldsScopedFamilyState';
|
||||
@ -114,11 +114,11 @@ export const useViewBar = (props?: UseViewProps) => {
|
||||
viewId: currentViewId,
|
||||
});
|
||||
|
||||
if (isNullable(availableFieldDefinitions)) {
|
||||
if (isUndefinedOrNull(availableFieldDefinitions)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const queriedViewFields = viewFields.filter(isNonNullable);
|
||||
const queriedViewFields = viewFields.filter(isDefined);
|
||||
|
||||
if (isPersistingView) {
|
||||
return;
|
||||
@ -154,7 +154,7 @@ export const useViewBar = (props?: UseViewProps) => {
|
||||
viewId: currentViewId,
|
||||
});
|
||||
|
||||
if (isNullable(availableFilterDefinitions)) {
|
||||
if (isUndefinedOrNull(availableFilterDefinitions)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -173,7 +173,7 @@ export const useViewBar = (props?: UseViewProps) => {
|
||||
definition: availableFilterDefinition,
|
||||
};
|
||||
})
|
||||
.filter(isNonNullable);
|
||||
.filter(isDefined);
|
||||
|
||||
if (!isDeeplyEqual(savedViewFilters, queriedViewFilters)) {
|
||||
set(savedViewFiltersState, queriedViewFilters);
|
||||
@ -220,7 +220,7 @@ export const useViewBar = (props?: UseViewProps) => {
|
||||
definition: availableSortDefinition,
|
||||
};
|
||||
})
|
||||
.filter(isNonNullable);
|
||||
.filter(isDefined);
|
||||
|
||||
if (!isDeeplyEqual(savedViewSorts, queriedViewSorts)) {
|
||||
set(savedViewSortsState, queriedViewSorts);
|
||||
@ -269,11 +269,11 @@ export const useViewBar = (props?: UseViewProps) => {
|
||||
viewScopeId: scopeId,
|
||||
});
|
||||
|
||||
if (isNonNullable(savedViewFilters)) {
|
||||
if (isDefined(savedViewFilters)) {
|
||||
set(currentViewFiltersState, savedViewFilters);
|
||||
onViewFiltersChange?.(savedViewFilters);
|
||||
}
|
||||
if (isNonNullable(savedViewSorts)) {
|
||||
if (isDefined(savedViewSorts)) {
|
||||
set(currentViewSortsState, savedViewSorts);
|
||||
onViewSortsChange?.(savedViewSorts);
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@ import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata'
|
||||
import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
|
||||
import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
|
||||
import { moveArrayItem } from '~/utils/array/moveArrayItem';
|
||||
import { isNonNullable } from '~/utils/isNonNullable';
|
||||
import { isNullable } from '~/utils/isNullable';
|
||||
import { isDefined } from '~/utils/isDefined';
|
||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||
|
||||
import { ViewField } from '../types/ViewField';
|
||||
|
||||
@ -26,7 +26,7 @@ export const mapViewFieldsToColumnDefinitions = ({
|
||||
const correspondingColumnDefinition =
|
||||
columnDefinitionsByFieldMetadataId[viewField.fieldMetadataId];
|
||||
|
||||
if (isNullable(correspondingColumnDefinition)) return null;
|
||||
if (isUndefinedOrNull(correspondingColumnDefinition)) return null;
|
||||
|
||||
const { isLabelIdentifier } = correspondingColumnDefinition;
|
||||
|
||||
@ -49,7 +49,7 @@ export const mapViewFieldsToColumnDefinitions = ({
|
||||
viewFieldId: viewField.id,
|
||||
};
|
||||
})
|
||||
.filter(isNonNullable);
|
||||
.filter(isDefined);
|
||||
|
||||
// No label identifier set for this object
|
||||
if (!labelIdentifierFieldMetadataId) return columnDefinitionsFromViewFields;
|
||||
|
||||
Reference in New Issue
Block a user