The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add object type filter dropdown to side panel record searches (#18912)
Félix Malfait5f0d6553f61a
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 744a9655afa..30c2c8492b8 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4089,6 +4089,7 @@ input UpdateObjectPayload {labelIdentifierFieldMetadataId: UUIDimageIdentifierFieldMetadataId: UUIDisLabelSyncedWithName: Boolean+ isSearchable: Boolean}input UpdateViewFieldInput {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 223aba8d0b1..5597570cf2d 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -6475,7 +6475,7 @@ export interface UpdateOneObjectInput {update: UpdateObjectPayload,/** The id of the object to update */id: Scalars['UUID']}-export interface UpdateObjectPayload {labelSingular?: (Scalars['String'] | null),labelPlural?: (Scalars['String'] | null),nameSingular?: (Scalars['String'] | null),namePlural?: (Scalars['String'] | null),description?: (Scalars['String'] | null),icon?: (Scalars['String'] | null),shortcut?: (Scalars['String'] | null),color?: (Scalars['String'] | null),isActive?: (Scalars['Boolean'] | null),labelIdentifierFieldMetadataId?: (Scalars['UUID'] | null),imageIdentifierFieldMetadataId?: (Scalars['UUID'] | null),isLabelSyncedWithName?: (Scalars['Boolean'] | null)}+export interface UpdateObjectPayload {labelSingular?: (Scalars['String'] | null),labelPlural?: (Scalars['String'] | null),nameSingular?: (Scalars['String'] | null),namePlural?: (Scalars['String'] | null),description?: (Scalars['String'] | null),icon?: (Scalars['String'] | null),shortcut?: (Scalars['String'] | null),color?: (Scalars['String'] | null),isActive?: (Scalars['Boolean'] | null),labelIdentifierFieldMetadataId?: (Scalars['UUID'] | null),imageIdentifierFieldMetadataId?: (Scalars['UUID'] | null),isLabelSyncedWithName?: (Scalars['Boolean'] | null),isSearchable?: (Scalars['Boolean'] | null)}export interface UpdateViewFieldInput {/** The id of the view field to update */diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 2eacb101169..ada7e65f35a 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -10303,6 +10303,9 @@ export default {"isLabelSyncedWithName": [6],+ "isSearchable": [+ 6+ ],"__typename": [1]diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 101dee58dd0..8878efcbf8b 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -5326,6 +5326,7 @@ export type UpdateObjectPayload = {imageIdentifierFieldMetadataId?: InputMaybe<Scalars['UUID']>;isActive?: InputMaybe<Scalars['Boolean']>;isLabelSyncedWithName?: InputMaybe<Scalars['Boolean']>;+ isSearchable?: InputMaybe<Scalars['Boolean']>;labelIdentifierFieldMetadataId?: InputMaybe<Scalars['UUID']>;labelPlural?: InputMaybe<Scalars['String']>;labelSingular?: InputMaybe<Scalars['String']>;diff --git a/packages/twenty-front/src/modules/mention/hooks/useMentionSearch.ts b/packages/twenty-front/src/modules/mention/hooks/useMentionSearch.tsindex 9b54038cd82..2bb6eabbad0 100644--- a/packages/twenty-front/src/modules/mention/hooks/useMentionSearch.ts+++ b/packages/twenty-front/src/modules/mention/hooks/useMentionSearch.ts@@ -1,8 +1,8 @@import { SEARCH_QUERY } from '@/command-menu/graphql/queries/search';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { useCallback, useMemo } from 'react';import {type SearchQuery,@@ -19,15 +19,10 @@ export const useMentionSearch = () => {const searchableObjectMetadataItems = useMemo(() =>- activeObjectMetadataItems.filter(- (item) =>- !item.isSystem &&- item.isSearchable &&- getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: item.id,- }).canReadObjectRecords === true,- ),+ filterReadableActiveObjectMetadataItems(+ activeObjectMetadataItems,+ objectPermissionsByObjectMetadataId,+ ).filter((item) => !item.isSystem && item.isSearchable),[activeObjectMetadataItems, objectPermissionsByObjectMetadataId],);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsxindex 937fae6749e..8a3b253ae61 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx@@ -1,18 +1,19 @@import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';+import { useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { useDebounce } from 'use-debounce';import { MAX_SEARCH_RESULTS } from '@/command-menu/constants/MaxSearchResults';import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';+import { SidePanelObjectFilterDropdown } from '@/side-panel/components/SidePanelObjectFilterDropdown';+import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { SidePanelNewSidebarItemRecordItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem';import { useQuery } from '@apollo/client/react';import { SearchDocument } from '~/generated/graphql';@@ -27,21 +28,30 @@ type SearchRecordBase = {export const SidePanelNewSidebarItemRecordSubPage = () => {const { t } = useLingui();const { currentDraft } = useDraftNavigationMenuItems();- const { objectMetadataItems } = useObjectMetadataItems();const [recordSearchInput, setRecordSearchInput] = useState('');const [deferredRecordSearchInput] = useDebounce(recordSearchInput, 300);const coreClient = useApolloCoreClient();- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();+ const { readableObjectMetadataItems } = useReadableObjectMetadataItems();+ const [selectedObjectNameSingular, setSelectedObjectNameSingular] = useState<+ string | null+ >(null);+ const sidePanelShowHiddenObjects = useAtomStateValue(+ sidePanelShowHiddenObjectsState,+ );++ const includedObjectNameSingulars = useMemo(() => {+ if (isDefined(selectedObjectNameSingular)) {+ return [selectedObjectNameSingular];+ }- const nonReadableObjectMetadataItemsNameSingular = objectMetadataItems- .filter(- (objectMetadataItem) =>- !getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- })?.canReadObjectRecords,- )- .map((objectMetadataItem) => objectMetadataItem.nameSingular);+ return readableObjectMetadataItems+ .filter((item) => sidePanelShowHiddenObjects || item.isSearchable)+ .map((item) => item.nameSingular);+ }, [+ readableObjectMetadataItems,+ selectedObjectNameSingular,+ sidePanelShowHiddenObjects,+ ]);const { data: searchData, loading: recordSearchLoading } = useQuery(SearchDocument,@@ -50,10 +60,7 @@ export const SidePanelNewSidebarItemRecordSubPage = () => {variables: {searchInput: deferredRecordSearchInput ?? '',limit: MAX_SEARCH_RESULTS,- excludedObjectNameSingulars: [- 'workspaceMember',- ...nonReadableObjectMetadataItemsNameSingular,- ],+ includedObjectNameSingulars,},},);@@ -84,6 +91,12 @@ export const SidePanelNewSidebarItemRecordSubPage = () => {searchPlaceholder={t`Search records...`}searchValue={recordSearchInput}onSearchChange={setRecordSearchInput}+ rightElement={+ <SidePanelObjectFilterDropdown+ selectedObjectNameSingular={selectedObjectNameSingular}+ onSelectObject={setSelectedObjectNameSingular}+ />+ }><SidePanelAddToNavigationDroppable>{({ innerRef, droppableProps, placeholder }) => (diff --git a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.tsindex ccf8d3bf0c4..72802253f8e 100644--- a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts+++ b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts@@ -2,8 +2,8 @@ import { currentUserState } from '@/auth/states/currentUserState';import { lastVisitedObjectMetadataItemIdState } from '@/navigation/states/lastVisitedObjectMetadataItemIdState';import { type ObjectPathInfo } from '@/navigation/types/ObjectPathInfo';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import isEmpty from 'lodash.isempty';@@ -17,29 +17,26 @@ export const useDefaultHomePagePath = () => {const currentUser = useAtomStateValue(currentUserState);const { objectPermissionsByObjectMetadataId } = useObjectPermissions();- const { alphaSortedActiveNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();+ const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();- const readableAlphaSortedActiveNonSystemObjectMetadataItems = useMemo(() => {- return alphaSortedActiveNonSystemObjectMetadataItems.filter((item) => {- const objectPermissions = getObjectPermissionsFromMapByObjectMetadataId({+ const readableNonSystemObjectMetadataItems = useMemo(+ () =>+ filterReadableActiveObjectMetadataItems(+ activeObjectMetadataItems,objectPermissionsByObjectMetadataId,- objectMetadataId: item.id,- });- return objectPermissions?.canReadObjectRecords;- });- }, [- alphaSortedActiveNonSystemObjectMetadataItems,- objectPermissionsByObjectMetadataId,- ]);+ )+ .filter((item) => !item.isSystem)+ .sort((a, b) => a.nameSingular.localeCompare(b.nameSingular)),+ [activeObjectMetadataItems, objectPermissionsByObjectMetadataId],+ );const getActiveObjectMetadataItemMatchingId = useCallback((objectMetadataId: string) => {- return readableAlphaSortedActiveNonSystemObjectMetadataItems.find(+ return readableNonSystemObjectMetadataItems.find((item) => item.id === objectMetadataId,);},- [readableAlphaSortedActiveNonSystemObjectMetadataItems],+ [readableNonSystemObjectMetadataItems],);const views = useAtomStateValue(viewsSelector);@@ -54,8 +51,7 @@ export const useDefaultHomePagePath = () => {);const firstObjectPathInfo = useMemo<ObjectPathInfo | null>(() => {- const [firstObjectMetadataItem] =- readableAlphaSortedActiveNonSystemObjectMetadataItems;+ const [firstObjectMetadataItem] = readableNonSystemObjectMetadataItems;if (!isDefined(firstObjectMetadataItem)) {return null;@@ -64,7 +60,7 @@ export const useDefaultHomePagePath = () => {const view = getFirstView(firstObjectMetadataItem?.id);return { objectMetadataItem: firstObjectMetadataItem, view };- }, [getFirstView, readableAlphaSortedActiveNonSystemObjectMetadataItems]);+ }, [getFirstView, readableNonSystemObjectMetadataItems]);const getDefaultObjectPathInfo = useCallback(() => {const lastVisitedObjectMetadataItemId = store.get(@@ -97,7 +93,7 @@ export const useDefaultHomePagePath = () => {return AppPath.SignInUp;}- if (isEmpty(readableAlphaSortedActiveNonSystemObjectMetadataItems)) {+ if (isEmpty(readableNonSystemObjectMetadataItems)) {return getSettingsPath(SettingsPath.ProfilePage);}@@ -118,7 +114,7 @@ export const useDefaultHomePagePath = () => {}, [currentUser,getDefaultObjectPathInfo,- readableAlphaSortedActiveNonSystemObjectMetadataItems,+ readableNonSystemObjectMetadataItems,]);return { defaultHomePagePath };diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useReadableObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useReadableObjectMetadataItems.tsnew file mode 100644index 00000000000..ddf4577c13f--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useReadableObjectMetadataItems.ts@@ -0,0 +1,21 @@+import { useMemo } from 'react';++import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';+import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';++export const useReadableObjectMetadataItems = () => {+ const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();+ const { objectPermissionsByObjectMetadataId } = useObjectPermissions();++ const readableObjectMetadataItems = useMemo(+ () =>+ filterReadableActiveObjectMetadataItems(+ activeObjectMetadataItems,+ objectPermissionsByObjectMetadataId,+ ),+ [activeObjectMetadataItems, objectPermissionsByObjectMetadataId],+ );++ return { readableObjectMetadataItems };+};diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsxindex ecfe43f5c10..c44fa2a9e6c 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx@@ -3,7 +3,9 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enricheimport { useDeleteOneObjectMetadataItem } from '@/object-metadata/hooks/useDeleteOneObjectMetadataItem';import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';+import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';import { SettingsUpdateDataModelObjectAboutForm } from '@/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm';+import { SettingsObjectSearchSection } from '@/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection';import { SettingsDataModelObjectSettingsFormCard } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';@@ -114,6 +116,20 @@ export const ObjectSettings = ({/></Section></StyledFormSectionContainer>+ <AdvancedSettingsWrapper>+ <StyledFormSectionContainer>+ <Section>+ <H2Title+ title={t`Search`}+ description={t`Configure how this object appears in search results`}+ />+ <SettingsObjectSearchSection+ objectMetadataItem={objectMetadataItem}+ isReadOnly={isReadOnly}+ />+ </Section>+ </StyledFormSectionContainer>+ </AdvancedSettingsWrapper>{!isReadOnly && (<StyledFormSectionContainer><Section>diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsxnew file mode 100644index 00000000000..3e74e06bf53--- /dev/null+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx@@ -0,0 +1,194 @@+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { SEARCH_VECTOR_FIELD_NAME } from '@/object-record/constants/SearchVectorFieldName';+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';+import { SettingsObjectFieldDataType } from '@/settings/data-model/object-details/components/SettingsObjectFieldDataType';+import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';+import { Table } from '@/ui/layout/table/components/Table';+import { TableCell } from '@/ui/layout/table/components/TableCell';+import { TableHeader } from '@/ui/layout/table/components/TableHeader';+import { TableRow } from '@/ui/layout/table/components/TableRow';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { useContext, useMemo, useState } from 'react';++import { IconEye, IconSearch, useIcons } from 'twenty-ui/display';+import { Card } from 'twenty-ui/layout';+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';++type SettingsObjectSearchSectionProps = {+ objectMetadataItem: EnrichedObjectMetadataItem;+ isReadOnly: boolean;+};++type IndexedFieldEntry = {+ id: string;+ label: string;+ icon?: string | null;+ weight: number;+ fieldType: string;+};++const StyledSearchSectionContent = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+`;++const StyledNameLabel = styled.div`+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+`;++const INDEXED_FIELDS_GRID_TEMPLATE_COLUMNS = 'minmax(0, 1fr) 100px 148px';++// TODO: This is very DIRTY ; let's migrate searchVector to be proper tables+// Already tracked here: https://github.com/twentyhq/core-team-issues/issues/1428+const extractIndexedFields = (+ objectMetadataItem: EnrichedObjectMetadataItem,+): IndexedFieldEntry[] => {+ const searchVectorField = objectMetadataItem.fields.find(+ (field) => field.name === SEARCH_VECTOR_FIELD_NAME,+ );++ const asExpression = (+ searchVectorField?.settings as { asExpression?: string } | null+ )?.asExpression;++ if (!asExpression) {+ return [];+ }++ const columnNames = [+ ...new Set(+ Array.from(asExpression.matchAll(/"([^"]+)"/g), (match) => match[1]),+ ),+ ];++ const seenFieldIds = new Set<string>();+ const entries: IndexedFieldEntry[] = [];++ for (const columnName of columnNames) {+ const field = objectMetadataItem.fields.find(+ (fieldItem) =>+ fieldItem.name === columnName || columnName.startsWith(fieldItem.name),+ );++ if (+ field &&+ field.name !== SEARCH_VECTOR_FIELD_NAME &&+ !seenFieldIds.has(field.id)+ ) {+ seenFieldIds.add(field.id);++ entries.push({+ id: field.id,+ label: field.label,+ icon: field.icon,+ weight: 1,+ fieldType: field.type,+ });+ }+ }++ return entries;+};++export const SettingsObjectSearchSection = ({+ objectMetadataItem,+ isReadOnly,+}: SettingsObjectSearchSectionProps) => {+ const { t } = useLingui();+ const { getIcon } = useIcons();+ const { theme } = useContext(ThemeContext);+ const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();++ const [isSearchable, setIsSearchable] = useState(+ objectMetadataItem.isSearchable,+ );+ const [searchTerm, setSearchTerm] = useState('');++ const indexedFields = useMemo(+ () => extractIndexedFields(objectMetadataItem),+ [objectMetadataItem],+ );++ const filteredIndexedFields = searchTerm+ ? indexedFields.filter((entry) =>+ entry.label.toLowerCase().includes(searchTerm.toLowerCase()),+ )+ : indexedFields;++ const handleToggleSearchable = async (value: boolean) => {+ setIsSearchable(value);+ await updateOneObjectMetadataItem({+ idToUpdate: objectMetadataItem.id,+ updatePayload: { isSearchable: value },+ });+ };++ return (+ <StyledSearchSectionContent>+ {!isReadOnly && (+ <Card rounded>+ <SettingsOptionCardContentToggle+ Icon={IconEye}+ title={t`Include in default search`}+ description={t`If disabled, use advanced search filters to find these records`}+ checked={isSearchable}+ advancedMode+ onChange={handleToggleSearchable}+ />+ </Card>+ )}+ {indexedFields.length > 0 && (+ <>+ <SettingsTextInput+ instanceId="indexed-fields-search"+ LeftIcon={IconSearch}+ placeholder={t`Search across indexed fields...`}+ value={searchTerm}+ onChange={setSearchTerm}+ />+ <Table>+ <TableRow+ gridTemplateColumns={INDEXED_FIELDS_GRID_TEMPLATE_COLUMNS}+ >+ <TableHeader>{t`Name`}</TableHeader>+ <TableHeader>{t`Weight`}</TableHeader>+ <TableHeader>{t`Data type`}</TableHeader>+ </TableRow>+ {filteredIndexedFields.map((entry) => {+ const FieldIcon = getIcon(entry.icon);+ return (+ <TableRow+ key={entry.id}+ gridTemplateColumns={INDEXED_FIELDS_GRID_TEMPLATE_COLUMNS}+ >+ <TableCell+ color={theme.font.color.primary}+ gap={theme.spacing[2]}+ >+ <FieldIcon+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ <StyledNameLabel>{entry.label}</StyledNameLabel>+ </TableCell>+ <TableCell>{entry.weight}</TableCell>+ <TableCell>+ <SettingsObjectFieldDataType+ value={entry.fieldType as SettingsFieldType}+ />+ </TableCell>+ </TableRow>+ );+ })}+ </Table>+ </>+ )}+ </StyledSearchSectionContent>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsxnew file mode 100644index 00000000000..d14a053c85c--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdown.tsx@@ -0,0 +1,44 @@+import { useLingui } from '@lingui/react/macro';+import { isDefined } from 'twenty-shared/utils';+import { IconFilter } from 'twenty-ui/display';+import { IconButton } from 'twenty-ui/input';++import { SidePanelObjectFilterDropdownContent } from '@/side-panel/components/SidePanelObjectFilterDropdownContent';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';++export const OBJECT_FILTER_DROPDOWN_ID = 'side-panel-object-filter-dropdown';++type SidePanelObjectFilterDropdownProps = {+ selectedObjectNameSingular: string | null;+ onSelectObject: (objectNameSingular: string | null) => void;+};++export const SidePanelObjectFilterDropdown = ({+ selectedObjectNameSingular,+ onSelectObject,+}: SidePanelObjectFilterDropdownProps) => {+ const { t } = useLingui();+ const isFilterActive = isDefined(selectedObjectNameSingular);++ return (+ <Dropdown+ dropdownId={OBJECT_FILTER_DROPDOWN_ID}+ dropdownPlacement="bottom-end"+ clickableComponent={+ <IconButton+ Icon={IconFilter}+ variant="tertiary"+ accent={isFilterActive ? 'blue' : 'default'}+ size="small"+ ariaLabel={t`Filter by object type`}+ />+ }+ dropdownComponents={+ <SidePanelObjectFilterDropdownContent+ selectedObjectNameSingular={selectedObjectNameSingular}+ onSelectObject={onSelectObject}+ />+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsxnew file mode 100644index 00000000000..e6cebd84078--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx@@ -0,0 +1,149 @@+import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';+import { IconCube, useIcons } from 'twenty-ui/display';+import { MenuItemSelectAvatar, MenuItemToggle } from 'twenty-ui/navigation';++import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { OBJECT_FILTER_DROPDOWN_ID } from '@/side-panel/components/SidePanelObjectFilterDropdown';+import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';++const ALL_OBJECTS_ITEM_ID = 'all-objects';++type SidePanelObjectFilterDropdownContentProps = {+ selectedObjectNameSingular: string | null;+ onSelectObject: (objectNameSingular: string | null) => void;+};++export const SidePanelObjectFilterDropdownContent = ({+ selectedObjectNameSingular,+ onSelectObject,+}: SidePanelObjectFilterDropdownContentProps) => {+ const { t } = useLingui();+ const { getIcon } = useIcons();+ const [filterSearch, setFilterSearch] = useState('');+ const [sidePanelShowHiddenObjects, setSidePanelShowHiddenObjects] =+ useAtomState(sidePanelShowHiddenObjectsState);+ const { readableObjectMetadataItems } = useReadableObjectMetadataItems();+ const { closeDropdown } = useCloseDropdown();++ const searchFilter = filterSearch.toLowerCase();++ const displayedObjects = readableObjectMetadataItems.filter((item) => {+ if (+ OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS.includes(+ item.nameSingular as (typeof OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS)[number],+ )+ ) {+ return false;+ }++ if (!sidePanelShowHiddenObjects && !item.isSearchable) {+ return false;+ }++ return item.labelPlural.toLowerCase().includes(searchFilter);+ });++ const handleSelect = (objectNameSingular: string | null) => {+ onSelectObject(objectNameSingular);+ closeDropdown(OBJECT_FILTER_DROPDOWN_ID);+ };++ const selectableItemIdArray = [+ ALL_OBJECTS_ITEM_ID,+ ...displayedObjects.map((item) => item.nameSingular),+ ];++ const selectedItemId = useAtomComponentStateValue(+ selectedItemIdComponentState,+ OBJECT_FILTER_DROPDOWN_ID,+ );++ return (+ <DropdownContent>+ <DropdownMenuHeader>{t`Object`}</DropdownMenuHeader>+ <DropdownMenuSearchInput+ value={filterSearch}+ onChange={(event) => setFilterSearch(event.target.value)}+ autoFocus+ />+ <DropdownMenuSeparator />+ <SelectableList+ selectableListInstanceId={OBJECT_FILTER_DROPDOWN_ID}+ focusId={OBJECT_FILTER_DROPDOWN_ID}+ selectableItemIdArray={selectableItemIdArray}+ >+ <DropdownMenuItemsContainer hasMaxHeight>+ <SelectableListItem+ itemId={ALL_OBJECTS_ITEM_ID}+ onEnter={() => handleSelect(null)}+ >+ <MenuItemSelectAvatar+ avatar={+ <NavigationMenuItemStyleIcon Icon={IconCube} color="gray" />+ }+ text={t`All objects`}+ selected={selectedObjectNameSingular === null}+ onClick={() => handleSelect(null)}+ focused={selectedItemId === ALL_OBJECTS_ITEM_ID}+ />+ </SelectableListItem>+ {displayedObjects.map((objectMetadataItem) => {+ const ObjectIcon = getIcon(objectMetadataItem.icon);+ const iconColor = getObjectColorWithFallback(objectMetadataItem);++ return (+ <SelectableListItem+ key={objectMetadataItem.id}+ itemId={objectMetadataItem.nameSingular}+ onEnter={() => handleSelect(objectMetadataItem.nameSingular)}+ >+ <MenuItemSelectAvatar+ avatar={+ <NavigationMenuItemStyleIcon+ Icon={ObjectIcon}+ color={iconColor}+ />+ }+ text={objectMetadataItem.labelPlural}+ selected={+ selectedObjectNameSingular ===+ objectMetadataItem.nameSingular+ }+ onClick={() => handleSelect(objectMetadataItem.nameSingular)}+ focused={selectedItemId === objectMetadataItem.nameSingular}+ />+ </SelectableListItem>+ );+ })}+ </DropdownMenuItemsContainer>+ </SelectableList>+ <DropdownMenuSeparator />+ <DropdownMenuItemsContainer>+ <MenuItemToggle+ LeftIcon={IconCube}+ onToggleChange={() =>+ setSidePanelShowHiddenObjects(!sidePanelShowHiddenObjects)+ }+ toggled={sidePanelShowHiddenObjects}+ text={t`Show hidden objects`}+ toggleSize="small"+ />+ </DropdownMenuItemsContainer>+ </DropdownContent>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsxindex e9ac2e64084..45ed832ff44 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsx@@ -53,6 +53,7 @@ type SidePanelSubViewWithSearchProps = {searchValue: string;onSearchChange: (value: string) => void;searchInputProps?: React.InputHTMLAttributes<HTMLInputElement>;+ rightElement?: ReactNode;children?: ReactNode;};@@ -61,6 +62,7 @@ export const SidePanelSubViewWithSearch = ({searchValue,onSearchChange,searchInputProps,+ rightElement,children,}: SidePanelSubViewWithSearchProps) => (<StyledSubViewContainer>@@ -73,6 +75,7 @@ export const SidePanelSubViewWithSearch = ({// oxlint-disable-next-line react/jsx-props-no-spreading{...searchInputProps}/>+ {rightElement}</StyledSearchContainer>{children != null && (<StyledScrollableListWrapper>{children}</StyledScrollableListWrapper>diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsxindex 09256089ba1..3e7c1a36de9 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarRightCornerIcon.tsx@@ -1,16 +1,17 @@-import { useOpenAskAIPageInSidePanel } from '@/side-panel/hooks/useOpenAskAIPageInSidePanel';+import { useSwitchToNewAIChat } from '@/ai/hooks/useSwitchToNewAIChat';+import { SidePanelObjectFilterDropdown } from '@/side-panel/components/SidePanelObjectFilterDropdown';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';+import { sidePanelSearchObjectFilterState } from '@/side-panel/states/sidePanelSearchObjectFilterState';+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { SidePanelPages } from 'twenty-shared/types';-import { IconEdit, IconSparkles } from 'twenty-ui/display';+import { IconEdit } from 'twenty-ui/display';import { IconButton } from 'twenty-ui/input';import { useIsMobile } from 'twenty-ui/utilities';import { FeatureFlagKey } from '~/generated-metadata/graphql';--import { useSwitchToNewAIChat } from '@/ai/hooks/useSwitchToNewAIChat';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledIconButtonContainer = styled.div`@@ -21,11 +22,19 @@ export const SidePanelTopBarRightCornerIcon = () => {const isMobile = useIsMobile();const isAiEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_AI_ENABLED);const sidePanelPage = useAtomStateValue(sidePanelPageState);- const { openAskAIPage } = useOpenAskAIPageInSidePanel();const { switchToNewChat } = useSwitchToNewAIChat();+ const [sidePanelSearchObjectFilter, setSidePanelSearchObjectFilter] =+ useAtomState(sidePanelSearchObjectFilterState);- if (isMobile || !isAiEnabled) {- return null;+ const isOnSearchPage = sidePanelPage === SidePanelPages.SearchRecords;++ if (isOnSearchPage) {+ return (+ <SidePanelObjectFilterDropdown+ selectedObjectNameSingular={sidePanelSearchObjectFilter}+ onSelectObject={setSidePanelSearchObjectFilter}+ />+ );}const isOnAskAIPage = [@@ -33,17 +42,8 @@ export const SidePanelTopBarRightCornerIcon = () => {SidePanelPages.ViewPreviousAIChats,].includes(sidePanelPage);- if (!isOnAskAIPage) {- return (- <StyledIconButtonContainer>- <IconButton- onClick={() => openAskAIPage({ resetNavigationStack: false })}- Icon={IconSparkles}- variant="tertiary"- size="small"- />- </StyledIconButtonContainer>- );+ if (isMobile || !isAiEnabled || !isOnAskAIPage) {+ return null;}return (diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.tsindex c6660de1c14..54ef3aae67e 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts@@ -7,7 +7,9 @@ import { sidePanelNavigationMorphItemsByPageState } from '@/side-panel/states/siimport { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState';import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';+import { sidePanelSearchObjectFilterState } from '@/side-panel/states/sidePanelSearchObjectFilterState';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';+import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';import { hasUserSelectedSidePanelListItemState } from '@/side-panel/states/hasUserSelectedSidePanelListItemState';import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';@@ -104,6 +106,8 @@ export const useSidePanelCloseAnimationCompleteCleanup = () => {});store.set(isSidePanelOpenedState.atom, false);store.set(sidePanelSearchState.atom, '');+ store.set(sidePanelSearchObjectFilterState.atom, null);+ store.set(sidePanelShowHiddenObjectsState.atom, false);store.set(sidePanelNavigationMorphItemsByPageState.atom, new Map());store.set(sidePanelNavigationStackState.atom, []);resetSelectedItem();diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.tsindex 17be98a3e90..f2e3bce0b76 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts@@ -5,6 +5,7 @@ import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';+import { sidePanelSearchObjectFilterState } from '@/side-panel/states/sidePanelSearchObjectFilterState';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';import { emitSidePanelOpenEvent } from '@/ui/layout/side-panel/utils/emitSidePanelOpenEvent';@@ -80,6 +81,7 @@ export const useSidePanelMenu = () => {const isSidePanelOpened = store.get(isSidePanelOpenedState.atom);store.set(sidePanelSearchState.atom, '');+ store.set(sidePanelSearchObjectFilterState.atom, null);if (isSidePanelOpened) {closeSidePanelMenu();diff --git a/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecords.tsx b/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecords.tsxindex b5a5d87bcaa..798c8d1aae5 100644--- a/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecords.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/search/hooks/useSidePanelSearchRecords.tsx@@ -3,16 +3,17 @@ import { CommandLink } from '@/command-menu-item/display/components/CommandLink'import { CommandMenuItemScope } from '@/command-menu-item/types/CommandMenuItemScope';import { CommandMenuItemType } from '@/command-menu-item/types/CommandMenuItemType';import { MAX_SEARCH_RESULTS } from '@/command-menu/constants/MaxSearchResults';+import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';+import { sidePanelSearchObjectFilterState } from '@/side-panel/states/sidePanelSearchObjectFilterState';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';+import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { CoreObjectNameSingular, AppPath } from 'twenty-shared/types';-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { t } from '@lingui/core/macro';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useMemo } from 'react';+import { isDefined } from 'twenty-shared/utils';import { Avatar } from 'twenty-ui/display';import { useDebounce } from 'use-debounce';import { useQuery } from '@apollo/client/react';@@ -20,34 +21,37 @@ import { SearchDocument } from '~/generated/graphql';export const useSidePanelSearchRecords = () => {const sidePanelSearch = useAtomStateValue(sidePanelSearchState);+ const sidePanelSearchObjectFilter = useAtomStateValue(+ sidePanelSearchObjectFilterState,+ );+ const sidePanelShowHiddenObjects = useAtomStateValue(+ sidePanelShowHiddenObjectsState,+ );const coreClient = useApolloCoreClient();const [deferredSidePanelSearch] = useDebounce(sidePanelSearch, 300);- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();- const { objectMetadataItems } = useObjectMetadataItems();+ const { readableObjectMetadataItems } = useReadableObjectMetadataItems();- const nonReadableObjectMetadataItemsNameSingular = useMemo(() => {- return Object.values(objectMetadataItems)- .filter((objectMetadataItem) => {- const objectPermission = getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- });+ const includedObjectNameSingulars = useMemo(() => {+ if (isDefined(sidePanelSearchObjectFilter)) {+ return [sidePanelSearchObjectFilter];+ }- return !objectPermission?.canReadObjectRecords;- })- .map((objectMetadataItem) => objectMetadataItem.nameSingular);- }, [objectMetadataItems, objectPermissionsByObjectMetadataId]);+ return readableObjectMetadataItems+ .filter((item) => sidePanelShowHiddenObjects || item.isSearchable)+ .map((item) => item.nameSingular);+ }, [+ readableObjectMetadataItems,+ sidePanelSearchObjectFilter,+ sidePanelShowHiddenObjects,+ ]);const { data: searchData, loading } = useQuery(SearchDocument, {client: coreClient,variables: {searchInput: deferredSidePanelSearch ?? '',limit: MAX_SEARCH_RESULTS,- excludedObjectNameSingulars: [- 'workspaceMember',- ...nonReadableObjectMetadataItemsNameSingular,- ],+ includedObjectNameSingulars,},});@@ -77,7 +81,7 @@ export const useSidePanelSearchRecords = () => {),shouldBeRegistered: () => true,description:- objectMetadataItems.find(+ readableObjectMetadataItems.find((item) => item.nameSingular === searchRecord.objectNameSingular,)?.labelSingular ?? searchRecord.objectNameSingular,};@@ -92,7 +96,8 @@ export const useSidePanelSearchRecords = () => {component: (<CommandonClick={() => {- searchRecord.objectNameSingular === 'task'+ searchRecord.objectNameSingular ===+ CoreObjectNameSingular.Task? openRecordInSidePanel({recordId: searchRecord.recordId,objectNameSingular: CoreObjectNameSingular.Task,@@ -122,7 +127,7 @@ export const useSidePanelSearchRecords = () => {};},);- }, [searchData, openRecordInSidePanel, objectMetadataItems]);+ }, [searchData, openRecordInSidePanel, readableObjectMetadataItems]);return {loading,diff --git a/packages/twenty-front/src/modules/side-panel/states/sidePanelSearchObjectFilterState.ts b/packages/twenty-front/src/modules/side-panel/states/sidePanelSearchObjectFilterState.tsnew file mode 100644index 00000000000..990346c2bb9--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/states/sidePanelSearchObjectFilterState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const sidePanelSearchObjectFilterState = createAtomState<string | null>({+ key: 'side-panel/sidePanelSearchObjectFilterState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/side-panel/states/sidePanelShowHiddenObjectsState.ts b/packages/twenty-front/src/modules/side-panel/states/sidePanelShowHiddenObjectsState.tsnew file mode 100644index 00000000000..365d5e2d650--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/states/sidePanelShowHiddenObjectsState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const sidePanelShowHiddenObjectsState = createAtomState<boolean>({+ key: 'side-panel/sidePanelShowHiddenObjectsState',+ defaultValue: false,+});diff --git a/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts b/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.tsindex d16178a9347..9cf7cfaaf95 100644--- a/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts+++ b/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts@@ -84,6 +84,24 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [universalIdentifier: 'non-searchable-object-universal-id',applicationId: workspaceId,}),+ getFlatObjectMetadataMock({+ id: '20202020-6a7c-4e3f-9b2d-1d8f7a3e5c4b',+ nameSingular: 'message',+ namePlural: 'messages',+ labelSingular: 'Message',+ labelPlural: 'Messages',+ description: 'Message',+ icon: 'IconMessage',+ isCustom: false,+ isSystem: true,+ isSearchable: false,+ labelIdentifierFieldMetadataId: null,+ imageIdentifierFieldMetadataId: null,+ workspaceId,+ fieldIds: [],+ universalIdentifier: 'message-universal-id',+ applicationId: workspaceId,+ }),];export const mockFlatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata> = {diff --git a/packages/twenty-server/src/engine/core-modules/search/__tests__/search.service.spec.ts b/packages/twenty-server/src/engine/core-modules/search/__tests__/search.service.spec.tsindex 4ecfeb719c8..4aded65c77e 100644--- a/packages/twenty-server/src/engine/core-modules/search/__tests__/search.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/search/__tests__/search.service.spec.ts@@ -65,6 +65,24 @@ describe('SearchService', () => {expect(objectMetadataItems).toEqual([mockFlatObjectMetadatas[1]]);});+ it('should allow non-searchable objects when explicitly included', () => {+ const objectMetadataItems = service.filterObjectMetadataItems({+ flatObjectMetadatas: mockFlatObjectMetadatas,+ includedObjectNameSingulars: ['non-searchable-object'],+ excludedObjectNameSingulars: [],+ });++ expect(objectMetadataItems).toEqual([mockFlatObjectMetadatas[3]]);+ });+ it('should block objects with channel visibility constraints even when explicitly included', () => {+ const objectMetadataItems = service.filterObjectMetadataItems({+ flatObjectMetadatas: mockFlatObjectMetadatas,+ includedObjectNameSingulars: ['message'],+ excludedObjectNameSingulars: [],+ });++ expect(objectMetadataItems).toEqual([]);+ });});describe('getLabelIdentifierColumns', () => {diff --git a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts b/packages/twenty-server/src/engine/core-modules/search/services/search.service.tsindex c561309e83a..ed455fa3453 100644--- a/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts+++ b/packages/twenty-server/src/engine/core-modules/search/services/search.service.ts@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';import { isNonEmptyString } from '@sniptt/guards';import chunk from 'lodash.chunk';+import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';import { FieldMetadataType, ObjectRecord } from 'twenty-shared/types';import { getLogoUrlFromDomainName, isDefined } from 'twenty-shared/utils';import { Brackets, type ObjectLiteral } from 'typeorm';@@ -138,20 +139,36 @@ export class SearchService {includedObjectNameSingulars: string[];excludedObjectNameSingulars: string[];}) {+ const hasExplicitInclusion = includedObjectNameSingulars.length > 0;+return flatObjectMetadatas.filter(({ nameSingular, isSearchable, isActive }) => {- if (!isSearchable) {+ if (!isActive) {return false;}- if (!isActive) {++ if (hasExplicitInclusion) {+ if (+ OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS.includes(+ nameSingular as (typeof OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS)[number],+ )+ ) {+ return false;+ }++ return (+ includedObjectNameSingulars.includes(nameSingular) &&+ !excludedObjectNameSingulars.includes(nameSingular)+ );+ }++ if (!isSearchable) {return false;}+if (excludedObjectNameSingulars.includes(nameSingular)) {return false;}- if (includedObjectNameSingulars.length > 0) {- return includedObjectNameSingulars.includes(nameSingular);- }return true;},diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/constants/flat-object-metadata-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/constants/flat-object-metadata-editable-properties.constant.tsindex 519e03e7ccb..3e7f876d963 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/constants/flat-object-metadata-editable-properties.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/constants/flat-object-metadata-editable-properties.constant.ts@@ -7,6 +7,7 @@ export const FLAT_OBJECT_METADATA_EDITABLE_PROPERTIES = {'icon','isActive','isLabelSyncedWithName',+ 'isSearchable','labelPlural','labelSingular','namePlural',@@ -18,6 +19,7 @@ export const FLAT_OBJECT_METADATA_EDITABLE_PROPERTIES = {'description','icon','isActive',+ 'isSearchable','labelPlural','labelSingular',],diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.tsindex de34a4b6661..2d08d3a715d 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/update-object.input.ts@@ -76,6 +76,11 @@ export class UpdateObjectPayload {@IsOptional()@Field({ nullable: true })isLabelSyncedWithName?: boolean;++ @IsBoolean()+ @IsOptional()+ @Field({ nullable: true })+ isSearchable?: boolean;}@InputType()diff --git a/packages/twenty-shared/src/constants/ObjectsWithChannelVisibilityConstraints.ts b/packages/twenty-shared/src/constants/ObjectsWithChannelVisibilityConstraints.tsnew file mode 100644index 00000000000..eec19efcb2b--- /dev/null+++ b/packages/twenty-shared/src/constants/ObjectsWithChannelVisibilityConstraints.ts@@ -0,0 +1,23 @@+// TODO: These objects are tied to connected accounts and have channel-based visibility+// settings (MessageChannelVisibility / CalendarChannelVisibility) that control what data+// workspace members can see. The global search service does not yet enforce these visibility+// rules, so we exclude these objects from explicit search inclusion to prevent leaking+// restricted content (e.g. message subjects, calendar event titles).+// Once the search service properly joins channel tables and applies visibility filtering,+// this list can be removed.+export const OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS = [+ 'blocklist',+ 'connectedAccount',+ 'message',+ 'messageThread',+ 'messageChannel',+ 'messageParticipant',+ 'messageFolder',+ 'messageChannelMessageAssociation',+ 'messageChannelMessageAssociationMessageFolder',+ 'messageThreadSubscriber',+ 'calendarEvent',+ 'calendarChannel',+ 'calendarChannelEventAssociation',+ 'calendarEventParticipant',+] as const;diff --git a/packages/twenty-shared/src/constants/index.ts b/packages/twenty-shared/src/constants/index.tsindex 0597c6e3acd..3b06cd9ef7c 100644--- a/packages/twenty-shared/src/constants/index.ts+++ b/packages/twenty-shared/src/constants/index.ts@@ -32,6 +32,7 @@ export { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from './LabelIdentifierFieldMetexport { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from './MultiItemFieldDefaultMaxValues';export { MULTI_ITEM_FIELD_MIN_MAX_VALUES } from './MultiItemFieldMinMaxValues';export { MUTATION_MAX_MERGE_RECORDS } from './MutationMaxMergeRecords';+export { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from './ObjectsWithChannelVisibilityConstraints';export { PermissionFlagType } from './PermissionFlagType';export { PermissionsOnAllObjectRecords } from './PermissionsOnAllObjectRecords';export { QUERY_DEFAULT_LIMIT_RECORDS } from './QueryDefaultLimitRecords';