@memberjunction/server 2.0.0 → 2.1.1

package/CHANGELOG.json

@@ -1,6 +1,135 @@
 {
   "name": "@memberjunction/server",
   "entries": [
+    {
+      "date": "Fri, 26 Jul 2024 17:51:36 GMT",
+      "version": "2.1.1",
+      "tag": "@memberjunction/server_v2.1.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/actions to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/ai to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/ai-mistral to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/ai-openai to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/ai-vectors-pinecone to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/aiengine to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/core to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/core-actions to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/core-entities to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/data-context to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/data-context-server to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/doc-utils to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/entity-communications-server to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/external-change-detection to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/global to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/queue to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/skip-types to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/sqlserver-dataprovider to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/storage to v2.1.1",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@memberjunction/server",
+            "comment": "Bump @memberjunction/templates to v2.1.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 21 Jun 2024 13:15:28 GMT",
       "version": "1.8.1",

package/CHANGELOG.md

@@ -1,9 +1,36 @@
 # Change Log - @memberjunction/server
 
-This log was last generated on Fri, 21 Jun 2024 13:15:28 GMT and should not be manually modified.
+This log was last generated on Fri, 26 Jul 2024 17:51:36 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.1.1
+
+Fri, 26 Jul 2024 17:51:36 GMT
+
+### Patches
+
+- Bump @memberjunction/actions to v2.1.1
+- Bump @memberjunction/ai to v2.1.1
+- Bump @memberjunction/ai-mistral to v2.1.1
+- Bump @memberjunction/ai-openai to v2.1.1
+- Bump @memberjunction/ai-vectors-pinecone to v2.1.1
+- Bump @memberjunction/aiengine to v2.1.1
+- Bump @memberjunction/core to v2.1.1
+- Bump @memberjunction/core-actions to v2.1.1
+- Bump @memberjunction/core-entities to v2.1.1
+- Bump @memberjunction/data-context to v2.1.1
+- Bump @memberjunction/data-context-server to v2.1.1
+- Bump @memberjunction/doc-utils to v2.1.1
+- Bump @memberjunction/entity-communications-server to v2.1.1
+- Bump @memberjunction/external-change-detection to v2.1.1
+- Bump @memberjunction/global to v2.1.1
+- Bump @memberjunction/queue to v2.1.1
+- Bump @memberjunction/skip-types to v2.1.1
+- Bump @memberjunction/sqlserver-dataprovider to v2.1.1
+- Bump @memberjunction/storage to v2.1.1
+- Bump @memberjunction/templates to v2.1.1
+
 ## 1.8.1
 
 Fri, 21 Jun 2024 13:15:28 GMT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -15,26 +15,26 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/actions": "2.0.0",
-    "@memberjunction/ai": "2.0.0",
-    "@memberjunction/ai-mistral": "2.0.0",
-    "@memberjunction/ai-openai": "2.0.0",
-    "@memberjunction/ai-vectors-pinecone": "2.0.0",
-    "@memberjunction/aiengine": "2.0.0",
-    "@memberjunction/core": "2.0.0",
-    "@memberjunction/core-actions": "2.0.0",
-    "@memberjunction/core-entities": "2.0.0",
-    "@memberjunction/data-context": "2.0.0",
-    "@memberjunction/data-context-server": "2.0.0",
-    "@memberjunction/doc-utils": "2.0.0",
-    "@memberjunction/entity-communications-server": "2.0.0",
-    "@memberjunction/external-change-detection": "2.0.0",
-    "@memberjunction/global": "2.0.0",
-    "@memberjunction/queue": "2.0.0",
-    "@memberjunction/skip-types": "2.0.0",
-    "@memberjunction/sqlserver-dataprovider": "2.0.0",
-    "@memberjunction/storage": "2.0.0",
-    "@memberjunction/templates": "2.0.0",
+    "@memberjunction/actions": "2.1.1",
+    "@memberjunction/ai": "2.1.1",
+    "@memberjunction/ai-mistral": "2.1.1",
+    "@memberjunction/ai-openai": "2.1.1",
+    "@memberjunction/ai-vectors-pinecone": "2.1.1",
+    "@memberjunction/aiengine": "2.1.1",
+    "@memberjunction/core": "2.1.1",
+    "@memberjunction/core-actions": "2.1.1",
+    "@memberjunction/core-entities": "2.1.1",
+    "@memberjunction/data-context": "2.1.1",
+    "@memberjunction/data-context-server": "2.1.1",
+    "@memberjunction/doc-utils": "2.1.1",
+    "@memberjunction/entity-communications-server": "2.1.1",
+    "@memberjunction/external-change-detection": "2.1.1",
+    "@memberjunction/global": "2.1.1",
+    "@memberjunction/queue": "2.1.1",
+    "@memberjunction/skip-types": "2.1.1",
+    "@memberjunction/sqlserver-dataprovider": "2.1.1",
+    "@memberjunction/storage": "2.1.1",
+    "@memberjunction/templates": "2.1.1",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",
     "@types/node": "20.14.2",
@@ -55,7 +55,7 @@
     "jsonwebtoken": "9.0.2",
     "jwks-rsa": "^3.0.0",
     "lru-cache": "^10.0.0",
-    "mssql": "^10.0.2",
+    "mssql": "^11.0.1",
     "reflect-metadata": "0.2.2",
     "rxjs": "^7.8.1",
     "type-graphql": "2.0.0-beta.3",

package/src/entitySubclasses/userViewEntity.server.ts

@@ -29,7 +29,7 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
      */
     protected async GetAIModel(): Promise<AIModelEntityExtended> {
         await AIEngine.Instance.Config(false, this.ContextCurrentUser); // most of the time this is already loaded, but just in case it isn't we will load it here
-        const models = AIEngine.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' && 
+        const models = AIEngine.Instance.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' && 
                                                    m.Vendor.trim().toLowerCase() === this.AIVendorName.trim().toLowerCase())  
         // next, sort the models by the PowerRank field so that the highest power rank model is the first array element
         models.sort((a, b) => b.PowerRank - a.PowerRank); // highest power rank first

package/src/generated/generated.ts

@@ -2,7 +2,7 @@
 * ALL ENTITIES - TypeGraphQL Type Class Definition - AUTO GENERATED FILE
 * Generated Entities and Resolvers for Server
 *
-* GENERATED: 7/21/2024, 10:58:05 AM
+* GENERATED: 7/24/2024, 2:44:16 PM
 *
 *   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
 *   >>> YOUR CHANGES WILL BE OVERWRITTEN
@@ -89,6 +89,14 @@ export class ScheduledAction_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(200)
+    CreatedByUser: string;
+        
+    @Field() 
+    @MaxLength(850)
+    Action: string;
+        
     @Field(() => [ScheduledActionParam_])
     ScheduledActionParamsArray: ScheduledActionParam_[]; // Link to ScheduledActionParams
     
@@ -312,6 +320,14 @@ export class ScheduledActionParam_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(510)
+    ScheduledAction: string;
+        
+    @Field() 
+    @MaxLength(510)
+    ActionParam: string;
+        
 }
 
 //****************************************************************************
@@ -7192,6 +7208,10 @@ export class List_ {
     @MaxLength(200)
     User: string;
         
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    Category?: string;
+        
     @Field(() => [ListDetail_])
     ListDetailsArray: ListDetail_[]; // Link to ListDetails
     
@@ -8781,6 +8801,14 @@ export class AuditLog_ {
     @MaxLength(200)
     User: string;
         
+    @Field() 
+    @MaxLength(100)
+    AuditLogType: string;
+        
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    Authorization?: string;
+        
     @Field({nullable: true}) 
     @MaxLength(510)
     Entity?: string;
@@ -9111,6 +9139,14 @@ export class AuthorizationRole_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(200)
+    Authorization: string;
+        
+    @Field() 
+    @MaxLength(100)
+    Role: string;
+        
 }
 //****************************************************************************
 // RESOLVER for Authorization Roles
@@ -9210,6 +9246,10 @@ export class AuditLogType_ {
     @MaxLength(100)
     Parent?: string;
         
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    Authorization?: string;
+        
     @Field(() => [AuditLogType_])
     AuditLogTypesArray: AuditLogType_[]; // Link to AuditLogTypes
     
@@ -9445,7 +9485,7 @@ export class EntityFieldValueResolver extends ResolverBase {
 //****************************************************************************
 // ENTITY CLASS for AI Models
 //****************************************************************************
-@ObjectType({ description: 'Catalog of all AI Models configured in the system' })
+@ObjectType({ description: 'Catalog of all AI Models configured in the system.' })
 export class AIModel_ {
     @Field() 
     @MaxLength(16)
@@ -9502,15 +9542,15 @@ export class AIModel_ {
     @Field(() => [EntityDocument_])
     EntityDocumentsArray: EntityDocument_[]; // Link to EntityDocuments
     
-    @Field(() => [EntityAIAction_])
-    EntityAIActionsArray: EntityAIAction_[]; // Link to EntityAIActions
-    
     @Field(() => [AIModelAction_])
     AIModelActionsArray: AIModelAction_[]; // Link to AIModelActions
     
     @Field(() => [VectorIndex_])
     VectorIndexesArray: VectorIndex_[]; // Link to VectorIndexes
     
+    @Field(() => [EntityAIAction_])
+    EntityAIActionsArray: EntityAIAction_[]; // Link to EntityAIActions
+    
 }
 
 //****************************************************************************
@@ -9662,14 +9702,6 @@ export class AIModelResolver extends ResolverBase {
         return result;
     }
         
-    @FieldResolver(() => [EntityAIAction_])
-    async EntityAIActionsArray(@Root() aimodel_: AIModel_, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
-        this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwEntityAIActions] WHERE [AIModelID]='${aimodel_.ID}' ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, EntityPermissionType.Read, 'AND');
-        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
-        return result;
-    }
-        
     @FieldResolver(() => [AIModelAction_])
     async AIModelActionsArray(@Root() aimodel_: AIModel_, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
         this.CheckUserReadPermissions('AI Model Actions', userPayload);
@@ -9686,6 +9718,14 @@ export class AIModelResolver extends ResolverBase {
         return result;
     }
         
+    @FieldResolver(() => [EntityAIAction_])
+    async EntityAIActionsArray(@Root() aimodel_: AIModel_, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        this.CheckUserReadPermissions('Entity AI Actions', userPayload);
+        const sSQL = `SELECT * FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwEntityAIActions] WHERE [AIModelID]='${aimodel_.ID}' ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
+        return result;
+    }
+        
     @Mutation(() => AIModel_)
     async CreateAIModel(
         @Arg('input', () => CreateAIModelInput) input: CreateAIModelInput,
@@ -12772,6 +12812,10 @@ export class DatasetItem_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(200)
+    Dataset: string;
+        
     @Field() 
     @MaxLength(510)
     Entity: string;
@@ -13078,6 +13122,10 @@ export class Conversation_ {
     @MaxLength(510)
     LinkedEntity?: string;
         
+    @Field({nullable: true}) 
+    @MaxLength(510)
+    DataContext?: string;
+        
     @Field(() => [ConversationDetail_])
     ConversationDetailsArray: ConversationDetail_[]; // Link to ConversationDetails
     
@@ -13277,9 +13325,6 @@ export class UserNotification_ {
     @MaxLength(16)
     ResourceTypeID?: string;
         
-    @Field(() => Int, {nullable: true}) 
-    ResourceRecordID?: number;
-        
     @Field({nullable: true}) 
     ResourceConfiguration?: string;
         
@@ -13298,6 +13343,10 @@ export class UserNotification_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field({nullable: true}) 
+    @MaxLength(16)
+    ResourceRecordID?: string;
+        
     @Field() 
     @MaxLength(200)
     User: string;
@@ -13325,9 +13374,6 @@ export class CreateUserNotificationInput {
     @Field({ nullable: true })
     ResourceTypeID?: string;
 
-    @Field(() => Int, { nullable: true })
-    ResourceRecordID?: number;
-
     @Field({ nullable: true })
     ResourceConfiguration?: string;
 
@@ -13336,6 +13382,9 @@ export class CreateUserNotificationInput {
 
     @Field({ nullable: true })
     ReadAt?: Date;
+
+    @Field({ nullable: true })
+    ResourceRecordID?: string;
 }
     
 
@@ -13359,9 +13408,6 @@ export class UpdateUserNotificationInput {
     @Field({ nullable: true })
     ResourceTypeID?: string;
 
-    @Field(() => Int, { nullable: true })
-    ResourceRecordID?: number;
-
     @Field({ nullable: true })
     ResourceConfiguration?: string;
 
@@ -13371,6 +13417,9 @@ export class UpdateUserNotificationInput {
     @Field({ nullable: true })
     ReadAt?: Date;
 
+    @Field({ nullable: true })
+    ResourceRecordID?: string;
+
     @Field(() => [KeyValuePairInput], { nullable: true })
     OldValues___?: KeyValuePairInput[];
 }
@@ -13817,6 +13866,10 @@ export class RecordMergeLog_ {
     @MaxLength(200)
     InitiatedByUser: string;
         
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    ApprovedByUser?: string;
+        
     @Field(() => [RecordMergeDeletionLog_])
     RecordMergeDeletionLogsArray: RecordMergeDeletionLog_[]; // Link to RecordMergeDeletionLogs
     
@@ -14832,6 +14885,14 @@ export class QueryPermission_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(510)
+    Query: string;
+        
+    @Field() 
+    @MaxLength(100)
+    Role: string;
+        
 }
 
 //****************************************************************************
@@ -15617,6 +15678,18 @@ export class EntityRecordDocument_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(510)
+    Entity: string;
+        
+    @Field() 
+    @MaxLength(500)
+    EntityDocument: string;
+        
+    @Field() 
+    @MaxLength(510)
+    VectorIndex: string;
+        
 }
 
 //****************************************************************************
@@ -15817,6 +15890,18 @@ export class EntityDocument_ {
     @MaxLength(510)
     Entity: string;
         
+    @Field() 
+    @MaxLength(200)
+    VectorDatabase: string;
+        
+    @Field() 
+    @MaxLength(510)
+    Template: string;
+        
+    @Field() 
+    @MaxLength(100)
+    AIModel: string;
+        
     @Field(() => [EntityDocumentSetting_])
     EntityDocumentSettingsArray: EntityDocumentSetting_[]; // Link to EntityDocumentSettings
     
@@ -16449,6 +16534,10 @@ export class UserViewCategory_ {
     @MaxLength(200)
     Parent?: string;
         
+    @Field() 
+    @MaxLength(510)
+    Entity: string;
+        
     @Field() 
     @MaxLength(200)
     User: string;
@@ -18831,6 +18920,10 @@ export class ApplicationSetting_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field() 
+    @MaxLength(200)
+    Application: string;
+        
 }
 
 //****************************************************************************
@@ -19504,6 +19597,10 @@ export class ActionAuthorization_ {
     @MaxLength(850)
     Action: string;
         
+    @Field() 
+    @MaxLength(200)
+    Authorization: string;
+        
 }
 
 //****************************************************************************
@@ -21689,6 +21786,14 @@ export class ListCategory_ {
     @MaxLength(10)
     _mj__UpdatedAt: Date;
         
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    Parent?: string;
+        
+    @Field() 
+    @MaxLength(200)
+    User: string;
+        
     @Field(() => [ListCategory_])
     ListCategoriesArray: ListCategory_[]; // Link to ListCategories
     

package/src/generic/ResolverBase.ts

@@ -554,7 +554,8 @@ export class ResolverBase {
       const entityInfo = entityObject.EntityInfo;
       const clientNewValues = {};
       Object.keys(input).forEach((key) => {
-        if (key !== 'OldValues___') clientNewValues[key] = input[key];
+        if (key !== 'OldValues___') 
+          clientNewValues[key] = input[key];
       }); // grab all the props except for the OldValues property
 
       if (entityInfo.TrackRecordChanges || !input.OldValues___) {
@@ -629,7 +630,8 @@ export class ResolverBase {
       // we need to do a quick transform on the values to make sure they match the TS Type for the given field because item.Value will always be a string
       const field = entityObject.EntityInfo.Fields.find((f) => f.CodeName === item.Key);
       let val = item.Value;
-      if ((val === null || val === undefined) && field.DefaultValue !== null && field.DefaultValue !== undefined) val = field.DefaultValue; // set default value as the field was never set
+      if ((val === null || val === undefined) && field.DefaultValue !== null && field.DefaultValue !== undefined && !field.AllowsNull) 
+        val = field.DefaultValue; // set default value as the field was never set and it does NOT allow nulls
 
       if (field) {
         switch (field.TSType) {