@owox/backend 0.35.0 → 0.36.0

package/dist/src/data-marts/facades/mcp-data-marts.facade.impl.d.ts

@@ -1,3 +1,6 @@
+import { TypeResolver } from '../../common/resolver/type-resolver';
+import { FormulaFunctionDialect } from '../calculated-fields/formula-function-dialect';
+import { DataStorageType } from '../data-storage-types/enums/data-storage-type.enum';
 import { BlendableSchemaService } from '../services/blendable-schema.service';
 import { DataMartRelationshipService } from '../services/data-mart-relationship.service';
 import { DataMartService } from '../services/data-mart.service';
@@ -14,12 +17,15 @@ export declare class McpDataMartsFacadeImpl implements McpDataMartsFacade {
     private readonly blendableSchemaService;
     private readonly relationshipService;
     private readonly summarizeMcpDataCatalogService;
+    private readonly dialects;
     private readonly logger;
-    constructor(listDataMartsService: ListDataMartsService, getDataMartService: GetDataMartService, dataMartService: DataMartService, queryDataMartService: QueryDataMartService, blendableSchemaService: BlendableSchemaService, relationshipService: DataMartRelationshipService, summarizeMcpDataCatalogService: SummarizeMcpDataCatalogService);
+    constructor(listDataMartsService: ListDataMartsService, getDataMartService: GetDataMartService, dataMartService: DataMartService, queryDataMartService: QueryDataMartService, blendableSchemaService: BlendableSchemaService, relationshipService: DataMartRelationshipService, summarizeMcpDataCatalogService: SummarizeMcpDataCatalogService, dialects: TypeResolver<DataStorageType, FormulaFunctionDialect>);
     listDataMarts(request: McpListDataMartsRequest): Promise<McpListDataMartsResponse>;
     getDataMartDetails(request: McpGetDataMartDetailsRequest): Promise<McpDataMartDetailsResponse>;
+    private blendableSchemaOnce;
     private resolveJoinedFields;
     private resolveJoins;
+    private grainCaveats;
     queryDataMart(request: McpQueryDataMartRequest, signal?: AbortSignal): Promise<McpQueryDataMartResponse>;
     summarizeDataCatalog(request: McpSummarizeDataCatalogRequest): Promise<McpDataCatalogSummaryResponse>;
     private ensurePublishedDataMartAccessible;

package/dist/src/data-marts/facades/mcp-data-marts.facade.impl.js

@@ -8,12 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var McpDataMartsFacadeImpl_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpDataMartsFacadeImpl = void 0;
 const common_1 = require("@nestjs/common");
+const internal_helpers_1 = require("@owox/internal-helpers");
+const type_resolver_1 = require("../../common/resolver/type-resolver");
 const ai_insights_constants_1 = require("../ai-insights/ai-insights.constants");
 const prepare_schema_1 = require("../ai-insights/utils/prepare-schema");
+const formula_analyzer_1 = require("../calculated-fields/formula-analyzer");
+const calculated_field_utils_1 = require("../calculated-fields/calculated-field.utils");
+const formula_function_dialect_1 = require("../calculated-fields/formula-function-dialect");
+const join_grain_1 = require("../calculated-fields/join-grain");
 const data_mart_schema_utils_1 = require("../data-storage-types/data-mart-schema.utils");
 const get_data_mart_command_1 = require("../dto/domain/get-data-mart.command");
 const list_data_marts_command_1 = require("../dto/domain/list-data-marts.command");
@@ -37,8 +46,9 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
     blendableSchemaService;
     relationshipService;
     summarizeMcpDataCatalogService;
+    dialects;
     logger = new common_1.Logger(McpDataMartsFacadeImpl_1.name);
-    constructor(listDataMartsService, getDataMartService, dataMartService, queryDataMartService, blendableSchemaService, relationshipService, summarizeMcpDataCatalogService) {
+    constructor(listDataMartsService, getDataMartService, dataMartService, queryDataMartService, blendableSchemaService, relationshipService, summarizeMcpDataCatalogService, dialects) {
         this.listDataMartsService = listDataMartsService;
         this.getDataMartService = getDataMartService;
         this.dataMartService = dataMartService;
@@ -46,6 +56,7 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
         this.blendableSchemaService = blendableSchemaService;
         this.relationshipService = relationshipService;
         this.summarizeMcpDataCatalogService = summarizeMcpDataCatalogService;
+        this.dialects = dialects;
     }
     async listDataMarts(request) {
         const status = request.status === 'draft' ? data_mart_status_enum_1.DataMartStatus.DRAFT : data_mart_status_enum_1.DataMartStatus.PUBLISHED;
@@ -71,8 +82,13 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
                 fields: this.filterAvailableFields(dataMart.schema.fields),
             })
             : undefined;
+        const blendable = this.blendableSchemaOnce(request);
+        const publishedNames = this.topLevelFieldNames(schema?.fields ?? []);
+        const grainCaveats = request.includeGrainCaveats
+            ? await this.grainCaveats(request, dataMart, publishedNames, blendable)
+            : undefined;
         const { joinedFields, joins, uniqueCountSources } = request.includeJoinedFields
-            ? await this.resolveJoinedFields(request, this.topLevelFieldNames(schema?.fields ?? []))
+            ? await this.resolveJoinedFields(request, publishedNames, blendable)
             : { joinedFields: [], joins: [], uniqueCountSources: [] };
         return {
             id: dataMart.id,
@@ -82,15 +98,23 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
             joinedFields,
             joins,
             uniqueCountSources,
+            ...(grainCaveats === undefined ? {} : { grainCaveats }),
+        };
+    }
+    blendableSchemaOnce(request) {
+        let pending;
+        return () => {
+            pending ??= this.blendableSchemaService.computeBlendableSchema(request.dataMartId, request.projectId, { userId: request.userId, roles: request.roles });
+            return pending;
         };
     }
