admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix merge conflict on import

Browse Source
This commit is contained in:
Charles Bochet
2025-06-10 17:24:41 +02:00
parent 87e944ca60
commit 93103210bf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/twenty-server/test/integration/graphql/suites/object-records-permissions/granular-object-records-permissions.integration-spec.ts
View File

@ -7,10 +7,10 @@ import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graph
import { updateFeatureFlagFactory } from 'test/integration/graphql/utils/update-feature-flag-factory.util'; import { updateFeatureFlagFactory } from 'test/integration/graphql/utils/update-feature-flag-factory.util';
import { updateWorkspaceMemberRole } from 'test/integration/graphql/utils/update-workspace-member-role.util'; import { updateWorkspaceMemberRole } from 'test/integration/graphql/utils/update-workspace-member-role.util';
import { SEED_APPLE_WORKSPACE_ID } from 'src/database/typeorm-seeds/core/workspaces';
import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util'; import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import { PermissionsExceptionMessage } from 'src/engine/metadata-modules/permissions/permissions.exception'; import { PermissionsExceptionMessage } from 'src/engine/metadata-modules/permissions/permissions.exception';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-workspaces.util';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
const client = request(`http://localhost:${APP_PORT}`); const client = request(`http://localhost:${APP_PORT}`);
@ -56,7 +56,7 @@ describe('granularObjectRecordsPermissions', () => {
query: ` query: `
mutation UpdateWorkspaceMemberRole { mutation UpdateWorkspaceMemberRole {
updateWorkspaceMemberRole( updateWorkspaceMemberRole(
workspaceMemberId: "${DEV_SEED_WORKSPACE_MEMBER_IDS.JONY}" workspaceMemberId: "${WORKSPACE_MEMBER_DATA_SEED_IDS.JONY}"
roleId: "${originalMemberRoleId}" roleId: "${originalMemberRoleId}"
) { ) {
id id
@ -96,7 +96,7 @@ describe('granularObjectRecordsPermissions', () => {
await updateWorkspaceMemberRole({ await updateWorkspaceMemberRole({
client, client,
roleId: customRoleId, roleId: customRoleId,
workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY, workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
}); });
// Act // Act
@ -151,7 +151,7 @@ describe('granularObjectRecordsPermissions', () => {
await updateWorkspaceMemberRole({ await updateWorkspaceMemberRole({
client, client,
roleId: customRoleId, roleId: customRoleId,
workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY, workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
}); });
// Act // Act

12
packages/twenty-server/test/integration/graphql/suites/object-records-permissions/permissions-on-relations.integration-spec.ts
View File

@ -11,10 +11,10 @@ import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graph
import { updateFeatureFlagFactory } from 'test/integration/graphql/utils/update-feature-flag-factory.util'; import { updateFeatureFlagFactory } from 'test/integration/graphql/utils/update-feature-flag-factory.util';
import { updateWorkspaceMemberRole } from 'test/integration/graphql/utils/update-workspace-member-role.util'; import { updateWorkspaceMemberRole } from 'test/integration/graphql/utils/update-workspace-member-role.util';
import { SEED_APPLE_WORKSPACE_ID } from 'src/database/typeorm-seeds/core/workspaces';
import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util'; import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
import { PermissionsExceptionMessage } from 'src/engine/metadata-modules/permissions/permissions.exception'; import { PermissionsExceptionMessage } from 'src/engine/metadata-modules/permissions/permissions.exception';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-workspaces.util';
import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';
const client = request(`http://localhost:${APP_PORT}`); const client = request(`http://localhost:${APP_PORT}`);
@ -90,7 +90,7 @@ describe('permissionsOnRelations', () => {
query: ` query: `
mutation UpdateWorkspaceMemberRole { mutation UpdateWorkspaceMemberRole {
updateWorkspaceMemberRole( updateWorkspaceMemberRole(
workspaceMemberId: "${DEV_SEED_WORKSPACE_MEMBER_IDS.JONY}" workspaceMemberId: "${WORKSPACE_MEMBER_DATA_SEED_IDS.JONY}"
roleId: "${originalMemberRoleId}" roleId: "${originalMemberRoleId}"
) { ) {
id id
@ -131,7 +131,7 @@ describe('permissionsOnRelations', () => {
await updateWorkspaceMemberRole({ await updateWorkspaceMemberRole({
client, client,
roleId: customRoleId, roleId: customRoleId,
workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY, workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
}); });
// Create GraphQL query that includes company relation // Create GraphQL query that includes company relation
@ -171,7 +171,7 @@ describe('permissionsOnRelations', () => {
await updateWorkspaceMemberRole({ await updateWorkspaceMemberRole({
client, client,
roleId: customRoleId, roleId: customRoleId,
workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY, workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
}); });
// Create GraphQL query that includes company relation // Create GraphQL query that includes company relation
@ -215,7 +215,7 @@ describe('permissionsOnRelations', () => {
await updateWorkspaceMemberRole({ await updateWorkspaceMemberRole({
client, client,
roleId: customRoleId, roleId: customRoleId,
workspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY, workspaceMemberId: WORKSPACE_MEMBER_DATA_SEED_IDS.JONY,
}); });
// Create a query with nested relations // Create a query with nested relations