The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Ignore isSystemSideEffect divergences when syncing manifests (#29169)
Paul Rastoin52e4d5b1708f
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/compare-two-universal-flat-entity.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/compare-two-universal-flat-entity.util.spec.tsindex 0afc2c36542..68ba15cf1f1 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/compare-two-universal-flat-entity.util.spec.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/__tests__/compare-two-universal-flat-entity.util.spec.ts@@ -12,6 +12,7 @@ import {import { fromApplicationVariableManifestToUniversalFlatApplicationVariable } from 'src/engine/core-modules/application/application-manifest/converters/from-application-variable-manifest-to-universal-flat-application-variable.util';import { fromPageLayoutTabManifestToUniversalFlatPageLayoutTab } from 'src/engine/core-modules/application/application-manifest/converters/from-page-layout-tab-manifest-to-universal-flat-page-layout-tab.util';+import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util';import { type EncryptedString } from 'src/engine/core-modules/secret-encryption/branded-strings/encrypted-string.type';import { type MetadataUniversalFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/metadata-universal-flat-entity.type';import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';@@ -52,6 +53,18 @@ const buildApplicationVariable = ({ isSecret }: { isSecret: boolean }) =>now: NOW,});+const buildViewField = ({ position }: { position: number }) =>+ fromViewFieldManifestToUniversalFlatViewField({+ viewFieldManifest: {+ universalIdentifier: 'view-field-universal-identifier',+ fieldMetadataUniversalIdentifier: 'field-metadata-universal-identifier',+ position,+ },+ viewUniversalIdentifier: 'view-universal-identifier',+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ now: NOW,+ });+type TestContext<T extends AllMetadataName = AllMetadataName> = FromTo<MetadataUniversalFlatEntity<T>,'universalFlatEntity'@@ -196,5 +209,21 @@ describe('compareTwoFlatEntity', () => {nonUpdatablePropertyDivergences: [],});});++ it('should ignore the isSystemSideEffect flag of an engine-provisioned entity', () => {+ expect(+ compareTwoFlatEntity({+ fromUniversalFlatEntity: {+ ...buildViewField({ position: 3 }),+ isSystemSideEffect: true,+ },+ toUniversalFlatEntity: buildViewField({ position: 0.5 }),+ metadataName: 'viewField',+ }),+ ).toEqual({+ update: { position: 0.5 },+ nonUpdatablePropertyDivergences: [],+ });+ });});});diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/compare-two-universal-flat-entity.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/compare-two-universal-flat-entity.util.tsindex 1c07d932914..eab25b566d2 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/compare-two-universal-flat-entity.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/compare-two-universal-flat-entity.util.ts@@ -8,7 +8,11 @@ import { type MetadataUniversalFlatEntity } from 'src/engine/metadata-modules/flimport { type UniversalFlatEntityUpdate } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-entity-update.type';import { diffUniversalFlatEntityProperties } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/utils/diff-universal-flat-entity-properties.util';-const SERVER_MANAGED_PROPERTIES = new Set(['createdAt', 'updatedAt']);+const SERVER_MANAGED_PROPERTIES = new Set([+ 'createdAt',+ 'updatedAt',+ 'isSystemSideEffect',+]);type CompareTwoUniversalFlatEntityArgs<T extends AllMetadataName> = FromTo<MetadataUniversalFlatEntity<T>,diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-search-vector-identifier-hijack.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-search-vector-identifier-hijack.integration-spec.ts.snapindex d59f2b0a9e3..5da75a6e762 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-search-vector-identifier-hijack.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-sync-application-search-vector-identifier-hijack.integration-spec.ts.snap@@ -13,11 +13,6 @@ exports[`Sync application should reject hijacking the searchVector system field"message": "System fields only allow updating: universalSettings, isActive. Forbidden properties: description, icon, isUIEditable, writability, disabledFieldPermissionActions","userFriendlyMessage": "System fields cannot be updated",},- {- "code": "NON_UPDATABLE_PROPERTY_DIVERGENCE",- "message": "fieldMetadata property "isSystemSideEffect" cannot be updated",- "userFriendlyMessage": "Property isSystemSideEffect cannot be updated",- },{"code": "NON_UPDATABLE_PROPERTY_DIVERGENCE","message": "fieldMetadata property "isSystem" cannot be updated",@@ -141,11 +136,6 @@ exports[`Sync application should reject hijacking the searchVector system field"userFriendlyMessage": "Field type TS_VECTOR must be named "searchVector"","value": "stolenSearchVector",},- {- "code": "NON_UPDATABLE_PROPERTY_DIVERGENCE",- "message": "fieldMetadata property "isSystemSideEffect" cannot be updated",- "userFriendlyMessage": "Property isSystemSideEffect cannot be updated",- },{"code": "NON_UPDATABLE_PROPERTY_DIVERGENCE","message": "fieldMetadata property "type" cannot be updated",