-    async resolveJoinedFields(request, nativeFieldNames) {
+    async resolveJoinedFields(request, nativeFieldNames, blendableSchema) {
         try {
             const relationships = await this.relationshipService.findBySourceDataMartId(request.dataMartId);
             if (relationships.length === 0) {
                 return { joinedFields: [], joins: [], uniqueCountSources: [] };
             }
-            const blendable = await this.blendableSchemaService.computeBlendableSchema(request.dataMartId, request.projectId, { userId: request.userId, roles: request.roles });
+            const blendable = await blendableSchema();
             const accessibleSources = blendable.availableSources.filter(s => s.isIncluded && s.isAccessibleForReporting);
             const accessiblePaths = new Set(accessibleSources.map(s => s.aliasPath));
             const joins = await this.resolveJoins(accessibleSources);
@@ -166,6 +190,45 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
             return [];
         }
     }
+    async grainCaveats(request, dataMart, publishedNames, blendableSchema) {
+        const readers = (0, calculated_field_utils_1.calculatedFieldsOf)(dataMart.schema?.fields ?? []).filter(field => publishedNames.has(field.name) && (0, calculated_field_utils_1.readsJoinedDataMart)(field));
+        if (readers.length === 0)
+            return {};
+        let blendable;
+        try {
+            blendable = await blendableSchema();
+        }
+        catch (err) {
+            if (!request.includeJoinedFields) {
+                this.logger.warn(`Join caveats skipped: ${(0, internal_helpers_1.castError)(err).message}`);
+            }
+            return {};
+        }
+        try {
+            const sources = (0, join_grain_1.buildJoinGrainSources)(blendable.availableSources, {
+                kind: 'agent',
+                blendedFields: blendable.blendedFields,
+            });
+            const dialect = await this.dialects.resolve(dataMart.storage.type);
+            const caveats = {};
+            for (const field of readers) {
+                const { aggregateCalls } = (0, formula_analyzer_1.analyzeFormula)({
+                    fieldName: field.name,
+                    formula: field.calculated.formula,
+                    dialect,
+                    knownField: () => 'ok',
+                });
+                const { warnings } = (0, join_grain_1.checkJoinGrain)({ fieldName: field.name, aggregateCalls, sources });
+                if (warnings.length > 0)
+                    caveats[field.name] = warnings.map(w => w.message).join(' ');
+            }
+            return caveats;
+        }
+        catch (err) {
+            this.logger.warn(`Join caveats skipped: ${(0, internal_helpers_1.castError)(err).message}`);
+            return {};
+        }
+    }
     async queryDataMart(request, signal) {
         return this.queryDataMartService.run(new query_data_mart_service_1.QueryDataMartCommand(request), signal);
     }
@@ -214,12 +277,14 @@ let McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = class McpDataMartsFacade
 exports.McpDataMartsFacadeImpl = McpDataMartsFacadeImpl;
 exports.McpDataMartsFacadeImpl = McpDataMartsFacadeImpl = McpDataMartsFacadeImpl_1 = __decorate([
     (0, common_1.Injectable)(),
+    __param(7, (0, common_1.Inject)(formula_function_dialect_1.FORMULA_FUNCTION_DIALECT_RESOLVER)),
     __metadata("design:paramtypes", [list_data_marts_service_1.ListDataMartsService,
         get_data_mart_service_1.GetDataMartService,
         data_mart_service_1.DataMartService,
         query_data_mart_service_1.QueryDataMartService,
         blendable_schema_service_1.BlendableSchemaService,
         data_mart_relationship_service_1.DataMartRelationshipService,
-        summarize_mcp_data_catalog_service_1.SummarizeMcpDataCatalogService])
+        summarize_mcp_data_catalog_service_1.SummarizeMcpDataCatalogService,
+        type_resolver_1.TypeResolver])
 ], McpDataMartsFacadeImpl);
 //# sourceMappingURL=mcp-data-marts.facade.impl.js.map

package/dist/src/data-marts/mappers/connector-definition.mapper.d.ts

@@ -0,0 +1,14 @@
+import { ActivateCustomConnectorVersionResponseApiDto, CreateCustomConnectorResponseApiDto, CustomConnectorDetailResponseApiDto, CustomConnectorListItemResponseApiDto, CustomConnectorVersionResponseApiDto, CustomConnectorVersionStateResponseApiDto, PublishCustomConnectorResponseApiDto } from '../dto/presentation/custom-connector-response.dto';
+import { ConnectorDefinition } from '../entities/connector-definition.entity';
+import { ConnectorDefinitionVersion } from '../entities/connector-definition-version.entity';
+import { ConnectorDefinitionVersionSummary } from '../services/connector/connector-definition.service';
+export declare class ConnectorDefinitionMapper {
+    toListItemResponse(def: ConnectorDefinition, activeVersion: number | null): CustomConnectorListItemResponseApiDto;
+    toListResponse(defs: ConnectorDefinition[], activeVersionByDefId: Map<string, number>): CustomConnectorListItemResponseApiDto[];
+    toDetailResponse(def: ConnectorDefinition, versions: ConnectorDefinitionVersionSummary[], activeVersion: number | null): CustomConnectorDetailResponseApiDto;
+    toCreateResponse(def: ConnectorDefinition): CreateCustomConnectorResponseApiDto;
+    toVersionResponse(row: ConnectorDefinitionVersion): CustomConnectorVersionResponseApiDto;
+    toVersionStateResponse(row: ConnectorDefinitionVersion): CustomConnectorVersionStateResponseApiDto;
+    toPublishResponse(row: ConnectorDefinitionVersion, warnings: string[]): PublishCustomConnectorResponseApiDto;
+    toActivateResponse(def: ConnectorDefinition, version: number): ActivateCustomConnectorVersionResponseApiDto;
+}

package/dist/src/data-marts/mappers/connector-definition.mapper.js

