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

Fix viewable (Build with) DS (#12665)

Browse source 
* fix viewable (Build with) DS

* update

* update

* update

* update

* update configurable ds
This commit is contained in:
platform-ops123 2025-04-22 23:23:16 +05:30 committed by GitHub
parent 6079ecf382
commit ad4f432c50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/src/modules/data-sources/ability/index.ts
View file

@ -88,13 +88,10 @@ export class FeatureAbilityFactory extends AbilityFactory<FEATURE_KEY, Subjects>
}
if (resourcePermissions?.configurableDataSourceId?.length) {
can([FEATURE_KEY.GET, FEATURE_KEY.TEST_CONNECTION, FEATURE_KEY.GET_BY_ENVIRONMENT], DataSource);
can([FEATURE_KEY.GET], DataSource);
if (dataSourceId && resourcePermissions?.configurableDataSourceId?.includes(dataSourceId)) {
can(
[FEATURE_KEY.GET, FEATURE_KEY.UPDATE, FEATURE_KEY.GET_BY_ENVIRONMENT, FEATURE_KEY.TEST_CONNECTION],
DataSource
);
can([FEATURE_KEY.UPDATE, FEATURE_KEY.GET_BY_ENVIRONMENT, FEATURE_KEY.TEST_CONNECTION], DataSource);
}
}
@ -102,12 +99,11 @@ export class FeatureAbilityFactory extends AbilityFactory<FEATURE_KEY, Subjects>
can([FEATURE_KEY.GET_BY_ENVIRONMENT, FEATURE_KEY.GET, FEATURE_KEY.TEST_CONNECTION], DataSource);
return;
}
if (
resourcePermissions.usableDataSourcesId?.length &&
dataSourceId &&
resourcePermissions?.usableDataSourcesId?.includes(dataSourceId)
) {
can([FEATURE_KEY.GET, FEATURE_KEY.GET_BY_ENVIRONMENT, FEATURE_KEY.TEST_CONNECTION], DataSource);
if (resourcePermissions.usableDataSourcesId?.length) {
can([FEATURE_KEY.GET], DataSource);
if (dataSourceId && resourcePermissions?.usableDataSourcesId?.includes(dataSourceId)) {
can([FEATURE_KEY.GET_BY_ENVIRONMENT, FEATURE_KEY.TEST_CONNECTION], DataSource);
}
return;
}
}