mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-24 09:28:31 +00:00
* Fix: User group permissions error on Openshift platform (#4041) * update dockerfile for file permissions on root group * add permissions from the user group on dockerfile * bump to v1.24.4 * bump to v1.25.0 * [feature] Added pagination and filtering features to users page (#3921) * added pagination and filtering in backend * added pagination - created a seperate component for users table - added pagination * Added filter UI * temporary css fix for pagination footer * fixed pagination width issue * now result will also clear when user clicks on clear icon * Added seperate api for comment mentions * Now we can search mentions by email, first and last names * Fixed a bug - email didn't send for comment mentions * refactoring the code * resolved PR changes * Added isAdmin guard * adding some checks * fixed lint errors * added wild card search * Added no result found text * fixed failing test case * Working on PR changes * Now users table avatars will load image too * replaced skeleton classes with skeleton library component * Completed PR changes * added orderby * Fixed some issues * fixed failed test case * have fixed some css issues * replaced query with quersrting package * fixed minor width issue * Fixed some css issues * fixed darkMode issue * implemented on enter press search * Refactored the code * fixed white space issue * refactored the code * fixed overlapping issue * refactored the code * fixing some issues * fixes * removed guard * code cleanup * comments notification fix * fixed conflict issues * fixed css height issue Co-authored-by: gsmithun4 <gsmithun4@gmail.com> * Remove signup guard from set-password-from-token API (#4050) * Remove sign up guard set-password-from-token API * test cases fix * Bump to v1.25.1 * Feature: Add PG_DB_OWNER env var to disable db and extension creation (#4055) * add PG_DB_OWNER env var to disable db and extension creation * update docs * bump to v1.25.2 Co-authored-by: Akshay <akshaysasidharan93@gmail.com> Co-authored-by: Muhsin Shah C P <muhsinshah21@gmail.com>
40 lines
1.1 KiB
TypeScript
40 lines
1.1 KiB
TypeScript
import * as Joi from 'joi';
|
|
import * as path from 'path';
|
|
|
|
export function filePathForEnvVars(env: string | undefined): string {
|
|
if (env === 'test') {
|
|
return path.resolve(process.cwd(), '../.env.test');
|
|
} else {
|
|
return path.resolve(process.cwd(), '../.env');
|
|
}
|
|
}
|
|
|
|
function buildDatabaseConfig(): any {
|
|
return {
|
|
PG_HOST: process.env.PG_HOST,
|
|
PG_PORT: process.env.PG_PORT,
|
|
PG_PASS: process.env.PG_PASS,
|
|
PG_USER: process.env.PG_USER,
|
|
PG_DB: process.env.PG_DB,
|
|
};
|
|
}
|
|
|
|
function validateDatabaseConfig(dbOptions: any): Joi.ValidationResult {
|
|
const envVarsSchema = Joi.object()
|
|
.keys({
|
|
PG_HOST: Joi.string().default('localhost'),
|
|
PG_PORT: Joi.number().positive().default(5432),
|
|
PG_PASS: Joi.string().default(''),
|
|
PG_USER: Joi.string().required(),
|
|
PG_DB: Joi.string().default('tooljet_db'),
|
|
})
|
|
.unknown();
|
|
|
|
return envVarsSchema.validate(dbOptions);
|
|
}
|
|
|
|
export function buildAndValidateDatabaseConfig(): Joi.ValidationResult {
|
|
const dbOptions: any = buildDatabaseConfig();
|
|
|
|
return validateDatabaseConfig(dbOptions);
|
|
}
|