From a76bee51fc3fdae00bac81478934c69c9d9f5f0a Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Wed, 9 Oct 2024 09:35:36 +0000 Subject: [PATCH] refactor(app-config): remove canCustomConnect virtual attribute --- .../src/models/__snapshots__/app-config.test.js.snap | 6 ------ packages/backend/src/models/app-config.js | 8 -------- packages/backend/src/models/app-config.test.js | 8 ++++---- packages/backend/src/serializers/app-config.js | 1 - packages/backend/src/serializers/app-config.test.js | 1 - .../backend/test/mocks/rest/api/v1/apps/get-config.js | 1 - .../web/src/components/ChooseConnectionSubstep/index.jsx | 5 ++++- packages/web/src/pages/Application/index.jsx | 6 ++++-- packages/web/src/propTypes/propTypes.js | 1 - 9 files changed, 12 insertions(+), 25 deletions(-) diff --git a/packages/backend/src/models/__snapshots__/app-config.test.js.snap b/packages/backend/src/models/__snapshots__/app-config.test.js.snap index 7542159e..81015bef 100644 --- a/packages/backend/src/models/__snapshots__/app-config.test.js.snap +++ b/packages/backend/src/models/__snapshots__/app-config.test.js.snap @@ -39,9 +39,3 @@ exports[`AppConfig model > jsonSchema should have correct validations 1`] = ` "type": "object", } `; - -exports[`AppConfig model > virtualAttributes should return correct properties 1`] = ` -[ - "canCustomConnect", -] -`; diff --git a/packages/backend/src/models/app-config.js b/packages/backend/src/models/app-config.js index 7a95f1de..15968890 100644 --- a/packages/backend/src/models/app-config.js +++ b/packages/backend/src/models/app-config.js @@ -32,14 +32,6 @@ class AppConfig extends Base { }, }); - static get virtualAttributes() { - return ['canCustomConnect']; - } - - get canCustomConnect() { - return !this.disabled && this.allowCustomConnection; - } - async getApp() { if (!this.key) return null; diff --git a/packages/backend/src/models/app-config.test.js b/packages/backend/src/models/app-config.test.js index 26f08077..10534857 100644 --- a/packages/backend/src/models/app-config.test.js +++ b/packages/backend/src/models/app-config.test.js @@ -36,14 +36,14 @@ describe('AppConfig model', () => { expect(AppConfig.virtualAttributes).toMatchSnapshot(); }); - describe('canCustomConnect', () => { + describe('allowCustomConnection', () => { it('should return true when app is enabled and allows custom connection', async () => { const appConfig = await createAppConfig({ disabled: false, allowCustomConnection: true, }); - expect(appConfig.canCustomConnect).toBe(true); + expect(appConfig.allowCustomConnection).toBe(true); }); it('should return false when app is disabled', async () => { @@ -52,7 +52,7 @@ describe('AppConfig model', () => { allowCustomConnection: true, }); - expect(appConfig.canCustomConnect).toBe(false); + expect(appConfig.allowCustomConnection).toBe(false); }); it(`should return false when app doesn't allow custom connection`, async () => { @@ -61,7 +61,7 @@ describe('AppConfig model', () => { allowCustomConnection: false, }); - expect(appConfig.canCustomConnect).toBe(false); + expect(appConfig.allowCustomConnection).toBe(false); }); }); diff --git a/packages/backend/src/serializers/app-config.js b/packages/backend/src/serializers/app-config.js index 56e6243e..7355f467 100644 --- a/packages/backend/src/serializers/app-config.js +++ b/packages/backend/src/serializers/app-config.js @@ -6,7 +6,6 @@ const appConfigSerializer = (appConfig) => { shared: appConfig.shared, disabled: appConfig.disabled, connectionAllowed: appConfig.connectionAllowed, - canCustomConnect: appConfig.canCustomConnect, createdAt: appConfig.createdAt.getTime(), updatedAt: appConfig.updatedAt.getTime(), }; diff --git a/packages/backend/src/serializers/app-config.test.js b/packages/backend/src/serializers/app-config.test.js index 9ade2769..cbd8d5e1 100644 --- a/packages/backend/src/serializers/app-config.test.js +++ b/packages/backend/src/serializers/app-config.test.js @@ -17,7 +17,6 @@ describe('appConfig serializer', () => { shared: appConfig.shared, disabled: appConfig.disabled, connectionAllowed: appConfig.connectionAllowed, - canCustomConnect: appConfig.canCustomConnect, createdAt: appConfig.createdAt.getTime(), updatedAt: appConfig.updatedAt.getTime(), }; diff --git a/packages/backend/test/mocks/rest/api/v1/apps/get-config.js b/packages/backend/test/mocks/rest/api/v1/apps/get-config.js index 4cc6e011..b854301a 100644 --- a/packages/backend/test/mocks/rest/api/v1/apps/get-config.js +++ b/packages/backend/test/mocks/rest/api/v1/apps/get-config.js @@ -7,7 +7,6 @@ const getAppConfigMock = (appConfig) => { shared: appConfig.shared, disabled: appConfig.disabled, connectionAllowed: appConfig.connectionAllowed, - canCustomConnect: appConfig.canCustomConnect, createdAt: appConfig.createdAt.getTime(), updatedAt: appConfig.updatedAt.getTime(), }, diff --git a/packages/web/src/components/ChooseConnectionSubstep/index.jsx b/packages/web/src/components/ChooseConnectionSubstep/index.jsx index 345e0dac..740e541b 100644 --- a/packages/web/src/components/ChooseConnectionSubstep/index.jsx +++ b/packages/web/src/components/ChooseConnectionSubstep/index.jsx @@ -93,7 +93,10 @@ function ChooseConnectionSubstep(props) { appWithConnections?.map((connection) => optionGenerator(connection)) || []; - if (!appConfig?.data || appConfig?.data?.canCustomConnect) { + if ( + !appConfig?.data || + (!appConfig.data?.disabled && appConfig.data?.allowCustomConnection) + ) { options.push({ label: formatMessage('chooseConnectionSubstep.addNewConnection'), value: ADD_CONNECTION_VALUE, diff --git a/packages/web/src/pages/Application/index.jsx b/packages/web/src/pages/Application/index.jsx index bd3c9540..bb8c2fdc 100644 --- a/packages/web/src/pages/Application/index.jsx +++ b/packages/web/src/pages/Application/index.jsx @@ -77,7 +77,8 @@ export default function Application() { const connectionOptions = React.useMemo(() => { const shouldHaveCustomConnection = - appConfig?.data?.connectionAllowed && appConfig?.data?.canCustomConnect; + appConfig?.data?.connectionAllowed && + appConfig?.data?.allowCustomConnection; const options = [ { @@ -155,8 +156,9 @@ export default function Application() { disabled={ !allowed || (appConfig?.data && + !appConfig?.data?.disabled && !appConfig?.data?.connectionAllowed && - !appConfig?.data?.canCustomConnect) || + !appConfig?.data?.allowCustomConnection) || connectionOptions.every(({ disabled }) => disabled) } options={connectionOptions} diff --git a/packages/web/src/propTypes/propTypes.js b/packages/web/src/propTypes/propTypes.js index ef730f33..f62c2d57 100644 --- a/packages/web/src/propTypes/propTypes.js +++ b/packages/web/src/propTypes/propTypes.js @@ -461,7 +461,6 @@ export const AppConfigPropType = PropTypes.shape({ key: PropTypes.string, allowCustomConnection: PropTypes.bool, connectionAllowed: PropTypes.bool, - canCustomConnect: PropTypes.bool, shared: PropTypes.bool, disabled: PropTypes.bool, });