[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] [FIX] tabular imports: return formatted data after import from the API, so the...

Victor Emanouilov pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki


Commits:
125477c5 by Victor Emanouilov at 2025-09-03T14:02:20+03:00
[FIX] tabular imports: return formatted data after import from the API, so the remote point can sync any PKs or other data if needed

- - - - -


2 changed files:

- lib/core/Services/Tracker/TabularController.php
- lib/core/Tracker/Tabular/Writer/TrackerWriter.php


Changes:

=====================================
lib/core/Services/Tracker/TabularController.php
=====================================
@@ -12,6 +12,7 @@ use Tracker\Tabular\Source\CsvSource;
 use Tracker\Tabular\Schema;
 use Tracker\Tabular\Source\PaginatedQuerySource;
 use Tracker\Tabular\Source\QuerySource;
+use Tracker\Tabular\Source\TrackerSourceEntry;
 use Tracker\Tabular\Writer\APIWriter;
 use Tracker\Tabular\Writer\HtmlWriter;
 use Tracker\Tabular\Writer\ODBCWriter;
@@ -557,13 +558,23 @@ class Services_Tracker_TabularController
 
             return TikiLib::lib('tiki')->allocate_extra(
                 'tracker_import_items',
-                function () use ($writer, $source, $info, $successImportMsg) {
-                    $writer->write($source);
+                function () use ($writer, $source, $info, $schema) {
+                    $result = $writer->write($source);
 
                     unlink($_FILES['file']['tmp_name']);
 
                     if (TIKI_API) {
-                        return ['feedback' => $successImportMsg];
+                        $data = [];
+                        $columns = $schema->getColumns();
+                        foreach ($result as $itemId) {
+                            $entry = new TrackerSourceEntry($itemId);
+                            $row = ['itemId' => $itemId];
+                            foreach ($columns as $column) {
+                                $row[$column->getField()] = $entry->render($column, false);
+                            }
+                            $data[] = $row;
+                        }
+                        return $data;
                     }
 
                     Feedback::success($successImportMsg);


=====================================
lib/core/Tracker/Tabular/Writer/TrackerWriter.php
=====================================
@@ -132,7 +132,7 @@ class TrackerWriter
 
         $definition = $schema->getDefinition();
 
-        $iterate(function ($line, $info, $columns) use ($utilities, $definition, $schema) {
+        $result = $iterate(function ($line, $info, $columns) use ($utilities, $definition, $schema) {
             try {
                 if (! isset($info['status'])) {
                     $info['status'] = '';
@@ -184,7 +184,7 @@ class TrackerWriter
             $source->importSuccess();
         }
 
-        return true;
+        return $result;
     }
 
     /**



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/125477c5aa2b3179bfb86b25db3450e7a6faafe8

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/125477c5aa2b3179bfb86b25db3450e7a6faafe8
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs