update function name; update logic

Sage-Bionetworks · Oct 12, 2023 · bb24df3 · bb24df3
1 parent dffe710
commit bb24df3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.html b/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.html
@@ -1,7 +1,7 @@
 <main *ngIf="challenge">
   <div id="bio">
     <h3 class="top-section-title">Overview</h3>
-    <p>{{ use_default(challenge.description) }}</p>
+    <p>{{ useNaIfEmpty(challenge.description) }}</p>
     <div *ngIf="challenge.description.endsWith('...')">
       <a class="read-more" href="{{ challenge.websiteUrl }}"
         >Continue reading <mat-icon aria-hidden="true" inline="true">open_in_new</mat-icon></a
@@ -15,13 +15,13 @@ <h3 class="section-title">Challenge Details</h3>
         <tr>
           <td class="text-right">Start Date</td>
           <td [ngClass]="{ 'text-grey': challenge.startDate === null }">
-            {{ use_default(challenge.startDate) }}
+            {{ useNaIfEmpty(challenge.startDate) }}
           </td>
         </tr>
         <tr>
           <td class="text-right">End Date</td>
           <td [ngClass]="{ 'text-grey': challenge.endDate === null }">
-            {{ use_default(challenge.endDate) }}
+            {{ useNaIfEmpty(challenge.endDate) }}
           </td>
         </tr>
         <tr>
@@ -31,7 +31,7 @@ <h3 class="section-title">Challenge Details</h3>
         <tr>
           <td class="text-right">Platform</td>
           <td [ngClass]="{ 'text-grey': challenge.platform.name === '' }">
-            {{ use_default(challenge.platform.name) }}
+            {{ useNaIfEmpty(challenge.platform.name) }}
           </td>
         </tr>
         <tr>

diff --git a/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.ts b/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.ts
@@ -19,8 +19,8 @@ export class ChallengeOverviewComponent {
   organizationCards: OrganizationCard[] = MOCK_ORGANIZATION_CARDS;
   // mockTopics = ['breast', 'cancer'];
 
-  use_default(str: string | null | undefined) {
-    return str === '' || str == null ? 'Not available' : str;
+  useNaIfEmpty(str: string | null | undefined) {
+    return str ?? 'Not available';
   }
 
   prettify(camel: string | undefined) {

diff --git a/...enchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.html b/...enchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.html
@@ -2,7 +2,7 @@
   <div id="bio" class="row">
     <div class="col">
       <h3>Overview</h3>
-      <p>{{ use_default(org.description) }}</p>
+      <p>{{ useNaIfEmpty(org.description) }}</p>
       <div *ngIf="org.description.endsWith('...')">
         <a class="read-more" href="{{ org.websiteUrl }}"
           >Continue reading <mat-icon aria-hidden="true" inline="true">open_in_new</mat-icon></a>
@@ -15,11 +15,11 @@ <h3 class="section-title">Organization Details</h3>
       <tbody>
         <tr>
           <td class="text-right">Acronym</td>
-          <td [ngClass]="{ 'text-grey': org.acronym === '' }">{{ use_default(org.acronym) }}</td>
+          <td [ngClass]="{ 'text-grey': org.acronym === '' }">{{ useNaIfEmpty(org.acronym) }}</td>
         </tr>
         <tr>
           <td class="text-right">Contact Email</td>
-          <td [ngClass]="{ 'text-grey': org.email === '' }">{{ use_default(org.email) }}</td>
+          <td [ngClass]="{ 'text-grey': org.email === '' }">{{ useNaIfEmpty(org.email) }}</td>
         </tr>
       </tbody>
     </table>

diff --git a/...openchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.ts b/...openchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.ts
@@ -18,7 +18,7 @@ export class OrgProfileOverviewComponent {
   @Input({ required: true }) organization!: Organization;
   organizationCards: OrganizationCard[] = MOCK_ORGANIZATION_CARDS;
 
-  use_default(str: string | undefined) {
-    return str === '' ? 'Not available' : str;
+  useNaIfEmpty(str: string | undefined) {
+    return str || 'Not available';
   }
 }