n8n 2.25.6 → 2.26.0

package/dist/modules/dynamic-credentials.ee/services/credential-connection-status.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-connection-status.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-connection-status.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,gCAA6B;AAM7B,4CAAkD;AAClD,sGAAgG;AAChG,gIAAyH;AAelH,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC7C,YAA6B,UAAgD;QAAhD,eAAU,GAAV,UAAU,CAAsC;IAAG,CAAC;IAEjF,KAAK,CAAC,0BAA0B,CAAC,MAAc,EAAE,aAAuB;QACvE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,GAAG,EAAE,CAAC;QAEjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACvC,MAAM,EAAE,CAAC,cAAc,CAAC;YACxB,KAAK,EAAE;gBACN,MAAM;gBACN,UAAU,EAAE,8BAAkB;gBAC9B,YAAY,EAAE,IAAA,OAAE,EAAC,aAAa,CAAC;aAC/B;SACD,CAAC,CAAC;QAEH,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACrD,CAAC;IAOD,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAE,YAAoB;QAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC3C,MAAM;YACN,YAAY;YACZ,UAAU,EAAE,8BAAkB;SAC9B,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,YAAoB;QAC7C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,YAAoB,EAAE,EAAkB;QAClE,MAAM,OAAO,GAAG,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAC9C,MAAM,OAAO,CAAC,MAAM,CAAC,0DAA0B,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACpE,CAAC;CACD,CAAA;AAzCY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,YAAO,GAAE;qCAEgC,+EAAoC;GADjE,iCAAiC,CAyC7C"}
+{"version":3,"file":"credential-connection-status.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-connection-status.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js

@@ -68,11 +68,12 @@ let DynamicCredentialService = class DynamicCredentialService {
             const decryptedConfig = await this.cipher.decryptV2(resolverEntity.config);
             const parsedConfig = (0, n8n_workflow_1.jsonParse)(decryptedConfig);
             const resolverConfig = await this.expressionService.resolve(parsedConfig);
-            const dynamicData = await resolver.getSecret(credentialsResolveMetadata.id, credentialContext, {
+            const handle = {
                 resolverId: resolverEntity.id,
                 resolverName: resolverEntity.type,
                 configuration: resolverConfig,
-            });
+            };
+            const dynamicData = await resolver.getSecret(credentialsResolveMetadata.id, credentialContext, handle);
             this.logger.debug('Successfully resolved dynamic credentials', {
                 credentialId: credentialsResolveMetadata.id,
                 resolverId,
@@ -84,7 +85,17 @@ let DynamicCredentialService = class DynamicCredentialService {
                     delete dynamicData[field];
                 }
             }
-            return { data: { ...staticData, ...dynamicData }, isDynamic: true };
+            let resolvedUserId;
+            try {
+                resolvedUserId = await resolver.resolveOwningUserId?.(credentialContext, handle);
+            }
+            catch (error) {
+                this.logger.debug('Could not resolve owning user for dynamic credentials', {
+                    credentialId: credentialsResolveMetadata.id,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+            return { data: { ...staticData, ...dynamicData }, isDynamic: true, resolvedUserId };
         }
         catch (error) {
             return this.handleResolutionError(credentialsResolveMetadata, error, resolverEntity.id, resolverEntity.type);

package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-credential.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dynamic-credential.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/external-secrets.ee/providers/infisical.d.ts

@@ -1,27 +1,33 @@
-import { type IDataObject, type INodeProperties } from 'n8n-workflow';
-import { SecretsProvider } from '../types';
+import { Logger } from '@n8n/backend-common';
+import { type INodeProperties } from 'n8n-workflow';
 import type { SecretsProviderSettings } from '../types';
-export interface InfisicalSettings {
-    token: string;
-    siteURL: string;
-    cacheTTL: number;
-    debug: boolean;
-}
+import { SecretsProvider } from '../types';
 export declare class InfisicalProvider extends SecretsProvider {
+    readonly logger: Logger;
     properties: INodeProperties[];
     displayName: string;
     name: string;
     private cachedSecrets;
-    private client;
     private settings;
-    private environment;
+    private http;
+    private currentToken;
+    private tokenExpiresAt;
+    private refreshTimeout;
+    private refreshAbort;
+    constructor(logger?: Logger);
     init(settings: SecretsProviderSettings): Promise<void>;
-    update(): Promise<void>;
     protected doConnect(): Promise<void>;
-    getEnvironment(): Promise<string>;
-    test(): Promise<[boolean] | [boolean, string]>;
     disconnect(): Promise<void>;
-    getSecret(name: string): IDataObject;
+    test(): Promise<[boolean] | [boolean, string]>;
+    update(): Promise<void>;
+    private fetchSecrets;
+    private dedupeSecrets;
+    private cacheSecrets;
+    private ensureTokenFresh;
+    private loginUniversalAuth;
+    private setupTokenRefresh;
+    private tokenRefresh;
+    getSecret(name: string): string | undefined;
     getSecretNames(): string[];
     hasSecret(name: string): boolean;
 }

package/dist/modules/external-secrets.ee/providers/infisical.js

@@ -1,136 +1,261 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfisicalProvider = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const axios_1 = __importDefault(require("axios"));
 const n8n_workflow_1 = require("n8n-workflow");
+const constants_1 = require("../constants");
 const types_1 = require("../types");
+const TOKEN_REFRESH_LEEWAY_SECONDS = 60;
+const MIN_REFRESH_DELAY_MS = 60 * 1000;
 class InfisicalProvider extends types_1.SecretsProvider {
-    constructor() {
-        super(...arguments);
+    constructor(logger = di_1.Container.get(backend_common_1.Logger)) {
+        super();
+        this.logger = logger;
         this.properties = [
+            constants_1.DOCS_HELP_NOTICE,
             {
-                displayName: '<h2>Important information about our infisical integration</h2><br>From the <b>30th July, 2024</b>, we will no longer be supporting new connections to inifiscal secrets vault using service tokens. Existing service tokens will remain usable until <b>July, 2025</b>. After that period, we will be removing support for Infisical from our external secrets integrations. You can find out more information about this change on <a href="https://docs.n8n.io/external-secrets/#connect-n8n-to-your-secrets-store" target="_blank">our docs</a>',
-                name: 'notice',
-                type: 'notice',
+                displayName: 'Site URL',
+                name: 'siteURL',
+                type: 'string',
+                hint: "The absolute URL of the Infisical instance. Change it only if you're self-hosting Infisical.",
+                required: true,
+                noDataExpression: true,
+                placeholder: 'https://app.infisical.com',
+                default: 'https://app.infisical.com',
+            },
+            {
+                displayName: 'Project ID',
+                name: 'projectId',
+                type: 'string',
+                hint: 'The Infisical project to read secrets from',
+                required: true,
+                noDataExpression: true,
+                placeholder: 'e.g. 7c1cbe9c-3f1b-4a92-b3a2-9d5e2f1c8a4b',
                 default: '',
+            },
+            {
+                displayName: 'Environment',
+                name: 'environment',
+                type: 'string',
+                hint: 'Environment slug (e.g. dev, staging, prod)',
+                required: true,
+                noDataExpression: true,
+                placeholder: 'dev',
+                default: 'dev',
+            },
+            {
+                displayName: 'Secret Path',
+                name: 'secretPath',
+                type: 'string',
+                hint: 'The path within the project to read secrets from',
+                required: true,
                 noDataExpression: true,
+                placeholder: '/',
+                default: '/',
             },
             {
-                displayName: 'Service Token',
-                name: 'token',
+                displayName: 'Authentication Method',
+                name: 'authMethod',
+                type: 'options',
+                required: true,
+                noDataExpression: true,
+                options: [{ name: 'Universal Auth', value: 'universalAuth' }],
+                default: 'universalAuth',
+            },
+            {
+                displayName: 'Client ID',
+                name: 'clientId',
                 type: 'string',
-                hint: 'The Infisical Service Token with read access',
                 default: '',
                 required: true,
-                placeholder: 'e.g. st.64ae963e1874ea.374226a166439dce.39557e4a1b7bdd82',
                 noDataExpression: true,
-                typeOptions: { password: true },
+                placeholder: 'e.g. 8a7b1f1c-9f2a-4d6c-bf1a-2c4e6f8b1d3a',
+                displayOptions: {
+                    show: {
+                        authMethod: ['universalAuth'],
+                    },
+                },
             },
             {
-                displayName: 'Site URL',
-                name: 'siteURL',
+                displayName: 'Client Secret',
+                name: 'clientSecret',
                 type: 'string',
-                hint: "The absolute URL of the Infisical instance. Change it only if you're self-hosting Infisical.",
+                default: '',
                 required: true,
                 noDataExpression: true,
-                placeholder: 'https://app.infisical.com',
-                default: 'https://app.infisical.com',
+                placeholder: '***************',
+                typeOptions: { password: true },
+                displayOptions: {
+                    show: {
+                        authMethod: ['universalAuth'],
+                    },
+                },
             },
         ];
         this.displayName = 'Infisical';
         this.name = 'infisical';
         this.cachedSecrets = {};
+        this.currentToken = null;
+        this.tokenExpiresAt = null;
+        this.refreshTimeout = null;
+        this.refreshAbort = new AbortController();
+        this.tokenRefresh = async () => {
+            if (this.refreshAbort.signal.aborted)
+                return;
+            try {
+                await this.loginUniversalAuth();
+                if (this.refreshAbort.signal.aborted)
+                    return;
+                this.setupTokenRefresh();
+            }
+            catch {
+                this.logger.error('Failed to refresh Infisical token. Attempting reconnect.');
+                void this.connect();
+            }
+        };
+        this.logger = this.logger.scoped('external-secrets');
     }
     async init(settings) {
         this.settings = settings.settings;
+        const baseURL = new URL(this.settings.siteURL);
+        this.http = axios_1.default.create({ baseURL: baseURL.toString() });
+        this.http.interceptors.request.use((config) => {
+            if (this.currentToken) {
+                config.headers.Authorization = `Bearer ${this.currentToken}`;
+            }
+            return config;
+        });
+        this.logger.debug('Infisical provider initialized');
     }
-    async update() {
-        if (!this.client) {
-            throw new n8n_workflow_1.UnexpectedError('Updated attempted on Infisical when initialization failed');
-        }
-        if (!(await this.test())[0]) {
-            throw new n8n_workflow_1.UnexpectedError('Infisical provider test failed during update');
-        }
-        const secrets = (await this.client.getAllSecrets({
-            environment: this.environment,
-            path: '/',
-            attachToProcessEnv: false,
-            includeImports: true,
-        }));
-        const newCache = Object.fromEntries(secrets.map((s) => [s.secretName, s.secretValue]));
-        if (Object.keys(newCache).length === 1 && '' in newCache) {
-            this.cachedSecrets = {};
+    async doConnect() {
+        this.refreshAbort = new AbortController();
+        if (this.settings.authMethod === 'universalAuth') {
+            if (!this.settings.clientId || !this.settings.clientSecret) {
+                throw new n8n_workflow_1.UnexpectedError('Client ID and Client Secret are required for Universal Auth');
+            }
+            await this.loginUniversalAuth();
         }
-        else {
-            this.cachedSecrets = newCache;
+        const [testSuccess, testMessage] = await this.test();
+        if (!testSuccess) {
+            throw new Error(testMessage ?? 'Connection test failed');
         }
+        this.setupTokenRefresh();
     }
-    async doConnect() {
-        const { default: InfisicalClientClass } = await Promise.resolve().then(() => __importStar(require('infisical-node')));
-        this.client = new InfisicalClientClass(this.settings);
-        const [testSuccess] = await this.test();
-        if (!testSuccess) {
-            throw new Error('Connection test failed');
+    async disconnect() {
+        if (this.refreshTimeout !== null) {
+            clearTimeout(this.refreshTimeout);
+            this.refreshTimeout = null;
         }
-        this.environment = await this.getEnvironment();
+        this.refreshAbort.abort();
+        this.currentToken = null;
+        this.tokenExpiresAt = null;
+        this.cachedSecrets = {};
     }
-    async getEnvironment() {
-        const { getServiceTokenData } = await Promise.resolve().then(() => __importStar(require('infisical-node/lib/api/serviceTokenData')));
-        const serviceTokenData = (await getServiceTokenData(this.client.clientConfig));
-        if (serviceTokenData.environment) {
-            return serviceTokenData.environment;
+    async test() {
+        try {
+            const resp = await this.http.get(`/api/v1/workspace/${encodeURIComponent(this.settings.projectId)}`, { validateStatus: () => true });
+            if (resp.status >= 200 && resp.status < 300) {
+                return [true];
+            }
+            if (resp.status === 401) {
+                return [false, 'Invalid credentials'];
+            }
+            if (resp.status === 403) {
+                return [
+                    false,
+                    'Permission denied. Verify the machine identity has access to this project.',
+                ];
+            }
+            if (resp.status === 404) {
+                return [false, 'Project not found. Check the Project ID and Site URL.'];
+            }
+            return [false, `Unexpected response from Infisical (status ${resp.status}).`];
         }
-        if (serviceTokenData.scopes) {
-            return serviceTokenData.scopes[0].environment;
+        catch (error) {
+            if (axios_1.default.isAxiosError(error) && error.code === 'ECONNREFUSED') {
+                return [false, 'Connection refused. Check the Site URL.'];
+            }
+            return [false, error instanceof Error ? error.message : 'Connection test failed'];
         }
-        throw new n8n_workflow_1.UnexpectedError("Couldn't find environment for Infisical");
     }
-    async test() {
-        if (!this.client) {
-            return [false, 'Client not initialized'];
+    async update() {
+        if (!this.currentToken) {
+            throw new n8n_workflow_1.UnexpectedError('Update attempted on Infisical before authentication');
         }
+        await this.ensureTokenFresh();
         try {
-            const { populateClientWorkspaceConfigsHelper } = await Promise.resolve().then(() => __importStar(require('infisical-node/lib/helpers/key')));
-            await populateClientWorkspaceConfigsHelper(this.client.clientConfig);
-            return [true];
+            this.cacheSecrets(await this.fetchSecrets());
         }
-        catch (e) {
-            return [false];
+        catch (error) {
+            if (axios_1.default.isAxiosError(error) && error.response?.status === 401) {
+                this.logger.debug('Infisical token rejected during update; re-authenticating and retrying');
+                await this.loginUniversalAuth();
+                this.cacheSecrets(await this.fetchSecrets());
+                return;
+            }
+            throw error;
         }
     }
-    async disconnect() {
+    async fetchSecrets() {
+        const resp = await this.http.get('/api/v4/secrets', {
+            params: {
+                projectId: this.settings.projectId,
+                environment: this.settings.environment,
+                secretPath: this.settings.secretPath,
+            },
+        });
+        return resp.data;
+    }
+    dedupeSecrets(secrets, imports) {
+        const dedupedSecrets = new Map();
+        secrets.forEach((s) => {
+            dedupedSecrets.set(s.secretKey, s);
+        });
+        imports.forEach((i) => {
+            i.secrets.forEach((s) => {
+                if (!dedupedSecrets.has(s.secretKey)) {
+                    dedupedSecrets.set(s.secretKey, s);
+                }
+            });
+        });
+        return Array.from(dedupedSecrets.values());
+    }
+    cacheSecrets(data) {
+        const dedupedSecrets = this.dedupeSecrets(data.secrets, data.imports);
+        this.cachedSecrets = Object.fromEntries(dedupedSecrets.map((s) => [s.secretKey, s.secretValue]));
+        this.logger.debug(`Infisical provider cached ${Object.keys(this.cachedSecrets).length} secrets`);
+    }
+    async ensureTokenFresh() {
+        if (this.tokenExpiresAt === null)
+            return;
+        if (Date.now() < this.tokenExpiresAt)
+            return;
+        await this.loginUniversalAuth();
+    }
+    async loginUniversalAuth() {
+        const resp = await this.http.post('/api/v1/auth/universal-auth/login', {
+            clientId: this.settings.clientId,
+            clientSecret: this.settings.clientSecret,
+        });
+        this.currentToken = resp.data.accessToken;
+        this.tokenExpiresAt =
+            Date.now() + Math.max(resp.data.expiresIn - TOKEN_REFRESH_LEEWAY_SECONDS, 60) * 1000;
+    }
+    setupTokenRefresh() {
+        if (this.refreshTimeout !== null) {
+            clearTimeout(this.refreshTimeout);
+            this.refreshTimeout = null;
+        }
+        if (this.tokenExpiresAt === null)
+            return;
+        const remaining = this.tokenExpiresAt - Date.now();
+        const refreshIn = Math.max(remaining / 2, MIN_REFRESH_DELAY_MS);
+        this.refreshTimeout = setTimeout(this.tokenRefresh, refreshIn);
     }
     getSecret(name) {
         return this.cachedSecrets[name];

package/dist/modules/external-secrets.ee/providers/infisical.js.map

@@ -1 +1 @@
-{"version":3,"file":"infisical.js","sourceRoot":"","sources":["../../../../src/modules/external-secrets.ee/providers/infisical.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"infisical.js","sourceRoot":"","sources":["../../../../src/modules/external-secrets.ee/providers/infisical.ts"],"names":[],"mappings":"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"}

package/dist/modules/favorites/dto/add-favorite.dto.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 declare const AddFavoriteDto_base: import("@n8n/api-types").ZodClass<{
     resourceId: string;
-    resourceType: "project" | "workflow" | "folder" | "dataTable";
+    resourceType: "workflow" | "project" | "folder" | "dataTable";
 }, {
     resourceId: z.ZodString;
     resourceType: z.ZodEnum<["workflow", "project", "dataTable", "folder"]>;

package/dist/modules/insights/database/entities/insights-shared.d.ts

@@ -15,5 +15,5 @@ export declare const TypeToNumber: {
 };
 export type TypeUnit = keyof typeof TypeToNumber;
 export type TypeUnitNumber = (typeof TypeToNumber)[TypeUnit];
-export declare const NumberToType: Record<0 | 1 | 2 | 3, "success" | "failure" | "time_saved_min" | "runtime_ms">;
+export declare const NumberToType: Record<0 | 1 | 2 | 3, "success" | "time_saved_min" | "runtime_ms" | "failure">;
 export declare function isValidTypeNumber(value: number): value is 0 | 1 | 2 | 3;

package/dist/modules/insights/database/repositories/insights-by-period-query.helper.d.ts

@@ -1,9 +1,10 @@
 import type { DatabaseConfig } from '@n8n/config';
 import { DateTime } from 'luxon';
-export declare const getDateRangesCommonTableExpressionQuery: ({ startDate, endDate, dbType, }: {
+export declare const getDateRangesCommonTableExpressionQuery: ({ startDate, endDate, dbType, now, }: {
     startDate: Date;
     endDate: Date;
     dbType: DatabaseConfig["type"];
+    now?: DateTime;
 }) => string;
 export declare function getDateRangesSelectQuery({ dbType, prevStartDateTime, startDateTime, endDateTime, }: {
     dbType: DatabaseConfig['type'];

package/dist/modules/insights/database/repositories/insights-by-period-query.helper.js

@@ -4,11 +4,10 @@ exports.getDateRangesCommonTableExpressionQuery = void 0;
 exports.getDateRangesSelectQuery = getDateRangesSelectQuery;
 const db_1 = require("@n8n/db");
 const luxon_1 = require("luxon");
-const getDateRangesCommonTableExpressionQuery = ({ startDate, endDate, dbType, }) => {
+const getDateRangesCommonTableExpressionQuery = ({ startDate, endDate, dbType, now = luxon_1.DateTime.now().toUTC(), }) => {
     let startDateTime = luxon_1.DateTime.fromJSDate(startDate).toUTC();
     let endDateTime = luxon_1.DateTime.fromJSDate(endDate).toUTC();
-    const today = luxon_1.DateTime.now().toUTC();
-    const isEndDateToday = endDateTime.hasSame(today, 'day');
+    const isEndDateToday = endDateTime.hasSame(now, 'day');
     if (!isEndDateToday) {
         startDateTime = startDateTime.startOf('day');
         endDateTime = endDateTime.plus({ days: 1 }).startOf('day');

package/dist/modules/insights/database/repositories/insights-by-period-query.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"insights-by-period-query.helper.js","sourceRoot":"","sources":["../../../../../src/modules/insights/database/repositories/insights-by-period-query.helper.ts"],"names":[],"mappings":";;;AAoDA,4DA+BC;AAlFD,gCAA8B;AAC9B,iCAAiC;AAmB1B,MAAM,uCAAuC,GAAG,CAAC,EACvD,SAAS,EACT,OAAO,EACP,MAAM,GAKN,EAAE,EAAE;IACJ,IAAI,aAAa,GAAG,gBAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3D,IAAI,WAAW,GAAG,gBAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IAEvD,MAAM,KAAK,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;IACrC,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAGzD,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7C,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAGD,IAAI,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;QACjE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAE/E,OAAO,wBAAwB,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;AAC5F,CAAC,CAAC;AA7BW,QAAA,uCAAuC,2CA6BlD;AAEF,SAAgB,wBAAwB,CAAC,EACxC,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,WAAW,GAMX;IACA,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAK/E,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;QAC7B,OAAO,IAAA,QAAG,EAAA;WACD,YAAY;WACZ,QAAQ;WACR,MAAM;GACd,CAAC;IACH,CAAC;IAED,OAAO,IAAA,QAAG,EAAA;MACL,YAAY;MACZ,QAAQ;MACR,MAAM;EACV,CAAC;AACH,CAAC"}
+{"version":3,"file":"insights-by-period-query.helper.js","sourceRoot":"","sources":["../../../../../src/modules/insights/database/repositories/insights-by-period-query.helper.ts"],"names":[],"mappings":";;;AAsDA,4DA+BC;AApFD,gCAA8B;AAC9B,iCAAiC;AAoB1B,MAAM,uCAAuC,GAAG,CAAC,EACvD,SAAS,EACT,OAAO,EACP,MAAM,EACN,GAAG,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,GAM5B,EAAE,EAAE;IACJ,IAAI,aAAa,GAAG,gBAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3D,IAAI,WAAW,GAAG,gBAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;IAEvD,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAGvD,IAAI,CAAC,cAAc,EAAE,CAAC;QACrB,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7C,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAGD,IAAI,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;QACjE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAE/E,OAAO,wBAAwB,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;AAC5F,CAAC,CAAC;AA9BW,QAAA,uCAAuC,2CA8BlD;AAEF,SAAgB,wBAAwB,CAAC,EACxC,MAAM,EACN,iBAAiB,EACjB,aAAa,EACb,WAAW,GAMX;IACA,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IACnF,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAK/E,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;QAC7B,OAAO,IAAA,QAAG,EAAA;WACD,YAAY;WACZ,QAAQ;WACR,MAAM;GACd,CAAC;IACH,CAAC;IAED,OAAO,IAAA,QAAG,EAAA;MACL,YAAY;MACZ,QAAQ;MACR,MAAM;EACV,CAAC;AACH,CAAC"}

package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts

@@ -53,14 +53,14 @@ export declare class InsightsByPeriodRepository extends Repository<InsightsByPer
         count: number;
         rows: {
             workflowId: string | null;
+            projectName: string;
             projectId: string | null;
             workflowName: string;
-            projectName: string;
             failed: number;
             total: number;
-            succeeded: number;
             timeSaved: number;
             runTime: number;
+            succeeded: number;
             failureRate: number;
             averageRunTime: number;
         }[];
@@ -74,9 +74,9 @@ export declare class InsightsByPeriodRepository extends Repository<InsightsByPer
     }): Promise<{
         periodStart: string;
         failed?: number | undefined;
-        succeeded?: number | undefined;
         timeSaved?: number | undefined;
         runTime?: number | undefined;
+        succeeded?: number | undefined;
     }[]>;
     pruneOldData(maxAgeInDays: number): Promise<{
         affected: number | null | undefined;

package/dist/modules/insights/insights.service.d.ts

@@ -34,14 +34,14 @@ export declare class InsightsService {
         count: number;
         data: {
             workflowId: string | null;
+            projectName: string;
             projectId: string | null;
             workflowName: string;
-            projectName: string;
             failed: number;
             total: number;
-            succeeded: number;
             timeSaved: number;
             runTime: number;
+            succeeded: number;
             failureRate: number;
             averageRunTime: number;
         }[];
@@ -55,8 +55,8 @@ export declare class InsightsService {
         date: string;
         values: {
             failed?: number | undefined;
-            succeeded?: number | undefined;
             timeSaved?: number | undefined;
+            succeeded?: number | undefined;
         } & {
             total?: number;
             successRate?: number;