Skip to content

Add account warnings to admin settings #40744

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
come-nc wants to merge 11 commits into from
Closed

Add account warnings to admin settings #40744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
88d6c8e
Add ClientDiagnostic mapper and controller
come-nc Oct 2, 2023
86fd999
Add migration to create DB table for client diagnostics
come-nc Oct 2, 2023
4687603
json_encode client diagnostic
come-nc Oct 2, 2023
e67969e
Add OCP API to register account warnings providers
come-nc Oct 2, 2023
f398b31
Add a provider of account warnings for outdated clients
come-nc Oct 2, 2023
a24a3d8
Implement account provider registration in RegistrationContext
come-nc Oct 3, 2023
b0528d3
Add route to get account warnings from server
come-nc Oct 3, 2023
d01ad74
Add QuotaWarningsProvider to warn about account close to full quota
come-nc Oct 3, 2023
2f96c57
Add user id information to quota warning
come-nc Oct 3, 2023
3298503
Add ClientDiagnosticWarningsProvider and fix diagnostic PUT route
come-nc Oct 3, 2023
0cde8b9
Move the route for pushing diagnostics to ocs endpoint
come-nc Oct 5, 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
Prev Previous commit
Next Next commit
Add user id information to quota warning 
This is a temporary solution, we’ll need to add the list in array format
 so that the UI can do something nice with it.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Oct 3, 2023
commit 2f96c57f6f3c0a2f6d08747a9d54ee345cf15351
10 changes: 5 additions & 5 deletions apps/settings/lib/AccountWarnings/QuotaWarning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ class QuotaWarning implements IAccountWarning {

public function __construct(
private IL10N $l10n,
private int $count,
private array $userIds,
private int $threshold,
) {
}

public function getText(): string {
return $this->l10n->n(
'%n account is using more than %d%% of their quota',
'%n accounts are using more than %d%% of their quota',
$this->count,
[$this->threshold]
'%n account is using more than %d%% of their quota: %s',
'%n accounts are using more than %d%% of their quota: %s',
count($this->userIds),
[$this->threshold, implode(',', $this->userIds)]
);
}

Expand Down
9 changes: 5 additions & 4 deletions apps/settings/lib/AccountWarnings/QuotaWarningsProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function getName(): string {
public function getAccountWarnings(): array {
$users = [];
foreach (QuotaWarning::THRESHOLDS as $threshold) {
$users[$threshold] = 0;
$users[$threshold] = [];
}
$this->userManager->callForSeenUsers(function (IUser $user) use (&$users) {
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
Expand All @@ -59,15 +59,16 @@ public function getAccountWarnings(): array {
$usage = 100 * ($size / $quota);
foreach (QuotaWarning::THRESHOLDS as $threshold => $level) {
if ($usage >= $threshold) {
$users[$threshold]++;
$users[$threshold][] = $user->getUID();
break;
}
}
});
$warnings = [];
foreach ($users as $threshold => $count) {
foreach ($users as $threshold => $uids) {
$count = count($uids);
if ($count > 0) {
$warnings[] = new QuotaWarning($this->l10n, $count, $threshold);
$warnings[] = new QuotaWarning($this->l10n, $uids, $threshold);
}
}
return $warnings;
Expand Down