Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions apps/nestjs-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,17 @@
"webpack": "5.91.0"
},
"dependencies": {
"@ai-sdk/amazon-bedrock": "4.0.0-beta.97",
"@ai-sdk/anthropic": "3.0.0-beta.87",
"@ai-sdk/azure": "3.0.0-beta.102",
"@ai-sdk/cohere": "3.0.0-beta.52",
"@ai-sdk/deepseek": "2.0.0-beta.54",
"@ai-sdk/google": "3.0.0-beta.77",
"@ai-sdk/mistral": "3.0.0-beta.53",
"@ai-sdk/openai": "3.0.0-beta.100",
"@ai-sdk/openai-compatible": "2.0.0-beta.52",
"@ai-sdk/togetherai": "2.0.0-beta.53",
"@ai-sdk/xai": "3.0.0-beta.60",
"@ai-sdk/amazon-bedrock": "4.0.9",
"@ai-sdk/anthropic": "3.0.7",
"@ai-sdk/azure": "3.0.7",
"@ai-sdk/cohere": "3.0.4",
"@ai-sdk/deepseek": "2.0.4",
"@ai-sdk/google": "3.0.5",
"@ai-sdk/mistral": "3.0.5",
"@ai-sdk/openai": "3.0.7",
"@ai-sdk/openai-compatible": "2.0.4",
"@ai-sdk/togetherai": "2.0.4",
"@ai-sdk/xai": "3.0.10",
"@aws-sdk/client-s3": "3.609.0",
"@aws-sdk/lib-storage": "3.609.0",
"@aws-sdk/s3-request-presigner": "3.609.0",
Expand Down Expand Up @@ -172,7 +172,7 @@
"@teable/openapi": "workspace:^",
"@teamwork/websocket-json-stream": "2.0.0",
"@valibot/to-json-schema": "1.3.0",
"ai": "6.0.0-beta.156",
"ai": "6.0.14",
"ajv": "8.12.0",
"archiver": "7.0.1",
"axios": "1.7.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,41 @@ export class FieldConvertingService {
return ops.filter(Boolean) as IOtOperation[];
}

/**
* Update conditional lookup field - validate dependencies and clear/set hasError
*/
private updateConditionalLookupField(field: IFieldInstance, fieldMap: IFieldMap): IOtOperation[] {
const ops: IOtOperation[] = [];

// Get referenced field IDs from the conditional lookup configuration
const referencedFieldIds = this.fieldSupplementService
.getFieldReferenceIds(field)
.filter((id) => !!id && id !== field.id);

// Check if any referenced field is missing or has error
const missingFields = referencedFieldIds.filter((id) => !fieldMap[id]);
const erroredFields = referencedFieldIds.filter((id) => fieldMap[id]?.hasError);

const hasMissingDependency = missingFields.length > 0;
const hasErroredDependency = erroredFields.length > 0;

if (hasMissingDependency || hasErroredDependency) {
const op = this.buildOpAndMutateField(field, 'hasError', true);
if (op) {
ops.push(op);
}
return ops;
}

// Clear error if all dependencies are valid
const clearErrorOp = this.buildOpAndMutateField(field, 'hasError', null);
if (clearErrorOp) {
ops.push(clearErrorOp);
}

return ops;
}

