diff --git a/packages/twenty-front/src/modules/favorites/components/Favorites.tsx b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx similarity index 89% rename from packages/twenty-front/src/modules/favorites/components/Favorites.tsx rename to packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx index 36d545c6f8..c40df8e53c 100644 --- a/packages/twenty-front/src/modules/favorites/components/Favorites.tsx +++ b/packages/twenty-front/src/modules/favorites/components/CurrentWorkspaceMemberFavorites.tsx @@ -34,7 +34,7 @@ const StyledNavigationDrawerItem = styled(NavigationDrawerItem)` } `; -export const Favorites = () => { +export const CurrentWorkspaceMemberFavorites = () => { const currentUser = useRecoilValue(currentUserState); const { favorites, handleReorderFavorite } = useFavorites(); @@ -48,7 +48,15 @@ export const Favorites = () => { return ; } - if (!favorites || favorites.length === 0) return <>; + const currentWorkspaceMemberFavorites = favorites.filter( + (favorite) => favorite.workspaceMemberId === currentUser?.id, + ); + + if ( + !currentWorkspaceMemberFavorites || + currentWorkspaceMemberFavorites.length === 0 + ) + return <>; return ( @@ -61,7 +69,7 @@ export const Favorites = () => { onDragEnd={handleReorderFavorite} draggableItems={ <> - {favorites.map((favorite, index) => { + {currentWorkspaceMemberFavorites.map((favorite, index) => { const { id, labelIdentifier, diff --git a/packages/twenty-front/src/modules/favorites/components/WorkspaceFavorites.tsx b/packages/twenty-front/src/modules/favorites/components/WorkspaceFavorites.tsx new file mode 100644 index 0000000000..b89290526c --- /dev/null +++ b/packages/twenty-front/src/modules/favorites/components/WorkspaceFavorites.tsx @@ -0,0 +1,45 @@ +import { useFavorites } from '@/favorites/hooks/useFavorites'; +import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems'; +import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader'; +import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; +import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading'; +import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData'; +import { PrefetchKey } from '@/prefetch/types/PrefetchKey'; +import { View } from '@/views/types/View'; + +export const WorkspaceFavorites = () => { + const { records: views } = usePrefetchedData(PrefetchKey.AllViews); + const loading = useIsPrefetchLoading(); + + const { workspaceFavorites } = useFavorites(); + + const workspaceFavoriteIds = new Set( + workspaceFavorites.map((favorite) => favorite.recordId), + ); + + const favoriteViewObjectMetadataIds = views.reduce((acc, view) => { + if (workspaceFavoriteIds.has(view.id)) { + acc.push(view.objectMetadataId); + } + return acc; + }, []); + + const { objectMetadataItems } = useFilteredObjectMetadataItems(); + + const objectMetadataItemsToDisplay = objectMetadataItems.filter((item) => + favoriteViewObjectMetadataIds.includes(item.id), + ); + + if (loading) { + return ; + } + + return ( + + ); +}; diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx index 6a4b83b77d..c5fc1e29e1 100644 --- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx +++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx @@ -1,7 +1,7 @@ -import { ReactNode } from 'react'; import { MockedProvider } from '@apollo/client/testing'; import { DropResult, ResponderProvided } from '@hello-pangea/dnd'; import { act, renderHook, waitFor } from '@testing-library/react'; +import { ReactNode } from 'react'; import { RecoilRoot, useSetRecoilState } from 'recoil'; import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState'; diff --git a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts index 802aa3a3de..0ca7bfc974 100644 --- a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts +++ b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts @@ -1,9 +1,10 @@ -import { useMemo } from 'react'; import { OnDragEndResponder } from '@hello-pangea/dnd'; +import { useMemo } from 'react'; import { useRecoilValue } from 'recoil'; import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState'; import { Favorite } from '@/favorites/types/Favorite'; +import { sortFavorites } from '@/favorites/utils/sort-favorites.util'; import { useGetObjectRecordIdentifierByNameSingular } from '@/object-metadata/hooks/useGetObjectRecordIdentifierByNameSingular'; import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; @@ -13,7 +14,6 @@ import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord'; import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData'; import { PrefetchKey } from '@/prefetch/types/PrefetchKey'; import { FieldMetadataType } from '~/generated-metadata/graphql'; -import { isDefined } from '~/utils/isDefined'; export const useFavorites = () => { const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState); @@ -44,6 +44,15 @@ export const useFavorites = () => { }, ); + const { records: workspaceFavorites } = usePrefetchedData( + PrefetchKey.AllFavorites, + { + workspaceMemberId: { + eq: undefined, + }, + }, + ); + const favoriteRelationFieldMetadataItems = useMemo( () => favoriteObjectMetadataItem.fields.filter( @@ -58,43 +67,31 @@ export const useFavorites = () => { useGetObjectRecordIdentifierByNameSingular(); const favoritesSorted = useMemo(() => { - return favorites - .map((favorite) => { - for (const relationField of favoriteRelationFieldMetadataItems) { - if (isDefined(favorite[relationField.name])) { - const relationObject = favorite[relationField.name]; - - const relationObjectNameSingular = - relationField.toRelationMetadata?.fromObjectMetadata - .nameSingular ?? ''; - - const objectRecordIdentifier = - getObjectRecordIdentifierByNameSingular( - relationObject, - relationObjectNameSingular, - ); - - return { - id: favorite.id, - recordId: objectRecordIdentifier.id, - position: favorite.position, - avatarType: objectRecordIdentifier.avatarType, - avatarUrl: objectRecordIdentifier.avatarUrl, - labelIdentifier: objectRecordIdentifier.name, - link: objectRecordIdentifier.linkToShowPage, - } as Favorite; - } - } - - return favorite; - }) - .sort((a, b) => a.position - b.position); + return sortFavorites( + favorites, + favoriteRelationFieldMetadataItems, + getObjectRecordIdentifierByNameSingular, + true, + ); }, [ favoriteRelationFieldMetadataItems, favorites, getObjectRecordIdentifierByNameSingular, ]); + const workspaceFavoritesSorted = useMemo(() => { + return sortFavorites( + workspaceFavorites.filter((favorite) => favorite.viewId), + favoriteRelationFieldMetadataItems, + getObjectRecordIdentifierByNameSingular, + false, + ); + }, [ + favoriteRelationFieldMetadataItems, + getObjectRecordIdentifierByNameSingular, + workspaceFavorites, + ]); + const createFavorite = ( targetRecord: Record, targetObjectNameSingular: string, @@ -157,6 +154,7 @@ export const useFavorites = () => { return { favorites: favoritesSorted, + workspaceFavorites: workspaceFavoritesSorted, createFavorite, handleReorderFavorite, deleteFavorite, diff --git a/packages/twenty-front/src/modules/favorites/utils/sort-favorites.util.ts b/packages/twenty-front/src/modules/favorites/utils/sort-favorites.util.ts new file mode 100644 index 0000000000..689c8067a6 --- /dev/null +++ b/packages/twenty-front/src/modules/favorites/utils/sort-favorites.util.ts @@ -0,0 +1,48 @@ +import { Favorite } from '@/favorites/types/Favorite'; +import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; +import { ObjectRecordIdentifier } from '@/object-record/types/ObjectRecordIdentifier'; +import { isDefined } from 'twenty-ui'; + +export const sortFavorites = ( + favorites: Favorite[], + favoriteRelationFieldMetadataItems: FieldMetadataItem[], + getObjectRecordIdentifierByNameSingular: ( + record: any, + objectNameSingular: string, + ) => ObjectRecordIdentifier, + hasLinkToShowPage: boolean, +) => { + return favorites + .map((favorite) => { + for (const relationField of favoriteRelationFieldMetadataItems) { + if (isDefined(favorite[relationField.name])) { + const relationObject = favorite[relationField.name]; + + const relationObjectNameSingular = + relationField.toRelationMetadata?.fromObjectMetadata.nameSingular ?? + ''; + + const objectRecordIdentifier = + getObjectRecordIdentifierByNameSingular( + relationObject, + relationObjectNameSingular, + ); + + return { + id: favorite.id, + recordId: objectRecordIdentifier.id, + position: favorite.position, + avatarType: objectRecordIdentifier.avatarType, + avatarUrl: objectRecordIdentifier.avatarUrl, + labelIdentifier: objectRecordIdentifier.name, + link: hasLinkToShowPage + ? objectRecordIdentifier.linkToShowPage + : '', + } as Favorite; + } + } + + return favorite; + }) + .sort((a, b) => a.position - b.position); +}; diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx index 367b121534..88f18e97e6 100644 --- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx +++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx @@ -3,12 +3,14 @@ import { useSetRecoilState } from 'recoil'; import { IconSearch, IconSettings } from 'twenty-ui'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; -import { Favorites } from '@/favorites/components/Favorites'; -import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems'; +import { CurrentWorkspaceMemberFavorites } from '@/favorites/components/CurrentWorkspaceMemberFavorites'; +import { WorkspaceFavorites } from '@/favorites/components/WorkspaceFavorites'; +import { NavigationDrawerSectionForObjectMetadataItemsWrapper } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper'; import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem'; import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection'; import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; +import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; export const MainNavigationDrawerItems = () => { const isMobile = useIsMobile(); @@ -17,6 +19,9 @@ export const MainNavigationDrawerItems = () => { const setNavigationMemorizedUrl = useSetRecoilState( navigationMemorizedUrlState, ); + const isWorkspaceFavoriteEnabled = useIsFeatureEnabled( + 'IS_WORKSPACE_FAVORITE_ENABLED', + ); return ( <> @@ -39,10 +44,16 @@ export const MainNavigationDrawerItems = () => { )} - + - - + {isWorkspaceFavoriteEnabled ? ( + + ) : ( + + )} + ); }; diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx index b2cffdd7b5..b4cbd4e899 100644 --- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx +++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx @@ -1,14 +1,9 @@ import { useLocation } from 'react-router-dom'; import { useRecoilValue } from 'recoil'; -import { isDefined, useIcons } from 'twenty-ui'; +import { useIcons } from 'twenty-ui'; -import { currentUserState } from '@/auth/states/currentUserState'; import { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView'; -import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader'; -import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; -import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading'; -import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData'; -import { PrefetchKey } from '@/prefetch/types/PrefetchKey'; +import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem'; import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem'; import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection'; import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle'; @@ -27,44 +22,37 @@ const ORDERED_STANDARD_OBJECTS = [ ]; export const NavigationDrawerSectionForObjectMetadataItems = ({ + sectionTitle, isRemote, + views, + objectMetadataItems, }: { + sectionTitle: string; isRemote: boolean; + views: View[]; + objectMetadataItems: ObjectMetadataItem[]; }) => { - const currentUser = useRecoilValue(currentUserState); - const { toggleNavigationSection, isNavigationSectionOpenState } = useNavigationSection('Objects' + (isRemote ? 'Remote' : 'Workspace')); const isNavigationSectionOpen = useRecoilValue(isNavigationSectionOpenState); - const { activeObjectMetadataItems } = useFilteredObjectMetadataItems(); - const filteredActiveObjectMetadataItems = activeObjectMetadataItems.filter( - (item) => (isRemote ? item.isRemote : !item.isRemote), - ); const { getIcon } = useIcons(); const currentPath = useLocation().pathname; - const { records: views } = usePrefetchedData(PrefetchKey.AllViews); - const loading = useIsPrefetchLoading(); - const { getLastVisitedViewIdFromObjectMetadataItemId } = useLastVisitedView(); - if (loading && isDefined(currentUser)) { - return ; - } - // TODO: refactor this by splitting into separate components return ( - filteredActiveObjectMetadataItems.length > 0 && ( + objectMetadataItems.length > 0 && ( toggleNavigationSection()} /> {isNavigationSectionOpen && [ - ...filteredActiveObjectMetadataItems + ...objectMetadataItems .filter((item) => ORDERED_STANDARD_OBJECTS.includes(item.nameSingular), ) @@ -82,7 +70,7 @@ export const NavigationDrawerSectionForObjectMetadataItems = ({ } return indexA - indexB; }), - ...filteredActiveObjectMetadataItems + ...objectMetadataItems .filter( (item) => !ORDERED_STANDARD_OBJECTS.includes(item.nameSingular), ) diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper.tsx new file mode 100644 index 0000000000..2127db1fc6 --- /dev/null +++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper.tsx @@ -0,0 +1,40 @@ +import { useRecoilValue } from 'recoil'; +import { isDefined } from 'twenty-ui'; + +import { currentUserState } from '@/auth/states/currentUserState'; +import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems'; +import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader'; +import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems'; +import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading'; +import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData'; +import { PrefetchKey } from '@/prefetch/types/PrefetchKey'; +import { View } from '@/views/types/View'; + +export const NavigationDrawerSectionForObjectMetadataItemsWrapper = ({ + isRemote, +}: { + isRemote: boolean; +}) => { + const currentUser = useRecoilValue(currentUserState); + + const { activeObjectMetadataItems } = useFilteredObjectMetadataItems(); + const filteredActiveObjectMetadataItems = activeObjectMetadataItems.filter( + (item) => (isRemote ? item.isRemote : !item.isRemote), + ); + + const { records: views } = usePrefetchedData(PrefetchKey.AllViews); + const loading = useIsPrefetchLoading(); + + if (loading && isDefined(currentUser)) { + return ; + } + + return ( + + ); +}; diff --git a/packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItems.stories.tsx b/packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItemsWrapper.stories.tsx similarity index 60% rename from packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItems.stories.tsx rename to packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItemsWrapper.stories.tsx index 10ed4d553a..fc21940e6d 100644 --- a/packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItems.stories.tsx +++ b/packages/twenty-front/src/modules/object-metadata/components/__stories__/NavigationDrawerSectionForObjectMetadataItemsWrapper.stories.tsx @@ -7,28 +7,32 @@ import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadat import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator'; import { graphqlMocks } from '~/testing/graphqlMocks'; -import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems'; +import { NavigationDrawerSectionForObjectMetadataItemsWrapper } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper'; import { within } from '@storybook/test'; import { PrefetchLoadedDecorator } from '~/testing/decorators/PrefetchLoadedDecorator'; -const meta: Meta = { - title: 'Modules/ObjectMetadata/NavigationDrawerSectionForObjectMetadataItems', - component: NavigationDrawerSectionForObjectMetadataItems, - decorators: [ - IconsProviderDecorator, - ObjectMetadataItemsDecorator, - ComponentWithRouterDecorator, - ComponentWithRecoilScopeDecorator, - SnackBarDecorator, - PrefetchLoadedDecorator, - ], - parameters: { - msw: graphqlMocks, - }, -}; +const meta: Meta = + { + title: + 'Modules/ObjectMetadata/NavigationDrawerSectionForObjectMetadataItemsWrapper', + component: NavigationDrawerSectionForObjectMetadataItemsWrapper, + decorators: [ + IconsProviderDecorator, + ObjectMetadataItemsDecorator, + ComponentWithRouterDecorator, + ComponentWithRecoilScopeDecorator, + SnackBarDecorator, + PrefetchLoadedDecorator, + ], + parameters: { + msw: graphqlMocks, + }, + }; export default meta; -type Story = StoryObj; +type Story = StoryObj< + typeof NavigationDrawerSectionForObjectMetadataItemsWrapper +>; export const Default: Story = { play: async ({ canvasElement }) => { diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx index f92d778e3b..dfbe324297 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx @@ -16,13 +16,13 @@ import { IconUsers, } from 'twenty-ui'; -import { Favorites } from '@/favorites/components/Favorites'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; import { GithubVersionLink } from '@/ui/navigation/link/components/GithubVersionLink'; import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator'; import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator'; +import { CurrentWorkspaceMemberFavorites } from '@/favorites/components/CurrentWorkspaceMemberFavorites'; import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem'; import { NavigationDrawer } from '../NavigationDrawer'; import { NavigationDrawerItem } from '../NavigationDrawerItem'; @@ -66,7 +66,7 @@ export const Default: Story = { /> - + diff --git a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts index 49f3c8dc8b..409723f165 100644 --- a/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts +++ b/packages/twenty-front/src/modules/workspace/types/FeatureFlagKey.ts @@ -8,4 +8,5 @@ export type FeatureFlagKey = | 'IS_CRM_MIGRATION_ENABLED' | 'IS_FREE_ACCESS_ENABLED' | 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED' - | 'IS_WORKFLOW_ENABLED'; + | 'IS_WORKFLOW_ENABLED' + | 'IS_WORKSPACE_FAVORITE_ENABLED'; diff --git a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts index 6e5fef348b..84277637fa 100644 --- a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts +++ b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts @@ -18,6 +18,7 @@ import { seedCalendarEventParticipants } from 'src/database/typeorm-seeds/worksp import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calendar-events'; import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies'; import { seedConnectedAccount } from 'src/database/typeorm-seeds/workspace/connected-account'; +import { seedWorkspaceFavorites } from 'src/database/typeorm-seeds/workspace/favorites'; import { seedMessageChannelMessageAssociation } from 'src/database/typeorm-seeds/workspace/message-channel-message-associations'; import { seedMessageChannel } from 'src/database/typeorm-seeds/workspace/message-channels'; import { seedMessageParticipant } from 'src/database/typeorm-seeds/workspace/message-participants'; @@ -206,12 +207,18 @@ export class DataSeedWorkspaceCommand extends CommandRunner { ); } - await viewPrefillData( + const viewDefinitionsWithId = await viewPrefillData( entityManager, dataSourceMetadata.schema, objectMetadataMap, featureFlags, ); + + await seedWorkspaceFavorites( + viewDefinitionsWithId.map((view) => view.id), + entityManager, + dataSourceMetadata.schema, + ); }, ); } catch (error) { diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts index 94fa135400..27b27fcc37 100644 --- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts +++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts @@ -50,6 +50,11 @@ export const seedFeatureFlags = async ( workspaceId: workspaceId, value: false, }, + { + key: FeatureFlagKey.IsWorkspaceFavoriteEnabled, + workspaceId: workspaceId, + value: false, + }, ]) .execute(); }; diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/favorites.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/favorites.ts new file mode 100644 index 0000000000..53d9b50d8d --- /dev/null +++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/favorites.ts @@ -0,0 +1,23 @@ +import { EntityManager } from 'typeorm'; +import { v4 } from 'uuid'; + +const tableName = 'favorite'; + +export const seedWorkspaceFavorites = async ( + viewIds: string[], + entityManager: EntityManager, + schemaName: string, +) => { + await entityManager + .createQueryBuilder() + .insert() + .into(`${schemaName}.${tableName}`, ['id', 'viewId', 'position']) + .values( + viewIds.map((viewId, index) => ({ + id: v4(), + viewId, + position: index, + })), + ) + .execute(); +}; diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts index 82c5eb7753..7bd085cc41 100644 --- a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts +++ b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts @@ -9,4 +9,5 @@ export enum FeatureFlagKey { IsWorkflowEnabled = 'IS_WORKFLOW_ENABLED', IsMessageThreadSubscriberEnabled = 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED', IsQueryRunnerTwentyORMEnabled = 'IS_QUERY_RUNNER_TWENTY_ORM_ENABLED', + IsWorkspaceFavoriteEnabled = 'IS_WORKSPACE_FAVORITE_ENABLED', } diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts index 097c68a53a..b41f760a48 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts @@ -10,6 +10,8 @@ import { FindManyOptions, FindOneOptions, In, Repository } from 'typeorm'; import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface'; import { TypeORMService } from 'src/database/typeorm/typeorm.service'; +import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum'; +import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service'; import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service'; import { FieldMetadataEntity, @@ -40,6 +42,7 @@ import { WorkspaceMigrationTableActionType, } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity'; import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service'; +import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util'; import { computeTableName } from 'src/engine/utils/compute-table-name.util'; import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service'; @@ -57,6 +60,7 @@ import { createForeignKeyDeterministicUuid, createRelationDeterministicUuid, } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util'; +import { FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-objects/favorite.workspace-entity'; import { ObjectMetadataEntity } from './object-metadata.entity'; @@ -81,6 +85,8 @@ export class ObjectMetadataService extends TypeOrmQueryService( + workspaceId, + 'favorite', + ); + + const favoriteCount = await favoriteRepository.count(); + + return favoriteRepository.insert( + favoriteRepository.create({ + viewId, + position: favoriteCount, + }), + ); + } } diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts index 05b269746a..d58c8e9cbf 100644 --- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts +++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/view.ts @@ -4,7 +4,6 @@ import { v4 } from 'uuid'; import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum'; import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity'; import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { activitiesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/activities-all.view'; import { companiesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view'; import { notesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/notes-all.view'; import { opportunitiesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view'; @@ -30,7 +29,6 @@ export const viewPrefillData = async ( await peopleAllView(objectMetadataMap), await opportunitiesAllView(objectMetadataMap), await opportunitiesByStageView(objectMetadataMap), - await activitiesAllView(objectMetadataMap), await notesAllView(objectMetadataMap), await tasksAllView(objectMetadataMap), await tasksByStatusView(objectMetadataMap), @@ -128,4 +126,6 @@ export const viewPrefillData = async ( .execute(); } } + + return viewDefinitionsWithId; }; diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/activities-all.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/activities-all.view.ts deleted file mode 100644 index 8988b76063..0000000000 --- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/activities-all.view.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; -import { - ACTIVITY_STANDARD_FIELD_IDS, - BASE_OBJECT_STANDARD_FIELD_IDS, -} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids'; -import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids'; - -export const activitiesAllView = async ( - objectMetadataMap: Record, -) => { - return { - name: 'All', - objectMetadataId: objectMetadataMap[STANDARD_OBJECT_IDS.activity].id, - type: 'table', - key: 'INDEX', - position: 1, - icon: 'IconList', - kanbanFieldMetadataId: '', - filters: [], - fields: [ - { - fieldMetadataId: - objectMetadataMap[STANDARD_OBJECT_IDS.activity].fields[ - ACTIVITY_STANDARD_FIELD_IDS.title - ], - position: 0, - isVisible: true, - size: 210, - }, - { - fieldMetadataId: - objectMetadataMap[STANDARD_OBJECT_IDS.activity].fields[ - ACTIVITY_STANDARD_FIELD_IDS.type - ], - position: 0, - isVisible: true, - size: 150, - }, - { - fieldMetadataId: - objectMetadataMap[STANDARD_OBJECT_IDS.activity].fields[ - ACTIVITY_STANDARD_FIELD_IDS.body - ], - position: 0, - isVisible: true, - size: 150, - }, - { - fieldMetadataId: - objectMetadataMap[STANDARD_OBJECT_IDS.activity].fields[ - BASE_OBJECT_STANDARD_FIELD_IDS.createdAt - ], - position: 0, - isVisible: true, - size: 150, - }, - /* - TODO: Add later, since we don't have real-time it probably doesn't work well? - { - fieldMetadataId: - objectMetadataMap[STANDARD_OBJECT_IDS.activity].fields[ - BASE_OBJECT_STANDARD_FIELD_IDS.updatedAt - ], - position: 0, - isVisible: true, - size: 210, - }, - */ - ], - }; -}; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts index cbc1c49f5e..06d5993a46 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts @@ -203,6 +203,7 @@ export const FAVORITE_STANDARD_FIELD_IDS = { workflow: '20202020-b11b-4dc8-999a-6bd0a947b463', task: '20202020-1b1b-4b3b-8b1b-7f8d6a1d7d5c', note: '20202020-1f25-43fe-8b00-af212fdde824', + view: '20202020-5a93-4fa9-acce-e73481a0bbdf', custom: '20202020-855a-4bc8-9861-79deef37011f', }; @@ -380,6 +381,7 @@ export const VIEW_STANDARD_FIELD_IDS = { viewFields: '20202020-542b-4bdc-b177-b63175d48edf', viewFilters: '20202020-ff23-4154-b63c-21fb36cd0967', viewSorts: '20202020-891b-45c3-9fe1-80a75b4aa043', + favorites: '20202020-c818-4a86-8284-9ec0ef0a59a5', }; export const WEBHOOK_STANDARD_FIELD_IDS = { diff --git a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts index a3cb307298..0aa6b7d3ae 100644 --- a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts +++ b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts @@ -21,6 +21,7 @@ import { NoteWorkspaceEntity } from 'src/modules/note/standard-objects/note.work import { OpportunityWorkspaceEntity } from 'src/modules/opportunity/standard-objects/opportunity.workspace-entity'; import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity'; import { TaskWorkspaceEntity } from 'src/modules/task/standard-objects/task.workspace-entity'; +import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity'; import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity'; import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity'; @@ -55,6 +56,7 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity { inverseSideFieldKey: 'favorites', inverseSideTarget: () => WorkspaceMemberWorkspaceEntity, }) + @WorkspaceIsNullable() workspaceMember: Relation; @WorkspaceJoinColumn('workspaceMember') @@ -156,6 +158,21 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity { @WorkspaceJoinColumn('note') noteId: string; + @WorkspaceRelation({ + standardId: FAVORITE_STANDARD_FIELD_IDS.view, + type: RelationMetadataType.MANY_TO_ONE, + label: 'View', + description: 'Favorite view', + icon: 'IconLayoutCollage', + inverseSideTarget: () => ViewWorkspaceEntity, + inverseSideFieldKey: 'favorites', + }) + @WorkspaceIsNullable() + view: Relation | null; + + @WorkspaceJoinColumn('view') + viewId: string; + @WorkspaceDynamicRelation({ type: RelationMetadataType.MANY_TO_ONE, argsFactory: (oppositeObjectMetadata) => ({ diff --git a/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts index be3bd0a127..8c8431c00e 100644 --- a/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts +++ b/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts @@ -14,6 +14,7 @@ import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator'; import { VIEW_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids'; import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids'; +import { FavoriteWorkspaceEntity } from 'src/modules/favorite/standard-objects/favorite.workspace-entity'; import { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity'; import { ViewFilterWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter.workspace-entity'; import { ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/view-sort.workspace-entity'; @@ -135,4 +136,16 @@ export class ViewWorkspaceEntity extends BaseWorkspaceEntity { }) @WorkspaceIsNullable() viewSorts: Relation; + + @WorkspaceRelation({ + standardId: VIEW_STANDARD_FIELD_IDS.favorites, + type: RelationMetadataType.ONE_TO_MANY, + label: 'Favorites', + description: 'Favorites linked to the view', + icon: 'IconHeart', + inverseSideTarget: () => FavoriteWorkspaceEntity, + onDelete: RelationOnDeleteAction.CASCADE, + }) + @WorkspaceIsSystem() + favorites: Relation; }