Skip to content

Commit cd06ae2

Browse files
chore(*): remove unused code (#6781)
The code removed in the PR was flagged as unused by the JetBrains inspector. I did a QA on the dev environment but other checks are highly recommended. There is one commit by scope to make the review easier. --------- Co-authored-by: Charles Bochet <[email protected]>
1 parent ebfdc6c commit cd06ae2

File tree

86 files changed

+97
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+97
-575
lines changed

packages/twenty-front/src/generated/graphql.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ export type Mutation = {
351351
deleteOneServerlessFunction: ServerlessFunction;
352352
deleteUser: User;
353353
disablePostgresProxy: PostgresCredentials;
354+
disableWorkflowTrigger: Scalars['Boolean'];
354355
emailPasswordResetLink: EmailPasswordResetLink;
355356
enablePostgresProxy: PostgresCredentials;
356357
enableWorkflowTrigger: Scalars['Boolean'];
@@ -431,6 +432,11 @@ export type MutationDeleteOneServerlessFunctionArgs = {
431432
};
432433

433434

435+
export type MutationDisableWorkflowTriggerArgs = {
436+
workflowVersionId: Scalars['String'];
437+
};
438+
439+
434440
export type MutationEmailPasswordResetLinkArgs = {
435441
email: Scalars['String'];
436442
};
@@ -1186,6 +1192,7 @@ export type Field = {
11861192
isSystem?: Maybe<Scalars['Boolean']>;
11871193
label: Scalars['String'];
11881194
name: Scalars['String'];
1195+
object?: Maybe<Object>;
11891196
options?: Maybe<Scalars['JSON']>;
11901197
relationDefinition?: Maybe<RelationDefinition>;
11911198
settings?: Maybe<Scalars['JSON']>;

packages/twenty-front/src/modules/object-record/record-action-bar/hooks/useRecordActionBar.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@ export const useRecordActionBar = ({
121121
title={`Delete ${numberOfSelectedRecords} ${
122122
numberOfSelectedRecords === 1 ? `record` : 'records'
123123
}`}
124-
subtitle={`This action cannot be undone. This will permanently delete ${
124+
subtitle={`Are you sure you want to delete ${
125125
numberOfSelectedRecords === 1
126126
? 'this record'
127127
: 'these records'
128-
}`}
128+
}? ${
129+
numberOfSelectedRecords === 1 ? 'It' : 'They'
130+
} can be recovered from the Options menu.`}
129131
onConfirmClick={() => handleDeleteClick()}
130132
deleteButtonText={`Delete ${
131133
numberOfSelectedRecords > 1 ? 'Records' : 'Record'

packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const useHandleToggleTrashColumnFilter = ({
5252
operand: ViewFilterOperand.IsNotEmpty,
5353
displayValue: '',
5454
definition: {
55-
label: 'Trash',
55+
label: `Deleted ${objectNameSingular}`,
5656
iconName: 'IconTrash',
5757
fieldMetadataId: trashFieldMetadata.id,
5858
type: filterType,
@@ -61,7 +61,12 @@ export const useHandleToggleTrashColumnFilter = ({
6161
};
6262

6363
upsertCombinedViewFilter(newFilter);
64-
}, [columnDefinitions, objectMetadataItem.fields, upsertCombinedViewFilter]);
64+
}, [
65+
columnDefinitions,
66+
objectMetadataItem.fields,
67+
objectNameSingular,
68+
upsertCombinedViewFilter,
69+
]);
6570

6671
return handleToggleTrashColumnFilter;
6772
};

packages/twenty-front/src/modules/object-record/record-index/options/components/RecordIndexOptionsDropdownContent.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export const RecordIndexOptionsDropdownContent = ({
166166
closeDropdown();
167167
}}
168168
LeftIcon={IconTrash}
169-
text="Trash"
169+
text={`Deleted ${objectNameSingular}`}
170170
/>
171171
</DropdownMenuItemsContainer>
172172
)}

packages/twenty-front/vite.config.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable no-console */
12
import react from '@vitejs/plugin-react-swc';
23
import wyw from '@wyw-in-js/vite';
34
import path from 'path';
@@ -8,13 +9,9 @@ import tsconfigPaths from 'vite-tsconfig-paths';
89

910
type Checkers = Parameters<typeof checker>[0];
1011

11-
// https://vitejs.dev/config/
1212
export default defineConfig(({ command, mode }) => {
1313
const env = loadEnv(mode, process.cwd(), '');
1414

15-
/*
16-
Using explicit env variables, there is no need to expose all of them (security).
17-
*/
1815
const {
1916
REACT_APP_SERVER_BASE_URL,
2017
VITE_BUILD_SOURCEMAP,
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
import { DataSource } from 'typeorm';
22

3-
import {
4-
seedUsers,
5-
deleteUsersByWorkspace,
6-
} from 'src/database/typeorm-seeds/core/users';
7-
import {
8-
seedWorkspaces,
9-
deleteWorkspaces,
10-
} from 'src/database/typeorm-seeds/core/workspaces';
11-
import {
12-
seedFeatureFlags,
13-
deleteFeatureFlags,
14-
} from 'src/database/typeorm-seeds/core/feature-flags';
15-
import {
16-
deleteUserWorkspaces,
17-
seedUserWorkspaces,
18-
} from 'src/database/typeorm-seeds/core/userWorkspaces';
3+
import { seedUsers } from 'src/database/typeorm-seeds/core/users';
4+
import { seedWorkspaces } from 'src/database/typeorm-seeds/core/workspaces';
5+
import { seedFeatureFlags } from 'src/database/typeorm-seeds/core/feature-flags';
6+
import { seedUserWorkspaces } from 'src/database/typeorm-seeds/core/userWorkspaces';
197

208
export const seedCoreSchema = async (
219
workspaceDataSource: DataSource,
@@ -28,16 +16,3 @@ export const seedCoreSchema = async (
2816
await seedUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
2917
await seedFeatureFlags(workspaceDataSource, schemaName, workspaceId);
3018
};
31-
32-
export const deleteCoreSchema = async (
33-
workspaceDataSource: DataSource,
34-
workspaceId: string,
35-
) => {
36-
const schemaName = 'core';
37-
38-
await deleteUserWorkspaces(workspaceDataSource, schemaName, workspaceId);
39-
await deleteUsersByWorkspace(workspaceDataSource, schemaName, workspaceId);
40-
await deleteFeatureFlags(workspaceDataSource, schemaName, workspaceId);
41-
// deleteWorkspaces should be last
42-
await deleteWorkspaces(workspaceDataSource, schemaName, workspaceId);
43-
};

packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts

-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ export class GraphQLConfigService
7575

7676
const data = await this.tokenService.validateToken(context.req);
7777

78-
user = data.user;
79-
workspace = data.workspace;
80-
8178
return await this.createSchema(context, data);
8279
} catch (error) {
8380
if (error instanceof UnauthorizedException) {

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/create-many-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { v4 as uuidv4 } from 'uuid';
44

@@ -14,8 +14,6 @@ import { FieldsStringFactory } from './fields-string.factory';
1414

1515
@Injectable()
1616
export class CreateManyQueryFactory {
17-
private readonly logger = new Logger(CreateManyQueryFactory.name);
18-
1917
constructor(
2018
private readonly fieldsStringFactory: FieldsStringFactory,
2119
private readonly argsAliasFactory: ArgsAliasFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/delete-one-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
44
import { DeleteOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
@@ -9,8 +9,6 @@ import { FieldsStringFactory } from './fields-string.factory';
99

1010
@Injectable()
1111
export class DeleteOneQueryFactory {
12-
private readonly logger = new Logger(DeleteOneQueryFactory.name);
13-
1412
constructor(private readonly fieldsStringFactory: FieldsStringFactory) {}
1513

1614
async create(

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { GraphQLResolveInfo } from 'graphql';
44
import graphqlFields from 'graphql-fields';
@@ -15,8 +15,6 @@ import { RelationFieldAliasFactory } from './relation-field-alias.factory';
1515

1616
@Injectable()
1717
export class FieldsStringFactory {
18-
private readonly logger = new Logger(FieldsStringFactory.name);
19-
2018
constructor(
2119
private readonly fieldAliasFactory: FieldAliasFactory,
2220
private readonly relationFieldAliasFactory: RelationFieldAliasFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import isEmpty from 'lodash.isempty';
44

@@ -15,8 +15,6 @@ import { FieldsStringFactory } from './fields-string.factory';
1515

1616
@Injectable()
1717
export class FindDuplicatesQueryFactory {
18-
private readonly logger = new Logger(FindDuplicatesQueryFactory.name);
19-
2018
constructor(
2119
private readonly fieldsStringFactory: FieldsStringFactory,
2220
private readonly argsAliasFactory: ArgsAliasFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-many-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import {
44
RecordFilter,
@@ -14,8 +14,6 @@ import { FieldsStringFactory } from './fields-string.factory';
1414

1515
@Injectable()
1616
export class FindManyQueryFactory {
17-
private readonly logger = new Logger(FindManyQueryFactory.name);
18-
1917
constructor(
2018
private readonly fieldsStringFactory: FieldsStringFactory,
2119
private readonly argsStringFactory: ArgsStringFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/find-one-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
44
import { RecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
@@ -11,8 +11,6 @@ import { FieldsStringFactory } from './fields-string.factory';
1111

1212
@Injectable()
1313
export class FindOneQueryFactory {
14-
private readonly logger = new Logger(FindOneQueryFactory.name);
15-
1614
constructor(
1715
private readonly fieldsStringFactory: FieldsStringFactory,
1816
private readonly argsStringFactory: ArgsStringFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/relation-field-alias.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { forwardRef, Inject, Injectable, Logger } from '@nestjs/common';
1+
import { forwardRef, Inject, Injectable } from '@nestjs/common';
22

33
import { GraphQLResolveInfo } from 'graphql';
44

@@ -20,8 +20,6 @@ import { ArgsStringFactory } from './args-string.factory';
2020

2121
@Injectable()
2222
export class RelationFieldAliasFactory {
23-
private logger = new Logger(RelationFieldAliasFactory.name);
24-
2523
constructor(
2624
@Inject(forwardRef(() => FieldsStringFactory))
2725
private readonly fieldsStringFactory: CircularDep<FieldsStringFactory>,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/factories/update-one-query.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
44
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
@@ -12,8 +12,6 @@ import { FieldsStringFactory } from './fields-string.factory';
1212

1313
@Injectable()
1414
export class UpdateOneQueryFactory {
15-
private readonly logger = new Logger(UpdateOneQueryFactory.name);
16-
1715
constructor(
1816
private readonly fieldsStringFactory: FieldsStringFactory,
1917
private readonly argsAliasFactory: ArgsAliasFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
44
import {
@@ -34,8 +34,6 @@ import { FindDuplicatesQueryFactory } from './factories/find-duplicates-query.fa
3434

3535
@Injectable()
3636
export class WorkspaceQueryBuilderFactory {
37-
private readonly logger = new Logger(WorkspaceQueryBuilderFactory.name);
38-
3937
constructor(
4038
private readonly findManyQueryFactory: FindManyQueryFactory,
4139
private readonly findOneQueryFactory: FindOneQueryFactory,

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/record-position.factory.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { TestingModule, Test } from '@nestjs/testing';
1+
import { Test, TestingModule } from '@nestjs/testing';
22

3-
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
43
import { RecordPositionQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
54
import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
5+
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
66

77
describe('RecordPositionFactory', () => {
88
const recordPositionQueryFactory = {
9-
create: jest.fn().mockResolvedValue('query'),
9+
create: jest.fn().mockReturnValue(['query', []]),
1010
};
1111

1212
let workspaceDataSourceService;

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export class QueryRunnerArgsFactory {
134134
),
135135
];
136136
case FieldMetadataType.NUMBER:
137-
return [key, await Promise.resolve(Number(value))];
137+
return [key, Number(value)];
138138
default:
139139
return [key, await Promise.resolve(value)];
140140
}

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/record-position.factory.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class RecordPositionFactory {
6464
dataSourceSchema: string,
6565
workspaceId: string,
6666
) {
67-
const [query, params] = await this.recordPositionQueryFactory.create(
67+
const [query, params] = this.recordPositionQueryFactory.create(
6868
recordPositionQueryArgs,
6969
objectMetadata,
7070
dataSourceSchema,

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage.ts

-6
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,4 @@ export class WorkspaceQueryHookStorage {
6666

6767
this.postHookInstances.get(key)?.push(data);
6868
}
69-
70-
getWorkspaceQueryPostHookInstances(
71-
key: WorkspaceQueryHookKey,
72-
): WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] | undefined {
73-
return this.postHookInstances.get(key);
74-
}
7569
}

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook-metadata.accessor.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { WorkspaceQueryHookOptions } from 'src/engine/api/graphql/workspace-quer
99
export class WorkspaceQueryHookMetadataAccessor {
1010
constructor(private readonly reflector: Reflector) {}
1111

12-
isWorkspaceQueryHook(target: Type<any> | Function): boolean {
12+
isWorkspaceQueryHook(target: Type | Function): boolean {
1313
if (!target) {
1414
return false;
1515
}
@@ -18,7 +18,7 @@ export class WorkspaceQueryHookMetadataAccessor {
1818
}
1919

2020
getWorkspaceQueryHookMetadata(
21-
target: Type<any> | Function,
21+
target: Type | Function,
2222
): WorkspaceQueryHookOptions | undefined {
2323
return this.reflector.get(WORKSPACE_QUERY_HOOK_METADATA, target);
2424
}

packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts

-11
Original file line numberDiff line numberDiff line change
@@ -1011,17 +1011,6 @@ export class WorkspaceQueryRunnerService {
10111011
return parseResult(resultWithGetters);
10121012
}
10131013

1014-
async executeAndParse<Result>(
1015-
query: string,
1016-
objectMetadataItem: ObjectMetadataInterface,
1017-
command: string,
1018-
workspaceId: string,
1019-
): Promise<Result> {
1020-
const result = await this.execute(query, workspaceId);
1021-
1022-
return this.parseResult(result, objectMetadataItem, command, workspaceId);
1023-
}
1024-
10251014
async triggerWebhooks<Record>(
10261015
jobsData: Record[] | undefined,
10271016
operation: CallWebhookJobsJobOperation,

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/connection-type-definition.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { GraphQLFieldConfigMap, GraphQLInt, GraphQLObjectType } from 'graphql';
44

@@ -20,8 +20,6 @@ export enum ConnectionTypeDefinitionKind {
2020

2121
@Injectable()
2222
export class ConnectionTypeDefinitionFactory {
23-
private readonly logger = new Logger(ConnectionTypeDefinitionFactory.name);
24-
2523
constructor(private readonly connectionTypeFactory: ConnectionTypeFactory) {}
2624

2725
public create(

packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/edge-type-definition.factory.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Injectable, Logger } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common';
22

33
import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
44

@@ -20,8 +20,6 @@ export enum EdgeTypeDefinitionKind {
2020

2121
@Injectable()
2222
export class EdgeTypeDefinitionFactory {
23-
private readonly logger = new Logger(EdgeTypeDefinitionFactory.name);
24-
2523
constructor(private readonly edgeTypeFactory: EdgeTypeFactory) {}
2624

2725
public create(

0 commit comments

Comments
 (0)