Skip to content

fix [properties-fe] - filter current entity from entity selection list #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielkweon merged 1 commit into from
Dec 15, 2025
Merged

fix [properties-fe] - filter current entity from entity selection list #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions js/app/packages/core/component/Properties/component/modal/shared/PropertyEntitySelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useBlockId } from '@core/block';
import { useChannelsContext } from '@core/component/ChannelsProvider';
import { EntityIcon } from '@core/component/EntityIcon';
import { UserIcon } from '@core/component/UserIcon';
Expand Down Expand Up @@ -31,6 +32,7 @@ import {
on,
Show,
} from 'solid-js';
import { usePropertiesContext } from '../../../context/PropertiesContext';
import { PROPERTY_STYLES } from '../../../styles/styles';
import type { Property } from '../../../types';
import { useSearchInputFocus } from '../../../utils';
Expand Down Expand Up @@ -205,6 +207,10 @@ export function PropertyEntitySelector(props: EntityInputProps) {

let searchInputRef!: HTMLInputElement;

// Get current entity context for self-filtering
const blockId = useBlockId();
const { entityType: currentEntityType } = usePropertiesContext();

const history = useHistory();
const contacts = useContacts();
const channelsContext = useChannelsContext();
Expand Down Expand Up @@ -315,17 +321,26 @@ export function PropertyEntitySelector(props: EntityInputProps) {
const MAX_VISIBLE_ENTITIES_NO_SEARCH = 50;
const MAX_SEARCH_RESULTS = 20;

// Filter out the current entity when selecting same entity type (e.g., parent task on a task)
const excludeFilter = (e: CombinedEntity) =>
!(getEntityType(e) === currentEntityType && e.id === blockId);

// Get visible entities based on search
const localResults = term
? entitySearch(allEntities, term)
.slice(0, MAX_SEARCH_RESULTS)
.map((result) => result.item)
: allEntities.slice(0, MAX_VISIBLE_ENTITIES_NO_SEARCH);
.filter(excludeFilter)
: allEntities
.filter(excludeFilter)
.slice(0, MAX_VISIBLE_ENTITIES_NO_SEARCH);

// For THREAD: merge local + server results (local first, server appended, deduped)
if (props.property.specificEntityType === 'THREAD' && term) {
const localIds = new Set(localResults.map((e) => e.id));
const serverResults = serverEmails().filter((e) => !localIds.has(e.id));
const serverResults = serverEmails()
.filter((e) => !localIds.has(e.id))
.filter(excludeFilter);
return [...localResults, ...serverResults].slice(0, MAX_SEARCH_RESULTS);
}

Expand Down