Raphaël Bosi
7dac60cfee
Fixes #11038 # Fix useFindManyRecords withSoftDeleterFilter The error came from a faulty implementation of the `withSoftDeleted` parameter inside `useFindManyRecords` and from the fact that `withSoftDeleted: true` was added to access deleted records actions. However, this parameter was always set in `useFindManyRecordsSelectedInContextStore` instead of considering whether the filter was active or not. ``` const withSoftDeleterFilter = { or: [{ deletedAt: { is: 'NULL' } }, { deletedAt: { is: 'NOT_NULL' } }], }; ``` The final filter was incorrectly doing an `or` operation between the base filter and `withSoftDeleterFilter` when it should have been an `and`: ``` filter: { ...filter, ...(withSoftDeleted ? withSoftDeleterFilter : {}), } ``` The correct implementation should be: ``` filter: filter || withSoftDeleted ? { and: [ ...(filter ? [filter] : []), ...(withSoftDeleted ? [withSoftDeleterFilter] : []), ], } : undefined, ``` # Fix useFindManyRecordsSelectedInContextStore - Check if the soft deleted filter is active before using the `withSoftDeleterFilter` parameter
59 lines
2.4 KiB
TypeScript
59 lines
2.4 KiB
TypeScript
import { CommandMenuContextRecordsChip } from '@/command-menu/components/CommandMenuContextRecordsChip';
|
|
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
|
|
import { COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID } from '@/command-menu/constants/CommandMenuPreviousComponentInstanceId';
|
|
import { RESET_CONTEXT_TO_SELECTION } from '@/command-menu/constants/ResetContextToSelection';
|
|
import { useResetPreviousCommandMenuContext } from '@/command-menu/hooks/useResetPreviousCommandMenuContext';
|
|
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
|
|
import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
|
|
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
|
|
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
|
|
import { t } from '@lingui/core/macro';
|
|
import { useRecoilValue } from 'recoil';
|
|
import { isDefined } from 'twenty-shared';
|
|
import { IconArrowBackUp } from 'twenty-ui';
|
|
|
|
export const ResetContextToSelectionCommandButton = () => {
|
|
const contextStoreTargetedRecordsRule = useRecoilComponentValueV2(
|
|
contextStoreTargetedRecordsRuleComponentState,
|
|
'command-menu-previous',
|
|
);
|
|
|
|
const contextStoreCurrentObjectMetadataItemId = useRecoilComponentValueV2(
|
|
contextStoreCurrentObjectMetadataItemIdComponentState,
|
|
'command-menu-previous',
|
|
);
|
|
|
|
const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
|
|
|
|
const objectMetadataItem = objectMetadataItems.find(
|
|
(objectMetadataItem) =>
|
|
objectMetadataItem.id === contextStoreCurrentObjectMetadataItemId,
|
|
);
|
|
|
|
const { resetPreviousCommandMenuContext } =
|
|
useResetPreviousCommandMenuContext();
|
|
|
|
if (
|
|
!isDefined(objectMetadataItem) ||
|
|
(contextStoreTargetedRecordsRule.mode === 'selection' &&
|
|
contextStoreTargetedRecordsRule.selectedRecordIds.length === 0)
|
|
) {
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<CommandMenuItem
|
|
id={RESET_CONTEXT_TO_SELECTION}
|
|
Icon={IconArrowBackUp}
|
|
label={t`Reset to`}
|
|
RightComponent={
|
|
<CommandMenuContextRecordsChip
|
|
objectMetadataItemId={objectMetadataItem.id}
|
|
instanceId={COMMAND_MENU_PREVIOUS_COMPONENT_INSTANCE_ID}
|
|
/>
|
|
}
|
|
onClick={resetPreviousCommandMenuContext}
|
|
/>
|
|
);
|
|
};
|