refactor: enhance lookup functionality by adding parentGroupUri support and cleaning up related code

Author: SKarolFolio

src/common/constants/bibframeMapping.constants.ts

@@ -482,8 +482,14 @@ export const SIMPLE_LOOKUP_MAPPING = {
 
 export const BFLITE_TYPES_MAP = {
   _notes: {
-    field: { uri: 'http://id.loc.gov/ontologies/bibframe/noteType' },
-    data: SIMPLE_LOOKUP_MAPPING._notes,
+    field: '',
+    data: {},
+    fields: {
+      type: {
+        field: { uri: 'type' },
+        data: SIMPLE_LOOKUP_MAPPING._notes,
+      },
+    },
   },
   _creatorReference: {
     field: '',

src/common/helpers/lookupOptions.helper.ts

@@ -40,15 +40,23 @@ export const formatLookupOptions = (
       };
     });
 
-export const getBFGroup = (typeMap: FieldTypeMap, propertyURI: string) =>
-  Object.values(typeMap).find(({ field }) => (field as { uri: string }).uri === propertyURI);
+export const getBFGroup = (typeMap: FieldTypeMap, propertyURI: string, parentGroupUri?: string) => {
+  return (
+    Object.values(typeMap).find(({ field }) => (field as { uri: string }).uri === propertyURI) ??
+    (parentGroupUri ? typeMap[parentGroupUri]?.fields?.[propertyURI] : undefined)
+  );
+};
 
-export const filterLookupOptionsByMappedValue = (lookupData: MultiselectOption[], propertyURI?: string) => {
+export const filterLookupOptionsByMappedValue = (
+  lookupData: MultiselectOption[],
+  propertyURI?: string,
+  parentGroupUri?: string,
+) => {
   if (!propertyURI) return lookupData;
 
   let filteredLookupData = lookupData;
   const typesMap = BFLITE_TYPES_MAP;
-  const bfGroup = getBFGroup(typesMap as FieldTypeMap, propertyURI);
+  const bfGroup = getBFGroup(typesMap as FieldTypeMap, propertyURI, parentGroupUri);
 
   if (bfGroup) {
     const bf20Uris = Object.values(bfGroup.data).map(({ uri }) => uri);
@@ -63,14 +71,15 @@ export const filterLookupOptionsByParentBlock = (
   lookupData?: MultiselectOption[] | Nullish,
   propertyURI?: string,
   parentBlockUri?: string,
+  parentGroupUri?: string,
 ) => {
   if (!lookupData) return;
 
   if (!parentBlockUri || !propertyURI) return lookupData;
 
   let filteredLookupData = lookupData;
   const typesMap = BFLITE_TYPES_MAP;
-  const bfGroup = getBFGroup(typesMap as FieldTypeMap, propertyURI);
+  const bfGroup = getBFGroup(typesMap as FieldTypeMap, propertyURI, parentGroupUri);
 
   if (bfGroup) {
     const bf20MappedData = Object.values(bfGroup.data);

src/common/hooks/useSimpleLookupData.ts

@@ -8,14 +8,14 @@ export const useSimpleLookupData = () => {
 
   const getLookupData = lookupCacheService.getAll;
 
-  const loadLookupData = async (uri: string, propertyURI?: string) => {
+  const loadLookupData = async (uri: string, propertyURI?: string, parentGroupUri?: string) => {
     try {
       const response = await loadSimpleLookup(uri);
 
       if (!response) return null;
 
       const formattedLookupData = formatLookupOptions(response, uri);
-      const filteredLookupData = filterLookupOptionsByMappedValue(formattedLookupData, propertyURI);
+      const filteredLookupData = filterLookupOptionsByMappedValue(formattedLookupData, propertyURI, parentGroupUri);
       const sortedLookupData = filteredLookupData?.toSorted(alphabeticSortLabel);
 
       lookupCacheService.save?.(uri, sortedLookupData);

src/common/services/recordToSchemaMapping/recordToSchemaMapping.service.ts

@@ -407,7 +407,7 @@ export class RecordToSchemaMappingService implements IRecordToSchemaMapping {
     schemaUiElem: SchemaEntry;
     id?: string;
   }) {
-    const { type, constraints, uri } = schemaUiElem;
+    const { type, constraints, uriBFLite } = schemaUiElem;
     const partialTemplateMatch = this.templateMetadata?.filter(({ path }) => path.at(-1) === fieldUri);
     let updatedData = data;
 
@@ -427,7 +427,7 @@ export class RecordToSchemaMappingService implements IRecordToSchemaMapping {
         data: updatedData,
         uri: constraints?.useValuesFrom?.[0],
         uriSelector: BFLITE_URIS.LINK,
-        propertyUri: uri,
+        propertyUri: uriBFLite,
         blockUri: this.currentBlockUri,
         groupUri: this.currentRecordGroupKey,
         fieldUri,

src/common/services/userValues/userValueTypes/simpleLookup.ts

@@ -6,6 +6,7 @@ import { BFLITE_TYPES_MAP, DEFAULT_GROUP_VALUES, BFLITE_URIS } from '@common/con
 
 export class SimpleLookupUserValueService extends UserValueType implements IUserValueType {
   private uri?: string;
+  private groupUri?: string;
   private propertyUri?: string;
   private loadedData?: MultiselectOption[];
   private contents?: UserValueContents[];
@@ -19,6 +20,7 @@ export class SimpleLookupUserValueService extends UserValueType implements IUser
 
   async generate({ data, uri, uuid, uriSelector, type, propertyUri, groupUri, fieldUri }: UserValueDTO) {
     this.uri = uri;
+    this.groupUri = groupUri;
     this.propertyUri = propertyUri;
     const cachedData = this.getCachedData();
 
@@ -110,11 +112,6 @@ export class SimpleLookupUserValueService extends UserValueType implements IUser
     type?: AdvancedFieldType;
     fieldUri?: string;
   }) {
-    console.log('====================================');
-    console.log('BFLITE_TYPES_MAP', BFLITE_TYPES_MAP);
-    console.log('groupUri', groupUri);
-    console.log('====================================');
-
     const typesMap = (BFLITE_TYPES_MAP as FieldTypeMap)[groupUri as string];
     const mappedUri =
       typesMap && itemUri
@@ -162,7 +159,7 @@ export class SimpleLookupUserValueService extends UserValueType implements IUser
     if (!response) return;
 
     const formattedLookupData = formatLookupOptions(response, this.uri);
-    const filteredLookupData = filterLookupOptionsByMappedValue(formattedLookupData, this.propertyUri);
+    const filteredLookupData = filterLookupOptionsByMappedValue(formattedLookupData, this.propertyUri, this.groupUri);
 
     this.loadedData = filteredLookupData?.toSorted(alphabeticSortLabel);
 

src/components/EditSection/DrawComponent.tsx

@@ -120,6 +120,13 @@ export const DrawComponent: FC<IDrawComponent & EditSectionDataProps> = ({
       value: AdvancedFieldType.block,
     });
 
+    const groupEntry = findParentEntryByProperty({
+      schema,
+      path: entry.path,
+      key: 'type',
+      value: AdvancedFieldType.group,
+    });
+
     return (
       <FieldWithMetadataAndControls entry={entry} level={level} isCompact={isCompact}>
         <SimpleLookupField
@@ -130,8 +137,9 @@ export const DrawComponent: FC<IDrawComponent & EditSectionDataProps> = ({
           parentUri={constraints?.valueDataType?.dataTypeURI}
           value={selectedUserValue?.contents}
           isDisabled={isDisabled}
-          propertyUri={entry.uri}
+          propertyUri={entry.uriBFLite}
           parentBlockUri={blockEntry?.uriBFLite}
+          parentGroupUri={groupEntry?.uriBFLite}
         />
       </FieldWithMetadataAndControls>
     );

src/components/SimpleLookupField/SimpleLookupField.tsx

@@ -26,6 +26,7 @@ interface Props {
   onChange: (uuid: string, contents: Array<UserValueContents>) => void;
   propertyUri?: string;
   parentBlockUri?: string;
+  parentGroupUri?: string;
 }
 
 const LoadingMessage: FC = () => <FormattedMessage id="ld.loading" />;
@@ -38,13 +39,14 @@ export const SimpleLookupField: FC<Props> = ({
   htmlId,
   onChange,
   parentUri,
+  parentGroupUri,
   isDisabled = false,
   propertyUri,
   parentBlockUri,
 }) => {
   const { getLookupData, loadLookupData } = useSimpleLookupData();
   const loadedOptions = getLookupData()?.[uri] || [];
-  const options = filterLookupOptionsByParentBlock(loadedOptions, propertyUri, parentBlockUri);
+  const options = filterLookupOptionsByParentBlock(loadedOptions, propertyUri, parentBlockUri, parentGroupUri);
   const { addStatusMessagesItem } = useStatusState();
   const { simpleLookupRef, forceDisplayOptionsAtTheTop } = useSimpleLookupObserver();
 
@@ -63,7 +65,7 @@ export const SimpleLookupField: FC<Props> = ({
     setIsLoading(true);
 
     try {
-      await loadLookupData(uri, propertyUri);
+      await loadLookupData(uri, propertyUri, parentGroupUri);
     } catch (error) {
       console.error('Cannot load data for the Lookup:', error);