From bbc3313598f2487e6b55b28697bfee163b87b7bc Mon Sep 17 00:00:00 2001
From: Tigranuhi-A <tigranuhy.alaverdyan@gmail.com>
Date: Wed, 14 Jan 2026 18:49:05 +0400
Subject: [PATCH 1/2] Backend validation errors are not displayed in Toolkit
 forms

---
 .../Templates/Toolkit/assets/css/toolkit.css     |  4 ++++
 .../src/Views/pages/database/index.php.tpl       |  5 +++++
 .../src/Views/partials/messages/error.php        | 16 ++++++++++++++++
 .../Toolkit/src/resources/lang/en/common.php     |  5 +++++
 .../Toolkit/src/resources/lang/en/validation.php |  6 ++++++
 .../Toolkit/src/resources/lang/es/common.php     |  5 +++++
 .../Toolkit/src/resources/lang/es/validation.php |  6 ++++++
 7 files changed, 47 insertions(+)
 create mode 100644 src/Module/Templates/Toolkit/src/Views/partials/messages/error.php
 create mode 100644 src/Module/Templates/Toolkit/src/resources/lang/en/common.php
 create mode 100644 src/Module/Templates/Toolkit/src/resources/lang/en/validation.php
 create mode 100644 src/Module/Templates/Toolkit/src/resources/lang/es/common.php
 create mode 100644 src/Module/Templates/Toolkit/src/resources/lang/es/validation.php

diff --git a/src/Module/Templates/Toolkit/assets/css/toolkit.css b/src/Module/Templates/Toolkit/assets/css/toolkit.css
index b76ad4af8..28e7a1067 100644
--- a/src/Module/Templates/Toolkit/assets/css/toolkit.css
+++ b/src/Module/Templates/Toolkit/assets/css/toolkit.css
@@ -133,4 +133,8 @@ div.jsoneditor-tree button.jsoneditor-invisible{
     .has-fixed-sidenav main {
         padding: 0 20px;
     }
+}
+
+.toast-left {
+    left: 100px !important;
 }
\ No newline at end of file
diff --git a/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl b/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl
index 68cdfbe0f..bcdbb48e4 100644
--- a/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl
+++ b/src/Module/Templates/Toolkit/src/Views/pages/database/index.php.tpl
@@ -1,5 +1,10 @@
 <div id="database">
     <div class="row">
+
+        <?php if (session()->has('error')): ?>
+            <?php echo partial('partials/messages/error') ?>
+        <?php endif; ?>
+
         <div class="tables col s2">
             <ul class="collection with-header">
                 <li class="collection-header table-header add-table waves-effect create-table">
diff --git a/src/Module/Templates/Toolkit/src/Views/partials/messages/error.php b/src/Module/Templates/Toolkit/src/Views/partials/messages/error.php
new file mode 100644
index 000000000..68680058b
--- /dev/null
+++ b/src/Module/Templates/Toolkit/src/Views/partials/messages/error.php
@@ -0,0 +1,16 @@
+<?php $error = session()->getFlash('error') ?>
+<?php if ($error): ?>
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            <?php if (is_array($error)): ?>
+                <?php foreach ($error as $field => $messages): ?>
+                    <?php foreach ($messages as $message): ?>
+                        M.toast({html: "<?php echo addslashes($message); ?>", classes: 'red toast-left'});
+                    <?php endforeach; ?>
+                <?php endforeach; ?>
+            <?php else: ?>
+                M.toast({html: "<?php echo addslashes($error); ?>", classes: 'red toast-left'});
+            <?php endif; ?>
+        });
+    </script>
+<?php endif; ?>
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/en/common.php b/src/Module/Templates/Toolkit/src/resources/lang/en/common.php
new file mode 100644
index 000000000..9c1b80ea9
--- /dev/null
+++ b/src/Module/Templates/Toolkit/src/resources/lang/en/common.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'table' => 'Table Name',
+];
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/en/validation.php b/src/Module/Templates/Toolkit/src/resources/lang/en/validation.php
new file mode 100644
index 000000000..6858cf6fe
--- /dev/null
+++ b/src/Module/Templates/Toolkit/src/resources/lang/en/validation.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'nonEmptyJson' => 'The JSON should not be empty.',
+    'uniqueTableName' => 'Table name must be unique.',
+];
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/es/common.php b/src/Module/Templates/Toolkit/src/resources/lang/es/common.php
new file mode 100644
index 000000000..6c871364c
--- /dev/null
+++ b/src/Module/Templates/Toolkit/src/resources/lang/es/common.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'table' => 'Nombre de la tabla',
+];
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/es/validation.php b/src/Module/Templates/Toolkit/src/resources/lang/es/validation.php
new file mode 100644
index 000000000..34d2d438d
--- /dev/null
+++ b/src/Module/Templates/Toolkit/src/resources/lang/es/validation.php
@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'nonEmptyJson' => 'El JSON no debe estar vacío.',
+    'uniqueTableName' => 'El nombre de la tabla debe ser único.',
+];

