Merge pull request #11979 from nanaya/team-info-stats

Show statistics on team page

Author: notbakaneko

app/Http/Controllers/TeamsController.php

@@ -122,15 +122,26 @@ public function part(string $id): Response
         return ujs_redirect(route('teams.show', ['team' => $team]));
     }
 
-    public function show(string $id): Response
+    public function show(string $id, ?string $ruleset = null): Response
     {
         $team = Team
             ::with(array_map(
                 fn (string $preload): string => "members.user.{$preload}",
                 UserCompactTransformer::CARD_INCLUDES_PRELOAD,
             ))->findOrFail($id);
 
-        return ext_view('teams.show', compact('team'));
+        if ($ruleset === null) {
+            $rulesetId = $team->default_ruleset_id;
+        } else {
+            $rulesetId = Beatmap::MODES[$ruleset] ?? null;
+
+            if ($rulesetId === null) {
+                abort(422, 'invalid ruleset name');
+            }
+        }
+        $statistics = $team->statistics()->firstOrNew(['ruleset_id' => $rulesetId]);
+
+        return ext_view('teams.show', compact('rulesetId', 'statistics', 'team'));
     }
 
     public function store(): Response

app/Models/TeamStatistics.php

@@ -12,8 +12,15 @@
 
 class TeamStatistics extends Model
 {
+    private const DEFAULT_ATTRIBUTES = [
+        'performance' => 0,
+        'play_count' => 0,
+        'ranked_score' => 0,
+    ];
+
     public $incrementing = false;
 
+    protected $attributes = self::DEFAULT_ATTRIBUTES;
     protected $primaryKey = ':composite';
     protected $primaryKeys = ['team_id', 'ruleset_id'];
 
@@ -27,6 +34,16 @@ public function members(): HasMany
         return $this->hasMany(TeamMember::class, 'team_id', 'team_id');
     }
 
+    public function getRank(): ?int
+    {
+        return $this->performance === 0
+            ? null
+            : 1 + static
+            ::where('ruleset_id', $this->ruleset_id)
+            ->where('performance', '>', $this->performance)
+            ->count();
+    }
+
     public function recalculate(): void
     {
         $userIdsQuery = TeamMember
@@ -42,11 +59,7 @@ public function recalculate(): void
             ->first();
 
         if ($statistics === null) {
-            $this->update([
-                'performance' => 0,
-                'ranked_score' => 0,
-                'play_count' => 0,
-            ]);
+            $this->update(static::DEFAULT_ATTRIBUTES);
 
             return;
         }

resources/css/bem-index.less

@@ -385,6 +385,7 @@
 @import "bem/supporter-quote";
 @import "bem/supporter-status";
 @import "bem/team-action-button";
+@import "bem/team-info";
 @import "bem/team-info-entries";
 @import "bem/team-info-entry";
 @import "bem/team-members";
@@ -393,7 +394,6 @@
 @import "bem/team-members-manage";
 @import "bem/team-settings";
 @import "bem/team-settings-description-preview";
-@import "bem/team-summary";
 @import "bem/textual-button";
 @import "bem/title";
 @import "bem/tooltip-achievement";

resources/css/bem/team-info-entries.less

@@ -4,5 +4,4 @@
 .team-info-entries {
   display: grid;
   gap: 10px;
-  margin-bottom: 20px;
 }

resources/css/bem/team-info-entry.less

@@ -7,5 +7,9 @@
   &__value {
     color: hsl(var(--hsl-c2));
     min-width: 0;
+
+    &--large {
+      font-size: 2em;
+    }
   }
 }

resources/css/bem/team-info.less

@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.team-info {
+  display: grid;
+  align-items: start;
+  gap: 20px;
+
+  @media @desktop {
+    grid-template-columns: 1fr auto 2fr;
+  }
+
+  &__separator {
+    --size: 2px;
+    background-color: hsl(var(--hsl-b6));
+    height: var(--size);
+
+    @media @desktop {
+      height: 100%;
+      width: var(--size);
+    }
+  }
+}

resources/css/bem/team-summary.less

@@ -117,7 +117,7 @@ export default class ScoreboardTableRow extends React.Component<Props> {
           <td className={`${bn}__cell u-relative`}>
             <span className={`${classWithModifiers(`${bn}__cell-content`, 'user-link')}`}>
               {score.user.team != null &&
-                <a className='u-contents' href={route('teams.show', { id: score.user.team.id })}>
+                <a className='u-contents' href={route('teams.show', { team: score.user.team.id })}>
                   <FlagTeam team={score.user.team} />
                 </a>
               }

resources/js/beatmapsets-show/scoreboard/table-row.tsx

@@ -137,9 +137,15 @@
         ],
 
         'sections' => [
+            'about' => 'About Us!',
             'info' => 'Info',
             'members' => 'Members',
         ],
+
+        'statistics' => [
+            'rank' => 'Rank',
+            'leader' => 'Team Leader',
+        ],
     ],
 
     'store' => [

resources/lang/en/teams.php

@@ -14,6 +14,14 @@ class="{{ class_with_modifiers('game-mode-link', ['active' => $ruleset === $curr
                     class="fal fa-extra-mode-{{ $ruleset }}"
                     title="{{ osu_trans("beatmaps.mode.{$ruleset}") }}"
                 ></span>
+                @if (isset($defaultRuleset) && $ruleset === $defaultRuleset)
+                    <span
+                      class="game-mode-link__icon"
+                      title="{{ osu_trans('users.show.edit.default_playmode.is_default_tooltip') }}"
+                    >
+                      <span class="fas fa-star"></span>
+                    </span>
+                @endif
             </a>
         </li>
     @endforeach