@@ -0,0 +1,57 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectorDefinitionMapper = void 0;
+const common_1 = require("@nestjs/common");
+let ConnectorDefinitionMapper = class ConnectorDefinitionMapper {
+    toListItemResponse(def, activeVersion) {
+        return {
+            id: def.id,
+            name: def.name,
+            title: def.title,
+            description: def.description ?? null,
+            logo: def.logo ?? null,
+            docUrl: def.docUrl ?? null,
+            activeVersionId: def.activeVersionId ?? null,
+            activeVersion,
+        };
+    }
+    toListResponse(defs, activeVersionByDefId) {
+        return defs.map(def => this.toListItemResponse(def, activeVersionByDefId.get(def.id) ?? null));
+    }
+    toDetailResponse(def, versions, activeVersion) {
+        return {
+            ...this.toListItemResponse(def, activeVersion),
+            versions: versions.map(v => ({
+                version: v.version,
+                status: v.status,
+                publishedAt: v.publishedAt ?? null,
+            })),
+        };
+    }
+    toCreateResponse(def) {
+        return { id: def.id, name: def.name, title: def.title };
+    }
+    toVersionResponse(row) {
+        return { version: row.version, status: row.status, manifest: row.manifest };
+    }
+    toVersionStateResponse(row) {
+        return { version: row.version, status: row.status };
+    }
+    toPublishResponse(row, warnings) {
+        return { version: row.version, status: row.status, publishedAt: row.publishedAt, warnings };
+    }
+    toActivateResponse(def, version) {
+        return { activeVersionId: def.activeVersionId ?? null, activeVersion: version };
+    }
+};
+exports.ConnectorDefinitionMapper = ConnectorDefinitionMapper;
+exports.ConnectorDefinitionMapper = ConnectorDefinitionMapper = __decorate([
+    (0, common_1.Injectable)()
+], ConnectorDefinitionMapper);
+//# sourceMappingURL=connector-definition.mapper.js.map

package/dist/src/data-marts/mappers/data-mart.mapper.d.ts

@@ -27,6 +27,7 @@ import { UpdateDataMartDefinitionCommand } from '../dto/domain/update-data-mart-
 import { GetBlendableSchemaCommand } from '../dto/domain/get-blendable-schema.command';
 import { UpdateBlendedFieldsConfigCommand } from '../dto/domain/update-blended-fields-config.command';
 import { UpdateDataMartDescriptionCommand } from '../dto/domain/update-data-mart-description.command';
+import { UpdateDataMartIconCommand } from '../dto/domain/update-data-mart-icon.command';
 import { UpdateDataMartSchemaCommand } from '../dto/domain/update-data-mart-schema.command';
 import { UpdateDataMartTitleCommand } from '../dto/domain/update-data-mart-title.command';
 import { ValidateDataMartDefinitionCommand } from '../dto/domain/validate-data-mart-definition.command';
@@ -48,6 +49,7 @@ import { SqlDryRunResponseApiDto } from '../dto/presentation/sql-dry-run-respons
 import { UpdateDataMartDefinitionApiDto } from '../dto/presentation/update-data-mart-definition-api.dto';
 import { UpdateBlendedFieldsConfigApiDto } from '../dto/presentation/update-blended-fields-config-api.dto';
 import { UpdateDataMartDescriptionApiDto } from '../dto/presentation/update-data-mart-description-api.dto';
+import { UpdateDataMartIconApiDto } from '../dto/presentation/update-data-mart-icon-api.dto';
 import { ValidateFormulaApiDto, ValidateFormulaResponseApiDto } from '../dto/presentation/validate-formula.api.dto';
 import { ValidateFormulaResult } from '../use-cases/validate-formula.service';
 import { UpdateDataMartSchemaApiDto, UpdateDataMartSchemaResponseApiDto } from '../dto/presentation/update-data-mart-schema-api.dto';
@@ -56,7 +58,7 @@ import { UpdateDataMartTitleApiDto } from '../dto/presentation/update-data-mart-
 import { DataMartRun } from '../entities/data-mart-run.entity';
 import { DataMart } from '../entities/data-mart.entity';
 import { OwnerFilter } from '../enums/owner-filter.enum';
-import { ConnectorSecretService } from '../services/connector/connector-secret.service';
+import { ConnectorSecretService, type SecretFieldsCache } from '../services/connector/connector-secret.service';
 import { UpdateDataMartOwnersApiDto } from '../dto/presentation/update-data-mart-owners-api.dto';
 import { UpdateDataMartOwnersCommand } from '../dto/domain/update-data-mart-owners.command';
 import { DataStorageMapper } from './data-storage.mapper';
