Skip to content

chore: Cherry-pick FormValidation migration + background user import onto develop #537

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

Merged
hellopablo merged 7 commits into from
Sep 6, 2026
Merged

chore: Cherry-pick FormValidation migration + background user import onto develop #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c0aca2
refactor: Migrate legacy form validation to `buildValidator()`
hellopablo Sep 4, 2026
1b5c127
refactor: Load language lines via the Translation service
hellopablo Sep 4, 2026
48222e4
refactor: Read cross-field values via the validation `Context` in imp…
hellopablo Sep 4, 2026
fe2cb24
feat: Add `Identity` and `Identifier` validators and use them across …
hellopablo Sep 4, 2026
28c5b58
refactor: Read the target user via `Context` in the merge validator
hellopablo Sep 4, 2026
9ad8cc9
chore: Boot Nails in the PHPUnit bootstrap
hellopablo Sep 4, 2026
b6b4fdb
feat: Move user import processing to background
hellopablo Sep 6, 2026
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,6 @@ $RECYCLE.BIN/
*.lnk

# End of https://www.gitignore.io/api/linux,macos,windows,phpstorm,visualstudiocode,composer,node

# PHPUnit
.phpunit.result.cache
43 changes: 40 additions & 3 deletions admin/views/Import/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,24 @@

/**
* @var array<int, string|Closure|Field> $additionalFields
* @var bool $bTemplateUnusable
*/

/**
* The controller has already reported why; offering a form which cannot work
* would only invite an upload that is certain to be rejected.
*/
if (!empty($bTemplateUnusable)) {
?>
<div class="module-auth import">
<p class="alert alert-danger">
User import is unavailable until the template is corrected.
</p>
</div>
<?php
return;
}

?>
<div class="module-auth import">
<?=form_open_multipart()?>
Expand All @@ -29,6 +45,8 @@
<p class="alert alert-info">
<strong>Please note:</strong> The CSV you supply should be in the correct format, as per the template
which you can download above. Remember to include the header rows describing each column.
<br>Every row is validated when you upload; if any of them cannot be imported the file is rejected
and nothing is created, so you can correct it and try again.
</p>
</fieldset>
<?php
Expand Down Expand Up @@ -66,13 +84,32 @@

echo Helper::floatingControls([
'save' => [
'text' => 'Preview',
'name' => 'action',
'value' => 'preview',
'text' => 'Upload &amp; Preview',
],
]);

echo form_close();

?>
<div id="user-import-list" class="hidden">
<hr>
<h2>Recent Imports</h2>
<div class="table-responsive">
<table>
<thead>
<tr>
<th class="field field--id">ID</th>
<th class="field field--file">File</th>
<th class="field field--status">Status</th>
<th class="field field--progress">Progress</th>
<th class="field field--requested">Requested</th>
<th class="field field--finished">Finished</th>
<th class="actions">Actions</th>
</tr>
</thead>
<tbody id="user-import-list-body">
</tbody>
</table>
</div>
</div>
</div>
Loading
Loading