groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(app-config): rename canConnect as connectionAllowed

Browse Source
This commit is contained in:
Ali BARIN
2024-10-09 08:48:53 +00:00
committed by Faruk AYDIN
parent aed61209fa
commit 6e42b52414
11 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/backend/src/db/migrations/20241002121145_persist_virtual_attributes_in_app_config.js
View File

@@ -1,6 +1,6 @@
export async function up(knex) {
await knex.schema.alterTable('app_configs', (table) => {
table.boolean('can_connect').defaultTo(false);
table.boolean('connectionAllowed').defaultTo(false);
});
const appConfigs = await knex('app_configs').select('*');
@@ -17,17 +17,21 @@ export async function up(knex) {
const shared = appConfig.shared;
const active = appConfig.disabled === false;
const canConnectConditions = [hasSomeActiveAppAuthClients, shared, active];
const canConnect = canConnectConditions.every(Boolean);
const connectionAllowedConditions = [
hasSomeActiveAppAuthClients,
shared,
active,
];
const connectionAllowed = connectionAllowedConditions.every(Boolean);
await knex('app_configs')
.where('id', appConfig.id)
.update({ can_connect: canConnect });
.update({ connection_allowed: connectionAllowed });
}
}
export async function down(knex) {
await knex.schema.alterTable('app_configs', (table) => {
table.dropColumn('can_connect');
table.dropColumn('connectionAllowed');
});
}

2
packages/backend/src/models/__snapshots__/app-config.test.js.snap
View File

@@ -7,7 +7,7 @@ exports[`AppConfig model > jsonSchema should have correct validations 1`] = `
"default": false,
"type": "boolean",
},
"canConnect": {
"connectionAllowed": {
"default": false,
"type": "boolean",
},

2
packages/backend/src/models/app-auth-client.js
View File

@@ -63,7 +63,7 @@ class AppAuthClient extends Base {
async triggerAppConfigUpdate() {
const appConfig = await this.$relatedQuery('appConfig').select('*');
await appConfig?.updateCanConnectProperty();
await appConfig?.updateConnectionAllowedProperty();
}
// TODO: Make another abstraction like beforeSave instead of using

24
packages/backend/src/models/app-config.js
View File

@@ -12,7 +12,7 @@ class AppConfig extends Base {
properties: {
id: { type: 'string', format: 'uuid' },
key: { type: 'string' },
canConnect: { type: 'boolean', default: false },
connectionAllowed: { type: 'boolean', default: false },
allowCustomConnection: { type: 'boolean', default: false },
shared: { type: 'boolean', default: false },
disabled: { type: 'boolean', default: false },
@@ -46,7 +46,7 @@ class AppConfig extends Base {
return await App.findOneByKey(this.key);
}
async computeCanConnectProperty(oldAppConfig) {
async computeConnectionAllowedProperty(oldAppConfig) {
const appAuthClients = await oldAppConfig.$relatedQuery('appAuthClients');
const hasSomeActiveAppAuthClients = !!appAuthClients?.some(
(appAuthClient) => appAuthClient.active
@@ -57,27 +57,29 @@ class AppConfig extends Base {
const conditions = [hasSomeActiveAppAuthClients, shared, active];
const canConnect = conditions.every(Boolean);
const connectionAllowed = conditions.every(Boolean);
return canConnect;
return connectionAllowed;
}
async updateCanConnectProperty() {
const canConnect = await this.computeCanConnectProperty(this);
async updateConnectionAllowedProperty() {
const connectionAllowed = await this.computeConnectionAllowedProperty(this);
return await this.$query().patch({
canConnect,
connectionAllowed,
});
}
async computeAndAssignCanConnectProperty(oldAppConfig) {
this.canConnect = await this.computeCanConnectProperty(oldAppConfig);
async computeAndAssignConnectionAllowedProperty(oldAppConfig) {
this.connectionAllowed = await this.computeConnectionAllowedProperty(
oldAppConfig
);
}
async $beforeInsert(queryContext) {
await super.$beforeInsert(queryContext);
await this.computeAndAssignCanConnectProperty(this);
await this.computeAndAssignConnectionAllowedProperty(this);
}
async $beforeUpdate(opt, queryContext) {
@@ -85,7 +87,7 @@ class AppConfig extends Base {
const oldAppConfig = opt.old;
await this.computeAndAssignCanConnectProperty(oldAppConfig);
await this.computeAndAssignConnectionAllowedProperty(oldAppConfig);
}
}

12
packages/backend/src/models/app-config.test.js
View File

@@ -65,7 +65,7 @@ describe('AppConfig model', () => {
});
});
describe('canConnect', () => {
describe('connectionAllowed', () => {
it('should return true when app is enabled, shared and allows custom connection with an active app auth client at least', async () => {
await createAppAuthClient({
appKey: 'deepl',
@@ -84,7 +84,7 @@ describe('AppConfig model', () => {
key: 'deepl',
});
expect(appConfig.canConnect).toBe(true);
expect(appConfig.connectionAllowed).toBe(true);
});
it('should return true when app is enabled, shared and allows custom connection with no active app auth client', async () => {
@@ -100,7 +100,7 @@ describe('AppConfig model', () => {
key: 'deepl',
});
expect(appConfig.canConnect).toBe(false);
expect(appConfig.connectionAllowed).toBe(false);
});
it('should return false when app is enabled, shared and allows custom connection without any app auth clients', async () => {
@@ -111,7 +111,7 @@ describe('AppConfig model', () => {
key: 'deepl',
});
expect(appConfig.canConnect).toBe(false);
expect(appConfig.connectionAllowed).toBe(false);
});
it('should return false when app is disabled', async () => {
@@ -120,7 +120,7 @@ describe('AppConfig model', () => {
allowCustomConnection: true,
});
expect(appConfig.canConnect).toBe(false);
expect(appConfig.connectionAllowed).toBe(false);
});
it(`should return false when app doesn't allow custom connection`, async () => {
@@ -129,7 +129,7 @@ describe('AppConfig model', () => {
allowCustomConnection: false,
});
expect(appConfig.canConnect).toBe(false);
expect(appConfig.connectionAllowed).toBe(false);
});
});

