custom_fields: added fallback to old thesis format

Author: 0einstein0

invenio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/customFields/Thesis.js

@@ -22,6 +22,8 @@ export class Thesis extends Component {
       icon,
       label,
     } = this.props;
+    const uniWidth = department && type ? 6 : 16;
+
     return (
       <>
         {label && (
@@ -31,7 +33,7 @@ export class Thesis extends Component {
           </>
         )}
         <Grid padded>
-          <Grid.Column width="6">
+          <Grid.Column width={uniWidth}>
             <Input
               fieldPath={`${fieldPath}.university`}
               label={university.label}
@@ -41,26 +43,32 @@ export class Thesis extends Component {
               <label className="helptext mb-0">{university.description}</label>
             )}
           </Grid.Column>
-          <Grid.Column width="6">
-            <Input
-              fieldPath={`${fieldPath}.department`}
-              label={department.label}
-              placeholder={department.placeholder}
-            />
-            {department.description && (
-              <label className="helptext mb-0">{department.description}</label>
-            )}
-          </Grid.Column>
-          <Grid.Column width="4">
-            <Input
-              fieldPath={`${fieldPath}.type`}
-              label={type.label}
-              placeholder={type.placeholder}
-            />
-            {type.description && (
-              <label className="helptext mb-0">{type.description}</label>
-            )}
-          </Grid.Column>
+
+          {department && (
+            <Grid.Column width={6}>
+              <Input
+                fieldPath={`${fieldPath}.department`}
+                label={department.label}
+                placeholder={department.placeholder}
+              />
+              {department.description && (
+                <label className="helptext mb-0">{department.description}</label>
+              )}
+            </Grid.Column>
+          )}
+
+          {type && (
+            <Grid.Column width={4}>
+              <Input
+                fieldPath={`${fieldPath}.type`}
+                label={type.label}
+                placeholder={type.placeholder}
+              />
+              {type.description && (
+                <label className="helptext mb-0">{type.description}</label>
+              )}
+            </Grid.Column>
+          )}
         </Grid>
       </>
     );

invenio_rdm_records/resources/serializers/ui/schema.py

@@ -287,13 +287,13 @@ def _format_imprint(imprint, publisher):
         return formatted
 
     def _format_thesis(thesis):
-        """Formats a thesis object into a string based on its attributes."""
-        university = thesis.get("university", "")
-        department = thesis.get("department", "")
-        ttype = thesis.get("type", "")
-        fields = [university, department, ttype]
-        formatted = ", ".join(filter(None, fields))
-        return formatted
+        """Formats a thesis entry into a string based on its attributes."""
+        if not isinstance(thesis, dict):
+            return thesis
+
+        fields = ["university", "department", "type"]
+        parts = [thesis.get(field, "") for field in fields]
+        return ", ".join(filter(None, parts))
 
     attr = "custom_fields"
     field = obj.get(attr, {})
@@ -302,7 +302,8 @@ def _format_thesis(thesis):
     # Retrieve publishing related custom fields
     journal = field.get("journal:journal")
     imprint = field.get("imprint:imprint")
-    thesis = field.get("thesis:thesis")
+
+    thesis = field.get("thesis:thesis") or field.get("thesis:university")
 
     publication_date = obj.get("metadata", {}).get("publication_date", None)
     result = {}