private updateConditionalRollupField(
field: ConditionalRollupFieldDto,
fieldMap: IFieldMap
Expand Down Expand Up @@ -326,6 +361,7 @@ export class FieldConvertingService {

private async generateReferenceFieldOps(fields: IFieldInstance[]) {
const fieldIds = fields.map((field) => field.id);

const topoOrdersContext = await this.fieldCalculationService.getTopoOrdersContext(fieldIds);
const { fieldId2TableId, directedGraph } = topoOrdersContext;
const fieldMap = { ...topoOrdersContext.fieldMap, ...keyBy(fields, 'id') };
Expand Down Expand Up @@ -362,7 +398,12 @@ export class FieldConvertingService {
const tableId = fieldId2TableId[curField.id];

if (curField.isLookup) {
pushOpsMap(tableId, curField.id, this.updateLookupField(curField, fieldMap));
// For conditional lookup fields, use the dedicated update method
if (curField.isConditionalLookup) {
pushOpsMap(tableId, curField.id, this.updateConditionalLookupField(curField, fieldMap));
} else {
pushOpsMap(tableId, curField.id, this.updateLookupField(curField, fieldMap));
}
} else if (curField.type === FieldType.Formula) {
pushOpsMap(tableId, curField.id, this.updateFormulaField(curField, fieldMap));
} else if (curField.type === FieldType.Rollup) {
Expand Down Expand Up @@ -1554,6 +1595,7 @@ export class FieldConvertingService {
);

const newField = createFieldInstanceByVo(newFieldVo);

const modifiedOps = await this.generateModifiedOps(tableId, newField, oldField);

// 2. collect changes effect by the supplement(link) field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,8 @@ export class FieldSupplementService {
isComputed: true,
cellValueType,
dbFieldType: this.getDbFieldType(field.type, cellValueType, true),
// Clear hasError since we validated all required fields exist
hasError: undefined,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export class FieldOpenApiService {
return false;
}

return this.validateFilterFieldReferences(tableId, foreignTableId, meta?.filter);
return await this.validateFilterFieldReferences(tableId, foreignTableId, meta?.filter);
}

private async isFieldConfigurationValid(
Expand Down Expand Up @@ -552,7 +552,10 @@ export class FieldOpenApiService {

return references.every((reference) => {
const referenceField = resolveReferenceField(reference);
return referenceField ? isFieldReferenceComparable(baseField, referenceField) : false;
if (!referenceField) {
return false;
}
return isFieldReferenceComparable(baseField, referenceField);
});
}

Expand All @@ -568,20 +571,28 @@ export class FieldOpenApiService {

private async markError(tableId: string, field: IFieldInstance, hasError: boolean) {
if (hasError) {
!field.hasError && (await this.fieldService.markError(tableId, [field.id], true));
if (!field.hasError) {
await this.fieldService.markError(tableId, [field.id], true);
}
} else {
field.hasError && (await this.fieldService.markError(tableId, [field.id], false));
if (field.hasError) {
await this.fieldService.markError(tableId, [field.id], false);
}
}
}

private async checkAndUpdateError(tableId: string, field: IFieldInstance) {
const fieldReferenceIds = this.fieldSupplementService.getFieldReferenceIds(field);
// Deduplicate field IDs since the same field can appear multiple times
// (e.g., as lookupFieldId and in filter)
const uniqueFieldReferenceIds = [...new Set(fieldReferenceIds)];

const refFields = await this.prismaService.txClient().field.findMany({
where: { id: { in: fieldReferenceIds }, deletedTime: null },
where: { id: { in: uniqueFieldReferenceIds }, deletedTime: null },
select: { id: true },
});

if (refFields.length !== fieldReferenceIds.length) {
if (refFields.length !== uniqueFieldReferenceIds.length) {
await this.markError(tableId, field, true);
return;
}
Expand All @@ -591,7 +602,7 @@ export class FieldOpenApiService {
toFieldId: field.id,
},
});
const missingReferenceIds = fieldReferenceIds.filter(
const missingReferenceIds = uniqueFieldReferenceIds.filter(
(refId) => !curReference.find((ref) => ref.fromFieldId === refId)
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ import {
} from '@teable/core';
import type { Prisma } from '@teable/db-main-prisma';
import { PrismaService } from '@teable/db-main-prisma';
import { MailTransporterType, MailType } from '@teable/openapi';
import {
MailTransporterType,
MailType,
type IGetNotifyListQuery,
type INotificationUnreadCountVo,
type INotificationVo,
Expand Down Expand Up @@ -48,12 +47,11 @@ export class NotificationService {
private readonly i18n: I18nService<I18nTranslations>
) {}

private async getUserLang(userId: string) {
const user = await this.userService.getUserById(userId);
return user?.lang ?? I18nContext.current()?.lang;
getUserLang(lang?: string | null) {
return lang ?? I18nContext.current()?.lang;
}

private getMessage(text: string | ILocalization<I18nPath>, lang?: string) {
getMessage(text: string | ILocalization<I18nPath>, lang?: string) {
return typeof text === 'string'
? text
: (this.i18n.t(text.i18nKey, {
Expand All @@ -65,7 +63,7 @@ export class NotificationService {
/**
* notification message i18n use common prefix, so we need to remove it to save db
*/
private getMessageI18n(localization: string | ILocalization<I18nPath>) {
getMessageI18n(localization: string | ILocalization<I18nPath>) {
return typeof localization === 'string'
? undefined
: JSON.stringify({
Expand Down Expand Up @@ -251,7 +249,7 @@ export class NotificationService {
this.sendNotifyBySocket(toUser.id, socketNotification);

if (emailConfig && toUser.notifyMeta && toUser.notifyMeta.email) {
const lang = await this.getUserLang(toUserId);
const lang = this.getUserLang(toUser.lang);
const emailOptions = await this.mailSenderService.htmlEmailOptions({
...emailConfig,
title: this.getMessage(emailConfig.title, lang),
Expand Down Expand Up @@ -340,7 +338,7 @@ export class NotificationService {
this.sendNotifyBySocket(toUser.id, socketNotification);

if (emailConfig && toUser.notifyMeta && toUser.notifyMeta.email) {
const lang = await this.getUserLang(toUserId);
const lang = this.getUserLang(toUser.lang);
const emailOptions = await this.mailSenderService.commonEmailOptions({
...emailConfig,
title: this.getMessage(emailConfig.title, lang),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,13 @@ class FieldCteSelectionVisitor implements IFieldVisitor<IFieldSelectName> {
if (field.isConditionalLookup) {
const cteName = this.fieldCteMap.get(field.id);
if (!cteName) {
// Log warning when conditional lookup CTE is missing
const fieldCteMapKeys = Array.from(this.fieldCteMap.keys());
console.warn(
`[ConditionalLookup] CTE not found for field ${field.id} (${field.name}). ` +
`Available CTEs: [${fieldCteMapKeys.join(', ')}]. ` +
`Returning NULL::${field.dbFieldType}`
);
return this.dialect.typedNullFor(field.dbFieldType);
}
return `"${cteName}"."conditional_lookup_${field.id}"`;
Expand Down Expand Up @@ -1805,24 +1812,41 @@ export class FieldCteVisitor implements IFieldVisitor<ICteResult> {
field: FieldCore,
options: IConditionalLookupOptions
): void {
if (field.hasError) return;
if (field.hasError) {
this.logger.warn(
`[ConditionalLookup] Skipping CTE generation for field ${field.id} (${field.name}): field.hasError=true`
);
return;
}
if (this.state.getFieldCteMap().has(field.id)) return;
if (this.conditionalLookupGenerationStack.has(field.id)) return;

this.conditionalLookupGenerationStack.add(field.id);
try {
const { foreignTableId, lookupFieldId, filter, sort, limit } = options;
if (!foreignTableId || !lookupFieldId) {
this.logger.warn(
`[ConditionalLookup] Skipping CTE generation for field ${field.id} (${field.name}): ` +
`foreignTableId=${foreignTableId}, lookupFieldId=${lookupFieldId}`
);
return;
}

const foreignTable = this.tables.getTable(foreignTableId);
if (!foreignTable) {
this.logger.warn(
`[ConditionalLookup] Skipping CTE generation for field ${field.id} (${field.name}): ` +
`foreignTable not found for foreignTableId=${foreignTableId}`
);
return;
}

const targetField = foreignTable.getField(lookupFieldId);
if (!targetField) {
this.logger.warn(
`[ConditionalLookup] Skipping CTE generation for field ${field.id} (${field.name}): ` +
`targetField not found for lookupFieldId=${lookupFieldId} in foreignTable=${foreignTableId}`
);
return;
}

Expand Down Expand Up @@ -2135,6 +2159,11 @@ export class FieldCteVisitor implements IFieldVisitor<ICteResult> {
const options = field.getConditionalLookupOptions?.();
if (options) {
this.generateConditionalLookupFieldCte(field, options);
} else {
this.logger.warn(
`[ConditionalLookup] getConditionalLookupOptions returned undefined for field ${field.id} (${field.name}). ` +
`isConditionalLookup=${field.isConditionalLookup}, lookupOptions=${JSON.stringify(field.lookupOptions)}`
);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,28 @@ export class FieldSelectVisitor implements IFieldVisitor<IFieldSelectName> {
}

// Conditional lookup CTEs are stored against the field itself.
if (field.isConditionalLookup && fieldCteMap.has(field.id)) {
const conditionalCteName = fieldCteMap.get(field.id)!;
if (!this.state.isCteJoined(conditionalCteName)) {
// If the CTE isn't joined in this scope, fall back to raw column access.
if (field.isConditionalLookup) {
if (!fieldCteMap.has(field.id)) {
console.warn(
`[ConditionalLookup] CTE not in fieldCteMap for field ${field.id} (${(field as unknown as { name?: string }).name}). ` +
`Available CTE keys: [${Array.from(fieldCteMap.keys()).join(', ')}]`
);
} else {
const column =
field.type === FieldType.ConditionalRollup
? `conditional_rollup_${field.id}`
: `conditional_lookup_${field.id}`;
const rawExpression = this.qb.client.raw(`??."${column}"`, [conditionalCteName]);
this.state.setSelection(field.id, `"${conditionalCteName}"."${column}"`);
return rawExpression;
const conditionalCteName = fieldCteMap.get(field.id)!;
if (!this.state.isCteJoined(conditionalCteName)) {
// If the CTE isn't joined in this scope, fall back to raw column access.
console.warn(
`[ConditionalLookup] CTE ${conditionalCteName} for field ${field.id} (${(field as unknown as { name?: string }).name}) is not joined in current scope`
);
} else {
const column =
field.type === FieldType.ConditionalRollup
? `conditional_rollup_${field.id}`
: `conditional_lookup_${field.id}`;
const rawExpression = this.qb.client.raw(`??."${column}"`, [conditionalCteName]);
this.state.setSelection(field.id, `"${conditionalCteName}"."${column}"`);
return rawExpression;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export class SettingOpenApiController {
SettingKey.AI_CONFIG,
SettingKey.APP_CONFIG,
SettingKey.WEB_SEARCH_CONFIG,
SettingKey.ENABLE_CREDIT_REWARD,
]);
const { aiConfig, appConfig, webSearchConfig, ...rest } = setting;
return {
Expand Down
Loading
Loading