2
packages/backend/src/serializers/app-config.js
View File

@@ -5,7 +5,7 @@ const appConfigSerializer = (appConfig) => {
allowCustomConnection: appConfig.allowCustomConnection,
shared: appConfig.shared,
disabled: appConfig.disabled,
canConnect: appConfig.canConnect,
connectionAllowed: appConfig.connectionAllowed,
canCustomConnect: appConfig.canCustomConnect,
createdAt: appConfig.createdAt.getTime(),
updatedAt: appConfig.updatedAt.getTime(),

2
packages/backend/src/serializers/app-config.test.js
View File

@@ -16,7 +16,7 @@ describe('appConfig serializer', () => {
allowCustomConnection: appConfig.allowCustomConnection,
shared: appConfig.shared,
disabled: appConfig.disabled,
canConnect: appConfig.canConnect,
connectionAllowed: appConfig.connectionAllowed,
canCustomConnect: appConfig.canCustomConnect,
createdAt: appConfig.createdAt.getTime(),
updatedAt: appConfig.updatedAt.getTime(),

2
packages/backend/test/mocks/rest/api/v1/apps/get-config.js
View File

@@ -6,7 +6,7 @@ const getAppConfigMock = (appConfig) => {
allowCustomConnection: appConfig.allowCustomConnection,
shared: appConfig.shared,
disabled: appConfig.disabled,
canConnect: appConfig.canConnect,
connectionAllowed: appConfig.connectionAllowed,
canCustomConnect: appConfig.canCustomConnect,
createdAt: appConfig.createdAt.getTime(),
updatedAt: appConfig.updatedAt.getTime(),

2
packages/web/src/components/ChooseConnectionSubstep/index.jsx
View File

@@ -100,7 +100,7 @@ function ChooseConnectionSubstep(props) {
});
}
if (appConfig?.data?.canConnect) {
if (appConfig?.data?.connectionAllowed) {
options.push({
label: formatMessage('chooseConnectionSubstep.addNewSharedConnection'),
value: ADD_SHARED_CONNECTION_VALUE,

6
packages/web/src/pages/Application/index.jsx
View File

@@ -77,14 +77,14 @@ export default function Application() {
const connectionOptions = React.useMemo(() => {
const shouldHaveCustomConnection =
appConfig?.data?.canConnect && appConfig?.data?.canCustomConnect;
appConfig?.data?.connectionAllowed && appConfig?.data?.canCustomConnect;
const options = [
{
label: formatMessage('app.addConnection'),
key: 'addConnection',
'data-test': 'add-connection-button',
to: URLS.APP_ADD_CONNECTION(appKey, appConfig?.data?.canConnect),
to: URLS.APP_ADD_CONNECTION(appKey, appConfig?.data?.connectionAllowed),
disabled: !currentUserAbility.can('create', 'Connection'),
},
];
@@ -155,7 +155,7 @@ export default function Application() {
disabled={
!allowed ||
(appConfig?.data &&
!appConfig?.data?.canConnect &&
!appConfig?.data?.connectionAllowed &&
!appConfig?.data?.canCustomConnect) ||
connectionOptions.every(({ disabled }) => disabled)
}

2
packages/web/src/propTypes/propTypes.js
View File

@@ -460,7 +460,7 @@ export const AppConfigPropType = PropTypes.shape({
id: PropTypes.string,
key: PropTypes.string,
allowCustomConnection: PropTypes.bool,
canConnect: PropTypes.bool,
connectionAllowed: PropTypes.bool,
canCustomConnect: PropTypes.bool,
shared: PropTypes.bool,
disabled: PropTypes.bool,