@@ -81,7 +83,7 @@ export declare class DataMartMapper {
     toBatchDataLastUpdatedResponse(results: Map<string, SourceDataLastUpdated>): BatchDataMartDataLastUpdatedResponseApiDto;
     toBatchHealthStatusDomainResponse(requestedIds: string[], latestRuns: DataMartRun[], userProjections: UserProjectionsListDto): BatchDataMartHealthStatusResponseDto;
     toResponseList(dtos: DataMartDto[]): Promise<DataMartResponseApiDto[]>;
-    toBatchHealthStatusResponse(dto: BatchDataMartHealthStatusResponseDto): Promise<BatchDataMartHealthStatusResponseApiDto>;
+    toBatchHealthStatusResponse(dto: BatchDataMartHealthStatusResponseDto, projectId: string): Promise<BatchDataMartHealthStatusResponseApiDto>;
     toUpdateDefinitionCommand(id: string, context: AuthorizationContext, dto: UpdateDataMartDefinitionApiDto): UpdateDataMartDefinitionCommand;
     toGetCommand(id: string, context: AuthorizationContext): GetDataMartCommand;
     toGetInputSourceChangeImpactCommand(id: string, context: AuthorizationContext): GetDataMartInputSourceChangeImpactCommand;
@@ -94,6 +96,7 @@ export declare class DataMartMapper {
     toListItemResponse(dto: DataMartListItemDto): DataMartListItemResponseApiDto;
     toPaginatedResponse(result: PaginatedDataMartListItemsDto): PaginatedDataMartsResponseApiDto;
     toUpdateTitleCommand(id: string, context: AuthorizationContext, dto: UpdateDataMartTitleApiDto): UpdateDataMartTitleCommand;
+    toUpdateIconCommand(id: string, context: AuthorizationContext, dto: UpdateDataMartIconApiDto): UpdateDataMartIconCommand;
     toUpdateDescriptionCommand(id: string, context: AuthorizationContext, dto: UpdateDataMartDescriptionApiDto): UpdateDataMartDescriptionCommand;
     toGetBlendableSchemaCommand(dataMartId: string, context: AuthorizationContext, includeDraftTargets?: boolean): GetBlendableSchemaCommand;
     toUpdateBlendedFieldsConfigCommand(id: string, context: AuthorizationContext, dto: UpdateBlendedFieldsConfigApiDto): UpdateBlendedFieldsConfigCommand;
@@ -112,12 +115,12 @@ export declare class DataMartMapper {
     toSqlDryRunResponse(result: SqlDryRunResult): SqlDryRunResponseApiDto;
     toDataMartRunDto(entity: DataMartRun, userProjection?: UserProjectionDto | null, dataQuality?: DataQualityRunDetailsDto | null): DataMartRunDto;
     toDataMartRunDtoList(entities: DataMartRun[], userProjections: UserProjectionsListDto): DataMartRunDto[];
-    toRunsResponse(runs: DataMartRunDto[]): Promise<DataMartRunsResponseApiDto>;
-    toProjectRunsResponse(runs: ProjectDataMartRunDto[]): Promise<ProjectDataMartRunsResponseApiDto>;
+    toRunsResponse(runs: DataMartRunDto[], projectId: string): Promise<DataMartRunsResponseApiDto>;
+    toProjectRunsResponse(runs: ProjectDataMartRunDto[], projectId: string): Promise<ProjectDataMartRunsResponseApiDto>;
     toListDataMartsByConnectorNameCommand(connectorName: string, context: AuthorizationContext): ListDataMartsByConnectorNameCommand;
     toGetDataMartRunCommand(dataMartId: string, runId: string, context: AuthorizationContext): GetDataMartRunCommand;
-    toRunResponse(run: DataMartRunDto): Promise<DataMartRunResponseApiDto>;
-    toRunDetailResponse(run: DataMartRunDto): Promise<DataMartRunDetailResponseApiDto>;
+    toRunResponse(run: DataMartRunDto, projectId: string, secretFieldsCache?: SecretFieldsCache): Promise<DataMartRunResponseApiDto>;
+    toRunDetailResponse(run: DataMartRunDto, projectId: string): Promise<DataMartRunDetailResponseApiDto>;
     toUpdateOwnersCommand(id: string, context: AuthorizationContext, dto: UpdateDataMartOwnersApiDto): UpdateDataMartOwnersCommand;
     private maskDefinitionRun;
     private maskAdditionalParams;

package/dist/src/data-marts/mappers/data-mart.mapper.js

@@ -37,6 +37,7 @@ const update_data_mart_definition_command_1 = require("../dto/domain/update-data
 const get_blendable_schema_command_1 = require("../dto/domain/get-blendable-schema.command");
 const update_blended_fields_config_command_1 = require("../dto/domain/update-blended-fields-config.command");
 const update_data_mart_description_command_1 = require("../dto/domain/update-data-mart-description.command");
+const update_data_mart_icon_command_1 = require("../dto/domain/update-data-mart-icon.command");
 const update_data_mart_schema_command_1 = require("../dto/domain/update-data-mart-schema.command");
 const update_data_mart_title_command_1 = require("../dto/domain/update-data-mart-title.command");
 const validate_data_mart_definition_command_1 = require("../dto/domain/validate-data-mart-definition.command");
@@ -59,10 +60,10 @@ let DataMartMapper = class DataMartMapper {
         this.connectorSecretService = connectorSecretService;
     }
     toCreateDomainCommand(context, dto) {
-        return new create_data_mart_command_1.CreateDataMartCommand(context.projectId, context.userId, dto.title, dto.storageId, context.roles ?? []);
+        return new create_data_mart_command_1.CreateDataMartCommand(context.projectId, context.userId, dto.title, dto.storageId, context.roles ?? [], dto.icon ?? null);
     }
     toDomainDto(entity, counters, createdByUser, businessOwnerUsers = [], technicalOwnerUsers = []) {
-        return new data_mart_dto_1.DataMartDto(entity.id, entity.title, entity.status, this.dataStorageMapper.toDomainDto(entity.storage), entity.createdAt, entity.modifiedAt, entity.definitionType ?? undefined, entity.definition, entity.description, entity.schema, entity.connectorState?.state, counters?.triggersCount ?? 0, counters?.reportsCount ?? 0, createdByUser ?? null, businessOwnerUsers, technicalOwnerUsers, entity.availableForReporting ?? true, entity.availableForMaintenance ?? true, entity.blendedFieldsConfig, (0, extract_context_summaries_1.extractContextSummaries)(entity.contexts), entity.dataLastUpdated ?? null);
+        return new data_mart_dto_1.DataMartDto(entity.id, entity.projectId, entity.title, entity.status, this.dataStorageMapper.toDomainDto(entity.storage), entity.createdAt, entity.modifiedAt, entity.definitionType ?? undefined, entity.definition, entity.description, entity.schema, entity.connectorState?.state, counters?.triggersCount ?? 0, counters?.reportsCount ?? 0, createdByUser ?? null, businessOwnerUsers, technicalOwnerUsers, entity.availableForReporting ?? true, entity.availableForMaintenance ?? true, entity.blendedFieldsConfig, (0, extract_context_summaries_1.extractContextSummaries)(entity.contexts), entity.dataLastUpdated ?? null, entity.icon ?? null);
     }
     toDomainDtoList(entities) {
         return entities.map(entity => this.toDomainDto(entity));
@@ -75,7 +76,7 @@ let DataMartMapper = class DataMartMapper {
     }
     async toResponse(dto) {
         const maskedDefinition = dto.definitionType === data_mart_definition_type_enum_1.DataMartDefinitionType.CONNECTOR
-            ? await this.connectorSecretService.mask(dto.definition)
+            ? await this.connectorSecretService.mask(dto.projectId, dto.definition)
             : dto.definition;
         return {
             id: dto.id,
@@ -85,8 +86,9 @@ let DataMartMapper = class DataMartMapper {
             definitionType: dto.definitionType,
             definition: maskedDefinition,
             description: dto.description,
+            icon: dto.icon,
             schema: dto.schema,
-            connectorState: dto.connectorState,
+            connectorState: omitConnectorOwnedState(dto.connectorState),
             triggersCount: dto.triggersCount,
             reportsCount: dto.reportsCount,
             blendedFieldsConfig: dto.blendedFieldsConfig,
@@ -142,13 +144,16 @@ let DataMartMapper = class DataMartMapper {
     async toResponseList(dtos) {
         return Promise.all(dtos.map(dto => this.toResponse(dto)));
     }
-    async toBatchHealthStatusResponse(dto) {
+    async toBatchHealthStatusResponse(dto, projectId) {
+        const cache = new Map();
         const itemsPromises = dto.items.map(async (item) => {
             const mappedItem = {
                 dataMartId: item.dataMartId,
-                connector: item.connector ? await this.toRunResponse(item.connector) : null,
-                report: item.report ? await this.toRunResponse(item.report) : null,
-                insight: item.insight ? await this.toRunResponse(item.insight) : null,
+                connector: item.connector
+                    ? await this.toRunResponse(item.connector, projectId, cache)
+                    : null,
+                report: item.report ? await this.toRunResponse(item.report, projectId, cache) : null,
+                insight: item.insight ? await this.toRunResponse(item.insight, projectId, cache) : null,
             };
             return mappedItem;
         });
@@ -172,7 +177,7 @@ let DataMartMapper = class DataMartMapper {
         return new list_data_marts_command_1.ListDataMartsCommand(context.projectId, context.userId, context.roles ?? [], offset, ownerFilter);
     }
     toListItemDto(entity, counters, createdByUser, businessOwnerUsers = [], technicalOwnerUsers = []) {
-        return new data_mart_list_item_dto_1.DataMartListItemDto(entity.id, entity.title, entity.status, entity.storage.type, entity.storage.title || (0, data_storage_type_enum_1.toHumanReadable)(entity.storage.type), entity.createdAt, entity.modifiedAt, entity.description ?? null, entity.definitionType, entity.definition, counters.triggersCount, counters.reportsCount, createdByUser ?? null, businessOwnerUsers, technicalOwnerUsers, (0, extract_context_summaries_1.extractContextSummaries)(entity.contexts), entity.availableForReporting, entity.availableForMaintenance, (0, source_data_last_updated_schema_1.toSourceDataLastUpdatedSummary)(entity.dataLastUpdated));
+        return new data_mart_list_item_dto_1.DataMartListItemDto(entity.id, entity.title, entity.status, entity.storage.type, entity.storage.title || (0, data_storage_type_enum_1.toHumanReadable)(entity.storage.type), entity.createdAt, entity.modifiedAt, entity.description ?? null, entity.definitionType, entity.definition, counters.triggersCount, counters.reportsCount, createdByUser ?? null, businessOwnerUsers, technicalOwnerUsers, (0, extract_context_summaries_1.extractContextSummaries)(entity.contexts), entity.availableForReporting, entity.availableForMaintenance, (0, source_data_last_updated_schema_1.toSourceDataLastUpdatedSummary)(entity.dataLastUpdated), entity.icon ?? null);
     }
     toListItemResponse(dto) {
         return {
@@ -181,6 +186,7 @@ let DataMartMapper = class DataMartMapper {
             status: dto.status,
             storage: { type: dto.storageType, title: dto.storageTitle },
             description: dto.description,
+            icon: dto.icon,
             definitionType: dto.definitionType,
             connectorSourceName: dto.definitionType === data_mart_definition_type_enum_1.DataMartDefinitionType.CONNECTOR && dto.definition
                 ? dto.definition.connector.source.name
@@ -209,6 +215,9 @@ let DataMartMapper = class DataMartMapper {
     toUpdateTitleCommand(id, context, dto) {
         return new update_data_mart_title_command_1.UpdateDataMartTitleCommand(id, context.projectId, dto.title, context.userId, context.roles ?? []);
     }
+    toUpdateIconCommand(id, context, dto) {
+        return new update_data_mart_icon_command_1.UpdateDataMartIconCommand(id, context.projectId, dto.icon ?? null, context.userId, context.roles ?? []);
+    }
     toUpdateDescriptionCommand(id, context, dto) {
         return new update_data_mart_description_command_1.UpdateDataMartDescriptionCommand(id, context.projectId, dto.description, context.userId, context.roles ?? []);
     }
@@ -288,9 +297,10 @@ let DataMartMapper = class DataMartMapper {
             return this.toDataMartRunDto(entity, projection);
         });
     }
-    async toRunsResponse(runs) {
+    async toRunsResponse(runs, projectId) {
+        const secretFieldsCache = new Map();
         const maskedRuns = await Promise.all(runs.map(async (run) => {
-            const maskedDefinitionRun = await this.maskDefinitionRun(run.definitionRun);
+            const maskedDefinitionRun = await this.maskDefinitionRun(run.definitionRun, projectId, secretFieldsCache);
             return {
                 id: run.id,
                 status: run.status,
@@ -318,9 +328,10 @@ let DataMartMapper = class DataMartMapper {
         }));
         return { runs: maskedRuns };
     }
-    async toProjectRunsResponse(runs) {
+    async toProjectRunsResponse(runs, projectId) {
+        const secretFieldsCache = new Map();
         const maskedRuns = await Promise.all(runs.map(async (item) => {
-            const maskedDefinitionRun = await this.maskDefinitionRun(item.run.definitionRun);
+            const maskedDefinitionRun = await this.maskDefinitionRun(item.run.definitionRun, projectId, secretFieldsCache);
             return {
                 id: item.run.id,
                 status: item.run.status,
@@ -355,8 +366,8 @@ let DataMartMapper = class DataMartMapper {
     toGetDataMartRunCommand(dataMartId, runId, context) {
         return new get_data_mart_run_command_1.GetDataMartRunCommand(dataMartId, context.projectId, runId, context.userId, context.roles ?? []);
     }
-    async toRunResponse(run) {
-        const maskedDefinitionRun = await this.maskDefinitionRun(run.definitionRun);
+    async toRunResponse(run, projectId, secretFieldsCache = new Map()) {
+        const maskedDefinitionRun = await this.maskDefinitionRun(run.definitionRun, projectId, secretFieldsCache);
         return {
             id: run.id,
             status: run.status,
@@ -382,18 +393,18 @@ let DataMartMapper = class DataMartMapper {
             qualitySummary: run.qualitySummary,
         };
     }
-    async toRunDetailResponse(run) {
+    async toRunDetailResponse(run, projectId) {
         return {
-            ...(await this.toRunResponse(run)),
+            ...(await this.toRunResponse(run, projectId)),
             dataQuality: run.dataQuality,
         };
     }
     toUpdateOwnersCommand(id, context, dto) {
         return new update_data_mart_owners_command_1.UpdateDataMartOwnersCommand(id, context.projectId, dto.businessOwnerIds, dto.technicalOwnerIds, context.userId, context.roles ?? []);
     }
-    async maskDefinitionRun(definitionRun) {
+    async maskDefinitionRun(definitionRun, projectId, secretFieldsCache) {
         if (definitionRun && (0, data_mart_definition_guards_1.isConnectorDefinition)(definitionRun)) {
-            return this.connectorSecretService.mask(definitionRun);
+            return this.connectorSecretService.mask(projectId, definitionRun, secretFieldsCache);
         }
         return undefined;
     }
@@ -426,4 +437,18 @@ exports.DataMartMapper = DataMartMapper = __decorate([
     __metadata("design:paramtypes", [data_storage_mapper_1.DataStorageMapper,
         connector_secret_service_1.ConnectorSecretService])
 ], DataMartMapper);
+const CONNECTOR_OWNED_STATE_KEYS = ['shortLinks'];
+function omitConnectorOwnedState(connectorState) {
+    if (!connectorState) {
+        return connectorState;
+    }
+    const strip = (state) => Object.fromEntries(Object.entries(state).filter(([key]) => !CONNECTOR_OWNED_STATE_KEYS.includes(key)));
+    return {
+        ...connectorState,
+        ...(connectorState.state ? { state: strip(connectorState.state) } : {}),
+        ...(connectorState.states
+            ? { states: connectorState.states.map(item => ({ ...item, state: strip(item.state) })) }
+            : {}),
+    };
+}
 //# sourceMappingURL=data-mart.mapper.js.map

package/dist/src/data-marts/mappers/insight-template.mapper.d.ts

@@ -25,7 +25,7 @@ export declare class InsightTemplateMapper {
     toCreateDomainCommand(dataMartId: string, context: AuthorizationContext, dto: CreateInsightTemplateRequestApiDto): CreateInsightTemplateCommand;
     toDomainDto(entity: InsightTemplate, lastManualDataMartRun?: DataMartRun | null, createdByUser?: UserProjectionDto | null): InsightTemplateDto;
     toDomainDtoList(entities: InsightTemplate[], userProjectionsList?: UserProjectionsListDto): InsightTemplateDto[];
-    toResponse(dto: InsightTemplateDto): Promise<InsightTemplateResponseApiDto>;
+    toResponse(dto: InsightTemplateDto, projectId: string): Promise<InsightTemplateResponseApiDto>;
     toListItemResponse(dto: InsightTemplateDto): InsightTemplateListItemResponseApiDto;
     toListItemResponseList(dtos: InsightTemplateDto[]): InsightTemplateListItemResponseApiDto[];
     toProjectResponseList(dtos: ProjectInsightTemplateDto[]): ProjectInsightTemplatesResponseApiDto;

package/dist/src/data-marts/mappers/insight-template.mapper.js

@@ -38,7 +38,7 @@ let InsightTemplateMapper = class InsightTemplateMapper {
     toDomainDtoList(entities, userProjectionsList) {
         return entities.map(entity => this.toDomainDto(entity, null, entity.createdById ? (userProjectionsList?.getByUserId(entity.createdById) ?? null) : null));
     }
-    async toResponse(dto) {
+    async toResponse(dto, projectId) {
         return {
             id: dto.id,
             title: dto.title,
@@ -50,7 +50,7 @@ let InsightTemplateMapper = class InsightTemplateMapper {
             createdAt: dto.createdAt,
             modifiedAt: dto.modifiedAt,
             lastManualDataMartRun: dto.lastManualDataMartRun
-                ? await this.dataMartMapper.toRunResponse(dto.lastManualDataMartRun)
+                ? await this.dataMartMapper.toRunResponse(dto.lastManualDataMartRun, projectId)
                 : null,
             createdByUser: dto.createdByUser,
         };

package/dist/src/data-marts/mappers/insight.mapper.d.ts

@@ -22,7 +22,7 @@ export declare class InsightMapper {
     toCreateWithAiDomainCommand(dataMartId: string, context: AuthorizationContext): CreateInsightWithAiCommand;
     toDomainDto(entity: Insight, lastManualDataMartRun?: DataMartRun | null): InsightDto;
     toDomainDtoList(entities: Insight[]): InsightDto[];
-    toResponse(dto: InsightDto): Promise<InsightResponseApiDto>;
+    toResponse(dto: InsightDto, projectId: string): Promise<InsightResponseApiDto>;
     toListItemResponse(dto: InsightDto): InsightListItemResponseApiDto;
     toListItemResponseList(dtos: InsightDto[]): InsightListItemResponseApiDto[];
     toGetCommand(insightId: string, dataMartId: string, context: AuthorizationContext): GetInsightCommand;

package/dist/src/data-marts/mappers/insight.mapper.js

@@ -40,7 +40,7 @@ let InsightMapper = class InsightMapper {
     toDomainDtoList(entities) {
         return entities.map(entity => this.toDomainDto(entity, null));
     }
-    async toResponse(dto) {
+    async toResponse(dto, projectId) {
         return {
             id: dto.id,
             title: dto.title,
@@ -51,7 +51,7 @@ let InsightMapper = class InsightMapper {
             createdAt: dto.createdAt,
             modifiedAt: dto.modifiedAt,
             lastManualDataMartRun: dto.lastManualDataMartRun
-                ? await this.dataMartMapper.toRunResponse(dto.lastManualDataMartRun)
+                ? await this.dataMartMapper.toRunResponse(dto.lastManualDataMartRun, projectId)
                 : null,
         };
     }

package/dist/src/data-marts/mappers/model-canvas.mapper.d.ts

@@ -5,10 +5,18 @@ import { ModelCanvasDataMartsDto, ModelCanvasNodeDto } from '../dto/domain/model
 import { GetModelCanvasDataMartsQueryApiDto } from '../dto/presentation/get-model-canvas-data-marts-query-api.dto';
 import { ModelCanvasDataMartsResponseApiDto } from '../dto/presentation/model-canvas-response-api.dto';
 import { DataMart } from '../entities/data-mart.entity';
+export interface ModelCanvasNodeCounts {
+    triggersCount: number;
+    reportsCount: number;
+}
+export interface ModelCanvasCountMaps {
+    triggerCounts?: ReadonlyMap<string, number>;
+    reportCounts?: ReadonlyMap<string, number>;
+}
 export declare class ModelCanvasMapper {
     toDataMartsCommand(context: AuthorizationContext, query: GetModelCanvasDataMartsQueryApiDto): GetModelCanvasDataMartsCommand;
     toEdgesCommand(context: AuthorizationContext, storageId: string): GetModelCanvasEdgesCommand;
-    toNodeDto(dataMart: DataMart): ModelCanvasNodeDto;
-    toDataMartsDto(dataMarts: DataMart[], total: number, offset: number): ModelCanvasDataMartsDto;
+    toNodeDto(dataMart: DataMart, counts?: Partial<ModelCanvasNodeCounts>): ModelCanvasNodeDto;
+    toDataMartsDto(dataMarts: DataMart[], total: number, offset: number, { triggerCounts, reportCounts }?: ModelCanvasCountMaps): ModelCanvasDataMartsDto;
     toDataMartsResponse(dto: ModelCanvasDataMartsDto): ModelCanvasDataMartsResponseApiDto;
 }

package/dist/src/data-marts/mappers/model-canvas.mapper.js

@@ -18,19 +18,25 @@ let ModelCanvasMapper = class ModelCanvasMapper {
     toEdgesCommand(context, storageId) {
         return new get_model_canvas_edges_command_1.GetModelCanvasEdgesCommand(context.projectId, context.userId, context.roles ?? [], storageId);
     }
-    toNodeDto(dataMart) {
+    toNodeDto(dataMart, counts = {}) {
         return {
             id: dataMart.id,
             title: dataMart.title,
             status: dataMart.status,
             description: dataMart.description ?? null,
+            icon: dataMart.icon ?? null,
             fieldCount: dataMart.schema?.fields?.length ?? 0,
+            triggersCount: counts.triggersCount ?? 0,
+            reportsCount: counts.reportsCount ?? 0,
             dataLastUpdated: (0, source_data_last_updated_schema_1.toSourceDataLastUpdatedSummary)(dataMart.dataLastUpdated),
         };
     }
-    toDataMartsDto(dataMarts, total, offset) {
+    toDataMartsDto(dataMarts, total, offset, { triggerCounts = new Map(), reportCounts = new Map() } = {}) {
         return {
-            items: dataMarts.map(dataMart => this.toNodeDto(dataMart)),
+            items: dataMarts.map(dataMart => this.toNodeDto(dataMart, {
+                triggersCount: triggerCounts.get(dataMart.id) ?? 0,
+                reportsCount: reportCounts.get(dataMart.id) ?? 0,
+            })),
             total,
             offset,
         };

package/dist/src/data-marts/mappers/report.mapper.js

@@ -51,14 +51,14 @@ let ReportMapper = class ReportMapper {
         return result.data;
     }
     toCreateDomainCommand(context, dto) {
-        return new create_report_command_1.CreateReportCommand(context.projectId, context.userId, dto.title, dto.dataMartId, dto.dataDestinationId, dto.destinationConfig, dto.ownerIds, context.roles ?? [], this.parseConfig(report_column_config_schema_1.ReportColumnConfigSchema, dto.columnConfig, 'columnConfig'), this.parseConfig(filter_config_schema_1.FilterConfigSchema, dto.filterConfig, 'filterConfig') ?? null, this.parseConfig(sort_config_schema_1.SortConfigSchema, dto.sortConfig, 'sortConfig') ?? null, dto.limitConfig ?? null, this.parseConfig(aggregation_config_schema_1.AggregationConfigSchema, dto.aggregationConfig, 'aggregationConfig') ?? null, this.parseConfig(date_trunc_config_schema_1.DateTruncConfigSchema, dto.dateTruncConfig, 'dateTruncConfig') ?? null, dto.uniqueCountConfig ?? null);
+        return new create_report_command_1.CreateReportCommand(context.projectId, context.userId, dto.title, dto.dataMartId, dto.dataDestinationId, dto.destinationConfig, dto.ownerIds, context.roles ?? [], this.parseConfig(report_column_config_schema_1.ReportColumnConfigSchema, dto.columnConfig, 'columnConfig'), this.parseConfig(filter_config_schema_1.FilterConfigSchema, dto.filterConfig, 'filterConfig') ?? null, this.parseConfig(sort_config_schema_1.SortConfigSchema, dto.sortConfig, 'sortConfig') ?? null, dto.limitConfig ?? null, this.parseConfig(aggregation_config_schema_1.AggregationConfigSchema, dto.aggregationConfig, 'aggregationConfig') ?? null, this.parseConfig(date_trunc_config_schema_1.DateTruncConfigSchema, dto.dateTruncConfig, 'dateTruncConfig') ?? null, dto.uniqueCountConfig ?? null, dto.autoAggregationOptOut);
     }
     toDomainDto(entity, createdByUser = null, ownerUsers = [], capabilities = {
         canRun: false,
         canManageTriggers: false,
         canEditConfig: false,
     }) {
-        return new report_dto_1.ReportDto(entity.id, entity.title, this.dataMartMapper.toDomainDto(entity.dataMart), this.dataDestinationMapper.toDomainDto(entity.dataDestination), entity.destinationConfig, entity.createdAt, entity.modifiedAt, entity.lastRunAt, entity.lastRunError, entity.lastRunStatus, entity.runsCount, createdByUser, ownerUsers, entity.columnConfig, entity.filterConfig ?? null, entity.sortConfig ?? null, entity.limitConfig ?? null, capabilities.canRun, capabilities.canManageTriggers, capabilities.canEditConfig, entity.aggregationConfig ?? null, entity.dateTruncConfig ?? null, entity.uniqueCountConfig ?? null);
+        return new report_dto_1.ReportDto(entity.id, entity.title, this.dataMartMapper.toDomainDto(entity.dataMart), this.dataDestinationMapper.toDomainDto(entity.dataDestination), entity.destinationConfig, entity.createdAt, entity.modifiedAt, entity.lastRunAt, entity.lastRunError, entity.lastRunStatus, entity.runsCount, createdByUser, ownerUsers, entity.columnConfig, entity.filterConfig ?? null, entity.sortConfig ?? null, entity.limitConfig ?? null, capabilities.canRun, capabilities.canManageTriggers, capabilities.canEditConfig, entity.aggregationConfig ?? null, entity.dateTruncConfig ?? null, entity.uniqueCountConfig ?? null, entity.autoAggregationOptOut ?? null);
     }
     async toResponse(dto) {
         return {
@@ -74,6 +74,7 @@ let ReportMapper = class ReportMapper {
             aggregationConfig: dto.aggregationConfig ?? null,
             dateTruncConfig: dto.dateTruncConfig ?? null,
             uniqueCountConfig: dto.uniqueCountConfig ?? null,
+            autoAggregationOptOut: dto.autoAggregationOptOut ?? null,
             lastRunAt: dto.lastRunAt,
             lastRunStatus: dto.lastRunStatus,
             lastRunError: dto.lastRunError,
@@ -118,7 +119,7 @@ let ReportMapper = class ReportMapper {
         };
     }
     toUpdateDomainCommand(id, context, dto) {
-        return new update_report_command_1.UpdateReportCommand(id, context.projectId, context.userId, context.roles ?? [], dto.title, dto.dataDestinationId, dto.destinationConfig, dto.ownerIds, this.parseConfig(report_column_config_schema_1.ReportColumnConfigSchema, dto.columnConfig, 'columnConfig'), this.parseConfig(filter_config_schema_1.FilterConfigSchema, dto.filterConfig, 'filterConfig') ?? null, this.parseConfig(sort_config_schema_1.SortConfigSchema, dto.sortConfig, 'sortConfig') ?? null, dto.limitConfig ?? null, this.parseConfig(aggregation_config_schema_1.AggregationConfigSchema, dto.aggregationConfig, 'aggregationConfig') ?? null, this.parseConfig(date_trunc_config_schema_1.DateTruncConfigSchema, dto.dateTruncConfig, 'dateTruncConfig') ?? null, dto.uniqueCountConfig ?? null);
+        return new update_report_command_1.UpdateReportCommand(id, context.projectId, context.userId, context.roles ?? [], dto.title, dto.dataDestinationId, dto.destinationConfig, dto.ownerIds, this.parseConfig(report_column_config_schema_1.ReportColumnConfigSchema, dto.columnConfig, 'columnConfig'), this.parseConfig(filter_config_schema_1.FilterConfigSchema, dto.filterConfig, 'filterConfig') ?? null, this.parseConfig(sort_config_schema_1.SortConfigSchema, dto.sortConfig, 'sortConfig') ?? null, dto.limitConfig ?? null, this.parseConfig(aggregation_config_schema_1.AggregationConfigSchema, dto.aggregationConfig, 'aggregationConfig') ?? null, this.parseConfig(date_trunc_config_schema_1.DateTruncConfigSchema, dto.dateTruncConfig, 'dateTruncConfig') ?? null, dto.uniqueCountConfig ?? null, dto.autoAggregationOptOut);
     }
     toCopyAsDataMartCommand(reportId, context) {
         return new copy_report_as_data_mart_command_1.CopyReportAsDataMartCommand(reportId, context.userId, context.projectId, context.roles ?? []);

package/dist/src/data-marts/services/auto-collapse.resolver.d.ts

@@ -1,6 +1,6 @@
 import { AggregationRule } from '../dto/schemas/aggregation-config.schema';
 import type { ReportLike } from '../dto/domain/report-like-read-plan';
-export type AutoCollapseSkipReason = 'analyst-aggregated' | 'no-explicit-projection' | 'non-groupable-column' | 'unresolvable-column' | 'no-allowed-aggregation' | 'calculated-not-liftable' | 'sort-outside-projection';
+export type AutoCollapseSkipReason = 'analyst-aggregated' | 'analyst-opted-out' | 'no-explicit-projection' | 'non-groupable-column' | 'unresolvable-column' | 'no-allowed-aggregation' | 'calculated-not-liftable' | 'sort-outside-projection';
 export interface LiftedCalculatedFormula {
     column: string;
     formula: string;