Skip to content

Commit 24152b7

Browse files
committed
Fixed
1 parent 2a53369 commit 24152b7

File tree

8 files changed

+48
-38
lines changed

8 files changed

+48
-38
lines changed

packages/twenty-front/src/modules/command-menu-item/server-items/hooks/useConvertBackendItemToCommandMenuItemConfig.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ export const useConvertBackendItemToCommandMenuItemConfig = () => {
8585
}
8686

8787
const isEditModeItem =
88-
item.conditionalAvailabilityExpression?.includes(
89-
'isPageInEditMode',
90-
) ?? false;
88+
item.conditionalAvailabilityExpression?.includes('isPageInEditMode') ??
89+
false;
9190

9291
const isPinned =
9392
item.availabilityType !== CommandMenuItemAvailabilityType.FALLBACK &&
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
2+
import { type ObjectPermissions } from 'twenty-shared/types';
3+
import { isDefined } from 'twenty-shared/utils';
4+
5+
export const filterReadableActiveObjectMetadataItems = (
6+
objectMetadataItems: EnrichedObjectMetadataItem[],
7+
objectPermissionsByObjectMetadataId: Record<
8+
string,
9+
ObjectPermissions & { objectMetadataId: string }
10+
>,
11+
): EnrichedObjectMetadataItem[] =>
12+
objectMetadataItems.filter((objectMetadataItem) => {
13+
const objectPermissions =
14+
objectPermissionsByObjectMetadataId[objectMetadataItem.id];
15+
16+
return (
17+
isDefined(objectPermissions) &&
18+
objectPermissions.canReadObjectRecords &&
19+
objectMetadataItem.isActive
20+
);
21+
});

packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetViewLoadEffect.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@ export const RecordTableWidgetViewLoadEffect = ({
2121
const [
2222
lastLoadedRecordTableWidgetViewId,
2323
setLastLoadedRecordTableWidgetViewId,
24-
] = useAtomComponentState(
25-
lastLoadedRecordTableWidgetViewIdComponentState,
26-
);
24+
] = useAtomComponentState(lastLoadedRecordTableWidgetViewIdComponentState);
2725

28-
const viewFromViewId = useAtomFamilySelectorValue(viewFromViewIdFamilySelector, {
29-
viewId,
30-
});
26+
const viewFromViewId = useAtomFamilySelectorValue(
27+
viewFromViewIdFamilySelector,
28+
{
29+
viewId,
30+
},
31+
);
3132

32-
const viewHasFields = isDefined(viewFromViewId) && viewFromViewId.viewFields.length > 0;
33+
const viewHasFields =
34+
isDefined(viewFromViewId) && viewFromViewId.viewFields.length > 0;
3335

3436
useEffect(() => {
3537
if (!isDefined(viewFromViewId)) {

packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyLoading.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ export const RecordTableBodyLoading = () => {
4949
data-testid={`row-id-${rowIndex}`}
5050
data-selectable-id={`row-id-${rowIndex}`}
5151
>
52-
{!isRecordTableDragColumnHidden && (
53-
<RecordTableCellDragAndDrop />
54-
)}
52+
{!isRecordTableDragColumnHidden && <RecordTableCellDragAndDrop />}
5553
{!isRecordTableCheckboxColumnHidden && (
5654
<RecordTableCellCheckbox />
5755
)}

packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/getRecordTableCellId.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getRecordTableCellId } from '../getRecordTableCellId';
1+
import { getRecordTableCellId } from '@/object-record/record-table/utils/getRecordTableCellId';
22

33
describe('getRecordTableCellId', () => {
44
it('returns the correct cell id format', () => {

packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/getRecordTableHtmlId.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getRecordTableHtmlId } from '../getRecordTableHtmlId';
1+
import { getRecordTableHtmlId } from '@/object-record/record-table/utils/getRecordTableHtmlId';
22

33
describe('getRecordTableHtmlId', () => {
44
it('returns the correct html id format', () => {

packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { useResetChartDraftFiltersSettings } from '@/side-panel/pages/page-layou
33
import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';
44
import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';
55
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
6+
import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';
67
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
78
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
89
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
@@ -49,17 +50,9 @@ export const ChartDataSourceDropdownContent = () => {
4950
dropdownId,
5051
);
5152

52-
const objectsWithReadAccess = objectMetadataItems.filter(
53-
(objectMetadataItem) => {
54-
const objectPermissions =
55-
objectPermissionsByObjectMetadataId[objectMetadataItem.id];
56-
57-
return (
58-
isDefined(objectPermissions) &&
59-
objectPermissions.canReadObjectRecords &&
60-
objectMetadataItem.isActive
61-
);
62-
},
53+
const objectsWithReadAccess = filterReadableActiveObjectMetadataItems(
54+
objectMetadataItems,
55+
objectPermissionsByObjectMetadataId,
6356
);
6457

6558
const regularObjects = objectsWithReadAccess

packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selec
1616
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
1717
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
1818
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
19+
import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';
1920
import { t } from '@lingui/core/macro';
2021
import { useState } from 'react';
2122
import { isDefined } from 'twenty-shared/utils';
@@ -57,18 +58,14 @@ export const RecordTableDataSourceDropdownContent = () => {
5758
const { closeDropdown } = useCloseDropdown();
5859
const { getIcon } = useIcons();
5960

60-
const objectsWithReadAccess = objectMetadataItems.filter(
61-
(objectMetadataItem) => {
62-
const objectPermissions =
63-
objectPermissionsByObjectMetadataId[objectMetadataItem.id];
64-
65-
return (
66-
isDefined(objectPermissions) &&
67-
objectPermissions.canReadObjectRecords &&
68-
objectMetadataItem.isActive &&
69-
!objectMetadataItem.isSystem
70-
);
71-
},
61+
const readableActiveObjectMetadataItems =
62+
filterReadableActiveObjectMetadataItems(
63+
objectMetadataItems,
64+
objectPermissionsByObjectMetadataId,
65+
);
66+
67+
const objectsWithReadAccess = readableActiveObjectMetadataItems.filter(
68+
(objectMetadataItem) => !objectMetadataItem.isSystem,
7269
);
7370

7471
const sortedObjects = objectsWithReadAccess.sort((first, second) =>

0 commit comments

Comments
 (0)