8dbe3848e7
* Add db schema * Add `CredentialRepository.findByTeamIdAndSlugs` * Add enabled app slugs for attribute syncing * Create repository for `IntegrationAttributeSync` * Create zod schemas * Create `AttributeSyncUserRuleOutputMapper` * Create `IntegrationAttributeSyncService` * Create DI contianer * Create trpc endpoints * Create page * Include team name in `CredentialRepository.findByTeamIdAndSlugs` * Update schema and relations * Update types and schemas * Add more methods to IntegrationAttributeSyncRepository * Add more services to `IntegrationAttributeSyncService` - getById - Init updateIncludeRulesAndMappings * Refactor `getTeams.handler` to use repository * Create `createAttributeSync` trpc endpoint * Create `updateAttributeSync` trpc endpoint * Add router to trpc * Create attribute sync child components * Pass custom actions to `FormCard` * Create `IntegrationAttributeSyncCard` * Pass inital props via server side * Fix prop * Only refetch on mutation * Fixes * Add form error when duplicate field and attribute combo * Add `updateTransactionWithRUleAndMappings` logic * Adjust zod schemas * Service add `updateIncludeRulesAndMappings` * Pass orgId from server to component * Rename types * Add deleteById method to repository * Add name to integrationAttributeSync * Add deleteById method to service * Rename method * Add deleteAttributeSync trpc endpoint * Make the IntegrationAttributeSyncCard a dummy component * test: add tests for IntegrationAttributeSync feature Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * Move creating a attribute sync record to the service * Add i18n strings * Safe select credential in find by id and team * Fix default credentialId value in form * Update repository return types * Add i18n string * Make credentialId optional for form schema * Fix label * Add cascade deletes * Add verification that syncs belong to org * Create mapper for repository output * Type fixes * Remove old test file * Pass `attributeOptions` from parent to children * Infer types from zod schema * Type fixes * Type fix * Clean up * Add i18n strings * Remove unused file * Address feedback * Add migration file * Address feedback * Add validation for new integration values * Remove unused router * Move away from z.infer to z.ZodType * Clean up comments * Type fix * Type fixes * Type fix * fix: add passthrough to syncFormDataSchema to preserve extra fields Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: remove incorrect test that expected extra fields to pass through syncFormDataSchema Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * Add indexes * Add aria label * Address feedback - consistent validation * Fix import paths for attribute types * refactor: change attributeSyncRules array to singular attributeSyncRule The database schema enforces a one-to-one relationship between IntegrationAttributeSync and AttributeSyncRule (via @unique constraint), and the UI only supports a single rule. This change makes the TypeScript type match the database schema and UI behavior. Changes: - Update IntegrationAttributeSync interface to use attributeSyncRule: AttributeSyncRule | null - Update mapper to return singular rule instead of wrapping in array - Update UI component to access sync.attributeSyncRule directly - Update IIntegrationAttributeSyncUpdateParams Omit type - Update tests to use attributeSyncRule: null instead of attributeSyncRules: [] Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * feat: implement FeatureOptInService (#25805) * feat: implement FeatureOptInService WIP * clean up * feat: consolidate feature repositories and add updateFeatureForUser - Implement updateFeatureForUser in FeaturesRepository (similar to updateFeatureForTeam) - Move getUserFeatureState and getTeamFeatureState from PrismaFeatureOptInRepository to FeaturesRepository - Update FeatureOptInService to use only FeaturesRepository - Add setUserFeatureState and setTeamFeatureState methods to FeatureOptInService - Update _router.ts to remove PrismaFeatureOptInRepository usage - Remove PrismaFeatureOptInRepository.ts and FeatureOptInRepositoryInterface.ts - Update features.repository.interface.ts and features.repository.mock.ts - Add integration tests for updateFeatureForUser, getUserFeatureState, getTeamFeatureState - Update service.integration-test.ts to use FeaturesRepository Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: rename updateFeatureForUser to setUserFeatureState Rename to match the convention used for setTeamFeatureState Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: return FeatureState type from getUserFeatureState and getTeamFeatureState * fix integration tests * clean up logics * update services and router * refactor: change getUserFeatureState and getTeamFeatureState to accept featureIds array - Renamed getUserFeatureState to getUserFeatureStates - Renamed getTeamFeatureState to getTeamFeatureStates - Changed parameter from featureId: string to featureIds: string[] - Changed return type from FeatureState to Record<string, FeatureState> - Updated FeatureOptInService to use the new batch methods - Added tests for querying multiple features in a single call - Optimized listFeaturesForTeam to fetch all feature states in one query Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * feat: add getFeatureStateForTeams for batch querying multiple teams - Added getFeatureStateForTeams method to query a single feature across multiple teams in one call - Updated FeatureOptInService.resolveFeatureStateAcrossTeams to use the new batch method - Replaces N+1 queries with a single database query for team states - Added comprehensive integration tests for the new method Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: combine org and team state queries into single call - Include orgId in the teamIds array passed to getFeatureStateForTeams - Extract org state and team states from the combined result - Reduces database queries from 3 to 2 in resolveFeatureStateAcrossTeams Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: use team.isOrganization and clarify computeEffectiveState comment Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: use MembershipRepository.findAllByUserId with isOrganization Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * feat: add featureId validation using isOptInFeature type guard Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * less queries * add fallback value * fix type error * move files * add autoOptInFeatures column * use autoOptInFeatures flag within FeatureOptInService * add setUserAutoOptIn and setTeamAutoOptIn * fix computeEffectiveState logic * rewrite computeEffectiveState * clean up integration tests * clean up in afterEach * fix type error * refactor: use FeaturesRepository methods instead of direct Prisma calls Replace all manual userFeatures and teamFeatures Prisma operations with the new setUserFeatureState and setTeamFeatureState repository methods. Changes include: - Admin handlers (assignFeatureToTeam, unassignFeatureFromTeam) - Test fixtures and integration tests - Playwright fixtures - Development scripts This ensures consistent feature flag management through the repository pattern and supports the new tri-state semantics (enabled/disabled/inherit). Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * clean up * fix the logic * extract some logic into applyAutoOptIn() * remove wrong code * refactor: convert setUserFeatureState and setTeamFeatureState to object params with discriminated union - Convert multiple positional parameters to single object parameter - Use discriminated union types: assignedBy required for enabled/disabled, omitted for inherit - Update all callers across repository, service, handlers, fixtures, and tests * fix type error * use Promise.all * fix --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * Prevent duplicate field and attribute mappings * Add validation that attribute belongs to the org * fix: address Cubic AI review feedback - Add @@index([credentialId]) to IntegrationAttributeSync model for efficient cascade deletes and credential-based queries (confidence: 9/10) - Fix translation key from 'credential_required' to 'attribute_sync_credential_required' to match existing locale definition (confidence: 10/10) Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * fix: address remaining cubic review feedback - RuleBuilder.tsx: Use unique IDs for React keys instead of array index to prevent reconciliation bugs when removing conditions - updateAttributeSync.handler.ts: Add early organization check before service calls for consistency - createAttributeSync.handler.ts: Add CredentialNotFoundError class for type-safe error handling instead of string matching - IntegrationAttributeSyncService.test.ts: Replace expect.fail() with proper Vitest rejects.toSatisfy() pattern Co-Authored-By: joe@cal.com <j.auyeung419@gmail.com> * Pull test file from main --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Eunjae Lee <hey@eunjae.dev>
109 lines
3.6 KiB
TypeScript
109 lines
3.6 KiB
TypeScript
import type { AttributeType } from "@calcom/prisma/enums";
|
|
|
|
import {
|
|
ConditionIdentifierEnum,
|
|
ConditionOperatorEnum,
|
|
type IAttributeCondition,
|
|
type ITeamCondition,
|
|
RuleOperatorEnum,
|
|
type TAttributeSyncRuleCondition,
|
|
} from "../repositories/IIntegrationAttributeSyncRepository";
|
|
|
|
type TFunction = (key: string) => string;
|
|
|
|
// Unique ID generator for React keys
|
|
export const generateConditionId = (): string => {
|
|
return crypto.randomUUID();
|
|
};
|
|
|
|
// Extended condition types with client-side ID for React keys
|
|
export interface ITeamConditionWithId extends ITeamCondition {
|
|
_id: string;
|
|
}
|
|
|
|
export interface IAttributeConditionWithId extends IAttributeCondition {
|
|
_id: string;
|
|
}
|
|
|
|
export type TAttributeSyncRuleConditionWithId = ITeamConditionWithId | IAttributeConditionWithId;
|
|
|
|
// Factory functions
|
|
export const getDefaultTeamCondition = (): ITeamConditionWithId => ({
|
|
_id: generateConditionId(),
|
|
identifier: ConditionIdentifierEnum.TEAM_ID,
|
|
operator: ConditionOperatorEnum.IN,
|
|
value: [],
|
|
});
|
|
|
|
export const getDefaultAttributeCondition = (): IAttributeConditionWithId => ({
|
|
_id: generateConditionId(),
|
|
identifier: ConditionIdentifierEnum.ATTRIBUTE_ID,
|
|
attributeId: "",
|
|
operator: ConditionOperatorEnum.EQUALS,
|
|
value: [],
|
|
});
|
|
|
|
// Type guards
|
|
export const isTeamCondition = (condition: TAttributeSyncRuleCondition): condition is ITeamCondition => {
|
|
return condition.identifier === ConditionIdentifierEnum.TEAM_ID;
|
|
};
|
|
|
|
export const isAttributeCondition = (
|
|
condition: TAttributeSyncRuleCondition
|
|
): condition is IAttributeCondition => {
|
|
return condition.identifier === ConditionIdentifierEnum.ATTRIBUTE_ID;
|
|
};
|
|
|
|
export const isArrayOperator = (operator: ConditionOperatorEnum): boolean => {
|
|
return operator === ConditionOperatorEnum.IN || operator === ConditionOperatorEnum.NOT_IN;
|
|
};
|
|
|
|
export const formatConditionValue = (
|
|
operator: ConditionOperatorEnum,
|
|
value: number[] | string[]
|
|
): number[] | string[] => {
|
|
if (isArrayOperator(operator)) {
|
|
return Array.isArray(value) ? value : value ? [value] : [];
|
|
} else {
|
|
return Array.isArray(value) ? value.slice(0, 1) : value ? [value] : [];
|
|
}
|
|
};
|
|
|
|
// Operator options for teams
|
|
export const getTeamOperatorOptions = (t: TFunction) => [
|
|
{ value: ConditionOperatorEnum.IN, label: t("attribute_sync_operator_is_any_of") },
|
|
{ value: ConditionOperatorEnum.NOT_IN, label: t("attribute_sync_operator_is_not_any_of") },
|
|
];
|
|
|
|
// Operator options based on attribute type
|
|
export const getOperatorOptionsForAttributeType = (type: AttributeType, t: TFunction) => {
|
|
switch (type) {
|
|
case "SINGLE_SELECT":
|
|
return [
|
|
{ value: ConditionOperatorEnum.EQUALS, label: t("attribute_sync_operator_is") },
|
|
{ value: ConditionOperatorEnum.NOT_EQUALS, label: t("attribute_sync_operator_is_not") },
|
|
];
|
|
case "MULTI_SELECT":
|
|
return [
|
|
{ value: ConditionOperatorEnum.IN, label: t("attribute_sync_operator_includes_any_of") },
|
|
{ value: ConditionOperatorEnum.NOT_IN, label: t("attribute_sync_operator_does_not_include") },
|
|
];
|
|
case "TEXT":
|
|
case "NUMBER":
|
|
return [
|
|
{ value: ConditionOperatorEnum.EQUALS, label: t("attribute_sync_operator_equals") },
|
|
{ value: ConditionOperatorEnum.NOT_EQUALS, label: t("attribute_sync_operator_not_equals") },
|
|
];
|
|
}
|
|
};
|
|
|
|
export const getParentOperatorOptions = (t: TFunction) => [
|
|
{ value: RuleOperatorEnum.AND, label: t("all") },
|
|
{ value: RuleOperatorEnum.OR, label: t("any") },
|
|
];
|
|
|
|
export const getConditionTypeOptions = (t: TFunction) => [
|
|
{ value: ConditionIdentifierEnum.TEAM_ID, label: t("team") },
|
|
{ value: ConditionIdentifierEnum.ATTRIBUTE_ID, label: t("attribute") },
|
|
];
|