+ {isDisabled && (
+
)}
diff --git a/frontend/src/AppBuilder/Widgets/Form/form.scss b/frontend/src/AppBuilder/Widgets/Form/form.scss
index 88a5ad055e..530e837eb2 100644
--- a/frontend/src/AppBuilder/Widgets/Form/form.scss
+++ b/frontend/src/AppBuilder/Widgets/Form/form.scss
@@ -1,7 +1,7 @@
.wj-form-header {
position: relative;
&::after {
- content: '';
+ content: "";
position: absolute;
bottom: 0;
left: -7px;
@@ -14,7 +14,7 @@
.wj-form-footer {
position: relative;
&::after {
- content: '';
+ content: "";
position: absolute;
top: 0;
left: -7px;
@@ -23,3 +23,18 @@
background-color: var(--border-weak);
}
}
+
+.tj-form-disabled-overlay {
+ /* TODO: Make slot overlays common */
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgba(255, 255, 255, 0.8);
+ z-index: 1;
+ margin: 0;
+
+ box-sizing: content-box;
+ padding: 4px 0;
+}
diff --git a/frontend/src/Editor/WidgetManager/configs/form.js b/frontend/src/Editor/WidgetManager/configs/form.js
index 7ab4bd26a6..2d8eb7f0a8 100644
--- a/frontend/src/Editor/WidgetManager/configs/form.js
+++ b/frontend/src/Editor/WidgetManager/configs/form.js
@@ -362,6 +362,9 @@ export const formConfig = {
exposedVariables: {
data: {},
isValid: true,
+ isVisible: true,
+ isDisabled: false,
+ isLoading: false,
},
actions: [
{
@@ -372,6 +375,21 @@ export const formConfig = {
handle: 'resetForm',
displayName: 'Reset Form',
},
+ {
+ handle: 'setVisibility',
+ displayName: 'Set visibility',
+ params: [{ handle: 'setVisibility', displayName: 'Set Visibility', defaultValue: '{{true}}', type: 'toggle' }],
+ },
+ {
+ handle: 'setDisable',
+ displayName: 'Set Disable',
+ params: [{ handle: 'setDisable', displayName: 'Set Disable', defaultValue: '{{false}}', type: 'toggle' }],
+ },
+ {
+ handle: 'setLoading',
+ displayName: 'Set Loading',
+ params: [{ handle: 'setLoading', displayName: 'Set Loading', defaultValue: '{{false}}', type: 'toggle' }],
+ },
],
definition: {
others: {
diff --git a/server/src/modules/apps/services/widget-config/form.js b/server/src/modules/apps/services/widget-config/form.js
index 7ab4bd26a6..2d8eb7f0a8 100644
--- a/server/src/modules/apps/services/widget-config/form.js
+++ b/server/src/modules/apps/services/widget-config/form.js
@@ -362,6 +362,9 @@ export const formConfig = {
exposedVariables: {
data: {},
isValid: true,
+ isVisible: true,
+ isDisabled: false,
+ isLoading: false,
},
actions: [
{
@@ -372,6 +375,21 @@ export const formConfig = {
handle: 'resetForm',
displayName: 'Reset Form',
},
+ {
+ handle: 'setVisibility',
+ displayName: 'Set visibility',
+ params: [{ handle: 'setVisibility', displayName: 'Set Visibility', defaultValue: '{{true}}', type: 'toggle' }],
+ },
+ {
+ handle: 'setDisable',
+ displayName: 'Set Disable',
+ params: [{ handle: 'setDisable', displayName: 'Set Disable', defaultValue: '{{false}}', type: 'toggle' }],
+ },
+ {
+ handle: 'setLoading',
+ displayName: 'Set Loading',
+ params: [{ handle: 'setLoading', displayName: 'Set Loading', defaultValue: '{{false}}', type: 'toggle' }],
+ },
],
definition: {
others: {
From 528c354ed56bdf7c3c5aa4a18b8142955c92a9bd Mon Sep 17 00:00:00 2001
From: Akshay
Date: Mon, 10 Mar 2025 23:31:57 +0530
Subject: [PATCH 14/16] fix workflow executions in modularistion (#12124)
---
.../Components/DataSourceSelect.jsx | 10 +--
frontend/src/_helpers/constants.js | 1 +
server/src/dto/app-version-update.dto.ts | 13 ++++
server/src/modules/apps/dto/index.ts | 8 ++-
server/src/modules/apps/service.ts | 4 +-
server/src/modules/apps/util.service.ts | 67 ++++++++++++++++++-
server/src/modules/data-queries/service.ts | 11 +--
server/src/modules/versions/service.ts | 4 ++
server/src/modules/workflows/module.ts | 1 +
9 files changed, 102 insertions(+), 17 deletions(-)
diff --git a/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx b/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
index 7e8865cdfe..d1afd378f4 100644
--- a/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
+++ b/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
@@ -7,7 +7,6 @@ import { getWorkspaceId, decodeEntities } from '@/_helpers/utils';
import { ButtonSolid } from '@/_ui/AppButton/AppButton';
import { useDataSources, useGlobalDataSources, useSampleDataSource } from '@/_stores/dataSourcesStore';
import { useDataQueriesActions } from '@/_stores/dataQueriesStore';
-import { staticDataSources as staticDatasources } from '../constants';
import { useQueryPanelActions } from '@/_stores/queryPanelStore';
import Search from '@/_ui/Icon/solidIcons/Search';
import { Tooltip } from 'react-tooltip';
@@ -16,7 +15,7 @@ import { canCreateDataSource } from '@/_helpers';
import './../queryManager.theme.scss';
import { DATA_SOURCE_TYPE } from '@/_helpers/constants';
-function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSources, onNewNode, defaultDataSources }) {
+function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSources, onNewNode, staticDataSources }) {
const dataSources = useDataSources();
const globalDataSources = useGlobalDataSources();
const sampleDataSource = useSampleDataSource();
@@ -33,11 +32,6 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
closePopup();
};
- const workflowsEnabled = window.public_config?.ENABLE_WORKFLOWS_FEATURE == 'true';
- const staticDataSources = workflowsEnabled
- ? staticDatasources
- : staticDatasources.filter((ds) => ds?.kind !== 'workflows');
-
useEffect(() => {
const shouldAddSampleDataSource = !!sampleDataSource;
const allDataSources = [...dataSources, ...globalDataSources, shouldAddSampleDataSource && sampleDataSource].filter(
@@ -148,7 +142,7 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
),
isDisabled: true,
- options: defaultDataSources?.map((source) => ({
+ options: staticDataSources?.map((source) => ({
label: (
{' '}
diff --git a/frontend/src/_helpers/constants.js b/frontend/src/_helpers/constants.js
index 1c3c3d48b6..79275fc6df 100644
--- a/frontend/src/_helpers/constants.js
+++ b/frontend/src/_helpers/constants.js
@@ -129,6 +129,7 @@ export const DATA_SOURCE_TYPE = {
LOCAL: 'local',
GLOBAL: 'global',
STATIC: 'static',
+ DEFAULT: 'default',
};
export const SAMPLE_DB_KIND = {
diff --git a/server/src/dto/app-version-update.dto.ts b/server/src/dto/app-version-update.dto.ts
index 6c7aadb71c..cc83273ba0 100644
--- a/server/src/dto/app-version-update.dto.ts
+++ b/server/src/dto/app-version-update.dto.ts
@@ -26,4 +26,17 @@ export class AppVersionUpdateDto {
@IsOptional()
pageSettings: any;
+
+ // Workflow related fields
+ @IsOptional()
+ @IsString()
+ @IsUUID()
+ currentEnvironmentId: string;
+
+ @IsOptional()
+ definition: any;
+
+ @IsOptional()
+ @IsBoolean()
+ is_user_switched_version: boolean;
}
diff --git a/server/src/modules/apps/dto/index.ts b/server/src/modules/apps/dto/index.ts
index 63d93bd9d3..532740273a 100644
--- a/server/src/modules/apps/dto/index.ts
+++ b/server/src/modules/apps/dto/index.ts
@@ -1,6 +1,7 @@
import { sanitizeInput } from '@helpers/utils.helper';
-import { IsString, IsOptional, IsNotEmpty, MaxLength, IsBoolean, IsUUID } from 'class-validator';
+import { IsString, IsOptional, IsNotEmpty, MaxLength, IsBoolean, IsUUID, IsEnum } from 'class-validator';
import { Exclude, Expose, Transform } from 'class-transformer';
+import { APP_TYPES } from '../constants';
export class AppCreateDto {
@IsNotEmpty()
@@ -12,6 +13,11 @@ export class AppCreateDto {
@IsString()
@MaxLength(200, { message: 'Maximum length has been reached.' })
icon?: string;
+
+ @IsNotEmpty()
+ @IsString()
+ @IsEnum(APP_TYPES, { message: 'Invalid app type.' })
+ type: string;
}
export class AppUpdateDto {
diff --git a/server/src/modules/apps/service.ts b/server/src/modules/apps/service.ts
index 7ad0ca351a..60c6f8bc15 100644
--- a/server/src/modules/apps/service.ts
+++ b/server/src/modules/apps/service.ts
@@ -60,9 +60,9 @@ export class AppsService implements IAppsService {
protected readonly aiUtilService: AiUtilService
) {}
async create(user: User, appCreateDto: AppCreateDto) {
- const { name, icon } = appCreateDto;
+ const { name, icon, type } = appCreateDto;
return await dbTransactionWrap(async (manager: EntityManager) => {
- const app = await this.appsUtilService.create(name, user, APP_TYPES.FRONT_END, manager);
+ const app = await this.appsUtilService.create(name, user, type, manager);
const appUpdateDto = new AppUpdateDto();
appUpdateDto.name = name;
diff --git a/server/src/modules/apps/util.service.ts b/server/src/modules/apps/util.service.ts
index 7be1609b32..36def10913 100644
--- a/server/src/modules/apps/util.service.ts
+++ b/server/src/modules/apps/util.service.ts
@@ -11,7 +11,7 @@ import {
NotAcceptableException,
NotFoundException,
} from '@nestjs/common';
-import { EntityManager, SelectQueryBuilder } from 'typeorm';
+import { EntityManager, MoreThan, SelectQueryBuilder } from 'typeorm';
import { v4 as uuidv4 } from 'uuid';
import { AppsRepository } from './repository';
import { AppVersion } from '@entities/app_version.entity';
@@ -36,6 +36,7 @@ import { AbilityService } from '@modules/ability/interfaces/IService';
import { DataSourcesRepository } from '@modules/data-sources/repository';
import { IAppsUtilService } from './interfaces/IUtilService';
import { DataSourcesUtilService } from '@modules/data-sources/util.service';
+import { AppVersionUpdateDto } from '@dto/app-version-update.dto';
@Injectable()
export class AppsUtilService implements IAppsUtilService {
@@ -281,6 +282,70 @@ export class AppsUtilService implements IAppsUtilService {
}, manager);
}
+ async updateWorflowVersion(version: AppVersion, body: AppVersionUpdateDto, app: App) {
+ const { name, currentEnvironmentId, definition } = body;
+ const { currentVersionId, organizationId } = app;
+ let currentEnvironment: AppEnvironment;
+
+ if (version.id === currentVersionId && !body?.is_user_switched_version)
+ throw new BadRequestException('You cannot update a released version');
+
+ if (currentEnvironmentId || definition) {
+ currentEnvironment = await AppEnvironment.findOne({
+ where: { id: version.currentEnvironmentId },
+ });
+ }
+
+ const editableParams = {};
+ if (name) {
+ //means user is trying to update the name
+ const versionNameExists = await this.versionRepository.findOne({
+ where: { name, appId: version.appId },
+ });
+
+ if (versionNameExists) {
+ throw new BadRequestException('Version name already exists.');
+ }
+ editableParams['name'] = name;
+ }
+
+ //check if the user is trying to promote the environment & raise an error if the currentEnvironmentId is not correct
+ if (currentEnvironmentId) {
+ if (!(await this.licenseTermsService.getLicenseTerms(LICENSE_FIELD.MULTI_ENVIRONMENT))) {
+ throw new BadRequestException('You do not have permissions to perform this action');
+ }
+
+ if (version.currentEnvironmentId !== currentEnvironmentId) {
+ throw new NotAcceptableException();
+ }
+ const nextEnvironment = await AppEnvironment.findOne({
+ select: ['id'],
+ where: {
+ priority: MoreThan(currentEnvironment.priority),
+ organizationId,
+ },
+ order: { priority: 'ASC' },
+ });
+ editableParams['currentEnvironmentId'] = nextEnvironment.id;
+ }
+
+ if (definition) {
+ const environments = await AppEnvironment.count({
+ where: {
+ organizationId,
+ },
+ });
+ if (environments > 1 && currentEnvironment.priority !== 1 && !body?.is_user_switched_version) {
+ throw new BadRequestException('You cannot update a promoted version');
+ }
+ editableParams['definition'] = definition;
+ }
+
+ editableParams['updatedAt'] = new Date();
+
+ return await this.versionRepository.update(version.id, editableParams);
+ }
+
protected async getEnvironmentOfVersion(versionId: string, manager: EntityManager): Promise
{
return manager
.createQueryBuilder(AppEnvironment, 'app_environments')
diff --git a/server/src/modules/data-queries/service.ts b/server/src/modules/data-queries/service.ts
index 874b3b0ee2..e8852da22d 100644
--- a/server/src/modules/data-queries/service.ts
+++ b/server/src/modules/data-queries/service.ts
@@ -191,11 +191,12 @@ export class DataQueriesService implements IDataQueriesService {
async changeQueryDataSource(user: User, queryId: string, dataSource: DataSource, newDataSourceId: string) {
return dbTransactionWrap(async (manager: EntityManager) => {
- const newDataSource = await this.dataSourceRepository.findOne({ where: { id: newDataSourceId } });
- if (dataSource.kind !== newDataSource.kind) {
- throw new BadRequestException();
- }
- return this.dataQueryRepository.updateOne(queryId, { dataSourceId: newDataSourceId }, manager);
+ const newDataSource = await this.dataSourceRepository.findOneOrFail({ where: { id: newDataSourceId } });
+ // FIXME: Disabling this check as workflows can change data source of a query with different kind
+ // if (dataSource.kind !== newDataSource.kind && dataSource) {
+ // throw new BadRequestException();
+ // }
+ return this.dataQueryRepository.updateOne(queryId, { dataSourceId: newDataSource.id }, manager);
// TODO: Audit logs
});
diff --git a/server/src/modules/versions/service.ts b/server/src/modules/versions/service.ts
index c4e263456f..e50b66b50b 100644
--- a/server/src/modules/versions/service.ts
+++ b/server/src/modules/versions/service.ts
@@ -175,6 +175,10 @@ export class VersionService implements IVersionService {
await this.versionsUtilService.updateVersion(appVersion, appVersionUpdateDto);
+ if (app.type === 'workflow') {
+ await this.appUtilService.updateWorflowVersion(appVersion, appVersionUpdateDto, app);
+ }
+
this.eventEmitter.emit('auditLogEntry', {
userId: user.id,
organizationId: user.organizationId,
diff --git a/server/src/modules/workflows/module.ts b/server/src/modules/workflows/module.ts
index 1e39e5123c..e71c52df50 100644
--- a/server/src/modules/workflows/module.ts
+++ b/server/src/modules/workflows/module.ts
@@ -98,6 +98,7 @@ export class WorkflowsModule {
UserRepository,
DataSourcesRepository,
DataQueryRepository,
+ DataSourcesRepository,
OrganizationConstantRepository,
VersionRepository,
AppsService,
From 8ec28e6668823869b010d3ca08d81431e0302e94 Mon Sep 17 00:00:00 2001
From: Akshay Sasidharan
Date: Mon, 10 Mar 2025 23:35:11 +0530
Subject: [PATCH 15/16] update submodule
---
frontend/ee | 2 +-
server/ee | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/ee b/frontend/ee
index 48b34618a9..6da03a83bd 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 48b34618a96d70a64fa6579a54da941e457899d0
+Subproject commit 6da03a83bd7a804f102b143351e59cc518898411
diff --git a/server/ee b/server/ee
index 88dcd4e30b..4a7ef99d60 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit 88dcd4e30b5e78df1b873189c8416dd26edcaa1c
+Subproject commit 4a7ef99d60c0b1c98558dafc73fbf72e05daf6cb
From b3c54f3b58680658a558093fea089286b93883ae Mon Sep 17 00:00:00 2001
From: Adish M
Date: Tue, 11 Mar 2025 12:39:30 +0530
Subject: [PATCH 16/16] Fix: Destroy render service according to Edition
- Miss match with render create service name and destory service
---
.github/workflows/render-preview-deploy.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/render-preview-deploy.yml b/.github/workflows/render-preview-deploy.yml
index a025290d39..ead9ba50bf 100644
--- a/.github/workflows/render-preview-deploy.yml
+++ b/.github/workflows/render-preview-deploy.yml
@@ -215,7 +215,7 @@ jobs:
- name: Delete service
run: |
export SERVICE_ID=$(curl --request GET \
- --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
+ --url 'https://api.render.com/v1/services?name=ToolJet%20CE%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
--header 'accept: application/json' \
--header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
jq -r '.[0].service.id')
@@ -583,7 +583,7 @@ jobs:
- name: Delete service
run: |
export SERVICE_ID=$(curl --request GET \
- --url 'https://api.render.com/v1/services?name=ToolJet%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
+ --url 'https://api.render.com/v1/services?name=ToolJet%20EE%20PR%20%23${{ env.PR_NUMBER }}&limit=1' \
--header 'accept: application/json' \
--header 'authorization: Bearer ${{ secrets.RENDER_API_KEY }}' | \
jq -r '.[0].service.id')
+ {/* Settings Icon */}
+
+ 
{
+ deleteComponents([id]);
+ }}
+ >
+ 
{
- deleteComponents([id]);
- }}
- data-cy={`${componentName.toLowerCase()}-delete-button`}
- className="delete-icon"
- />
-