Renamed nullable utils into isDefined and isUndefinedOrNull (#4402)
* Renamed nullable utils into isDefined and isUndefinedOrNull
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user