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>
313 lines
10 KiB
TypeScript
313 lines
10 KiB
TypeScript
import { useEffect, useState } from "react";
|
|
import { useForm, Controller } from "react-hook-form";
|
|
|
|
import { Dialog } from "@calcom/features/components/controlled-dialog";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { FormCard, FormCardBody } from "@calcom/ui/components/card";
|
|
import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
|
|
import { SelectField, Switch } from "@calcom/ui/components/form";
|
|
import { Icon } from "@calcom/ui/components/icon";
|
|
|
|
import {
|
|
type IntegrationAttributeSync,
|
|
type ISyncFormData,
|
|
RuleOperatorEnum,
|
|
} from "../repositories/IIntegrationAttributeSyncRepository";
|
|
import { FieldMappingBuilder } from "./FieldMappingBuilder";
|
|
import { RuleBuilder } from "./RuleBuilder";
|
|
|
|
export interface IIntegrationAttributeSyncCardProps {
|
|
sync?: IntegrationAttributeSync; // Optional for create mode
|
|
credentialOptions: {
|
|
value: string;
|
|
label: string;
|
|
}[];
|
|
teamOptions: {
|
|
value: string;
|
|
label: string;
|
|
}[];
|
|
attributes: Attribute[];
|
|
attributeOptions: {
|
|
value: string;
|
|
label: string;
|
|
}[];
|
|
organizationId: number;
|
|
onSubmit: (data: ISyncFormData) => void;
|
|
isSubmitting: boolean;
|
|
onCancel?: () => void;
|
|
onDelete?: () => void;
|
|
}
|
|
|
|
const IntegrationAttributeSyncCard = (
|
|
props: IIntegrationAttributeSyncCardProps
|
|
) => {
|
|
const {
|
|
sync,
|
|
credentialOptions,
|
|
teamOptions,
|
|
attributes,
|
|
attributeOptions,
|
|
organizationId,
|
|
onSubmit,
|
|
onCancel,
|
|
onDelete,
|
|
isSubmitting,
|
|
} = props;
|
|
|
|
const { t } = useLocale();
|
|
const isCreateMode = !sync;
|
|
const [showDeleteDialog, setShowDeleteDialog] = useState(false);
|
|
|
|
// Initialize form with sync data or defaults
|
|
const form = useForm<ISyncFormData>({
|
|
defaultValues: sync
|
|
? {
|
|
id: sync.id,
|
|
name: sync.name,
|
|
credentialId: sync.credentialId ?? undefined,
|
|
enabled: sync.enabled,
|
|
organizationId: sync.organizationId,
|
|
ruleId: sync.attributeSyncRule?.id || "",
|
|
rule: sync.attributeSyncRule?.rule || {
|
|
operator: RuleOperatorEnum.AND,
|
|
conditions: [],
|
|
},
|
|
syncFieldMappings: Array.isArray(sync.syncFieldMappings)
|
|
? sync.syncFieldMappings
|
|
: [],
|
|
}
|
|
: {
|
|
id: "",
|
|
name: t("attribute_sync_new_integration_sync"),
|
|
credentialId: undefined,
|
|
enabled: true,
|
|
organizationId,
|
|
ruleId: "",
|
|
rule: { operator: RuleOperatorEnum.AND, conditions: [] },
|
|
syncFieldMappings: [],
|
|
},
|
|
});
|
|
|
|
// Update form when sync prop changes (after refetch with new IDs)
|
|
useEffect(() => {
|
|
if (sync) {
|
|
form.reset({
|
|
id: sync.id,
|
|
name: sync.name,
|
|
credentialId: sync.credentialId ?? undefined,
|
|
enabled: sync.enabled,
|
|
organizationId: sync.organizationId,
|
|
ruleId: sync.attributeSyncRule?.id || "",
|
|
rule: sync.attributeSyncRule?.rule || {
|
|
operator: RuleOperatorEnum.AND,
|
|
conditions: [],
|
|
},
|
|
syncFieldMappings: Array.isArray(sync.syncFieldMappings)
|
|
? sync.syncFieldMappings
|
|
: [],
|
|
});
|
|
}
|
|
// Only need to run if the sync changes
|
|
}, [sync?.id]);
|
|
|
|
const onFormSubmit = (data: ISyncFormData) => {
|
|
onSubmit(data);
|
|
};
|
|
|
|
const handleDelete = () => {
|
|
if (!sync) return;
|
|
setShowDeleteDialog(true);
|
|
};
|
|
|
|
const confirmDelete = () => {
|
|
if (!sync || !onDelete) return;
|
|
onDelete();
|
|
setShowDeleteDialog(false);
|
|
};
|
|
|
|
const formName = form.watch("name");
|
|
const isPending = isSubmitting;
|
|
|
|
return (
|
|
<>
|
|
<form onSubmit={form.handleSubmit(onFormSubmit)}>
|
|
<FormCard
|
|
label={formName}
|
|
leftIcon="link"
|
|
collapsible={true}
|
|
isLabelEditable={true}
|
|
onLabelChange={(label) => {
|
|
form.setValue("name", label, { shouldDirty: true });
|
|
}}
|
|
customActions={
|
|
<Controller
|
|
name="enabled"
|
|
control={form.control}
|
|
render={({ field }) => (
|
|
<Switch
|
|
checked={field.value}
|
|
onCheckedChange={field.onChange}
|
|
onClick={(e) => e.stopPropagation()}
|
|
/>
|
|
)}
|
|
/>
|
|
}
|
|
deleteField={
|
|
!isCreateMode && onDelete
|
|
? {
|
|
check: () => true,
|
|
fn: handleDelete,
|
|
}
|
|
: undefined
|
|
}
|
|
>
|
|
<FormCardBody>
|
|
<div className="space-y-4">
|
|
<div className="bg-default border-subtle rounded-2xl border p-2">
|
|
<div className="ml-2 flex items-center gap-0.5">
|
|
<div className="border-subtle rounded-lg border p-1">
|
|
<Icon name="key" className="text-subtle h-4 w-4" />
|
|
</div>
|
|
<span className="text-emphasis ml-2 text-sm font-medium">
|
|
{t("attribute_sync_credential")}
|
|
</span>
|
|
</div>
|
|
<div className="mt-2">
|
|
<Controller
|
|
name="credentialId"
|
|
control={form.control}
|
|
rules={{
|
|
required: t("attribute_sync_credential_required"),
|
|
validate: (value) => {
|
|
if (!value || value <= 0) {
|
|
return t("attribute_sync_credential_validation");
|
|
}
|
|
return true;
|
|
},
|
|
}}
|
|
render={({ field, fieldState }) => (
|
|
<>
|
|
<SelectField
|
|
placeholder={t("attribute_sync_select_credential")}
|
|
options={credentialOptions}
|
|
value={
|
|
credentialOptions.find(
|
|
(opt) => Number(opt.value) === field.value
|
|
) || null
|
|
}
|
|
onChange={(option) =>
|
|
field.onChange(Number(option?.value))
|
|
}
|
|
/>
|
|
{fieldState.error && (
|
|
<p className="mt-1 text-xs text-red-600">
|
|
{fieldState.error.message}
|
|
</p>
|
|
)}
|
|
</>
|
|
)}
|
|
/>
|
|
<p className="text-subtle mt-1 text-xs">
|
|
{t("attribute_sync_credential_description")}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div>
|
|
<label className="text-emphasis mb-2 block text-sm font-medium">
|
|
{t("attribute_sync_user_filter_rules")}
|
|
</label>
|
|
<Controller
|
|
name="rule"
|
|
control={form.control}
|
|
render={({ field }) => (
|
|
<RuleBuilder
|
|
value={field.value}
|
|
onChange={field.onChange}
|
|
teamOptions={teamOptions}
|
|
attributes={attributes ?? []}
|
|
/>
|
|
)}
|
|
/>
|
|
<p className="text-subtle mt-1 text-xs">
|
|
{t("attribute_sync_user_filter_rules_description")}
|
|
</p>
|
|
</div>
|
|
|
|
<div>
|
|
<label className="text-emphasis mb-2 block text-sm font-medium">
|
|
{t("attribute_sync_field_mappings")}
|
|
</label>
|
|
<Controller
|
|
name="syncFieldMappings"
|
|
control={form.control}
|
|
rules={{
|
|
validate: (mappings) => {
|
|
const seenAttributes = new Set<string>();
|
|
for (const mapping of mappings || []) {
|
|
if (
|
|
mapping.attributeId &&
|
|
seenAttributes.has(mapping.attributeId)
|
|
) {
|
|
return t(
|
|
"attribute_sync_duplicate_attribute_mapping"
|
|
);
|
|
}
|
|
if (mapping.attributeId)
|
|
seenAttributes.add(mapping.attributeId);
|
|
}
|
|
return true;
|
|
},
|
|
}}
|
|
render={({ field }) => (
|
|
<FieldMappingBuilder
|
|
value={{ mappings: field.value || [] }}
|
|
onChange={(fieldMappings) =>
|
|
field.onChange(fieldMappings.mappings)
|
|
}
|
|
attributeOptions={attributeOptions}
|
|
/>
|
|
)}
|
|
/>
|
|
<p className="text-subtle mt-1 text-xs">
|
|
{t("attribute_sync_field_mappings_description")}
|
|
</p>
|
|
</div>
|
|
|
|
<div className="border-subtle flex justify-end gap-2 border-t pt-4">
|
|
{isCreateMode && onCancel && (
|
|
<Button type="button" color="secondary" onClick={onCancel}>
|
|
{t("cancel")}
|
|
</Button>
|
|
)}
|
|
<Button
|
|
type="submit"
|
|
loading={isPending}
|
|
disabled={!form.formState.isDirty}
|
|
>
|
|
{isCreateMode ? t("create") : t("save")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</FormCardBody>
|
|
</FormCard>
|
|
</form>
|
|
|
|
<Dialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
|
|
<ConfirmationDialogContent
|
|
variety="danger"
|
|
title={t("attribute_sync_delete_title")}
|
|
confirmBtnText={t("delete")}
|
|
onConfirm={confirmDelete}
|
|
>
|
|
{t("attribute_sync_delete_confirmation")}
|
|
</ConfirmationDialogContent>
|
|
</Dialog>
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default IntegrationAttributeSyncCard;
|