bugfix

Author: maximiliani

src/components/pid-component/pid-component.stories.ts

@@ -419,3 +419,19 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
     },
   },
 };
+
+export const TypedPIDMakerExampleText: Story = {
+  args: {
+    value: '21.T11981/be908bd1-e049-4d35-975e-8e27d40117e6',
+  },
+  decorators: [
+    (story: () => unknown) => html`
+      <p class="align-middle items-center w-1/3">
+        The Typed PID Maker is an entry point to integrate digital resources into the FAIR Digital Object (FAIR DO) ecosystem. It allows creating PIDs for resources and to provide
+        them with the necessary metadata to ensure that the resources can be found and understood. <br />
+        As a result, a machine-readable representation of all kinds of research artifacts allows act on such FAIR Digital Objects which present themselves as PID, e.g., ${story()},
+        but carry much more than just a pointer to a landing page.
+      </p>
+    `,
+  ],
+};

src/rendererModules/LocaleType.tsx

@@ -11,7 +11,7 @@ export class LocaleType extends GenericIdentifierType {
   }
 
   hasCorrectFormat(): boolean {
-    const regex = /^[a-z]{2}(-[A-Z]{2})?$/;
+    const regex = /^([a-zA-Z]{2})(-[A-Z]{2})?$/;
     return regex.test(this.value);
   }
 

src/rendererModules/ORCiD/ORCIDInfo.ts

@@ -296,9 +296,22 @@ export class ORCIDInfo {
     });
     // .then(response => response.json());
 
-    // Parse family name and given names
-    const familyName = rawOrcidJSON['person']['name']['family-name']['value'];
-    const givenNames = rawOrcidJSON['person']['name']['given-names']['value'];
+    let familyName = '';
+    let givenNames = [];
+
+    try {
+      familyName = rawOrcidJSON['person']['name']['family-name']['value'];
+    } catch (e) {
+      console.debug(e);
+    }
+
+    try {
+      givenNames = rawOrcidJSON['person']['name']['given-names']['value'];
+    } catch (e) {
+      console.debug(e);
+    }
+    // const familyName = rawOrcidJSON['person']['name']['family-name']['value'] ? rawOrcidJSON['person']['name']['family-name']['value'] : '';
+    // const givenNames = rawOrcidJSON['person']['name']['given-names']['value'] ? rawOrcidJSON['person']['name']['given-names']['value'] : '';
 
     // Parse employments, if available
     const affiliations = rawOrcidJSON['activities-summary']['employments']['affiliation-group'];

src/rendererModules/ORCiD/ORCIDType.tsx

@@ -65,20 +65,26 @@ export class ORCIDType extends GenericIdentifierType {
 
     // Generate items and actions
     this.items.push(
-      ...[
-        new FoldableItem(
-          0,
-          'ORCiD',
-          this._orcidInfo.orcid,
-          'ORCiD is a free service for researchers to distinguish themselves by creating a unique personal identifier.',
-          'https://orcid.org',
-          undefined,
-          true,
-        ),
-        new FoldableItem(1, 'Family Name', this._orcidInfo.familyName, 'The family name of the person.'),
-      ],
+      new FoldableItem(
+        0,
+        'ORCiD',
+        this._orcidInfo.orcid,
+        'ORCiD is a free service for researchers to distinguish themselves by creating a unique personal identifier.',
+        'https://orcid.org',
+        undefined,
+        true,
+      ),
     );
 
+    try {
+      const familyName = this._orcidInfo.familyName;
+      if (familyName) {
+        new FoldableItem(1, 'Family Name', this._orcidInfo.familyName, 'The family name of the person.');
+      }
+    } catch (e) {
+      console.log('Failed to obtain family name from ORCiD record.', e);
+    }
+
     try {
       const givenNames = this._orcidInfo.givenNames;
       if (givenNames) {
@@ -139,9 +145,7 @@ export class ORCIDType extends GenericIdentifierType {
 
       // If there are other e-mail addresses, generate an item with a list of them
       if (other.length > 0)
-        this.items.push(
-          new FoldableItem(70, 'Other E-Mail addresses', other.map(email => email.email).join(', '), 'All other e-mail addresses of the person.', undefined, undefined, false),
-        );
+        this.items.push(new FoldableItem(70, 'Other E-Mail addresses', other.map(email => email.email).join(', '), 'All other e-mail addresses of the person.'));
 
       if (this._orcidInfo.preferredLocale)
         this.items.push(new FoldableItem(25, 'Preferred Language', this._orcidInfo.preferredLocale, 'The preferred locale/language of the person.'));