Affiliations dropdown fixes

src/lib/elements/contrib/invenioRDM/records/AffiliationsSuggestions.js

@@ -60,8 +60,14 @@ export const makeSubheader = (creatibutor, isOrganization) => {
     }`.trim();
   } else {
     return (
-      creatibutor?.affiliations?.map((affiliation) => affiliation.name)?.join(", ") ||
-      ""
+      creatibutor?.affiliations
+        ?.map((affiliation) => {
+          if (affiliation.acronym?.length > 0) {
+            return `${affiliation.name} (${affiliation.acronym})`;
+          }
+          return affiliation.name;
+        })
+        ?.join(", ") || ""
     );
   }
 };
@@ -84,9 +90,9 @@ export const AffiliationsSuggestions = (creatibutors, isOrganization) => {
 
     return {
       text: creatibutor.name,
-      value: creatibutor.name,
+      value: creatibutor.id || creatibutor.name,
+      name: creatibutor.id || creatibutor.name,
       extra: creatibutor,
-      name: creatibutor.name,
       key: creatibutor.id,
       id: creatibutor.id,
       content: (

src/lib/forms/RemoteSelectField.js

@@ -44,9 +44,17 @@ export class RemoteSelectField extends Component {
     this.cancellableAction && this.cancellableAction.cancel();
   }
 
-  onSelectValue = (event, { options, value }, callbackFunc) => {
+  onSelectValue = (event, { options, value, ...otherData }, callbackFunc) => {
     const { multiple } = this.props;
-    const newSelectedSuggestions = options.filter((item) => value.includes(item.value));
+    const newSelectedSuggestions = options.filter((item) => {
+      if (multiple) {
+        // "value" is an array so check if it includes the option's value
+        return value.includes(item.value);
+      } else {
+        // "value" is a string so we just compare directly
+        return item.value === value;
+      }
+    });
 
     this.setState(
       {

src/lib/forms/widgets/custom_fields/AddDiscoverableFieldsModal.js

@@ -10,7 +10,7 @@ import { RemoveField } from "./RemoveField";
 import { ListAndFilterCustomFields } from "./ListAndFilterCustomFields";
 import { importWidget } from "../loader";
 
-import { Button, Icon, Modal, Divider } from "semantic-ui-react";
+import { Button, Icon, Modal } from "semantic-ui-react";
 
 import PropTypes from "prop-types";