Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #9833 from ToolJet/main

Browse source 
Main to develop
This commit is contained in:
Midhun G S 2024-05-23 22:11:29 +05:30 committed by GitHub
commit 0d358576b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 37 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.43.0
2.44.0

2
frontend/.version
View file

@ -1 +1 @@
2.43.0
2.44.0

12
frontend/src/Editor/CodeBuilder/CodeHinter.jsx
View file

@ -103,8 +103,6 @@ export function CodeHinter({
}) {
const context = useContext(CodeHinterContext);
const hiddenWorkspaceConstantText = 'Workspace constant values are hidden';
const darkMode = localStorage.getItem('darkMode') === 'true';
const options = {
lineNumbers: lineNumbers ?? false,
@ -137,8 +135,6 @@ export function CodeHinter({
const isWorkspaceVariable =
typeof currentValue === 'string' && (currentValue.includes('%%client') || currentValue.includes('%%server'));
const isWorkspaceConstant = typeof currentValue === 'string' && currentValue.includes('constants.');
const constantRegex = /{{constants\.([a-zA-Z0-9_]+)}}/g;
const slideInStyles = useSpring({
@ -269,7 +265,7 @@ export function CodeHinter({
globalPreviewCopy = preview;
globalErrorCopy = null;
setResolvingError(null);
setResolvedValue(isWorkspaceConstant ? hiddenWorkspaceConstantText : preview);
setResolvedValue(preview);
}
return [globalPreviewCopy, globalErrorCopy];
@ -281,7 +277,7 @@ export function CodeHinter({
return () => {
if (enablePreview) {
setPrevCurrentValue(null);
setResolvedValue(isWorkspaceConstant ? hiddenWorkspaceConstantText : globalPreviewCopy);
setResolvedValue(globalPreviewCopy);
setResolvingError(globalErrorCopy);
}
};
@ -377,9 +373,9 @@ export function CodeHinter({
<div>
<div className="d-flex my-1">
<div className="flex-grow-1" style={{ fontWeight: 700, textTransform: 'capitalize' }}>
{!isWorkspaceConstant && previewType}
{previewType}
</div>
{isFocused && !isWorkspaceConstant && (
{isFocused && (
<div className="preview-icons position-relative">
<CodeHinter.PopupIcon callback={() => copyToClipboard(content)} icon="copy" tip="Copy to clipboard" />
</div>

5
frontend/src/Editor/Editor.jsx
View file

@ -77,8 +77,6 @@ enablePatches();
const decimalToHex = (alpha) => (alpha === 0 ? '00' : Math.round(255 * alpha).toString(16));
const maskedWorkspaceConstantStr = '**************';
const EditorComponent = (props) => {
const { socket } = createWebsocketConnection(props?.params?.id);
const mounted = useMounted();
@ -374,7 +372,8 @@ const EditorComponent = (props) => {
orgEnvironmentConstantService.getAll().then(({ constants }) => {
const orgConstants = {};
constants.map((constant) => {
orgConstants[constant.name] = maskedWorkspaceConstantStr;
const constantValue = constant.values.find((value) => value.environmentName === 'production')['value'];
orgConstants[constant.name] = constantValue;
});
useCurrentStateStore.getState().actions.setCurrentState({

3
frontend/src/Editor/Viewer.jsx
View file

@ -48,7 +48,6 @@ import DesktopHeader from './Viewer/DesktopHeader';
import './Viewer/viewer.scss';
import useAppDarkMode from '@/_hooks/useAppDarkMode';
const maskedWorkspaceConstantStr = '**************';
class ViewerComponent extends React.Component {
constructor(props) {
super(props);
@ -246,7 +245,7 @@ class ViewerComponent extends React.Component {
if (variablesResult && Array.isArray(variablesResult)) {
variablesResult.map((constant) => {
const constantValue = constant.values.find((value) => value.environmentName === 'production')['value'];
orgConstants[constant.name] = maskedWorkspaceConstantStr;
orgConstants[constant.name] = constantValue;
});
return {
constants: orgConstants,

20
frontend/src/_components/OrgConstantsVariablesResolver/OrgConstantsVariablesPreviewBox.jsx
View file

@ -61,19 +61,7 @@ const verifyConstant = (value, definedConstants) => {
};
const ResolvedValue = ({ value, isFocused, state = {}, type }) => {
const isConstant = type === 'Workspace Constant';
const hiddenWorkspaceConstantText = 'Workspace constant values are hidden';
const invalidConstants = verifyConstant(value, state.constants);
let preview;
let error;
if (invalidConstants?.length) {
[preview, error] = [value, `Undefined constants: ${invalidConstants}`];
} else {
[preview, error] = resolveReferences(value, state, null, {}, true, true);
if (isConstant) {
preview = hiddenWorkspaceConstantText;
}
}
const [preview, error] = resolveReferences(value, state, null, {}, true, true);
const previewType = typeof preview;
@ -84,7 +72,7 @@ const ResolvedValue = ({ value, isFocused, state = {}, type }) => {
: error?.toString();
const isValidError = error && errorMessage !== 'HiddenEnvironmentVariable';
if (error && (!isValidError || error?.toString().includes('Undefined constants:'))) {
if (error && !isValidError) {
resolvedValue = errorMessage;
}
@ -109,6 +97,8 @@ const ResolvedValue = ({ value, isFocused, state = {}, type }) => {
}
};
const isConstant = type === 'Workspace Constant';
const [heightRef, currentHeight] = useHeight();
const slideInStyles = useSpring({
@ -130,7 +120,7 @@ const ResolvedValue = ({ value, isFocused, state = {}, type }) => {
<div className="alert-banner-type-text">
<div className="d-flex my-1">
<div className="flex-grow-1" style={{ fontWeight: 800, textTransform: 'capitalize' }}>
{isValidError ? 'Error' : isConstant ? null : ` ${type} - ${previewType}`}
{isValidError ? 'Error' : ` ${type} - ${previewType}`}
</div>
</div>
{getPreviewContent(resolvedValue, previewType)}

1
frontend/src/_stores/currentStateStore.js
View file

@ -17,6 +17,7 @@ const initialState = {
variables: {},
},
succededQuery: {},
constants: {},
};
export const useCurrentStateStore = create(

1
plugins/packages/restapi/lib/index.ts
View file

@ -111,7 +111,6 @@ export default class RestapiQueryService implements QueryService {
...this.fetchHttpsCertsForCustomCA(sourceOptions),
headers: sanitizeHeaders(sourceOptions, queryOptions, hasDataSource),
searchParams,
...(isUrlEncoded ? { form: json } : { json }),
};
const hasFiles = (json) => {

2
server/.version
View file

@ -1 +1 @@
2.43.0
2.44.0

26
server/src/controllers/organization_constants.controller.ts
View file

@ -20,7 +20,6 @@ import { OrganizationConstantsAbilityFactory } from 'src/modules/casl/abilities/
import { AppDecorator as App } from 'src/decorators/app.decorator';
import { OrgEnvironmentVariablesAbilityFactory } from 'src/modules/casl/abilities/org-environment-variables-ability.factory';
import { OrgEnvironmentVariable } from 'src/entities/org_envirnoment_variable.entity';
import { OrganizationConstant } from 'src/entities/organization_constants.entity';
@Controller('organization-constants')
export class OrganizationConstantController {
@ -32,39 +31,24 @@ export class OrganizationConstantController {
@UseGuards(JwtAuthGuard)
@Get()
async get(@User() user, @Query('decryptValue') decryptValue) {
const ability = await this.organizationConstantsAbilityFactory.organizationConstantActions(user, null);
const decrypt =
decryptValue === 'true' &&
(ability.can('createOrganizationConstant', OrganizationConstant) ||
ability.can('deleteOrganizationConstant', OrganizationConstant));
const result = await this.organizationConstantsService.allEnvironmentConstants(user.organizationId, decrypt);
async get(@User() user) {
const result = await this.organizationConstantsService.allEnvironmentConstants(user.organizationId);
return { constants: result };
}
@UseGuards(IsPublicGuard)
@Get(':app_slug')
async getConstantsFromApp(@App() app, @User() user) {
const result = await this.organizationConstantsService.allEnvironmentConstants(app.organizationId, false);
const result = await this.organizationConstantsService.allEnvironmentConstants(app.organizationId);
return { constants: result };
}
@UseGuards(JwtAuthGuard)
@Get('/environment/:environmentId')
async getConstantsFromEnvironment(
@User() user,
@Param('environmentId') environmentId,
@Query('decryptValue') decryptValue
) {
const ability = await this.organizationConstantsAbilityFactory.organizationConstantActions(user, null);
const decrypt =
decryptValue === 'true' &&
(ability.can('createOrganizationConstant', OrganizationConstant) ||
ability.can('deleteOrganizationConstant', OrganizationConstant));
async getConstantsFromEnvironment(@User() user, @Param('environmentId') environmentId) {
const result = await this.organizationConstantsService.getConstantsForEnvironment(
user.organizationId,
environmentId,
decrypt
environmentId
);
return { constants: result };
}

3
server/src/dto/app-authentication.dto.ts
View file

@ -1,4 +1,4 @@
import { IsEmail, IsNotEmpty, IsOptional, IsString, IsUUID, MinLength } from 'class-validator';
import { IsEmail, IsNotEmpty, IsOptional, IsString, IsUUID, MinLength, MaxLength } from 'class-validator';
import { lowercaseString } from 'src/helpers/utils.helper';
import { Transform } from 'class-transformer';
@ -31,6 +31,7 @@ export class AppSignupDto {
@IsString()
@IsNotEmpty()
@MinLength(5, { message: 'Password should contain more than 5 letters' })
@MaxLength(100, { message: 'Password length should not be more than 100 ' })
password: string;
@IsOptional()

2
server/src/services/data_queries.service.ts
View file

@ -605,7 +605,7 @@ export class DataQueriesService {
if (variables?.length > 0) {
for (const variable of variables) {
object = object.replace(variable, await this.resolveConstants(variable, organization_id, environmentId));
object = object.replace(variable, options[variable]);
}
}
return object;

38
server/src/services/organization_constants.service.ts
View file

@ -17,7 +17,7 @@ export class OrganizationConstantsService {
private appEnvironmentService: AppEnvironmentService
) {}
async allEnvironmentConstants(organizationId: string, decryptValue: boolean): Promise<OrganizationConstant[]> {
async allEnvironmentConstants(organizationId: string): Promise<OrganizationConstant[]> {
return await dbTransactionWrap(async (manager: EntityManager) => {
const query = manager
.createQueryBuilder(OrganizationConstant, 'organization_constants')
@ -33,21 +33,11 @@ export class OrganizationConstantsService {
appEnvironments.map(async (env) => {
const value = constant.orgEnvironmentConstantValues.find((value) => value.environmentId === env.id);
const valueResult = {
return {
environmentName: env.name,
id: value ? value.environmentId : undefined, // Safeguard for undefined 'value'
value: value && value.value.length > 0 ? await this.decryptSecret(organizationId, value.value) : '',
id: value.environmentId,
};
if (value && value.value.length > 0) {
const decryptedOrRawValue = decryptValue
? await this.decryptSecret(organizationId, value.value)
: value.value;
if (decryptValue) {
valueResult['value'] = decryptedOrRawValue;
}
}
return valueResult;
})
);
@ -64,11 +54,7 @@ export class OrganizationConstantsService {
});
}
async getConstantsForEnvironment(
organizationId: string,
environmentId: string,
decryptValue: boolean
): Promise<OrganizationConstant[]> {
async getConstantsForEnvironment(organizationId: string, environmentId: string): Promise<OrganizationConstant[]> {
return await dbTransactionWrap(async (manager: EntityManager) => {
const query = manager
.createQueryBuilder(OrganizationConstant, 'organization_constants')
@ -78,20 +64,12 @@ export class OrganizationConstantsService {
const result = await query.getMany();
const constantsWithValues = result.map(async (constant) => {
const constantResult = {
const decryptedValue = await this.decryptSecret(organizationId, constant.orgEnvironmentConstantValues[0].value);
return {
id: constant.id,
name: constant.constantName,
value: decryptedValue,
};
if (decryptValue && constant.orgEnvironmentConstantValues.length > 0) {
const decryptedValue = await this.decryptSecret(
organizationId,
constant.orgEnvironmentConstantValues[0].value
);
constantResult['value'] = decryptedValue;
}
return constantResult;
});
return Promise.all(constantsWithValues);

9
server/src/services/tooljet_db_operations.service.ts
View file

@ -4,6 +4,7 @@ import { QueryService, QueryResult } from '@tooljet/plugins/dist/packages/common
import { TooljetDbService } from './tooljet_db.service';
import { isEmpty } from 'lodash';
import { PostgrestProxyService } from './postgrest_proxy.service';
import { maybeSetSubPath } from 'src/helpers/utils.helper';
@Injectable()
export class TooljetDbOperationsService implements QueryService {
@ -74,7 +75,7 @@ export class TooljetDbOperationsService implements QueryService {
!isEmpty(offset) && query.push(`offset=${offset}`);
}
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}` + `?${query}`;
const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}` + `?${query}`);
return await this.proxyPostgrest(url, 'GET', headers);
}
@ -87,7 +88,7 @@ export class TooljetDbOperationsService implements QueryService {
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${queryOptions.table_id}`;
const url = maybeSetSubPath(`/api/tooljet-db/proxy/${queryOptions.table_id}`);
return await this.proxyPostgrest(url, 'POST', headers, columns);
}
@ -112,7 +113,7 @@ export class TooljetDbOperationsService implements QueryService {
!isEmpty(whereQuery) && query.push(whereQuery);
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}?` + query.join('&') + '&order=id';
const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}?` + query.join('&') + '&order=id');
return await this.proxyPostgrest(url, 'PATCH', headers, body);
}
@ -149,7 +150,7 @@ export class TooljetDbOperationsService implements QueryService {
limit && limit !== '' && query.push(`limit=${limit}&order=id`);
const headers = { 'data-query-id': queryOptions.id, 'tj-workspace-id': queryOptions.organization_id };
const url = `/api/tooljet-db/proxy/${tableId}?` + query.join('&');
const url = maybeSetSubPath(`/api/tooljet-db/proxy/${tableId}?` + query.join('&'));
return await this.proxyPostgrest(url, 'DELETE', headers);
}