admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

followup #12033 (#12150)

Browse Source 
follow up #12033

in #12033, SettingsDataModelFieldRelationForm I changed the the use of
objectMetadataItems to activeObjectMetadataItems, which filtered out
system objects. The naming was one factor for this confusion
Renaming it everywhere to specify that they don't include system objects

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
nitin
2025-05-21 15:15:33 +05:30
committed by GitHub
parent c29ed1c0c9
commit 819b3c6c0d
21 changed files with 116 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
View File

@ -23,18 +23,18 @@ import styled from '@emotion/styled';
import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyArray } from '@sniptt/guards';
import { useMemo, useState } from 'react';
import { GET_SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';
import { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';
import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
import { Button } from 'twenty-ui/input';
import {
H2Title,
IconChevronRight,
IconPlus,
IconSearch,
} from 'twenty-ui/display';
import { Button } from 'twenty-ui/input';
import { Section } from 'twenty-ui/layout';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { GET_SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';
import { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';
import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
const StyledIconChevronRight = styled(IconChevronRight)`
color: ${({ theme }) => theme.font.color.tertiary};
@ -52,21 +52,23 @@ export const SettingsObjects = () => {
const { deleteOneObjectMetadataItem } = useDeleteOneObjectMetadataItem();
const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
const { activeObjectMetadataItems, inactiveObjectMetadataItems } =
useFilteredObjectMetadataItems();
const {
activeNonSystemObjectMetadataItems,
inactiveNonSystemObjectMetadataItems,
} = useFilteredObjectMetadataItems();
const { totalCountByObjectMetadataItemNamePlural } = useCombinedGetTotalCount(
{
objectMetadataItems: [
...activeObjectMetadataItems,
...inactiveObjectMetadataItems,
...activeNonSystemObjectMetadataItems,
...inactiveNonSystemObjectMetadataItems,
],
},
);
const activeObjectSettingsArray = useMemo(
() =>
activeObjectMetadataItems.map(
activeNonSystemObjectMetadataItems.map(
(objectMetadataItem) =>
({
objectMetadataItem,
@ -81,12 +83,15 @@ export const SettingsObjects = () => {
] ?? 0,
}) satisfies SettingsObjectTableItem,
),
[activeObjectMetadataItems, totalCountByObjectMetadataItemNamePlural],
[
activeNonSystemObjectMetadataItems,
totalCountByObjectMetadataItemNamePlural,
],
);
const inactiveObjectSettingsArray = useMemo(
() =>
inactiveObjectMetadataItems.map(
inactiveNonSystemObjectMetadataItems.map(
(objectMetadataItem) =>
({
objectMetadataItem,
@ -101,7 +106,10 @@ export const SettingsObjects = () => {
] ?? 0,
}) satisfies SettingsObjectTableItem,
),
[inactiveObjectMetadataItems, totalCountByObjectMetadataItemNamePlural],
[
inactiveNonSystemObjectMetadataItems,
totalCountByObjectMetadataItemNamePlural,
],
);
const sortedActiveObjectSettingsItems = useSortedArray(
@ -211,7 +219,7 @@ export const SettingsObjects = () => {
)}
</TableSection>
)}
{isNonEmptyArray(inactiveObjectMetadataItems) && (
{isNonEmptyArray(inactiveNonSystemObjectMetadataItems) && (
<TableSection title={t`Inactive`}>
{filteredInactiveObjectSettingsItems.map(
(objectSettingsItem) => (