@memberjunction/server 2.98.0 → 2.100.0

package/src/generated/generated.ts

@@ -2768,6 +2768,10 @@ if this limit is exceeded.`})
     @Field(() => Int, {nullable: true, description: `Default effort level for all prompts executed by this agent (1-100, where 1=minimal effort, 100=maximum effort). Takes precedence over individual prompt EffortLevel settings but can be overridden by runtime parameters. Inherited by sub-agents unless explicitly overridden.`}) 
     DefaultPromptEffortLevel?: number;
         
+    @Field({nullable: true, description: `Controls how Chat next steps are handled. When null (default), Chat propagates to caller. When set to Success, Failed, or Retry, Chat steps are remapped to that value and re-validated.`}) 
+    @MaxLength(60)
+    ChatHandlingOption?: string;
+        
     @Field({nullable: true}) 
     @MaxLength(510)
     Parent?: string;
@@ -2930,6 +2934,9 @@ export class CreateAIAgentInput {
 
     @Field(() => Int, { nullable: true })
     DefaultPromptEffortLevel: number | null;
+
+    @Field({ nullable: true })
+    ChatHandlingOption: string | null;
 }
     
 
@@ -3040,6 +3047,9 @@ export class UpdateAIAgentInput {
     @Field(() => Int, { nullable: true })
     DefaultPromptEffortLevel?: number | null;
 
+    @Field({ nullable: true })
+    ChatHandlingOption?: string | null;
+
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
@@ -39164,6 +39174,10 @@ export class ComponentLibrary_ {
     @Field({nullable: true, description: `JSON object defining dependencies for this component library. Format: { "libraryName": "versionSpec", ... }. Version specifications follow NPM-style syntax (e.g., "~1.0.0", "^1.2.3", "2.3.4"). Dependencies are loaded before this library to ensure proper execution context.`}) 
     Dependencies?: string;
         
+    @Field({description: `Controls how the library can be used: Direct (by components), Dependency (only as dependency), or Both`}) 
+    @MaxLength(100)
+    UsageType: string;
+        
     @Field(() => [ComponentLibraryLink_])
     MJ_ComponentLibraryLinks_LibraryIDArray: ComponentLibraryLink_[]; // Link to MJ_ComponentLibraryLinks
     
@@ -39209,6 +39223,9 @@ export class CreateComponentLibraryInput {
 
     @Field({ nullable: true })
     Dependencies: string | null;
+
+    @Field({ nullable: true })
+    UsageType?: string;
 }
     
 
@@ -39253,6 +39270,9 @@ export class UpdateComponentLibraryInput {
     @Field({ nullable: true })
     Dependencies?: string | null;
 
+    @Field({ nullable: true })
+    UsageType?: string;
+
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }

package/src/generic/RunViewResolver.ts

@@ -1,10 +1,11 @@
 import { Arg, Ctx, Field, InputType, Int, ObjectType, PubSubEngine, Query, Resolver } from 'type-graphql';
 import { AppContext } from '../types.js';
 import { ResolverBase } from './ResolverBase.js';
-import { LogError, LogStatus } from '@memberjunction/core';
+import { LogError, LogStatus, EntityInfo } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GetReadOnlyProvider } from '../util.js';
 import { UserViewEntityExtended } from '@memberjunction/core-entities';
+import { KeyValuePairOutputType } from './KeyInputOutputTypes.js';
 
 /********************************************************************************
  * The PURPOSE of this resolver is to provide a generic way to run a view and return the results.
@@ -384,8 +385,10 @@ export class RunViewGenericInput {
 
 @ObjectType()
 export class RunViewResultRow {
-  @Field(() => String)
-  ID: string;
+  @Field(() => [KeyValuePairOutputType], { 
+    description: 'Primary key values for the record' 
+  })
+  PrimaryKey: KeyValuePairOutputType[];
 
   @Field(() => String)
   EntityID: string;
@@ -396,8 +399,10 @@ export class RunViewResultRow {
 
 @ObjectType()
 export class RunViewGenericResultRow {
-  @Field(() => String)
-  ID: string;
+  @Field(() => [KeyValuePairOutputType], { 
+    description: 'Primary key values for the record' 
+  })
+  PrimaryKey: KeyValuePairOutputType[];
 
   @Field(() => String)
   EntityID: string;
@@ -469,7 +474,8 @@ export class RunViewResolver extends ResolverBase {
         return null;
 
       const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { Name: input.ViewName }, userPayload.userRecord));
-      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
+      const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
+      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -496,7 +502,8 @@ export class RunViewResolver extends ResolverBase {
         return null;
 
       const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
-      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
+      const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
+      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -522,7 +529,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) return null;
 
       const entity = provider.Entities.find((e) => e.Name === input.EntityName);
-      const returnData = this.processRawData(rawData.Results, entity.ID);
+      const returnData = this.processRawData(rawData.Results, entity.ID, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -552,7 +559,7 @@ export class RunViewResolver extends ResolverBase {
       let results: RunViewGenericResult[] = [];
       for (const [index, data] of rawData.entries()) {
         const entity = provider.Entities.find((e) => e.Name === input[index].EntityName);
-        const returnData: any[] = this.processRawData(data.Results, entity.ID);
+        const returnData: any[] = this.processRawData(data.Results, entity.ID, entity);
 
         results.push({
           Results: returnData,
@@ -594,7 +601,7 @@ export class RunViewResolver extends ResolverBase {
 
       const entity = provider.Entities.find((e) => e.Name === input.ViewName);
       const entityId = entity ? entity.ID : null;
-      const returnData = this.processRawData(rawData.Results, entityId);
+      const returnData = this.processRawData(rawData.Results, entityId, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -640,7 +647,8 @@ export class RunViewResolver extends ResolverBase {
       }
 
       const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
-      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
+      const entity = provider.Entities.find((e) => e.ID === viewInfo.EntityID);
+      const returnData = this.processRawData(rawData.Results, viewInfo.EntityID, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -698,7 +706,7 @@ export class RunViewResolver extends ResolverBase {
           ExecutionTime: 0
         };
       }
-      const returnData = this.processRawData(rawData.Results, entity.ID);
+      const returnData = this.processRawData(rawData.Results, entity.ID, entity);
       return {
         Results: returnData,
         UserViewRunID: rawData?.UserViewRunID,
@@ -743,7 +751,7 @@ export class RunViewResolver extends ResolverBase {
           LogError(new Error(`Entity with name ${input[index].EntityName} not found`));
           continue;
         }
-        const returnData: any[] = this.processRawData(data.Results, entity.ID);
+        const returnData: any[] = this.processRawData(data.Results, entity.ID, entity);
 
         results.push({
           Results: returnData,
@@ -763,12 +771,19 @@ export class RunViewResolver extends ResolverBase {
     }
   }
 
-  protected processRawData(rawData: any[], entityId: string): RunViewResultRow[] {
+  protected processRawData(rawData: any[], entityId: string, entityInfo: EntityInfo): RunViewResultRow[] {
     const returnResult = [];
     for (let i = 0; i < rawData.length; i++) {
       const row = rawData[i];
+      
+      // Build the primary key array from the entity's primary key fields
+      const primaryKey: KeyValuePairOutputType[] = entityInfo.PrimaryKeys.map(pk => ({
+        FieldName: pk.Name,
+        Value: row[pk.Name]?.toString() || ''
+      }));
+      
       returnResult.push({
-        ID: row.ID.toString(),
+        PrimaryKey: primaryKey,
         EntityID: entityId,
         Data: JSON.stringify(row),
       });

package/src/index.ts

@@ -92,6 +92,7 @@ export * from './generic/DeleteOptionsInput.js';
 
 export * from './resolvers/AskSkipResolver.js';
 export * from './resolvers/ColorResolver.js';
+export * from './resolvers/ComponentRegistryResolver.js';
 export * from './resolvers/DatasetResolver.js';
 export * from './resolvers/EntityRecordNameResolver.js';
 export * from './resolvers/MergeRecordsResolver.js';

package/src/resolvers/AskSkipResolver.ts

@@ -54,7 +54,7 @@ import {
   UserNotificationEntity,
   AIAgentEntityExtended
 } from '@memberjunction/core-entities';
-import { apiKey, baseUrl, publicUrl, configInfo, graphqlPort, graphqlRootPath, mj_core_schema } from '../config.js';
+import { apiKey as callbackAPIKey, AskSkipInfo, baseUrl, publicUrl, configInfo, graphqlPort, graphqlRootPath, mj_core_schema } from '../config.js';
 import mssql from 'mssql';
 
 import { registerEnumType } from 'type-graphql';
@@ -445,7 +445,9 @@ type BaseSkipRequest = {
   /** API key for the calling server */
   callingServerAPIKey: string,
   /** Access token for the calling server */
-  callingServerAccessToken: string
+  callingServerAccessToken: string,
+  /** Email of the user making the request */
+  userEmail: string
 }
 /**
  * Resolver for Skip AI interactions
@@ -729,7 +731,7 @@ export class AskSkipResolver {
     const skipConfigInfo = configInfo.askSkip;
     LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${skipConfigInfo.learningCycleURL}`);
 
