From ad4f432c50e2211c454c995e35332f4f94366a12 Mon Sep 17 00:00:00 2001 From: platform-ops123 Date: Tue, 22 Apr 2025 23:23:16 +0530 Subject: [PATCH] Fix viewable (Build with) DS (#12665) * fix viewable (Build with) DS * update * update * update * update * update configurable ds --- .../src/modules/data-sources/ability/index.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/server/src/modules/data-sources/ability/index.ts b/server/src/modules/data-sources/ability/index.ts index 13c9be760c..60686e24d7 100644 --- a/server/src/modules/data-sources/ability/index.ts +++ b/server/src/modules/data-sources/ability/index.ts @@ -88,13 +88,10 @@ export class FeatureAbilityFactory extends AbilityFactory } 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 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; } }