feat(openchallenges): add caption showing undatedChallengeCounts in timeline plot

apps/openchallenges/challenge-service/src/main/java/org/sagebionetworks/openchallenges/challenge/service/api/ChallengeAnalyticsApiDelegate.java

@@ -34,7 +34,7 @@ default ResponseEntity<ChallengesPerYearDto> getChallengesPerYear() {
               for (MediaType mediaType : MediaType.parseMediaTypes(request.getHeader("Accept"))) {
                 if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
                   String exampleString =
-                      "{ \"challengeCounts\" : [ 0, 0 ], \"years\" : [ \"years\", \"years\" ] }";
+                      "{ \"undatedChallengeCount\" : 0, \"challengeCounts\" : [ 0, 0 ], \"years\" : [ \"years\", \"years\" ] }";
                   ApiUtil.setExampleResponse(request, "application/json", exampleString);
                   break;
                 }

apps/openchallenges/challenge-service/src/main/java/org/sagebionetworks/openchallenges/challenge/service/model/dto/ChallengesPerYearDto.java

@@ -26,6 +26,9 @@ public class ChallengesPerYearDto {
   @Valid
   private List<Integer> challengeCounts = new ArrayList<>();
 
+  @JsonProperty("undatedChallengeCount")
+  private Integer undatedChallengeCount = 0;
+
   public ChallengesPerYearDto years(List<String> years) {
     this.years = years;
     return this;
@@ -82,6 +85,27 @@ public void setChallengeCounts(List<Integer> challengeCounts) {
     this.challengeCounts = challengeCounts;
   }
 
+  public ChallengesPerYearDto undatedChallengeCount(Integer undatedChallengeCount) {
+    this.undatedChallengeCount = undatedChallengeCount;
+    return this;
+  }
+
+  /**
+   * Get undatedChallengeCount minimum: 0
+   *
+   * @return undatedChallengeCount
+   */
+  @NotNull
+  @Min(0)
+  @Schema(name = "undatedChallengeCount", example = "0", required = true)
+  public Integer getUndatedChallengeCount() {
+    return undatedChallengeCount;
+  }
+
+  public void setUndatedChallengeCount(Integer undatedChallengeCount) {
+    this.undatedChallengeCount = undatedChallengeCount;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -92,12 +116,13 @@ public boolean equals(Object o) {
     }
     ChallengesPerYearDto challengesPerYear = (ChallengesPerYearDto) o;
     return Objects.equals(this.years, challengesPerYear.years)
-        && Objects.equals(this.challengeCounts, challengesPerYear.challengeCounts);
+        && Objects.equals(this.challengeCounts, challengesPerYear.challengeCounts)
+        && Objects.equals(this.undatedChallengeCount, challengesPerYear.undatedChallengeCount);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(years, challengeCounts);
+    return Objects.hash(years, challengeCounts, undatedChallengeCount);
   }
 
   @Override
@@ -106,6 +131,9 @@ public String toString() {
     sb.append("class ChallengesPerYearDto {\n");
     sb.append("    years: ").append(toIndentedString(years)).append("\n");
     sb.append("    challengeCounts: ").append(toIndentedString(challengeCounts)).append("\n");
+    sb.append("    undatedChallengeCount: ")
+        .append(toIndentedString(undatedChallengeCount))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }

apps/openchallenges/challenge-service/src/main/java/org/sagebionetworks/openchallenges/challenge/service/service/ChallengeAnalyticsService.java

@@ -17,7 +17,12 @@ public ChallengesPerYearDto getChallengesPerYear() {
             "2018", "2019", "2020", "2021", "2022", "2023");
     List<Integer> challengeCounts =
         Arrays.asList(5, 8, 12, 16, 21, 27, 31, 38, 45, 54, 80, 91, 110, 129, 177, 203, 226);
+    Integer undatedChallengeCount = 50;
 
-    return ChallengesPerYearDto.builder().years(years).challengeCounts(challengeCounts).build();
+    return ChallengesPerYearDto.builder()
+        .years(years)
+        .challengeCounts(challengeCounts)
+        .undatedChallengeCount(undatedChallengeCount)
+        .build();
   }
 }

apps/openchallenges/challenge-service/src/main/resources/openapi.yaml

@@ -876,6 +876,7 @@ components:
     ChallengesPerYear:
       description: An object
       example:
+        undatedChallengeCount: 0
         challengeCounts:
         - 0
         - 0
@@ -891,8 +892,14 @@ components:
           items:
             type: integer
           type: array
+        undatedChallengeCount:
+          default: 0
+          example: 0
+          minimum: 0
+          type: integer
       required:
       - challengeCounts
+      - undatedChallengeCount
       - years
       type: object
       x-java-class-annotations:

libs/openchallenges/api-client-angular/src/lib/model/challengesPerYear.ts

@@ -17,5 +17,6 @@
 export interface ChallengesPerYear { 
     years: Array<string>;
     challengeCounts: Array<number>;
+    undatedChallengeCount: number;
 }
 

libs/openchallenges/api-description/build/challenge.openapi.yaml

@@ -614,9 +614,15 @@ components:
           type: array
           items:
             type: integer
+        undatedChallengeCount:
+          type: integer
+          default: 0
+          minimum: 0
+          example: 0
       required:
         - years
         - challengeCounts
+        - undatedChallengeCount
       x-java-class-annotations:
         - '@lombok.Builder'
     ChallengeInputDataTypeSort:

libs/openchallenges/api-description/build/openapi.yaml

@@ -768,9 +768,15 @@ components:
           type: array
           items:
             type: integer
+        undatedChallengeCount:
+          type: integer
+          default: 0
+          minimum: 0
+          example: 0
       required:
         - years
         - challengeCounts
+        - undatedChallengeCount
       x-java-class-annotations:
         - '@lombok.Builder'
     ChallengeInputDataTypeSort:

libs/openchallenges/api-description/src/components/schemas/ChallengesPerYear.yaml

@@ -9,8 +9,14 @@ properties:
     type: array
     items:
       type: integer
+  undatedChallengeCount:
+    type: integer
+    default: 0
+    minimum: 0
+    example: 0
 required:
   - years
   - challengeCounts
+  - undatedChallengeCount
 x-java-class-annotations:
   - '@lombok.Builder'

libs/openchallenges/challenge-search/src/lib/challenge-search.component.ts

@@ -231,8 +231,13 @@ export class ChallengeSearchComponent
 
     // update the total number of challenges in database with empty query
     this.challengeService
-      .listChallenges({})
-      .subscribe((page) => (this.totalChallengesCount = page.totalElements));
+      .listChallenges({ pageSize: 1, pageNumber: 0 })
+      .subscribe((page) => {
+        this.totalChallengesCount = page.totalElements;
+
+        // const num = page.challenges.filter((c) => c.startDate !== null).length;
+        // console.log(num);
+      });
 
     // update platform filter values
     this.challengeSearchDataService

libs/openchallenges/home/src/lib/statistics-viewer/statistics-viewer.component.ts

@@ -75,10 +75,29 @@ export class StatisticsViewerComponent implements OnInit, OnDestroy {
                 },
                 // disable default clicking
                 silent: true,
-                // make bar plot rise from left to right instead of rising all together in the same time
+                // make bar plot rise from left to right
+                // instead of rising all together in the same time
                 animationDelay: (dataIndex: number) => dataIndex * 100,
               },
             ],
+            graphic: res.undatedChallengeCount
+              ? {
+                  elements: [
+                    {
+                      type: 'text',
+                      style: {
+                        text:
+                          `*The OC database includes an additional ${res.undatedChallengeCount} challenges ` +
+                          `without known start dates.`,
+                        fill: '#888',
+                        fontSize: '1em',
+                      },
+                      left: '25%',
+                      bottom: 5,
+                    },
+                  ],
+                }
+              : undefined,
           })
       );
   }