Skip to content
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

Enhancement - Idiomas - Corrección el id de etiqueta de idioma #161

Closed
wants to merge 6 commits into from
Closed

Enhancement - Idiomas - Corrección el id de etiqueta de idioma #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
447aad5
Feature - APP+API + Mejora - EDA - Permitir gestión de múltiples r…
jortilles May 29, 2024
fb001dc
Improvement APP+API Permitir filtrar "vacío" a nivel informe SDA#126 …
jortilles Jun 5, 2024
6739447
Enhancement - APP - Posibilidad de cambiar títulos en los filtros (#155)
jortilles Jun 6, 2024
282981e
Hotfix - APP + API - Corrección paneles SQL y autorelaciones (#151)
jortilles Jun 12, 2024
d6212a7
Enhancement - Idiomas - Modificación de etiquetas (#158)
juanSTIC Jun 13, 2024
5311eb4
fix i18n id
juanSTIC Jun 14, 2024
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
4 changes: 4 additions & 0 deletions eda/eda_api/config/eda_api_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
//podem modificar el valor null de la bbdd per a que ens otorgui un altre valor de lectura en pantalla
null_value: ''
}
196 changes: 137 additions & 59 deletions eda/eda_api/lib/module/dashboard/dashboard.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { CachedQueryService } from '../../services/cache-service/cached-query.se
import { QueryOptions } from 'mongoose'
import ServerLogService from '../../services/server-log/server-log.service'
const cache_config = require('../../../config/cache.config')

const eda_api_config = require('../../../config/eda_api_config');
export class DashboardController {
static async getDashboards(req: Request, res: Response, next: NextFunction) {
try {
Expand Down Expand Up @@ -657,11 +657,10 @@ export class DashboardController {
uniquesForbiddenTables = [];
}

if( req.user._id == '135792467811111111111112'){
console.log('ANONYMOUS USER QUERY....NO PERMISSIONS APPLY HERE.....');
uniquesForbiddenTables = [];

}
/* SDA CUSTOM*/ if( req.user._id == '135792467811111111111112'){
/* SDA CUSTOM*/ console.log('ANONYMOUS USER QUERY....NO PERMISSIONS APPLY HERE.....');
/* SDA CUSTOM*/ uniquesForbiddenTables = [];
/* SDA CUSTOM*/ }



Expand Down Expand Up @@ -694,13 +693,11 @@ export class DashboardController {
mylabels.push(req.body.query.fields[c].column_name)
}
}

myQuery.simple = req.body.query.simple;
myQuery.queryLimit = req.body.query.queryLimit;
myQuery.joinType = req.body.query.joinType ? req.body.query.joinType : 'inner';



if (myQuery.fields.length == 0) {
console.log('you cannot see any data');
return res.status(200).json([['noDataAllowed'], [[]]]);
Expand All @@ -713,15 +710,76 @@ export class DashboardController {

/** por compatibilidad. Si no tengo el tipo de columna en el filtro lo añado */
if(myQuery.filters){
myQuery.filters.forEach(f => {
if(!f.filter_column_type){
for (const filter of myQuery.filters) {
if (!filter.filter_column_type) {
const filterTable = dataModelObject.ds.model.tables.find((t) => t.table_name == filter.filter_table.split('.')[0]);

f.filter_column_type = dataModelObject.ds.model.tables.filter( t=> t.table_name == f.filter_table)[0]
.columns.filter(c=> c.column_name == f.filter_column )[0].column_type;
if (filterTable) {
const filterColumn = filterTable.columns.find((c) => c.column_name == filter.filter_column);
filter.filter_column_type = filterColumn?.column_type || 'text';
}
}
});
}
}

let nullFilter = {};
const filters = myQuery.filters;


filters.forEach(a => {
a.filter_elements.forEach(b => {
if( b.value1){
if (
( b.value1.includes('null') || b.value1.includes('1900-01-01') )
&& b.value1.length > 1 /** Si tengo varios elementos */
&& ( a.filter_type == '=' || a.filter_type == 'in' || a.filter_type == 'like' || a.filter_type == 'between')
) {
nullFilter = {
filter_id: 'is_null',
filter_table: a.filter_table,
filter_column: a.filter_column ,
filter_type: 'is_null',
filter_elements: [{value1:['null']}],
filter_column_type: a.filter_column_type,
isGlobal: true,
applyToAll: false
}
b.value1 = b.value1.filter(c => c != 'null')
filters.push(nullFilter);
}else if ( ( b.value1.includes('null') || b.value1.includes('1900-01-01') )
&& b.value1.length > 1 /** Si tengo varios elementos */
&& ( a.filter_type == '!=' || a.filter_type == 'not_in' || a.filter_type == 'not_like' )
) {
nullFilter = {
filter_id: 'not_null',
filter_table: a.filter_table,
filter_column: a.filter_column ,
filter_type: 'not_null',
filter_elements: [{value1:['null']}],
filter_column_type: a.filter_column_type,
isGlobal: true,
applyToAll: false
}
b.value1 = b.value1.filter(c => c != 'null')
filters.push(nullFilter);
} else if (
( b.value1.includes('null') || b.value1.includes('1900-01-01') )
&& b.value1.length == 1
&& ( a.filter_type == '=' || a.filter_type == 'in' || a.filter_type == 'like' || a.filter_type == 'between')
){
a.filter_type='is_null';
} else if (
( b.value1.includes('null') || b.value1.includes('1900-01-01') )
&& b.value1.length == 1
&& ( a.filter_type == '!=' || a.filter_type == 'not_in' || a.filter_type == 'not_like')
){
a.filter_type='not_null';
}
}
})
})

myQuery.filters = filters;
const query = await connection.getQueryBuilded(
myQuery,
dataModelObject,
Expand Down Expand Up @@ -767,7 +825,8 @@ export class DashboardController {
}
})
}
const results = []

let results = []

// Normalize data here i also transform oracle numbers who come as strings to real numbers
for (let i = 0, n = getResults.length; i < n; i++) {
Expand All @@ -781,22 +840,22 @@ export class DashboardController {
if (numerics[ind] == 'true') {
const res = parseFloat(r[i])
if (isNaN(res)) {
return null
return eda_api_config.null_value;
} else {
return res
}
} else {
//això es per evitar els null trec els nulls i els canvio per '' dels lavels
if (r[i] == null == null) {
return ''
if (r[i] === null) {
return eda_api_config.null_value;
} else {
return r[i]
return r[i];
}
}
} else {
// trec els nulls i els canvio per '' dels lavels
// trec els nulls i els canvio per eda_api_config.null_value dels lavels
if (numerics[ind] != 'true' && r[i] == null) {
return ''
return eda_api_config.null_value;
} else {
return r[i];
}
Expand All @@ -805,11 +864,11 @@ export class DashboardController {
}

})
results.push(output)

results.push(output)
}
// las etiquetas son el nombre técnico...
const output = [mylabels, results]

if (output[1].length < cache_config.MAX_STORED_ROWS && cacheEnabled) {
CachedQueryService.storeQuery(req.body.model_id, query, output)
}
Expand All @@ -826,6 +885,8 @@ export class DashboardController {
} Panel:${req.body.dashboard.panel_id} DONE\n`
)



return res.status(200).json(output)

/**
Expand All @@ -845,7 +906,7 @@ export class DashboardController {
'\x1b[32m%s\x1b[0m',
`Date: ${formatDate(new Date())} Dashboard:${req.body.dashboard.dashboard_id
} Panel:${req.body.dashboard.panel_id} DONE\n`
)
)
return res.status(200).json(cachedQuery.cachedQuery.response)
}
} catch (err) {
Expand All @@ -860,9 +921,8 @@ export class DashboardController {
*/
static async execSqlQuery(req: Request, res: Response, next: NextFunction) {
try {
const connection = await ManagerConnectionService.getConnection(
req.body.model_id
)
console.log('execSqlQuery');
const connection = await ManagerConnectionService.getConnection(req.body.model_id);
const dataModel = await connection.getDataSource(req.body.model_id)

/**Security check */
Expand All @@ -889,11 +949,11 @@ export class DashboardController {
// el admin ve todo
uniquesForbiddenTables = [];
}
if( req.user._id == '135792467811111111111112'){
console.log('ANONYMOUS USER QUERY....NO PERMISSIONS APPLY HERE.....');
uniquesForbiddenTables = [];
/* SDA CUSTOM */ if( req.user._id == '135792467811111111111112'){
/* SDA CUSTOM */ console.log('ANONYMOUS USER QUERY....NO PERMISSIONS APPLY HERE.....');
/* SDA CUSTOM */ uniquesForbiddenTables = [];
/* SDA CUSTOM */ }

}
let notAllowedQuery = false
uniquesForbiddenTables.forEach(table => {
if (req.body.query.SQLexpression.indexOf(table) >= 0) {
Expand All @@ -912,23 +972,12 @@ export class DashboardController {

/**If query is in format select foo from a, b queryBuilder returns null */
if (!query) {
return next(
new HttpException(
500,
'Queries in format "select x from A, B" are not suported'
)
)
return next(new HttpException(500,'Queries in format "select x from A, B" are not suported'));
}

console.log(
'\x1b[32m%s\x1b[0m',
`QUERY for user ${req.user.name}, with ID: ${req.user._id
}, at: ${formatDate(new Date())} `
)
console.log('\x1b[32m%s\x1b[0m', `QUERY for user ${req.user.name}, with ID: ${req.user._id}, at: ${formatDate(new Date())} `);
console.log(query)
console.log(
'\n-------------------------------------------------------------------------------\n'
)
console.log('\n-------------------------------------------------------------------------------\n');

/**cached query */
let cacheEnabled =
Expand Down Expand Up @@ -964,45 +1013,74 @@ export class DashboardController {
const output = Object.keys(r).map(i => r[i])
resultsRollback.push([...output])
const tmpArray = []

output.forEach((val, index) => {

if (DashboardController.isNotNumeric(val)) {
tmpArray.push('NaN')
tmpArray.push('NaN');
if(val===null ){
output[index] = eda_api_config.null_value; // los valores nulos les canvio per un espai en blanc pero que si no tinc problemes
resultsRollback[i][index] = eda_api_config.null_value; // los valores nulos les canvio per un espai en blanc pero que si no tinc problemes
}
} else {
tmpArray.push('int')
output[index] = parseFloat(val)
if(val !== null){
output[index] = parseFloat(val);
}else{
output[index] = eda_api_config.null_value;
resultsRollback[i][index] = eda_api_config.null_value;
//output[index] = null;
}

}
})
oracleDataTypes.push(tmpArray)
results.push(output)
} else {
const output = Object.keys(r).map(i => r[i])
const output = Object.keys(r).map(i => r[i]);
output.forEach((val, index) => {
if(val===null ){
output[index] = eda_api_config.null_value;// los valores nulos les canvio per un espai en blanc pero que si no tinc problemes
resultsRollback[i][index] = eda_api_config.null_value; // los valores nulos les canvio per un espai en blanc pero que si no tinc problemes
}
})
results.push(output)
resultsRollback.push(output)
}
}




/** si tinc resultats de oracle evaluo la matriu de tipus de numero per verure si tinc enters i textos barrejats.
* miro cada valor amb el seguent per baix de la matriu. */
if (oracleDataTypes.length > 1) {
for (var i = 0; i < oracleDataTypes.length - 1; i++) {
var e = oracleDataTypes[i]
for (var j = 0; j < e.length; j++) {
if (oracleDataTypes[i][j] != oracleDataTypes[i + 1][j]) {
oracleEval = false
if(oracleDataTypes[j][0]=='int' ){
if ( oracleDataTypes[i][j] != oracleDataTypes[i + 1][j]) {
oracleEval = false
}
}
}
}
}

/** si tinc numeros barrejats. Poso el rollback */
if (oracleEval !== true) {
results = resultsRollback
}else{
// pongo a nulo los numeros nulos
for (var i = 0; i < results.length; i++) {
var e = results[i]
for (var j = 0; j < e.length; j++) {
if(oracleDataTypes[j][0]=='int' ){
if ( results[i][j] == eda_api_config.null_value ) {
results[i][j] = null;
}
}
}
}
}
const output = [labels, results]

if (output[1].length < cache_config.MAX_STORED_ROWS && cacheEnabled) {
CachedQueryService.storeQuery(req.body.model_id, query, output)
}
Expand Down Expand Up @@ -1042,7 +1120,7 @@ export class DashboardController {
if (
isNaN(val) || val.toString().indexOf('-') >= 0 || val.toString().indexOf('/') >= 0 ||
val.toString().indexOf('|') >= 0 || val.toString().indexOf(':') >= 0 || val.toString().indexOf('T') >= 0 ||
val.toString().indexOf('Z') >= 0 || val.toString().indexOf('Z') >= 0) {
val.toString().indexOf('Z') >= 0 || val.toString().indexOf('Z') >= 0 || val.toString().replace(/['"]+/g, '').length == 0 ) {
isNotNumeric = true;
}
} catch (e) {
Expand All @@ -1060,10 +1138,10 @@ export class DashboardController {
if( user.role.includes('135792467811111111111110') ){
return true;
}
if(user._id== '135792467811111111111112'){
console.log('Anonymous access');
return true;
}
/*SDA CUSTOM*/if(user._id== '135792467811111111111112'){
/*SDA CUSTOM*/ console.log('Anonymous access');
/*SDA CUSTOM*/ return true;
/*SDA CUSTOM*/}



Expand Down
2 changes: 1 addition & 1 deletion eda/eda_api/lib/module/datasource/datasource.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export class DataSourceController {
const names = JSON.parse(JSON.stringify(ds));
for (let i = 0, n = names.length; i < n; i += 1) {
const e = names[i];
output.push({ _id: e._id, model_name: e.ds.metadata.model_name });
output.push({ _id: e._id, model_name: e.ds.metadata.model_name });
}
output.sort((a,b) => (upperCase(a.model_name) > upperCase(b.model_name)) ? 1 :
((upperCase(b.model_name) > upperCase(a.model_name)) ? -1 : 0));
Expand Down
Loading
Loading