Automation update

.cursor/mcp.json

@@ -1,7 +1,3 @@
 {
-  "mcpServers": {
-    "nx-mcp": {
-      "url": "http://localhost:9216/sse"
-    }
-  }
+  "mcpServers": {}
 }

.vscode/settings.json

@@ -7,5 +7,8 @@
   "nxConsole.nxWorkspacePath": "",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.preferences.importModuleSpecifierEnding": "minimal",
-  "typescript.updateImportsOnFileMove.enabled": "always"
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "[plaintext]": {
+    "editor.defaultFormatter": "lkrms.inifmt"
+  }
 }

backend/core-api/src/connectionResolvers.ts

@@ -146,6 +146,8 @@ import {
   loadClass as loadExecutionClass,
 } from './modules/automations/db/models/Executions';
 import {
+  AiAgentDocument,
+  aiAgentSchema,
   emailDeliverySchema,
   IAutomationDocument,
   IAutomationExecutionDocument,
@@ -156,6 +158,8 @@ import {
   notificationConfigSchema,
   notificationSchema,
   userNotificationSettingsSchema,
+  aiEmbeddingSchema,
+  IAiEmbeddingDocument,
 } from 'erxes-api-shared/core-modules';
 
 export interface IModels {
@@ -196,6 +200,8 @@ export interface IModels {
   NotificationConfigs: Model<INotificationConfigDocument>;
   UserNotificationSettings: Model<IUserNotificationSettingsDocument>;
   EmailDeliveries: Model<IEmailDeliveryDocument>;
+  AiAgents: Model<AiAgentDocument>;
+  AiEmbeddings: Model<IAiEmbeddingDocument>;
 }
 
 export interface IContext extends IMainContext {
@@ -369,6 +375,20 @@ export const loadClasses = (
     IEmailDeliveryDocument,
     Model<IEmailDeliveryDocument>
   >('email_deliveries', emailDeliverySchema);
+  models.EmailDeliveries = db.model<
+    IEmailDeliveryDocument,
+    Model<IEmailDeliveryDocument>
+  >('email_deliveries', emailDeliverySchema);
+
+  models.AiAgents = db.model<AiAgentDocument, Model<AiAgentDocument>>(
+    'automations_ai_agents',
+    aiAgentSchema,
+  );
+
+  models.AiEmbeddings = db.model<
+    IAiEmbeddingDocument,
+    Model<IAiEmbeddingDocument>
+  >('ai_embeddings', aiEmbeddingSchema);
 
   const db_name = db.name;
 
@@ -383,5 +403,5 @@ export const loadClasses = (
 };
 
 export const generateModels = createGenerateModels<IModels>(loadClasses, {
-  ignoreModels: ['logs', 'automations_executions'],
+  ignoreModels: ['logs', 'automations_executions', 'ai_embeddings'],
 });

backend/core-api/src/main.ts

@@ -15,12 +15,12 @@ import {
   leaveErxesGateway,
 } from 'erxes-api-shared/utils';
 
-import './meta/automations';
+import { initAutomation } from './meta/automations';
 import { generateModels } from './connectionResolvers';
 import { documents } from './meta/documents';
 import { moduleObjects } from './meta/permission';
 import { tags } from './meta/tags';
-import './segments';
+import { initSegmentCoreProducers } from './segments';
 import * as path from 'path';
 import rateLimit from 'express-rate-limit';
 
@@ -119,6 +119,8 @@ httpServer.listen(port, async () => {
       documents,
     },
   });
+  await initAutomation(app);
+  await initSegmentCoreProducers(app);
 });
 
 // GRACEFULL SHUTDOWN

backend/core-api/src/meta/automations.ts

@@ -5,6 +5,7 @@ import {
 } from 'erxes-api-shared/core-modules';
 import { generateModels, IModels } from '../connectionResolvers';
 import { sendTRPCMessage } from 'erxes-api-shared/utils';
+import { Express } from 'express';
 
 const getRelatedValue = async (
   models: IModels,
@@ -123,126 +124,127 @@ const getItems = async (
   return filter ? model.find(filter) : [];
 };
 
-export default startAutomations('core', {
-  receiveActions: async (
-    { subdomain },
-    { action, execution, triggerType, actionType },
-  ) => {
-    const models = await generateModels(subdomain);
-
-    if (actionType === 'set-property') {
-      const { module, rules } = action.config;
-
-      const relatedItems = await getItems(
-        subdomain,
-        module,
-        execution,
-        triggerType,
-      );
-
-      const result = await setProperty({
+export const initAutomation = (app: Express) =>
+  startAutomations(app, 'core', {
+    receiveActions: async (
+      { subdomain },
+      { action, execution, triggerType, actionType },
+    ) => {
+      const models = await generateModels(subdomain);
+
+      if (actionType === 'set-property') {
+        const { module, rules } = action.config;
+
+        const relatedItems = await getItems(
+          subdomain,
+          module,
+          execution,
+          triggerType,
+        );
+
+        const result = await setProperty({
+          models,
+          subdomain,
+          getRelatedValue,
+          module: module.includes('lead') ? 'core:customer' : module,
+          rules,
+          execution,
+          relatedItems,
+          triggerType,
+        });
+        return { result };
+      }
+      return { result: 'Hello World Core' };
+    },
+    replacePlaceHolders: async ({ subdomain }, { data }) => {
+      const { target, config, relatedValueProps } = data || {};
+      const models = await generateModels(subdomain);
+
+      return await replacePlaceHolders<IModels>({
         models,
         subdomain,
-        getRelatedValue,
-        module: module.includes('lead') ? 'core:customer' : module,
-        rules,
-        execution,
-        relatedItems,
-        triggerType,
+        target,
+        actionData: config,
+        customResolver: {
+          resolver: getRelatedValue,
+          props: relatedValueProps,
+        },
       });
-      return { result };
-    }
-    return { result: 'Hello World Core' };
-  },
-  replacePlaceHolders: async ({ subdomain }, { data }) => {
-    const { target, config, relatedValueProps } = data || {};
-    const models = await generateModels(subdomain);
-
-    return await replacePlaceHolders<IModels>({
-      models,
-      subdomain,
-      target,
-      actionData: config,
-      customResolver: {
-        resolver: getRelatedValue,
-        props: relatedValueProps,
-      },
-    });
-  },
-  getRecipientsEmails: async ({ subdomain }, { data }) => {
-    const models = await generateModels(subdomain);
-    const { type, config } = data;
+    },
+    getRecipientsEmails: async ({ subdomain }, { data }) => {
+      const models = await generateModels(subdomain);
+      const { type, config } = data;
 
-    const ids = config[`${type}Ids`];
+      const ids = config[`${type}Ids`];
 
-    const commonFilter = {
-      _id: { $in: Array.isArray(ids) ? ids : [ids] },
-    };
+      const commonFilter = {
+        _id: { $in: Array.isArray(ids) ? ids : [ids] },
+      };
 
-    if (type === 'user') {
-      const result = await models.Users.find(commonFilter).distinct('email');
+      if (type === 'user') {
+        const result = await models.Users.find(commonFilter).distinct('email');
 
-      return result;
-    }
+        return result;
+      }
 
-    const CONTACT_TYPES = {
-      lead: {
-        model: models.Customers,
-        filter: { ...commonFilter },
-      },
-      customer: {
-        model: models.Customers,
-        filter: {
-          ...commonFilter,
+      const CONTACT_TYPES = {
+        lead: {
+          model: models.Customers,
+          filter: { ...commonFilter },
         },
-      },
-      company: {
-        model: models.Companies,
-        filter: { ...commonFilter },
-      },
-    };
-
-    const { model, filter } = CONTACT_TYPES[type];
-
-    return await model.find(filter).distinct('primaryEmail');
-  },
-  constants: {
-    triggers: [
-      {
-        type: 'core:user',
-        icon: 'Users',
-        label: 'Team member',
-        description:
-          'Start with a blank workflow that enrolls and is triggered off team members',
-      },
-      {
-        type: 'core:customer',
-        icon: 'UsersGroup',
-        label: 'Customer',
-        description:
-          'Start with a blank workflow that enrolls and is triggered off Customers',
-      },
-      {
-        type: 'core:lead',
-        icon: 'UsersGroup',
-        label: 'Lead',
-        description:
-          'Start with a blank workflow that enrolls and is triggered off Leads',
-      },
-      {
-        type: 'core:company',
-        icon: 'Building',
-        label: 'Company',
-        description:
-          'Start with a blank workflow that enrolls and is triggered off company',
-      },
-      {
-        type: 'core:form_submission',
-        icon: 'Forms',
-        label: 'Form submission',
-        description:
-          'Start with a blank workflow that enrolls and is triggered off form submission',
-      },
-    ],
-  },
-});
+        customer: {
+          model: models.Customers,
+          filter: {
+            ...commonFilter,
+          },
+        },
+        company: {
+          model: models.Companies,
+          filter: { ...commonFilter },
+        },
+      };
+
+      const { model, filter } = CONTACT_TYPES[type];
+
+      return await model.find(filter).distinct('primaryEmail');
+    },
+    constants: {
+      triggers: [
+        {
+          type: 'core:user',
+          icon: 'Users',
+          label: 'Team member',
+          description:
+            'Start with a blank workflow that enrolls and is triggered off team members',
+        },
+        {
+          type: 'core:customer',
+          icon: 'UsersGroup',
+          label: 'Customer',
+          description:
+            'Start with a blank workflow that enrolls and is triggered off Customers',
+        },
+        {
+          type: 'core:lead',
+          icon: 'UsersGroup',
+          label: 'Lead',
+          description:
+            'Start with a blank workflow that enrolls and is triggered off Leads',
+        },
+        {
+          type: 'core:company',
+          icon: 'Building',
+          label: 'Company',
+          description:
+            'Start with a blank workflow that enrolls and is triggered off company',
+        },
+        {
+          type: 'core:form_submission',
+          icon: 'Forms',
+          label: 'Form submission',
+          description:
+            'Start with a blank workflow that enrolls and is triggered off form submission',
+        },
+      ],
+    },
+  });

backend/core-api/src/modules/auth/graphql/resolvers/mutations.ts

@@ -149,6 +149,8 @@ export const authMutations = {
     assertSaasEnvironment();
     const WORKOS_API_KEY = getEnv({ name: 'WORKOS_API_KEY', subdomain });
 
+    const CORE_DOMAIN = getEnv({ name: 'CORE_DOMAIN', subdomain });
+
     const workosClient = new WorkOS(WORKOS_API_KEY);
 
     const state = await jwt.sign(
@@ -162,7 +164,7 @@ export const authMutations = {
 
     const authorizationURL = workosClient.sso.getAuthorizationUrl({
       provider: 'GoogleOAuth',
-      redirectUri: getCallbackRedirectUrl(subdomain, 'sso-callback'),
+      redirectUri: `${CORE_DOMAIN}/saas-sso-callback`,
 
       clientId: getEnv({ name: 'WORKOS_PROJECT_ID', subdomain }),
       state,