From d178e0cd8bdf7556fbc8872b8ae575de91b2d86a Mon Sep 17 00:00:00 2001
From: Tigranuhi-A <tigranuhy.alaverdyan@gmail.com>
Date: Wed, 14 Jan 2026 19:39:58 +0400
Subject: [PATCH 2/2] Migrate form templates from php to php.tpl

---
 .../src/Views/partials/messages/{error.php => error.php.tpl}      | 0
 .../Toolkit/src/resources/lang/en/{common.php => common.php.tpl}  | 0
 .../src/resources/lang/en/{validation.php => validation.php.tpl}  | 0
 .../Toolkit/src/resources/lang/es/{common.php => common.php.tpl}  | 0
 .../src/resources/lang/es/{validation.php => validation.php.tpl}  | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename src/Module/Templates/Toolkit/src/Views/partials/messages/{error.php => error.php.tpl} (100%)
 rename src/Module/Templates/Toolkit/src/resources/lang/en/{common.php => common.php.tpl} (100%)
 rename src/Module/Templates/Toolkit/src/resources/lang/en/{validation.php => validation.php.tpl} (100%)
 rename src/Module/Templates/Toolkit/src/resources/lang/es/{common.php => common.php.tpl} (100%)
 rename src/Module/Templates/Toolkit/src/resources/lang/es/{validation.php => validation.php.tpl} (100%)

diff --git a/src/Module/Templates/Toolkit/src/Views/partials/messages/error.php b/src/Module/Templates/Toolkit/src/Views/partials/messages/error.php.tpl
similarity index 100%
rename from src/Module/Templates/Toolkit/src/Views/partials/messages/error.php
rename to src/Module/Templates/Toolkit/src/Views/partials/messages/error.php.tpl
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/en/common.php b/src/Module/Templates/Toolkit/src/resources/lang/en/common.php.tpl
similarity index 100%
rename from src/Module/Templates/Toolkit/src/resources/lang/en/common.php
rename to src/Module/Templates/Toolkit/src/resources/lang/en/common.php.tpl
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/en/validation.php b/src/Module/Templates/Toolkit/src/resources/lang/en/validation.php.tpl
similarity index 100%
rename from src/Module/Templates/Toolkit/src/resources/lang/en/validation.php
rename to src/Module/Templates/Toolkit/src/resources/lang/en/validation.php.tpl
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/es/common.php b/src/Module/Templates/Toolkit/src/resources/lang/es/common.php.tpl
similarity index 100%
rename from src/Module/Templates/Toolkit/src/resources/lang/es/common.php
rename to src/Module/Templates/Toolkit/src/resources/lang/es/common.php.tpl
diff --git a/src/Module/Templates/Toolkit/src/resources/lang/es/validation.php b/src/Module/Templates/Toolkit/src/resources/lang/es/validation.php.tpl
similarity index 100%
rename from src/Module/Templates/Toolkit/src/resources/lang/es/validation.php
rename to src/Module/Templates/Toolkit/src/resources/lang/es/validation.php.tpl