Refactor user profile page initial data #9324
Conversation
…e with other sections
...probably for years
notbakaneko
force-pushed
the
feature/user-profile-data-refactor
branch
from
7f2d906
to
f1abea3
Compare
| @@ -118,6 +141,86 @@ public function checkUsernameExists() | |||
| return json_item($user, 'UserCompact', ['cover', 'country']); | |||
| } | |||
|
|
|||
| public function extraPages($_id, $page) | |||
| { | |||
| if (!in_array($page, static::LAZY_EXTRA_PAGES, true)) { | |||
| $initialData = [ | ||
| 'achievements' => $achievements, | ||
| 'current_mode' => $currentMode, | ||
| 'extras' => $extras, | ||
| 'per_page' => $perPage, | ||
| 'per_page' => static::PER_PAGE, |
There was a problem hiding this comment.
looks like this can be moved as part of extra page data
| return [ | ||
| 'favourite' => [ | ||
| 'count' => $this->user->profileBeatmapsetsFavourite()->count(), | ||
| 'items' => $this->getExtra($this->user, 'favouriteBeatmapsets', [], static::PER_PAGE['favouriteBeatmapsets']), |
There was a problem hiding this comment.
this looks like can be made into function (the +1 limit can be $extraLimit parameter or something) or maybe pass count (and do the limit thing if no count is passed for has_more data).
also not sure why $this->user and $this->mode are explicitly passed when everything calling this function passes the same thing.
| }; | ||
| } | ||
|
|
||
| for (const key of Object.keys(this.state.scores) as (keyof TopScoresJson)[]) { |
There was a problem hiding this comment.
Also for beatmapsets above (or maybe not needed if the server returns correct json in the first place)
topScoresJsonKeys = ['best', 'firsts', 'pinned'] as const;
type TopScoresJson = Record<(typeof topScoresJsonKeys)[number], ExtraPageJson<SoloScoreJsonForUser>>;
// use topScoresJsonKeys for this loop| scoresRecent: SoloScoreJsonForUser[]; | ||
| } | ||
|
|
||
| export interface ExtraPageJson<T> { |
There was a problem hiding this comment.
more like PaginatedPageSectionJson. And maybe extend the WithoutCount version instead
| export interface ExtraPageJson<T> { | ||
| count: number; | ||
| items: T[]; | ||
| pagination: OffsetPaginationJson; |
There was a problem hiding this comment.
this is a lie as the original json doesn't contain this
maybe update the controller to actually return the correct pagination data instead. It would be even better if the item is discarded before turned into json.
| historical: HistoricalJson; | ||
| kudosu: ExtraPageJsonWithoutCount<KudosuHistoryJson>; | ||
| recentActivity: ExtraPageJsonWithoutCount<EventJson>; | ||
| scores: TopScoresJson; |
| const beatmapsets = this.props.controller.state.extras[section.key]; | ||
| const pagination = this.props.controller.state.pagination[section.key]; | ||
| const state = this.props.controller.state.beatmapsets; | ||
| const count = state[section.translationKey].count; |
There was a problem hiding this comment.
translationKey should just be called key and key should be urlKey or something along that line.
since show() sets $this->user via parsePaginationParams now
move b682fe5ed4 to this branch
making pagination optional instead of having the extra types had its own set of typing problems...
...one of the reasons we did ppy#9324 in the first place
Part 1 of ?
Refactoring the initial data for the user profile page to better support future lazy loading of extra page tab sections.
The initial data structure to make it more convenient for the lazy loaded components to handle.
LazyLoadcomponent will be a separate PR (basically a wrapper withIntersectionObserver)