The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix: Filter out deactivated objects from navigation sidebar (#19620)
Abdul Rahman96959b43baa8
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.tsindex 3fe214077ee..78b6ac052b7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts@@ -13,6 +13,7 @@ describe('filterAndSortNavigationMenuItems', () => {namePlural: 'people',labelPlural: 'People',icon: 'IconUser',+ isActive: true,} as EnrichedObjectMetadataItem;const mockView: Pick<View, 'id' | 'objectMetadataId' | 'key'> = {@@ -223,6 +224,57 @@ describe('filterAndSortNavigationMenuItems', () => {expect(result).toEqual([]);});+ it('should filter out items for deactivated objects', () => {+ const inactiveObjectMetadataItem = {+ ...mockObjectMetadataItem,+ id: 'inactive-metadata-id',+ isActive: false,+ } as EnrichedObjectMetadataItem;++ const result = filterAndSortNavigationMenuItems(+ [+ {+ id: 'obj-1',+ type: NavigationMenuItemType.OBJECT,+ targetObjectMetadataId: 'inactive-metadata-id',+ position: 1,+ } as NavigationMenuItem,+ ],+ [],+ [inactiveObjectMetadataItem],+ );+ expect(result).toEqual([]);+ });++ it('should filter out view items for deactivated objects', () => {+ const inactiveObjectMetadataItem = {+ ...mockObjectMetadataItem,+ id: 'inactive-metadata-id',+ isActive: false,+ } as EnrichedObjectMetadataItem;++ const viewForInactiveObject: Pick<View, 'id' | 'objectMetadataId' | 'key'> =+ {+ id: 'view-for-inactive',+ objectMetadataId: 'inactive-metadata-id',+ key: ViewKey.INDEX,+ };++ const result = filterAndSortNavigationMenuItems(+ [+ {+ id: 'view-item-1',+ type: NavigationMenuItemType.VIEW,+ viewId: 'view-for-inactive',+ position: 1,+ } as NavigationMenuItem,+ ],+ [viewForInactiveObject],+ [inactiveObjectMetadataItem],+ );+ expect(result).toEqual([]);+ });+it('should keep folder items', () => {const result = filterAndSortNavigationMenuItems([diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.tsindex 8e075372207..9a76366fbe1 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts@@ -7,8 +7,12 @@ import { type NavigationMenuItem } from '~/generated-metadata/graphql';export const filterAndSortNavigationMenuItems = (navigationMenuItems: NavigationMenuItem[],views: Pick<View, 'id' | 'objectMetadataId' | 'key'>[],- objectMetadataItems: Pick<EnrichedObjectMetadataItem, 'id'>[],+ objectMetadataItems: Pick<EnrichedObjectMetadataItem, 'id' | 'isActive'>[],): NavigationMenuItem[] => {+ const activeObjectMetadataItems = objectMetadataItems.filter(+ (meta) => meta.isActive,+ );+return navigationMenuItems.filter((item) => {if (item.type === NavigationMenuItemType.FOLDER) {@@ -20,7 +24,7 @@ export const filterAndSortNavigationMenuItems = (if (item.type === NavigationMenuItemType.OBJECT) {return (isDefined(item.targetObjectMetadataId) &&- objectMetadataItems.some(+ activeObjectMetadataItems.some((meta) => meta.id === item.targetObjectMetadataId,));@@ -32,7 +36,9 @@ export const filterAndSortNavigationMenuItems = (const view = views.find((view) => view.id === item.viewId);return (isDefined(view) &&- objectMetadataItems.some((meta) => meta.id === view.objectMetadataId)+ activeObjectMetadataItems.some(+ (meta) => meta.id === view.objectMetadataId,+ ));}if (item.type === NavigationMenuItemType.RECORD) {@@ -40,7 +46,7 @@ export const filterAndSortNavigationMenuItems = (isDefined(item.targetRecordId) &&isDefined(item.targetObjectMetadataId) &&isDefined(item.targetRecordIdentifier) &&- objectMetadataItems.some(+ activeObjectMetadataItems.some((meta) => meta.id === item.targetObjectMetadataId,));