From 73edb45ff7f779c48d8d9d1c7f6cd012adf175fa Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Wed, 9 Oct 2024 12:03:57 +0000 Subject: [PATCH] refactor(app-config): rename allowCustomConnection as customConnectionAllowed --- ...241002121145_add_connection_allowed_to_app_configs.js} | 0 ...ection_as_custom_connection_allowed_in_app_configs.js} | 0 .../e2e-tests/fixtures/admin/application-settings-page.js | 8 ++++++-- .../components/AdminApplicationCreateAuthClient/index.jsx | 4 ++-- .../web/src/components/AdminApplicationSettings/index.jsx | 7 ++++--- .../web/src/components/ChooseConnectionSubstep/index.jsx | 2 +- packages/web/src/locales/en.json | 2 +- packages/web/src/pages/Application/index.jsx | 4 ++-- packages/web/src/propTypes/propTypes.js | 2 +- 9 files changed, 17 insertions(+), 12 deletions(-) rename packages/backend/src/db/migrations/{20241002121145_persist_virtual_attributes_in_app_config.js => 20241002121145_add_connection_allowed_to_app_configs.js} (100%) rename packages/backend/src/db/migrations/{20241009094438_rename_app_config_allow_custom_connection_as_custom_connection_allowed.js => 20241009094438_rename_allow_custom_connection_as_custom_connection_allowed_in_app_configs.js} (100%) diff --git a/packages/backend/src/db/migrations/20241002121145_persist_virtual_attributes_in_app_config.js b/packages/backend/src/db/migrations/20241002121145_add_connection_allowed_to_app_configs.js similarity index 100% rename from packages/backend/src/db/migrations/20241002121145_persist_virtual_attributes_in_app_config.js rename to packages/backend/src/db/migrations/20241002121145_add_connection_allowed_to_app_configs.js diff --git a/packages/backend/src/db/migrations/20241009094438_rename_app_config_allow_custom_connection_as_custom_connection_allowed.js b/packages/backend/src/db/migrations/20241009094438_rename_allow_custom_connection_as_custom_connection_allowed_in_app_configs.js similarity index 100% rename from packages/backend/src/db/migrations/20241009094438_rename_app_config_allow_custom_connection_as_custom_connection_allowed.js rename to packages/backend/src/db/migrations/20241009094438_rename_allow_custom_connection_as_custom_connection_allowed_in_app_configs.js diff --git a/packages/e2e-tests/fixtures/admin/application-settings-page.js b/packages/e2e-tests/fixtures/admin/application-settings-page.js index 37dda591..57858ccb 100644 --- a/packages/e2e-tests/fixtures/admin/application-settings-page.js +++ b/packages/e2e-tests/fixtures/admin/application-settings-page.js @@ -8,11 +8,15 @@ export class AdminApplicationSettingsPage extends AuthenticatedPage { constructor(page) { super(page); - this.allowCustomConnectionsSwitch = this.page.locator('[name="allowCustomConnection"]'); + this.allowCustomConnectionsSwitch = this.page.locator( + '[name="customConnectionAllowed"]' + ); this.allowSharedConnectionsSwitch = this.page.locator('[name="shared"]'); this.disableConnectionsSwitch = this.page.locator('[name="disabled"]'); this.saveButton = this.page.getByTestId('submit-button'); - this.successSnackbar = this.page.getByTestId('snackbar-save-admin-apps-settings-success'); + this.successSnackbar = this.page.getByTestId( + 'snackbar-save-admin-apps-settings-success' + ); } async allowCustomConnections() { diff --git a/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx b/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx index dd385217..75f2b79b 100644 --- a/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx +++ b/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx @@ -20,7 +20,7 @@ function AdminApplicationCreateAuthClient(props) { const { mutateAsync: createAppConfig, isPending: isCreateAppConfigPending, - error: createAppConfigError + error: createAppConfigError, } = useAdminCreateAppConfig(props.appKey); const { @@ -34,7 +34,7 @@ function AdminApplicationCreateAuthClient(props) { if (!appConfigId) { const { data: appConfigData } = await createAppConfig({ - allowCustomConnection: true, + customConnectionAllowed: true, shared: false, disabled: false, }); diff --git a/packages/web/src/components/AdminApplicationSettings/index.jsx b/packages/web/src/components/AdminApplicationSettings/index.jsx index b24d2557..34ef8d0c 100644 --- a/packages/web/src/components/AdminApplicationSettings/index.jsx +++ b/packages/web/src/components/AdminApplicationSettings/index.jsx @@ -46,7 +46,8 @@ function AdminApplicationSettings(props) { const defaultValues = useMemo( () => ({ - allowCustomConnection: appConfig?.data?.allowCustomConnection || false, + customConnectionAllowed: + appConfig?.data?.customConnectionAllowed || false, shared: appConfig?.data?.shared || false, disabled: appConfig?.data?.disabled || false, }), @@ -61,8 +62,8 @@ function AdminApplicationSettings(props) { { const shouldHaveCustomConnection = appConfig?.data?.connectionAllowed && - appConfig?.data?.allowCustomConnection; + appConfig?.data?.customConnectionAllowed; const options = [ { @@ -158,7 +158,7 @@ export default function Application() { (appConfig?.data && !appConfig?.data?.disabled && !appConfig?.data?.connectionAllowed && - !appConfig?.data?.allowCustomConnection) || + !appConfig?.data?.customConnectionAllowed) || connectionOptions.every(({ disabled }) => disabled) } options={connectionOptions} diff --git a/packages/web/src/propTypes/propTypes.js b/packages/web/src/propTypes/propTypes.js index f62c2d57..82d6fd6b 100644 --- a/packages/web/src/propTypes/propTypes.js +++ b/packages/web/src/propTypes/propTypes.js @@ -459,7 +459,7 @@ export const SamlAuthProviderRolePropType = PropTypes.shape({ export const AppConfigPropType = PropTypes.shape({ id: PropTypes.string, key: PropTypes.string, - allowCustomConnection: PropTypes.bool, + customConnectionAllowed: PropTypes.bool, connectionAllowed: PropTypes.bool, shared: PropTypes.bool, disabled: PropTypes.bool,