mirror of
https://github.com/twentyhq/twenty.git
synced 2024-10-04 04:47:38 +03:00
Add workspace favorites behind feature flag (#6904)
- make member nullable on favorites - add potential relation with view entity - add a new type of favorite list in front : workspace favorite - build a new component for retrieving workspace favorite to display + refacto the existing one Bonus: - removing activities seed since this is deprecated
This commit is contained in:
parent
bc8c961e30
commit
78d8df6a68
@ -34,7 +34,7 @@ const StyledNavigationDrawerItem = styled(NavigationDrawerItem)`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Favorites = () => {
|
export const CurrentWorkspaceMemberFavorites = () => {
|
||||||
const currentUser = useRecoilValue(currentUserState);
|
const currentUser = useRecoilValue(currentUserState);
|
||||||
|
|
||||||
const { favorites, handleReorderFavorite } = useFavorites();
|
const { favorites, handleReorderFavorite } = useFavorites();
|
||||||
@ -48,7 +48,15 @@ export const Favorites = () => {
|
|||||||
return <FavoritesSkeletonLoader />;
|
return <FavoritesSkeletonLoader />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!favorites || favorites.length === 0) return <></>;
|
const currentWorkspaceMemberFavorites = favorites.filter(
|
||||||
|
(favorite) => favorite.workspaceMemberId === currentUser?.id,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (
|
||||||
|
!currentWorkspaceMemberFavorites ||
|
||||||
|
currentWorkspaceMemberFavorites.length === 0
|
||||||
|
)
|
||||||
|
return <></>;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledContainer>
|
<StyledContainer>
|
||||||
@ -61,7 +69,7 @@ export const Favorites = () => {
|
|||||||
onDragEnd={handleReorderFavorite}
|
onDragEnd={handleReorderFavorite}
|
||||||
draggableItems={
|
draggableItems={
|
||||||
<>
|
<>
|
||||||
{favorites.map((favorite, index) => {
|
{currentWorkspaceMemberFavorites.map((favorite, index) => {
|
||||||
const {
|
const {
|
||||||
id,
|
id,
|
||||||
labelIdentifier,
|
labelIdentifier,
|
@ -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<View>(PrefetchKey.AllViews);
|
||||||
|
const loading = useIsPrefetchLoading();
|
||||||
|
|
||||||
|
const { workspaceFavorites } = useFavorites();
|
||||||
|
|
||||||
|
const workspaceFavoriteIds = new Set(
|
||||||
|
workspaceFavorites.map((favorite) => favorite.recordId),
|
||||||
|
);
|
||||||
|
|
||||||
|
const favoriteViewObjectMetadataIds = views.reduce<string[]>((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 <NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NavigationDrawerSectionForObjectMetadataItems
|
||||||
|
sectionTitle={'Workspace Favorites'}
|
||||||
|
objectMetadataItems={objectMetadataItemsToDisplay}
|
||||||
|
views={views}
|
||||||
|
isRemote={false}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
@ -1,7 +1,7 @@
|
|||||||
import { ReactNode } from 'react';
|
|
||||||
import { MockedProvider } from '@apollo/client/testing';
|
import { MockedProvider } from '@apollo/client/testing';
|
||||||
import { DropResult, ResponderProvided } from '@hello-pangea/dnd';
|
import { DropResult, ResponderProvided } from '@hello-pangea/dnd';
|
||||||
import { act, renderHook, waitFor } from '@testing-library/react';
|
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||||
|
import { ReactNode } from 'react';
|
||||||
import { RecoilRoot, useSetRecoilState } from 'recoil';
|
import { RecoilRoot, useSetRecoilState } from 'recoil';
|
||||||
|
|
||||||
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
import { useMemo } from 'react';
|
|
||||||
import { OnDragEndResponder } from '@hello-pangea/dnd';
|
import { OnDragEndResponder } from '@hello-pangea/dnd';
|
||||||
|
import { useMemo } from 'react';
|
||||||
import { useRecoilValue } from 'recoil';
|
import { useRecoilValue } from 'recoil';
|
||||||
|
|
||||||
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
||||||
import { Favorite } from '@/favorites/types/Favorite';
|
import { Favorite } from '@/favorites/types/Favorite';
|
||||||
|
import { sortFavorites } from '@/favorites/utils/sort-favorites.util';
|
||||||
import { useGetObjectRecordIdentifierByNameSingular } from '@/object-metadata/hooks/useGetObjectRecordIdentifierByNameSingular';
|
import { useGetObjectRecordIdentifierByNameSingular } from '@/object-metadata/hooks/useGetObjectRecordIdentifierByNameSingular';
|
||||||
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
||||||
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
|
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 { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
|
||||||
import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
|
import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
|
||||||
import { FieldMetadataType } from '~/generated-metadata/graphql';
|
import { FieldMetadataType } from '~/generated-metadata/graphql';
|
||||||
import { isDefined } from '~/utils/isDefined';
|
|
||||||
|
|
||||||
export const useFavorites = () => {
|
export const useFavorites = () => {
|
||||||
const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
|
const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
|
||||||
@ -44,6 +44,15 @@ export const useFavorites = () => {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const { records: workspaceFavorites } = usePrefetchedData<Favorite>(
|
||||||
|
PrefetchKey.AllFavorites,
|
||||||
|
{
|
||||||
|
workspaceMemberId: {
|
||||||
|
eq: undefined,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
const favoriteRelationFieldMetadataItems = useMemo(
|
const favoriteRelationFieldMetadataItems = useMemo(
|
||||||
() =>
|
() =>
|
||||||
favoriteObjectMetadataItem.fields.filter(
|
favoriteObjectMetadataItem.fields.filter(
|
||||||
@ -58,43 +67,31 @@ export const useFavorites = () => {
|
|||||||
useGetObjectRecordIdentifierByNameSingular();
|
useGetObjectRecordIdentifierByNameSingular();
|
||||||
|
|
||||||
const favoritesSorted = useMemo(() => {
|
const favoritesSorted = useMemo(() => {
|
||||||
return favorites
|
return sortFavorites(
|
||||||
.map((favorite) => {
|
favorites,
|
||||||
for (const relationField of favoriteRelationFieldMetadataItems) {
|
favoriteRelationFieldMetadataItems,
|
||||||
if (isDefined(favorite[relationField.name])) {
|
getObjectRecordIdentifierByNameSingular,
|
||||||
const relationObject = favorite[relationField.name];
|
true,
|
||||||
|
);
|
||||||
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);
|
|
||||||
}, [
|
}, [
|
||||||
favoriteRelationFieldMetadataItems,
|
favoriteRelationFieldMetadataItems,
|
||||||
favorites,
|
favorites,
|
||||||
getObjectRecordIdentifierByNameSingular,
|
getObjectRecordIdentifierByNameSingular,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
const workspaceFavoritesSorted = useMemo(() => {
|
||||||
|
return sortFavorites(
|
||||||
|
workspaceFavorites.filter((favorite) => favorite.viewId),
|
||||||
|
favoriteRelationFieldMetadataItems,
|
||||||
|
getObjectRecordIdentifierByNameSingular,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
}, [
|
||||||
|
favoriteRelationFieldMetadataItems,
|
||||||
|
getObjectRecordIdentifierByNameSingular,
|
||||||
|
workspaceFavorites,
|
||||||
|
]);
|
||||||
|
|
||||||
const createFavorite = (
|
const createFavorite = (
|
||||||
targetRecord: Record<string, any>,
|
targetRecord: Record<string, any>,
|
||||||
targetObjectNameSingular: string,
|
targetObjectNameSingular: string,
|
||||||
@ -157,6 +154,7 @@ export const useFavorites = () => {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
favorites: favoritesSorted,
|
favorites: favoritesSorted,
|
||||||
|
workspaceFavorites: workspaceFavoritesSorted,
|
||||||
createFavorite,
|
createFavorite,
|
||||||
handleReorderFavorite,
|
handleReorderFavorite,
|
||||||
deleteFavorite,
|
deleteFavorite,
|
||||||
|
@ -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);
|
||||||
|
};
|
@ -3,12 +3,14 @@ import { useSetRecoilState } from 'recoil';
|
|||||||
import { IconSearch, IconSettings } from 'twenty-ui';
|
import { IconSearch, IconSettings } from 'twenty-ui';
|
||||||
|
|
||||||
import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
|
import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
|
||||||
import { Favorites } from '@/favorites/components/Favorites';
|
import { CurrentWorkspaceMemberFavorites } from '@/favorites/components/CurrentWorkspaceMemberFavorites';
|
||||||
import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems';
|
import { WorkspaceFavorites } from '@/favorites/components/WorkspaceFavorites';
|
||||||
|
import { NavigationDrawerSectionForObjectMetadataItemsWrapper } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsWrapper';
|
||||||
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
|
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
|
||||||
import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
|
import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
|
||||||
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
|
import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
|
||||||
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
|
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
|
||||||
|
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
|
||||||
|
|
||||||
export const MainNavigationDrawerItems = () => {
|
export const MainNavigationDrawerItems = () => {
|
||||||
const isMobile = useIsMobile();
|
const isMobile = useIsMobile();
|
||||||
@ -17,6 +19,9 @@ export const MainNavigationDrawerItems = () => {
|
|||||||
const setNavigationMemorizedUrl = useSetRecoilState(
|
const setNavigationMemorizedUrl = useSetRecoilState(
|
||||||
navigationMemorizedUrlState,
|
navigationMemorizedUrlState,
|
||||||
);
|
);
|
||||||
|
const isWorkspaceFavoriteEnabled = useIsFeatureEnabled(
|
||||||
|
'IS_WORKSPACE_FAVORITE_ENABLED',
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -39,10 +44,16 @@ export const MainNavigationDrawerItems = () => {
|
|||||||
</NavigationDrawerSection>
|
</NavigationDrawerSection>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Favorites />
|
<CurrentWorkspaceMemberFavorites />
|
||||||
|
|
||||||
<NavigationDrawerSectionForObjectMetadataItems isRemote={false} />
|
{isWorkspaceFavoriteEnabled ? (
|
||||||
<NavigationDrawerSectionForObjectMetadataItems isRemote={true} />
|
<WorkspaceFavorites />
|
||||||
|
) : (
|
||||||
|
<NavigationDrawerSectionForObjectMetadataItemsWrapper
|
||||||
|
isRemote={false}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<NavigationDrawerSectionForObjectMetadataItemsWrapper isRemote={true} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -1,14 +1,9 @@
|
|||||||
import { useLocation } from 'react-router-dom';
|
import { useLocation } from 'react-router-dom';
|
||||||
import { useRecoilValue } from 'recoil';
|
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 { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView';
|
||||||
import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader';
|
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
|
||||||
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 { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
|
import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
|
||||||
import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
|
import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
|
||||||
import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
|
import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
|
||||||
@ -27,44 +22,37 @@ const ORDERED_STANDARD_OBJECTS = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
export const NavigationDrawerSectionForObjectMetadataItems = ({
|
export const NavigationDrawerSectionForObjectMetadataItems = ({
|
||||||
|
sectionTitle,
|
||||||
isRemote,
|
isRemote,
|
||||||
|
views,
|
||||||
|
objectMetadataItems,
|
||||||
}: {
|
}: {
|
||||||
|
sectionTitle: string;
|
||||||
isRemote: boolean;
|
isRemote: boolean;
|
||||||
|
views: View[];
|
||||||
|
objectMetadataItems: ObjectMetadataItem[];
|
||||||
}) => {
|
}) => {
|
||||||
const currentUser = useRecoilValue(currentUserState);
|
|
||||||
|
|
||||||
const { toggleNavigationSection, isNavigationSectionOpenState } =
|
const { toggleNavigationSection, isNavigationSectionOpenState } =
|
||||||
useNavigationSection('Objects' + (isRemote ? 'Remote' : 'Workspace'));
|
useNavigationSection('Objects' + (isRemote ? 'Remote' : 'Workspace'));
|
||||||
const isNavigationSectionOpen = useRecoilValue(isNavigationSectionOpenState);
|
const isNavigationSectionOpen = useRecoilValue(isNavigationSectionOpenState);
|
||||||
|
|
||||||
const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
|
|
||||||
const filteredActiveObjectMetadataItems = activeObjectMetadataItems.filter(
|
|
||||||
(item) => (isRemote ? item.isRemote : !item.isRemote),
|
|
||||||
);
|
|
||||||
const { getIcon } = useIcons();
|
const { getIcon } = useIcons();
|
||||||
const currentPath = useLocation().pathname;
|
const currentPath = useLocation().pathname;
|
||||||
|
|
||||||
const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
|
|
||||||
const loading = useIsPrefetchLoading();
|
|
||||||
|
|
||||||
const { getLastVisitedViewIdFromObjectMetadataItemId } = useLastVisitedView();
|
const { getLastVisitedViewIdFromObjectMetadataItemId } = useLastVisitedView();
|
||||||
|
|
||||||
if (loading && isDefined(currentUser)) {
|
|
||||||
return <NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader />;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: refactor this by splitting into separate components
|
// TODO: refactor this by splitting into separate components
|
||||||
return (
|
return (
|
||||||
filteredActiveObjectMetadataItems.length > 0 && (
|
objectMetadataItems.length > 0 && (
|
||||||
<NavigationDrawerSection>
|
<NavigationDrawerSection>
|
||||||
<NavigationDrawerSectionTitle
|
<NavigationDrawerSectionTitle
|
||||||
label={isRemote ? 'Remote' : 'Workspace'}
|
label={sectionTitle}
|
||||||
onClick={() => toggleNavigationSection()}
|
onClick={() => toggleNavigationSection()}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{isNavigationSectionOpen &&
|
{isNavigationSectionOpen &&
|
||||||
[
|
[
|
||||||
...filteredActiveObjectMetadataItems
|
...objectMetadataItems
|
||||||
.filter((item) =>
|
.filter((item) =>
|
||||||
ORDERED_STANDARD_OBJECTS.includes(item.nameSingular),
|
ORDERED_STANDARD_OBJECTS.includes(item.nameSingular),
|
||||||
)
|
)
|
||||||
@ -82,7 +70,7 @@ export const NavigationDrawerSectionForObjectMetadataItems = ({
|
|||||||
}
|
}
|
||||||
return indexA - indexB;
|
return indexA - indexB;
|
||||||
}),
|
}),
|
||||||
...filteredActiveObjectMetadataItems
|
...objectMetadataItems
|
||||||
.filter(
|
.filter(
|
||||||
(item) => !ORDERED_STANDARD_OBJECTS.includes(item.nameSingular),
|
(item) => !ORDERED_STANDARD_OBJECTS.includes(item.nameSingular),
|
||||||
)
|
)
|
||||||
|
@ -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<View>(PrefetchKey.AllViews);
|
||||||
|
const loading = useIsPrefetchLoading();
|
||||||
|
|
||||||
|
if (loading && isDefined(currentUser)) {
|
||||||
|
return <NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NavigationDrawerSectionForObjectMetadataItems
|
||||||
|
sectionTitle={isRemote ? 'Remote' : 'Workspace'}
|
||||||
|
objectMetadataItems={filteredActiveObjectMetadataItems}
|
||||||
|
views={views}
|
||||||
|
isRemote={isRemote}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
@ -7,28 +7,32 @@ import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadat
|
|||||||
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
|
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
|
||||||
import { graphqlMocks } from '~/testing/graphqlMocks';
|
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 { within } from '@storybook/test';
|
||||||
import { PrefetchLoadedDecorator } from '~/testing/decorators/PrefetchLoadedDecorator';
|
import { PrefetchLoadedDecorator } from '~/testing/decorators/PrefetchLoadedDecorator';
|
||||||
|
|
||||||
const meta: Meta<typeof NavigationDrawerSectionForObjectMetadataItems> = {
|
const meta: Meta<typeof NavigationDrawerSectionForObjectMetadataItemsWrapper> =
|
||||||
title: 'Modules/ObjectMetadata/NavigationDrawerSectionForObjectMetadataItems',
|
{
|
||||||
component: NavigationDrawerSectionForObjectMetadataItems,
|
title:
|
||||||
decorators: [
|
'Modules/ObjectMetadata/NavigationDrawerSectionForObjectMetadataItemsWrapper',
|
||||||
IconsProviderDecorator,
|
component: NavigationDrawerSectionForObjectMetadataItemsWrapper,
|
||||||
ObjectMetadataItemsDecorator,
|
decorators: [
|
||||||
ComponentWithRouterDecorator,
|
IconsProviderDecorator,
|
||||||
ComponentWithRecoilScopeDecorator,
|
ObjectMetadataItemsDecorator,
|
||||||
SnackBarDecorator,
|
ComponentWithRouterDecorator,
|
||||||
PrefetchLoadedDecorator,
|
ComponentWithRecoilScopeDecorator,
|
||||||
],
|
SnackBarDecorator,
|
||||||
parameters: {
|
PrefetchLoadedDecorator,
|
||||||
msw: graphqlMocks,
|
],
|
||||||
},
|
parameters: {
|
||||||
};
|
msw: graphqlMocks,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export default meta;
|
export default meta;
|
||||||
type Story = StoryObj<typeof NavigationDrawerSectionForObjectMetadataItems>;
|
type Story = StoryObj<
|
||||||
|
typeof NavigationDrawerSectionForObjectMetadataItemsWrapper
|
||||||
|
>;
|
||||||
|
|
||||||
export const Default: Story = {
|
export const Default: Story = {
|
||||||
play: async ({ canvasElement }) => {
|
play: async ({ canvasElement }) => {
|
@ -16,13 +16,13 @@ import {
|
|||||||
IconUsers,
|
IconUsers,
|
||||||
} from 'twenty-ui';
|
} from 'twenty-ui';
|
||||||
|
|
||||||
import { Favorites } from '@/favorites/components/Favorites';
|
|
||||||
import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
|
import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
|
||||||
import { SettingsPath } from '@/types/SettingsPath';
|
import { SettingsPath } from '@/types/SettingsPath';
|
||||||
import { GithubVersionLink } from '@/ui/navigation/link/components/GithubVersionLink';
|
import { GithubVersionLink } from '@/ui/navigation/link/components/GithubVersionLink';
|
||||||
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
|
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
|
||||||
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
|
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
|
||||||
|
|
||||||
|
import { CurrentWorkspaceMemberFavorites } from '@/favorites/components/CurrentWorkspaceMemberFavorites';
|
||||||
import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';
|
import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';
|
||||||
import { NavigationDrawer } from '../NavigationDrawer';
|
import { NavigationDrawer } from '../NavigationDrawer';
|
||||||
import { NavigationDrawerItem } from '../NavigationDrawerItem';
|
import { NavigationDrawerItem } from '../NavigationDrawerItem';
|
||||||
@ -66,7 +66,7 @@ export const Default: Story = {
|
|||||||
/>
|
/>
|
||||||
</NavigationDrawerSection>
|
</NavigationDrawerSection>
|
||||||
|
|
||||||
<Favorites />
|
<CurrentWorkspaceMemberFavorites />
|
||||||
|
|
||||||
<NavigationDrawerSection>
|
<NavigationDrawerSection>
|
||||||
<NavigationDrawerSectionTitle label="Workspace" />
|
<NavigationDrawerSectionTitle label="Workspace" />
|
||||||
|
@ -8,4 +8,5 @@ export type FeatureFlagKey =
|
|||||||
| 'IS_CRM_MIGRATION_ENABLED'
|
| 'IS_CRM_MIGRATION_ENABLED'
|
||||||
| 'IS_FREE_ACCESS_ENABLED'
|
| 'IS_FREE_ACCESS_ENABLED'
|
||||||
| 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED'
|
| 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED'
|
||||||
| 'IS_WORKFLOW_ENABLED';
|
| 'IS_WORKFLOW_ENABLED'
|
||||||
|
| 'IS_WORKSPACE_FAVORITE_ENABLED';
|
||||||
|
@ -18,6 +18,7 @@ import { seedCalendarEventParticipants } from 'src/database/typeorm-seeds/worksp
|
|||||||
import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calendar-events';
|
import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calendar-events';
|
||||||
import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
|
import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
|
||||||
import { seedConnectedAccount } from 'src/database/typeorm-seeds/workspace/connected-account';
|
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 { seedMessageChannelMessageAssociation } from 'src/database/typeorm-seeds/workspace/message-channel-message-associations';
|
||||||
import { seedMessageChannel } from 'src/database/typeorm-seeds/workspace/message-channels';
|
import { seedMessageChannel } from 'src/database/typeorm-seeds/workspace/message-channels';
|
||||||
import { seedMessageParticipant } from 'src/database/typeorm-seeds/workspace/message-participants';
|
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,
|
entityManager,
|
||||||
dataSourceMetadata.schema,
|
dataSourceMetadata.schema,
|
||||||
objectMetadataMap,
|
objectMetadataMap,
|
||||||
featureFlags,
|
featureFlags,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
await seedWorkspaceFavorites(
|
||||||
|
viewDefinitionsWithId.map((view) => view.id),
|
||||||
|
entityManager,
|
||||||
|
dataSourceMetadata.schema,
|
||||||
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
@ -50,6 +50,11 @@ export const seedFeatureFlags = async (
|
|||||||
workspaceId: workspaceId,
|
workspaceId: workspaceId,
|
||||||
value: false,
|
value: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: FeatureFlagKey.IsWorkspaceFavoriteEnabled,
|
||||||
|
workspaceId: workspaceId,
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
])
|
])
|
||||||
.execute();
|
.execute();
|
||||||
};
|
};
|
||||||
|
@ -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();
|
||||||
|
};
|
@ -9,4 +9,5 @@ export enum FeatureFlagKey {
|
|||||||
IsWorkflowEnabled = 'IS_WORKFLOW_ENABLED',
|
IsWorkflowEnabled = 'IS_WORKFLOW_ENABLED',
|
||||||
IsMessageThreadSubscriberEnabled = 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED',
|
IsMessageThreadSubscriberEnabled = 'IS_MESSAGE_THREAD_SUBSCRIBER_ENABLED',
|
||||||
IsQueryRunnerTwentyORMEnabled = 'IS_QUERY_RUNNER_TWENTY_ORM_ENABLED',
|
IsQueryRunnerTwentyORMEnabled = 'IS_QUERY_RUNNER_TWENTY_ORM_ENABLED',
|
||||||
|
IsWorkspaceFavoriteEnabled = 'IS_WORKSPACE_FAVORITE_ENABLED',
|
||||||
}
|
}
|
||||||
|
@ -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 { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
|
||||||
|
|
||||||
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
|
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 { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||||
import {
|
import {
|
||||||
FieldMetadataEntity,
|
FieldMetadataEntity,
|
||||||
@ -40,6 +42,7 @@ import {
|
|||||||
WorkspaceMigrationTableActionType,
|
WorkspaceMigrationTableActionType,
|
||||||
} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
|
} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
|
||||||
import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
|
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 { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
|
||||||
import { computeTableName } from 'src/engine/utils/compute-table-name.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';
|
import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
|
||||||
@ -57,6 +60,7 @@ import {
|
|||||||
createForeignKeyDeterministicUuid,
|
createForeignKeyDeterministicUuid,
|
||||||
createRelationDeterministicUuid,
|
createRelationDeterministicUuid,
|
||||||
} from 'src/engine/workspace-manager/workspace-sync-metadata/utils/create-deterministic-uuid.util';
|
} 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';
|
import { ObjectMetadataEntity } from './object-metadata.entity';
|
||||||
|
|
||||||
@ -81,6 +85,8 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
|
|||||||
private readonly workspaceMigrationService: WorkspaceMigrationService,
|
private readonly workspaceMigrationService: WorkspaceMigrationService,
|
||||||
private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
|
private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
|
||||||
private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
|
private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
|
||||||
|
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
|
||||||
|
private readonly featureFlagService: FeatureFlagService,
|
||||||
) {
|
) {
|
||||||
super(objectMetadataRepository);
|
super(objectMetadataRepository);
|
||||||
}
|
}
|
||||||
@ -369,6 +375,19 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const isViewWorkspaceFavoriteEnabled =
|
||||||
|
await this.featureFlagService.isFeatureEnabled(
|
||||||
|
FeatureFlagKey.IsWorkspaceFavoriteEnabled,
|
||||||
|
objectMetadataInput.workspaceId,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isViewWorkspaceFavoriteEnabled) {
|
||||||
|
await this.createViewWorkspaceFavorite(
|
||||||
|
objectMetadataInput.workspaceId,
|
||||||
|
view[0].id,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
await this.workspaceMetadataVersionService.incrementMetadataVersion(
|
await this.workspaceMetadataVersionService.incrementMetadataVersion(
|
||||||
objectMetadataInput.workspaceId,
|
objectMetadataInput.workspaceId,
|
||||||
);
|
);
|
||||||
@ -1260,4 +1279,24 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async createViewWorkspaceFavorite(
|
||||||
|
workspaceId: string,
|
||||||
|
viewId: string,
|
||||||
|
) {
|
||||||
|
const favoriteRepository =
|
||||||
|
await this.twentyORMGlobalManager.getRepositoryForWorkspace<FavoriteWorkspaceEntity>(
|
||||||
|
workspaceId,
|
||||||
|
'favorite',
|
||||||
|
);
|
||||||
|
|
||||||
|
const favoriteCount = await favoriteRepository.count();
|
||||||
|
|
||||||
|
return favoriteRepository.insert(
|
||||||
|
favoriteRepository.create({
|
||||||
|
viewId,
|
||||||
|
position: favoriteCount,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ import { v4 } from 'uuid';
|
|||||||
import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
|
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 { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
|
||||||
import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.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 { 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 { 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';
|
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 peopleAllView(objectMetadataMap),
|
||||||
await opportunitiesAllView(objectMetadataMap),
|
await opportunitiesAllView(objectMetadataMap),
|
||||||
await opportunitiesByStageView(objectMetadataMap),
|
await opportunitiesByStageView(objectMetadataMap),
|
||||||
await activitiesAllView(objectMetadataMap),
|
|
||||||
await notesAllView(objectMetadataMap),
|
await notesAllView(objectMetadataMap),
|
||||||
await tasksAllView(objectMetadataMap),
|
await tasksAllView(objectMetadataMap),
|
||||||
await tasksByStatusView(objectMetadataMap),
|
await tasksByStatusView(objectMetadataMap),
|
||||||
@ -128,4 +126,6 @@ export const viewPrefillData = async (
|
|||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return viewDefinitionsWithId;
|
||||||
};
|
};
|
||||||
|
@ -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<string, ObjectMetadataEntity>,
|
|
||||||
) => {
|
|
||||||
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,
|
|
||||||
},
|
|
||||||
*/
|
|
||||||
],
|
|
||||||
};
|
|
||||||
};
|
|
@ -203,6 +203,7 @@ export const FAVORITE_STANDARD_FIELD_IDS = {
|
|||||||
workflow: '20202020-b11b-4dc8-999a-6bd0a947b463',
|
workflow: '20202020-b11b-4dc8-999a-6bd0a947b463',
|
||||||
task: '20202020-1b1b-4b3b-8b1b-7f8d6a1d7d5c',
|
task: '20202020-1b1b-4b3b-8b1b-7f8d6a1d7d5c',
|
||||||
note: '20202020-1f25-43fe-8b00-af212fdde824',
|
note: '20202020-1f25-43fe-8b00-af212fdde824',
|
||||||
|
view: '20202020-5a93-4fa9-acce-e73481a0bbdf',
|
||||||
custom: '20202020-855a-4bc8-9861-79deef37011f',
|
custom: '20202020-855a-4bc8-9861-79deef37011f',
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -380,6 +381,7 @@ export const VIEW_STANDARD_FIELD_IDS = {
|
|||||||
viewFields: '20202020-542b-4bdc-b177-b63175d48edf',
|
viewFields: '20202020-542b-4bdc-b177-b63175d48edf',
|
||||||
viewFilters: '20202020-ff23-4154-b63c-21fb36cd0967',
|
viewFilters: '20202020-ff23-4154-b63c-21fb36cd0967',
|
||||||
viewSorts: '20202020-891b-45c3-9fe1-80a75b4aa043',
|
viewSorts: '20202020-891b-45c3-9fe1-80a75b4aa043',
|
||||||
|
favorites: '20202020-c818-4a86-8284-9ec0ef0a59a5',
|
||||||
};
|
};
|
||||||
|
|
||||||
export const WEBHOOK_STANDARD_FIELD_IDS = {
|
export const WEBHOOK_STANDARD_FIELD_IDS = {
|
||||||
|
@ -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 { OpportunityWorkspaceEntity } from 'src/modules/opportunity/standard-objects/opportunity.workspace-entity';
|
||||||
import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.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 { 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 { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow.workspace-entity';
|
||||||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.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',
|
inverseSideFieldKey: 'favorites',
|
||||||
inverseSideTarget: () => WorkspaceMemberWorkspaceEntity,
|
inverseSideTarget: () => WorkspaceMemberWorkspaceEntity,
|
||||||
})
|
})
|
||||||
|
@WorkspaceIsNullable()
|
||||||
workspaceMember: Relation<WorkspaceMemberWorkspaceEntity>;
|
workspaceMember: Relation<WorkspaceMemberWorkspaceEntity>;
|
||||||
|
|
||||||
@WorkspaceJoinColumn('workspaceMember')
|
@WorkspaceJoinColumn('workspaceMember')
|
||||||
@ -156,6 +158,21 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity {
|
|||||||
@WorkspaceJoinColumn('note')
|
@WorkspaceJoinColumn('note')
|
||||||
noteId: string;
|
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<ViewWorkspaceEntity> | null;
|
||||||
|
|
||||||
|
@WorkspaceJoinColumn('view')
|
||||||
|
viewId: string;
|
||||||
|
|
||||||
@WorkspaceDynamicRelation({
|
@WorkspaceDynamicRelation({
|
||||||
type: RelationMetadataType.MANY_TO_ONE,
|
type: RelationMetadataType.MANY_TO_ONE,
|
||||||
argsFactory: (oppositeObjectMetadata) => ({
|
argsFactory: (oppositeObjectMetadata) => ({
|
||||||
|
@ -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 { 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 { 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 { 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 { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity';
|
||||||
import { ViewFilterWorkspaceEntity } from 'src/modules/view/standard-objects/view-filter.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';
|
import { ViewSortWorkspaceEntity } from 'src/modules/view/standard-objects/view-sort.workspace-entity';
|
||||||
@ -135,4 +136,16 @@ export class ViewWorkspaceEntity extends BaseWorkspaceEntity {
|
|||||||
})
|
})
|
||||||
@WorkspaceIsNullable()
|
@WorkspaceIsNullable()
|
||||||
viewSorts: Relation<ViewSortWorkspaceEntity[]>;
|
viewSorts: Relation<ViewSortWorkspaceEntity[]>;
|
||||||
|
|
||||||
|
@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<FavoriteWorkspaceEntity[]>;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user