Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

chore: hide developer tokens section in if there is nothing to display or create #3753

Merged
merged 5 commits into from
Mar 12, 2023
Merged

chore: hide developer tokens section in if there is nothing to display or create #3753

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a890b0
Hide Developer Tokens section in Security view if there is nothing to…
rob006 Mar 11, 2023
8e65036
Fix CS.
rob006 Mar 11, 2023
6a43a1d
Revert invalid change.
rob006 Mar 12, 2023
8b020a8
Fix classes names.
rob006 Mar 12, 2023
2f70a50
Fix key name for `items.add()` calls.
rob006 Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions framework/core/js/src/forum/components/UserSecurityPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,31 @@ export default class UserSecurityPage<CustomAttrs extends IUserPageAttrs = IUser
settingsItems() {
const items = new ItemList<Mithril.Children>();

['developerTokens', 'sessions'].forEach((section) => {
const sectionName = `${section}Items` as 'developerTokensItems' | 'sessionsItems';
const sectionLocale = camelCaseToSnakeCase(section);

if (
app.forum.attribute('canCreateAccessToken') ||
app.forum.attribute('canModerateAccessTokens') ||
(this.state.hasLoadedTokens() && this.state.getDeveloperTokens()?.length)
) {
items.add(
section,
<FieldSet className={`UserSecurityPage-${section}`} label={app.translator.trans(`core.forum.security.${sectionLocale}_heading`)}>
{this[sectionName]().toArray()}
'developerTokensItems',
rob006 marked this conversation as resolved.
Show resolved Hide resolved
<FieldSet
className="UserSecurityPage-developerTokensItems"
rob006 marked this conversation as resolved.
Show resolved Hide resolved
styles={!this.state.hasLoadedTokens() || !this.state.getDeveloperTokens() ? { display: 'none' } : { color: 'red' }}
rob006 marked this conversation as resolved.
Show resolved Hide resolved
label={app.translator.trans(`core.forum.security.developer_tokens_heading`)}
>
{this.developerTokensItems().toArray()}
</FieldSet>
);
});
} else if (!this.state.hasLoadedTokens()) {
items.add('developerTokensItems', <LoadingIndicator />);
}
SychO9 marked this conversation as resolved.
Show resolved Hide resolved

items.add(
'sessionsItems',
rob006 marked this conversation as resolved.
Show resolved Hide resolved
<FieldSet className="UserSecurityPage-sessionsItems" label={app.translator.trans(`core.forum.security.sessions_heading`)}>
rob006 marked this conversation as resolved.
Show resolved Hide resolved
{this.sessionsItems().toArray()}
</FieldSet>
);

if (this.user!.id() === app.session.user!.id()) {
items.add(
Expand Down