Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { isActiveFieldMetadataItem } from '@/object-metadata/utils/isActiveFieldMetadataItem';
import { useMemo } from 'react';

export const useActiveFieldMetadataItems = ({
Expand All @@ -10,7 +11,11 @@ export const useActiveFieldMetadataItems = ({
() =>
objectMetadataItem
? objectMetadataItem.readableFields.filter(
({ isActive, isSystem }) => isActive && !isSystem,
({ isActive, isSystem, name }) =>
isActiveFieldMetadataItem({
objectNameSingular: objectMetadataItem.nameSingular,
fieldMetadata: { isActive, isSystem, name },
}),
)
: [],
[objectMetadataItem],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { isActiveFieldMetadataItem } from '@/object-metadata/utils/isActiveFieldMetadataItem';

describe('isActiveFieldMetadataItem', () => {
it('should return false for inactive fields', () => {
const res = isActiveFieldMetadataItem({
fieldMetadata: { isActive: false, isSystem: false, name: 'fieldName' },
objectNameSingular: 'objectNameSingular',
});
expect(res).toBe(false);
});

it('should return true for active fields', () => {
const res = isActiveFieldMetadataItem({
fieldMetadata: { isActive: true, isSystem: false, name: 'fieldName' },
objectNameSingular: 'objectNameSingular',
});
expect(res).toBe(true);
});

it('should return false for system fields', () => {
const res = isActiveFieldMetadataItem({
fieldMetadata: { isActive: true, isSystem: true, name: 'fieldName' },
objectNameSingular: 'objectNameSingular',
});
expect(res).toBe(false);
});

it('should return true for note targets', () => {
const res = isActiveFieldMetadataItem({
fieldMetadata: { isActive: true, isSystem: false, name: 'noteTargets' },
objectNameSingular: 'note',
});
expect(res).toBe(true);
});

it('should return true for task targets', () => {
const res = isActiveFieldMetadataItem({
fieldMetadata: { isActive: true, isSystem: false, name: 'taskTargets' },
objectNameSingular: 'task',
});
expect(res).toBe(true);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { type FieldMetadataItem } from '../types/FieldMetadataItem';

type IsFieldMetadataAvailableForViewFieldArgs = {
objectNameSingular: string;
fieldMetadata: Pick<FieldMetadataItem, 'name' | 'isSystem' | 'isActive'>;
};

export const isActiveFieldMetadataItem = ({
objectNameSingular,
fieldMetadata,
}: IsFieldMetadataAvailableForViewFieldArgs) => {
if (fieldMetadata.isActive === false) {
return false;
}

if (
(objectNameSingular === CoreObjectNameSingular.Note &&
fieldMetadata.name === 'noteTargets') ||
(objectNameSingular === CoreObjectNameSingular.Task &&
fieldMetadata.name === 'taskTargets')
) {
return true;
}

if (fieldMetadata.isSystem === true) {
return false;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not very intuitive with the "active" naming

}

return true;
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { flattenedReadableFieldMetadataItemsSelector } from '@/object-metadata/states/flattenedReadableFieldMetadataItemIdsSelector';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
import { isActiveFieldMetadataItem } from '@/object-metadata/utils/isActiveFieldMetadataItem';
import { RecordFieldsComponentInstanceContext } from '@/object-record/record-field/states/context/RecordFieldsComponentInstanceContext';
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector';
Expand All @@ -16,20 +17,41 @@ export const visibleRecordFieldsComponentSelector = createComponentSelector({
}),
);

const readableFieldMetadataItems = get(
flattenedReadableFieldMetadataItemsSelector,
);
const objectMetadataItems = get(objectMetadataItemsState);

const filteredVisibleAndReadableRecordFields = currentRecordFields.filter(
(recordFieldToFilter) =>
recordFieldToFilter.isVisible === true &&
readableFieldMetadataItems.some(
(fieldMetadataItemToFilter) =>
fieldMetadataItemToFilter.id ===
recordFieldToFilter.fieldMetadataItemId &&
fieldMetadataItemToFilter.isActive === true &&
fieldMetadataItemToFilter.isSystem !== true,
),
(recordFieldToFilter) => {
if (!recordFieldToFilter.isVisible) {
return false;
}

const objectMetadataItem = objectMetadataItems.find(
(objectMetadataItem) =>
objectMetadataItem.fields.some(
(fieldMetadataItem) =>
fieldMetadataItem.id ===
recordFieldToFilter.fieldMetadataItemId,
),
);

if (!objectMetadataItem) {
return false;
}

const fieldMetadataItem = objectMetadataItem.fields.find(
(fieldMetadataItem) =>
fieldMetadataItem.id === recordFieldToFilter.fieldMetadataItemId,
);

if (!fieldMetadataItem) {
return false;
}

return isActiveFieldMetadataItem({
objectNameSingular: objectMetadataItem.nameSingular,
fieldMetadata: fieldMetadataItem,
});
},
);

return [...filteredVisibleAndReadableRecordFields].sort(
Expand Down