Add title and refactor

src/dom.ts

@@ -14,6 +14,17 @@ export function createTitle(title: string): HTMLElement {
     return h1;
 }
 
+/**
+ * Creates the title of a popover.
+ *
+ * @param title The title to set.
+ */
+export function createPopoverTitle(title: string): HTMLElement {
+    const h4 = document.createElement('h4');
+    h4.innerText = title;
+    return h4;
+}
+
 /**
  * Creates a container which contains a round-robin stage.
  * 
@@ -129,9 +140,9 @@ export function createMatchContainer(match?: Match | MatchGame): HTMLElement {
  * @param status The status to set as tooltip.
  * @param onClick Called when the label is clicked.
  */
-export function createMatchLabel(label: string, status: string, onClick?: (event: MouseEvent) => void): HTMLElement {
+export function createMatchLabel(label: string | undefined, status: string, onClick?: (event: MouseEvent) => void): HTMLElement {
     const span = document.createElement('span');
-    span.innerText = label;
+    span.innerText = label || '';
     span.title = status;
     onClick && span.addEventListener('click', onClick);
     return span;

src/helpers.ts

@@ -1,5 +1,5 @@
 import { Match, ParticipantResult, GroupType, MatchGame } from 'brackets-model';
-import { RankingHeader, Ranking, RankingFormula, RankingItem, RankingMap, Side } from './types';
+import { RankingHeader, Ranking, RankingFormula, RankingItem, RankingMap, Side, MatchWithMetadata } from './types';
 import { t } from './lang';
 
 /**
@@ -73,8 +73,8 @@ export function findRoot(selector?: string): HTMLElement {
  * @param matches The list of first round matches.
  * @param nextMatches The list of second round matches.
  */
-export function completeWithBlankMatches(bracketType: GroupType, matches: Match[], nextMatches?: Match[]): {
-    matches: (Match | null)[],
+export function completeWithBlankMatches(bracketType: GroupType, matches: MatchWithMetadata[], nextMatches?: MatchWithMetadata[]): {
+    matches: (MatchWithMetadata | null)[],
     fromToornament: boolean,
 } {
     if (!nextMatches)
@@ -233,10 +233,20 @@ function createRanking(rankingMap: RankingMap): RankingItem[] {
 }
 
 /**
- * Indicates whether the input is a match or a match game.
+ * Indicates whether the input is a match.
+ * 
+ * @param input A match or a match game.
+ */
+export function isMatch(input: Match | MatchGame): input is Match {
+    return 'child_count' in input;
+}
+
+
+/**
+ * Indicates whether the input is a match game.
  * 
  * @param input A match or a match game.
  */
 export function isMatchGame(input: Match | MatchGame): input is MatchGame {
-    return 'parent_id' in input;
+    return !isMatch(input);
 }

src/i18n/en/translation.json

@@ -8,6 +8,7 @@
         "grand-final": "Winner of $t(abbreviations.loser-bracket) Final"
     },
     "match-label": {
+        "default": "Match {{matchNumber}}",
         "winner-bracket": "$t(abbreviations.winner-bracket)",
         "loser-bracket": "$t(abbreviations.loser-bracket)",
         "standard-bracket": "$t(abbreviations.match)",

src/i18n/fr/translation.json

@@ -8,6 +8,7 @@
         "grand-final": "Gagnant Finale $t(abbreviations.loser-bracket)"
     },
     "match-label": {
+        "default": "Match {{matchNumber}}",
         "winner-bracket": "$t(abbreviations.winner-bracket)",
         "loser-bracket": "$t(abbreviations.loser-bracket)",
         "standard-bracket": "$t(abbreviations.match)",

src/lang.ts

@@ -131,7 +131,10 @@ export function getFinalOriginHint(finalType: FinalType, roundNumber: number): O
  * @param roundCount Count of rounds.
  * @param matchLocation Location of the match.
  */
-export function getMatchLabel(matchNumber: number, roundNumber: number, roundCount: number, matchLocation: GroupType): string {
+export function getMatchLabel(matchNumber: number, roundNumber?: number, roundCount?: number, matchLocation?: GroupType): string {
+    if (roundNumber === undefined || roundCount === undefined || matchLocation === undefined)
+        return t('match-label.default', { matchNumber });
+
     const matchPrefix = matchLocation === 'winner_bracket' ? t('match-label.winner-bracket') :
         matchLocation === 'loser_bracket' ? t('match-label.loser-bracket') : t('match-label.standard-bracket');