feat: multi-query/upload .sql en query runner + selector BD por rol
This commit is contained in:
+10
-1
@@ -17,6 +17,7 @@ type Roles struct {
|
||||
EsPortalCliente bool `json:"es_portal_cliente" gorm:"column:es_portal_cliente;default:false"`
|
||||
EsPortalPartner bool `json:"es_portal_partner" gorm:"column:es_portal_partner;default:false"`
|
||||
Submodules []Submodules `json:"submodules" gorm:"many2many:roles_submodules"`
|
||||
ConxDBs []ConxDb `json:"conx_dbs" gorm:"many2many:roles_conx_db"`
|
||||
}
|
||||
|
||||
// TableName overrides the table name used by Modules to `modules`
|
||||
@@ -41,7 +42,7 @@ func AllRoles(limit, offset int, search string) ([]Roles, int64, error) {
|
||||
}
|
||||
|
||||
// Obtener los módulos con paginación
|
||||
if err := db.Order("id DESC").Limit(limit).Offset(offset).Preload("Submodules").Find(&roles).Error; err != nil {
|
||||
if err := db.Order("id DESC").Limit(limit).Offset(offset).Preload("Submodules").Preload("ConxDBs").Find(&roles).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
@@ -62,6 +63,14 @@ func AllRolesSelect() ([]Roles, error) {
|
||||
|
||||
// CreateModule creates a new rol
|
||||
func CreateRole(role Roles) error {
|
||||
var conxDbs []ConxDb
|
||||
for _, db := range role.ConxDBs {
|
||||
var found ConxDb
|
||||
if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
|
||||
conxDbs = append(conxDbs, found)
|
||||
}
|
||||
}
|
||||
role.ConxDBs = conxDbs
|
||||
if err := app.Http.Database.DB.Create(&role).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
+1
-1
@@ -175,7 +175,7 @@ func FindUserByID(id interface{}) (*Users, error) {
|
||||
db := app.Http.Database.DB.Model(&Users{})
|
||||
|
||||
// Buscar el usuario por ID
|
||||
if err := db.Where("id = ?", id).Preload("Role.Submodules.Module").First(&user).Error; err != nil {
|
||||
if err := db.Where("id = ?", id).Preload("Role.Submodules.Module").Preload("Role.ConxDBs").First(&user).Error; err != nil {
|
||||
// Manejar el error si el registro no se encuentra
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, fmt.Errorf("usuario no encontrado con ID: %d", id)
|
||||
|
||||
@@ -136,6 +136,19 @@
|
||||
Limpiar
|
||||
</button>
|
||||
|
||||
<!-- Batch mode toggle -->
|
||||
<button @click="batchMode = !batchMode; if(!batchMode) batchResults = []"
|
||||
class="px-3 py-1.5 text-xs border rounded transition"
|
||||
:class="batchMode ? 'bg-amber-500 text-white border-amber-500' : 'hover:bg-gray-50'">
|
||||
<span x-text="batchMode ? '📚 Lote ON' : '📄 Lote OFF'"></span>
|
||||
</button>
|
||||
|
||||
<!-- Subir .sql -->
|
||||
<label x-show="!isMongo && !isRedis" class="px-3 py-1.5 text-xs border rounded hover:bg-gray-50 cursor-pointer transition">
|
||||
📁 Subir .sql
|
||||
<input type="file" accept=".sql" @change="uploadSQLFile($event)" class="hidden">
|
||||
</label>
|
||||
|
||||
<!-- Botón AI -->
|
||||
<button @click="askAI()" :disabled="aiLoading || !sqlText.trim()"
|
||||
class="flex items-center gap-1 px-3 py-1.5 text-xs rounded transition disabled:opacity-40"
|
||||
@@ -555,13 +568,68 @@
|
||||
|
||||
<!-- ── TAB: Resultados ── -->
|
||||
<div x-show="activeTab === 'results'" class="flex-1 overflow-auto border rounded-lg">
|
||||
<div x-show="results.length === 0 && !loadingQuery" class="flex flex-col items-center justify-center h-40 text-gray-400 text-sm gap-2">
|
||||
<!-- Sin resultados -->
|
||||
<div x-show="!batchMode && results.length === 0 && !loadingQuery" class="flex flex-col items-center justify-center h-40 text-gray-400 text-sm gap-2">
|
||||
<svg class="w-10 h-10 opacity-30" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 5.625c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125"/>
|
||||
</svg>
|
||||
<span>Sin resultados. Ejecuta una consulta.</span>
|
||||
</div>
|
||||
<table x-show="results.length > 0" class="table-auto w-full text-xs">
|
||||
|
||||
<!-- Batch results tabs -->
|
||||
<div x-show="batchMode && batchResults.length > 0" class="flex flex-col h-full">
|
||||
<div class="flex items-center gap-1 px-2 py-1.5 border-b bg-gray-50 sticky top-0 overflow-x-auto shrink-0">
|
||||
<template x-for="(br, i) in batchResults" :key="i">
|
||||
<button @click="batchActiveIdx = i"
|
||||
class="px-2.5 py-1 text-[10px] rounded whitespace-nowrap font-mono transition flex items-center gap-1"
|
||||
:class="batchActiveIdx === i
|
||||
? (br.status === 'error' ? 'bg-red-100 text-red-700 border border-red-200' : 'bg-[#8eb02f] text-white')
|
||||
: (br.status === 'error' ? 'bg-red-50 text-red-500 border border-red-100' : 'bg-white text-gray-600 border border-gray-200 hover:bg-gray-50')">
|
||||
<span x-text="'#' + (i+1)"></span>
|
||||
<span class="truncate max-w-[100px]" x-text="br.sql.substring(0, 30)"></span>
|
||||
<span x-show="br.status === 'ok'" class="text-green-500">✓</span>
|
||||
<span x-show="br.status === 'error'" class="text-red-500">✗</span>
|
||||
</button>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Resultado activo del batch -->
|
||||
<template x-for="(br, i) in batchResults" :key="i">
|
||||
<div x-show="batchActiveIdx === i" class="flex-1 overflow-auto">
|
||||
<div x-show="br.status === 'error'" class="p-4 text-xs text-red-600 bg-red-50 font-mono" x-text="br.error"></div>
|
||||
<div x-show="br.status === 'ok' && (!br.columns || br.columns.length === 0)" class="p-4 text-xs text-green-700 bg-green-50">
|
||||
✅ Consulta ejecutada — <span x-text="br.rows + ' filas afectadas'"></span> · <span x-text="br.duration"></span>
|
||||
</div>
|
||||
<table x-show="br.status === 'ok' && br.columns && br.columns.length > 0" class="table-auto w-full text-xs">
|
||||
<thead class="sticky top-0 bg-gray-50 z-10">
|
||||
<tr>
|
||||
<th class="py-2 px-3 border-b text-left font-semibold text-gray-500 w-10">#</th>
|
||||
<template x-for="col in br.columns" :key="col">
|
||||
<th class="py-2 px-3 border-b text-left font-semibold text-gray-600 whitespace-nowrap" x-text="col"></th>
|
||||
</template>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-gray-100">
|
||||
<template x-for="(row, idx) in br.data" :key="idx">
|
||||
<tr class="hover:bg-gray-50">
|
||||
<td class="py-2 px-3 text-gray-400 select-none" x-text="idx+1"></td>
|
||||
<template x-for="col in br.columns" :key="col">
|
||||
<td class="py-2 px-3 font-mono max-w-xs truncate" :title="nullStr(row[col])" x-text="nullStr(row[col])"></td>
|
||||
</template>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
</table>
|
||||
<div x-show="br.status === 'ok'" class="px-3 py-1.5 text-[10px] text-gray-400 border-t bg-gray-50">
|
||||
<span x-text="(br.data || []).length + ' filas'"></span> ·
|
||||
<span x-text="br.duration"></span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Single results table (modo normal) -->
|
||||
<table x-show="!batchMode && results.length > 0" class="table-auto w-full text-xs">
|
||||
<thead class="sticky top-0 bg-gray-50 z-10">
|
||||
<tr>
|
||||
<th class="py-2 px-3 border-b text-left font-semibold text-gray-500 w-10">#</th>
|
||||
@@ -704,6 +772,9 @@ document.addEventListener('alpine:init', () => {
|
||||
results: [],
|
||||
history: [],
|
||||
activeTab: 'results',
|
||||
batchMode: false,
|
||||
batchResults: [],
|
||||
batchActiveIdx: 0,
|
||||
statusMsg: '',
|
||||
statusOk: true,
|
||||
testMsg: '',
|
||||
@@ -1374,6 +1445,10 @@ document.addEventListener('alpine:init', () => {
|
||||
|
||||
async runQuery() {
|
||||
if (!this.selectedConxId || !this.sqlText.trim()) return;
|
||||
if (this.batchMode) {
|
||||
await this.runBatch();
|
||||
return;
|
||||
}
|
||||
this.loadingQuery = true;
|
||||
this.statusMsg = '';
|
||||
this.results = [];
|
||||
@@ -1407,6 +1482,65 @@ document.addEventListener('alpine:init', () => {
|
||||
await this.loadHistory();
|
||||
},
|
||||
|
||||
// ── Batch mode ──────────────────────────────────────────────
|
||||
extractSQLStatements(text) {
|
||||
// Split by semicolons, trim whitespace, remove empty
|
||||
return text
|
||||
.split(';')
|
||||
.map(s => s.trim())
|
||||
.filter(s => s.length > 0 && !s.toUpperCase().startsWith('--') && !s.startsWith('#'));
|
||||
},
|
||||
|
||||
uploadSQLFile(event) {
|
||||
const file = event.target.files[0];
|
||||
if (!file) return;
|
||||
const reader = new FileReader();
|
||||
reader.onload = (e) => {
|
||||
const content = e.target.result;
|
||||
this.sqlText = content;
|
||||
this.batchMode = true;
|
||||
this.showToast(`📁 Archivo "${file.name}" cargado (${(content.length / 1024).toFixed(1)} KB)`);
|
||||
};
|
||||
reader.readAsText(file);
|
||||
// Reset input so re-selecting same file triggers change
|
||||
event.target.value = '';
|
||||
},
|
||||
|
||||
async runBatch() {
|
||||
if (!this.selectedConxId) return;
|
||||
const sqls = this.extractSQLStatements(this.sqlText);
|
||||
if (sqls.length === 0) {
|
||||
this.showToast('No se encontraron sentencias SQL válidas', 'error');
|
||||
return;
|
||||
}
|
||||
this.loadingQuery = true;
|
||||
this.statusMsg = '';
|
||||
this.batchResults = [];
|
||||
this.batchActiveIdx = 0;
|
||||
this.activeTab = 'results';
|
||||
try {
|
||||
const formData = new FormData();
|
||||
formData.append('conx_db_id', this.selectedConxId);
|
||||
formData.append('database', this.selectedDb || '');
|
||||
sqls.forEach((sql, i) => formData.append('sqls[]', sql));
|
||||
const res = await axios.post('/app/query-runner/run-batch', formData, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' }
|
||||
});
|
||||
this.batchResults = res.data.results || [];
|
||||
const okCount = this.batchResults.filter(r => r.status === 'ok').length;
|
||||
const errCount = this.batchResults.filter(r => r.status === 'error').length;
|
||||
this.statusOk = errCount === 0;
|
||||
this.statusMsg = `✓ ${okCount} consultas ejecutadas, ${errCount} con error — ${res.data.duration || ''}`;
|
||||
} catch (e) {
|
||||
this.statusOk = false;
|
||||
this.statusMsg = '✗ ' + (e.response?.data?.error || 'Error al ejecutar batch');
|
||||
if (e.response?.data?.results) {
|
||||
this.batchResults = e.response.data.results;
|
||||
}
|
||||
}
|
||||
this.loadingQuery = false;
|
||||
},
|
||||
|
||||
async loadHistory() {
|
||||
if (!this.selectedConxId) return;
|
||||
try {
|
||||
|
||||
@@ -120,6 +120,7 @@
|
||||
Name = registro.name;
|
||||
Description = registro.description;
|
||||
Submodules = [...registro.submodules];
|
||||
ConxDBs = [...(registro.conx_dbs || [])];
|
||||
EsPortalCliente = registro.es_portal_cliente || false;
|
||||
EsPortalPartner = registro.es_portal_partner || false;
|
||||
HomeUrl = registro.home_url || '';
|
||||
@@ -254,6 +255,20 @@
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mt-4 p-3 border rounded-md bg-slate-50">
|
||||
<p class="font-semibold text-sm mb-2">Bases de datos permitidas (Query Runner)</p>
|
||||
<div class="grid grid-cols-2 gap-1 max-h-32 overflow-y-auto">
|
||||
<template x-for="con in conexiones" :key="con.ID">
|
||||
<div>
|
||||
<input type="checkbox" :value="con.ID" :id="'edit-conxdb-' + con.ID"
|
||||
:checked="ConxDBs.some(c => c.ID === con.ID)"
|
||||
@change="if($event.target.checked) { ConxDBs.push(con) } else { ConxDBs = ConxDBs.filter(c => c.ID !== con.ID) }"
|
||||
class="mr-2">
|
||||
<label :for="'edit-conxdb-' + con.ID" x-text="con.nombre" class="text-xs"></label>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-4 flex justify-between">
|
||||
<button type="submit" class="bg-[#8eb02f] text-white px-4 py-2 rounded">Guardar Cambios</button>
|
||||
<button type="button" class="bg-gray-600 text-white px-4 py-2 rounded"
|
||||
@@ -326,6 +341,20 @@
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mt-4 p-3 border rounded-md bg-slate-50">
|
||||
<p class="font-semibold text-sm mb-2">Bases de datos permitidas (Query Runner)</p>
|
||||
<div class="grid grid-cols-2 gap-1 max-h-32 overflow-y-auto">
|
||||
<template x-for="con in conexiones" :key="con.ID">
|
||||
<div>
|
||||
<input type="checkbox" :value="con.ID" :id="'add-conxdb-' + con.ID"
|
||||
:checked="newConxDBs.some(c => c.ID === con.ID)"
|
||||
@change="if($event.target.checked) { newConxDBs.push(con) } else { newConxDBs = newConxDBs.filter(c => c.ID !== con.ID) }"
|
||||
class="mr-2">
|
||||
<label :for="'add-conxdb-' + con.ID" x-text="con.nombre" class="text-xs"></label>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-4 flex justify-between">
|
||||
<button type="submit" class="bg-[#8eb02f] text-white px-4 py-2 rounded">Guardar</button>
|
||||
<button type="button" class="bg-gray-600 text-white px-4 py-2 rounded"
|
||||
@@ -378,6 +407,9 @@
|
||||
|
||||
sinregistro: '',
|
||||
modules: [],
|
||||
conexiones: [],
|
||||
ConxDBs: [],
|
||||
newConxDBs: [],
|
||||
|
||||
|
||||
|
||||
@@ -405,10 +437,11 @@
|
||||
fetch(`/app/loadroles?page=${page}${search}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
this.totalRecords = data.total; // Establece el total de registros aquí
|
||||
this.totalRecords = data.total;
|
||||
this.modulos = data.modules;
|
||||
this.registros = data.roles; // Asignar
|
||||
this.totalPages = data.totalPages; // Asignar total de páginas
|
||||
this.registros = data.roles;
|
||||
this.conexiones = data.conexiones || [];
|
||||
this.totalPages = data.totalPages;
|
||||
this.createPagination(this.totalPages, page);
|
||||
if (data.roles.length === 0) {
|
||||
this.sinregistro = true;
|
||||
@@ -496,7 +529,8 @@
|
||||
es_portal_cliente: this.newEsPortalCliente,
|
||||
es_portal_partner: this.newEsPortalPartner,
|
||||
home_url: this.newHomeUrl,
|
||||
submodules: selectedSubmodules.flatMap(modulo => modulo.submodules)
|
||||
submodules: selectedSubmodules.flatMap(modulo => modulo.submodules),
|
||||
conx_dbs: this.newConxDBs
|
||||
};
|
||||
|
||||
fetch('/app/roles', {
|
||||
@@ -510,8 +544,9 @@
|
||||
this.newDescription = '';
|
||||
this.newEsPortalCliente = false;
|
||||
this.newEsPortalPartner = false;
|
||||
this.newConxDBs = [];
|
||||
this.modulos.forEach(modulo => {
|
||||
modulo.submodules.forEach(submodulo => submodulo.checked = false); // Reset checkboxes
|
||||
modulo.submodules.forEach(submodulo => submodulo.checked = false);
|
||||
});
|
||||
|
||||
this.closeModal();
|
||||
@@ -557,7 +592,8 @@
|
||||
es_portal_cliente: this.EsPortalCliente,
|
||||
es_portal_partner: this.EsPortalPartner,
|
||||
home_url: this.HomeUrl,
|
||||
submodules: this.submodulos
|
||||
submodules: this.submodulos,
|
||||
conx_dbs: this.ConxDBs
|
||||
})
|
||||
})
|
||||
.then(response => response.json())
|
||||
@@ -567,6 +603,7 @@
|
||||
this.EsPortalCliente = false;
|
||||
this.EsPortalPartner = false;
|
||||
this.submodulos = [];
|
||||
this.ConxDBs = [];
|
||||
this.modulos.forEach(modulo => {
|
||||
modulo.submodules.forEach(submodulo => {
|
||||
submodulo.checked = false;
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/sujit-baniya/fiber-boilerplate/app"
|
||||
"github.com/sujit-baniya/fiber-boilerplate/pkg/auth"
|
||||
"github.com/sujit-baniya/fiber-boilerplate/pkg/models"
|
||||
"github.com/sujit-baniya/fiber-boilerplate/pkg/services"
|
||||
)
|
||||
@@ -42,10 +43,29 @@ func QueryRunnerPage(c *fiber.Ctx) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetConxDbList devuelve todas las conexiones DB disponibles (para el selector).
|
||||
// GetConxDbList devuelve las conexiones DB disponibles (según el rol del usuario).
|
||||
// Para API calls (Hermes) sin sesión retorna todas.
|
||||
func GetConxDbList(c *fiber.Ctx) error {
|
||||
user, err := auth.User(c)
|
||||
if err != nil || user == nil {
|
||||
var all []models.ConxDb
|
||||
app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&all)
|
||||
return c.JSON(fiber.Map{"data": all})
|
||||
}
|
||||
|
||||
var items []models.ConxDb
|
||||
app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&items)
|
||||
if user.IsAdmin {
|
||||
app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Find(&items)
|
||||
} else {
|
||||
ids := make([]uint, 0)
|
||||
for _, db := range user.Role.ConxDBs {
|
||||
ids = append(ids, db.ID)
|
||||
}
|
||||
if len(ids) == 0 {
|
||||
return c.JSON(fiber.Map{"data": []models.ConxDb{}})
|
||||
}
|
||||
app.Http.Database.DB.Preload("TipoDb").Preload("Servidor").Where("id IN ?", ids).Find(&items)
|
||||
}
|
||||
return c.JSON(fiber.Map{"data": items})
|
||||
}
|
||||
|
||||
@@ -103,6 +123,102 @@ func RunQuery(c *fiber.Ctx) error {
|
||||
return c.JSON(result)
|
||||
}
|
||||
|
||||
// RunBatchQuery ejecuta múltiples consultas en lote.
|
||||
// POST /app/query-runner/run-batch
|
||||
// Body: { conx_db_id, database, sqls: ["...", "..."] }
|
||||
// También soporta multipart/form-data con file .sql
|
||||
func RunBatchQuery(c *fiber.Ctx) error {
|
||||
conxDbIDStr := c.FormValue("conx_db_id", c.Query("conx_db_id"))
|
||||
database := c.FormValue("database", c.Query("database"))
|
||||
|
||||
// Obtener statements del body o del archivo subido
|
||||
var statements []string
|
||||
|
||||
// 1. Intentar leer archivo .sql subido
|
||||
if file, err := c.FormFile("file"); err == nil {
|
||||
f, err := file.Open()
|
||||
if err == nil {
|
||||
defer f.Close()
|
||||
buf := new(bytes.Buffer)
|
||||
buf.ReadFrom(f)
|
||||
content := buf.String()
|
||||
// Dividir por ;
|
||||
for _, stmt := range strings.Split(content, ";") {
|
||||
stmt = strings.TrimSpace(stmt)
|
||||
if stmt != "" {
|
||||
statements = append(statements, stmt)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Si no hay archivo, leer del body JSON
|
||||
if len(statements) == 0 {
|
||||
var body struct {
|
||||
ConxDbID uint `json:"conx_db_id"`
|
||||
Database string `json:"database"`
|
||||
SQLs []string `json:"sqls"`
|
||||
}
|
||||
if err := c.BodyParser(&body); err == nil {
|
||||
conxDbIDStr = strconv.Itoa(int(body.ConxDbID))
|
||||
if body.Database != "" {
|
||||
database = body.Database
|
||||
}
|
||||
for _, s := range body.SQLs {
|
||||
s = strings.TrimSpace(s)
|
||||
if s != "" {
|
||||
statements = append(statements, s)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(statements) == 0 {
|
||||
return c.Status(400).JSON(fiber.Map{"error": "No hay consultas para ejecutar. Envía sqls[] o un archivo .sql"})
|
||||
}
|
||||
|
||||
conx, err := loadConxDb(conxDbIDStr)
|
||||
if err != nil {
|
||||
return c.Status(400).JSON(fiber.Map{"error": err.Error()})
|
||||
}
|
||||
|
||||
type batchResult struct {
|
||||
Index int `json:"index"`
|
||||
SQL string `json:"sql"`
|
||||
Status string `json:"status"`
|
||||
Duration string `json:"duration"`
|
||||
Rows int `json:"rows"`
|
||||
Columns []string `json:"columns,omitempty"`
|
||||
Data []fiber.Map `json:"data,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
results := make([]batchResult, 0, len(statements))
|
||||
|
||||
for i, stmt := range statements {
|
||||
r := services.ExecuteSQL(conx, database, stmt)
|
||||
br := batchResult{
|
||||
Index: i,
|
||||
SQL: stmt,
|
||||
Status: "ok",
|
||||
Duration: fmt.Sprintf("%dms", r.DurationMs),
|
||||
Rows: r.RowCount,
|
||||
}
|
||||
if r.Error != "" {
|
||||
br.Status = "error"
|
||||
br.Error = r.Error
|
||||
} else {
|
||||
br.Columns = r.Columns
|
||||
br.Data = make([]fiber.Map, len(r.Rows))
|
||||
for j, row := range r.Rows {
|
||||
br.Data[j] = fiber.Map(row)
|
||||
}
|
||||
}
|
||||
results = append(results, br)
|
||||
}
|
||||
|
||||
return c.JSON(fiber.Map{"results": results, "total": len(results)})
|
||||
}
|
||||
|
||||
// TestConnection verifica que la conexión funciona.
|
||||
// GET /app/query-runner/test?conx_db_id=1
|
||||
func TestConnection(c *fiber.Ctx) error {
|
||||
|
||||
@@ -69,6 +69,12 @@ func GetRoles(c *fiber.Ctx) error {
|
||||
// })
|
||||
// }
|
||||
|
||||
// Obtener todas las conexiones disponibles para asignar a roles
|
||||
conexiones, err := models.GetConxDbSelect("")
|
||||
if err != nil {
|
||||
conexiones = []models.ConxDb{}
|
||||
}
|
||||
|
||||
// Calcular el total de páginas
|
||||
totalPages := int(math.Ceil(float64(total) / float64(limit)))
|
||||
|
||||
@@ -76,6 +82,7 @@ func GetRoles(c *fiber.Ctx) error {
|
||||
return c.JSON(fiber.Map{
|
||||
"roles": roles,
|
||||
"modules": modules,
|
||||
"conexiones": conexiones,
|
||||
"total": total, // Total de disponibles
|
||||
"totalPages": totalPages, // Total de páginas
|
||||
"page": page, // Página actual
|
||||
@@ -128,10 +135,18 @@ func UpdateRole(c *fiber.Ctx) error {
|
||||
newSubmodules = append(newSubmodules, newSubmodule)
|
||||
}
|
||||
}
|
||||
|
||||
// Asignar los nuevos submódulos al rol
|
||||
m.Submodules = newSubmodules
|
||||
|
||||
// Agregar las nuevas conexiones a BD
|
||||
var newConxDBs []models.ConxDb
|
||||
for _, db := range m.ConxDBs {
|
||||
var found models.ConxDb
|
||||
if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
|
||||
newConxDBs = append(newConxDBs, found)
|
||||
}
|
||||
}
|
||||
m.ConxDBs = newConxDBs
|
||||
|
||||
// Actualizar el rol en la base de datos
|
||||
if err := app.Http.Database.DB.Session(&gorm.Session{FullSaveAssociations: true}).Save(&m).Error; err != nil {
|
||||
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
|
||||
@@ -158,6 +173,16 @@ func CreateRole(c *fiber.Ctx) error {
|
||||
})
|
||||
}
|
||||
|
||||
// Look up ConxDBs by ID
|
||||
var conxDbs []models.ConxDb
|
||||
for _, db := range m.ConxDBs {
|
||||
var found models.ConxDb
|
||||
if err := app.Http.Database.DB.First(&found, db.ID).Error; err == nil {
|
||||
conxDbs = append(conxDbs, found)
|
||||
}
|
||||
}
|
||||
m.ConxDBs = conxDbs
|
||||
|
||||
// Create the role in the database
|
||||
if err := models.CreateRole(m); err != nil {
|
||||
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
|
||||
|
||||
@@ -332,6 +332,7 @@ func AdminApiRoutes(api fiber.Router) {
|
||||
h.Get("/query-runner/tables", controllers.GetTables)
|
||||
h.Get("/query-runner/test", controllers.TestConnection)
|
||||
h.Post("/query-runner/run", controllers.RunQuery)
|
||||
h.Post("/query-runner/run-batch", controllers.RunBatchQuery)
|
||||
h.Get("/query-runner/history", controllers.GetHistory)
|
||||
h.Get("/query-runner/columns", controllers.GetTableColumnsHandler)
|
||||
|
||||
|
||||
@@ -139,6 +139,7 @@ func UserRoutes(app fiber.Router) {
|
||||
protected.Get("/query-runner/tables", controllers.GetTables)
|
||||
protected.Get("/query-runner/test", controllers.TestConnection)
|
||||
protected.Post("/query-runner/run", controllers.RunQuery)
|
||||
protected.Post("/query-runner/run-batch", controllers.RunBatchQuery)
|
||||
protected.Get("/query-runner/history", controllers.GetHistory)
|
||||
protected.Delete("/query-runner/history", controllers.ClearHistory)
|
||||
protected.Post("/query-runner/export/csv", controllers.ExportCSV)
|
||||
|
||||
Reference in New Issue
Block a user