-    const response = await sendPostRequest(skipConfigInfo.learningCycleURL, input, true, null);
+    const response = await sendPostRequest(skipConfigInfo.learningCycleURL, input, true, this.buildSkipPostHeaders());
 
     if (response && response.length > 0) {
       // the last object in the response array is the final response from the Skip API
@@ -790,7 +792,7 @@ export class AskSkipResolver {
     LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${skipConfigInfo.chatURL}`);
 
     try {
-      const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, null);
+      const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, this.buildSkipPostHeaders());
 
       if (response && response.length > 0) {
         // the last object in the response array is the final response from the Skip API
@@ -1054,6 +1056,7 @@ cycle.`);
       queries,
       notes,
       noteTypes,
+      userEmail: contextUser.Email,
       requests, 
       accessToken,
       organizationID: skipConfigInfo.orgID,
@@ -1062,7 +1065,7 @@ cycle.`);
       // Favors public URL for conciseness or when behind a proxy for local development
       // otherwise uses base URL and GraphQL port/path from configuration
       callingServerURL: accessToken ? (publicUrl || `${baseUrl}:${graphqlPort}${graphqlRootPath}`) : undefined,
-      callingServerAPIKey: accessToken ? apiKey : undefined,
+      callingServerAPIKey: accessToken ? callbackAPIKey : undefined,
       callingServerAccessToken: accessToken ? accessToken.Token : undefined
     };
   }
@@ -2459,7 +2462,7 @@ cycle.`);
         skipConfigInfo.chatURL,
         input,
         true,
-        null,
+        this.buildSkipPostHeaders(),
         (message: {
           type: string;
           value: {
@@ -2605,6 +2608,12 @@ cycle.`);
     }
   }
 
+  protected buildSkipPostHeaders(): { [key: string]: string } {
+    return {
+      'x-api-key': configInfo.askSkip?.apiKey ?? '',
+    };
+  }
+
   /**
    * Publishes a status update message to the user based on the Skip API response
    * Provides feedback about what phase of processing is happening