npm - @solidxai/core - Versions diffs - 0.1.12-beta.1 → 0.1.12-beta.3 - Mend

@solidxai/core 0.1.12-beta.1 → 0.1.12-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (169) hide show

package/src/seeders/seed-data/email-templates/chatter-mention-notification.handlebars.html ADDED Viewed

@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8" />
+    <title>You were mentioned in a note</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style>
+        @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
+        body {
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f7;
+            font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
+            color: #333;
+        }
+        .email-wrapper {
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+        }
+        .logo {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+        .logo img {
+            height: 50px;
+        }
+        .content-box {
+            background-color: #ffffff;
+            padding: 40px;
+            border-radius: 8px;
+        }
+        .title {
+            font-size: 22px;
+            margin-bottom: 10px;
+        }
+        .intro {
+            font-size: 16px;
+            line-height: 1.6;
+            margin: 0;
+        }
+        .note-box {
+            background-color: #f7f3ff;
+            border-left: 4px solid #722ED1;
+            padding: 16px;
+            border-radius: 5px;
+            margin: 24px 0;
+        }
+        .note-label {
+            margin: 0 0 8px;
+            font-size: 13px;
+            font-weight: 700;
+            color: #722ED1;
+            text-transform: uppercase;
+            letter-spacing: 0.04em;
+        }
+        .note-box p {
+            margin: 0;
+            font-size: 16px;
+            line-height: 1.6;
+            white-space: pre-wrap;
+        }
+        .note-body {
+            font-weight: 700;
+            font-style: italic;
+            color: #2f2450;
+        }
+        .record-summary {
+            background-color: #fbfbfd;
+            border: 1px solid #ececf1;
+            padding: 14px;
+            border-radius: 5px;
+            margin-bottom: 24px;
+        }
+        .record-summary p {
+            margin: 0 0 8px;
+            font-size: 14px;
+            line-height: 1.5;
+        }
+        .button-container {
+            text-align: center;
+            margin-bottom: 30px;
+            margin-top: 20px;
+        }
+        .button {
+            display: inline-block;
+            padding: 12px 24px;
+            background-color: #722ED1;
+            color: #ffffff;
+            text-decoration: none;
+            font-weight: bold;
+            border-radius: 5px;
+        }
+        .footer-text {
+            font-size: 16px;
+            line-height: 1.6;
+        }
+        .footer {
+            text-align: center;
+            font-size: 12px;
+            color: #6b6e76;
+            margin-top: 40px;
+        }
+        @media only screen and (max-width: 600px) {
+            .email-wrapper {
+                width: 100% !important;
+                padding: 20px 0 !important;
+                margin: 0;
+            }
+            .content-box {
+                padding: 20px !important;
+                border-radius: 0;
+            }
+            .title {
+                font-size: 18px !important;
+            }
+            .button {
+                padding: 10px !important;
+                font-size: 14px;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="email-wrapper">
+        {{#if companyLogoUrl}}
+        <div class="logo">
+            <img src="{{companyLogoUrl}}" alt="Company Logo" />
+        </div>
+        {{/if}}
+        <div class="content-box">
+            <h2 class="title">Hi {{ mentionedUserDisplayName }},</h2>
+            <p class="intro">
+                <strong>{{ mentionedByDisplayName }}</strong> mentioned you in a note on
+                <strong>{{ entityDisplayName }}</strong>{{#if entityUserKey}} <strong>{{ entityUserKey }}</strong>{{/if}}.
+            </p>
+            <div class="note-box">
+                <p class="note-label" style="margin: 0 0 8px; font-size: 13px; font-weight: 700; color: #722ED1; text-transform: uppercase; letter-spacing: 0.04em;">
+                    Note
+                </p>
+                <p class="note-body" style="margin: 0; font-size: 16px; line-height: 1.6; white-space: pre-wrap; font-weight: 700; font-style: italic; color: #2f2450;">
+                    {{ noteBody }}
+                </p>
+            </div>
+            <div class="record-summary">
+                <p><strong>Record:</strong> {{ entityDisplayName }}{{#if entityUserKey}} - {{ entityUserKey }}{{/if}}</p>
+                <p><strong>Mentioned by:</strong> {{ mentionedByDisplayName }}{{#if mentionedByEmail}} ({{ mentionedByEmail }}){{/if}}</p>
+            </div>
+            <p class="intro">
+                To view the note and reply to {{ mentionedByDisplayName }}, open the record below.
+            </p>
+            <div class="button-container">
+                <a href="{{ entityFormUrl }}" class="button" target="_blank">
+                    Open Record
+                </a>
+            </div>
+            <p class="intro">
+                Regards,
+                <br />
+                The {{ solidAppName }} Team.
+            </p>
+        </div>
+        <div class="footer">
+            © 2025 <a href="{{ solidAppWebsiteUrl }}" target="_blank">{{ solidAppName }}</a>. All rights reserved.
+        </div>
+    </div>
+</body>
+</html>

package/src/seeders/seed-data/solid-core-metadata.json CHANGED Viewed

@@ -1704,6 +1704,18 @@
             "columnName": "original_file_name",
             "isSystem": true
           },
+          {
+            "name": "isPublic",
+            "displayName": "Is Public",
+            "type": "boolean",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "columnName": "is_public",
+            "isSystem": true
+          },
           {
             "name": "modelMetadata",
             "displayName": "Model Metadata",
@@ -3911,6 +3923,18 @@
             "encrypt": false,
             "isSystem": false
           },
+          {
+            "name": "messageBodyMentions",
+            "displayName": "Message Body Mentions",
+            "type": "longText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
           {
             "name": "coModelEntityId",
             "displayName": "CoModel Entity Id",
@@ -5294,6 +5318,9 @@
         "FieldMetadataController.getSelectionDynamicValues",
         "FieldMetadataController.getSelectionDynamicValue",
         "FieldMetadataController.findFieldDefaultMetaData",
+        "MediaController.findMany",
+        "MediaController.findOne",
+        "MediaController.download",
         "SavedFiltersController.delete",
         "SavedFiltersController.deleteMany",
         "SavedFiltersController.findOne",
@@ -8595,9 +8622,9 @@
                             "attrs": {
                               "name": "roles",
                               "widget": "checkbox",
-                              "inlineCreateAutoSave": "true",
+                              "inlineCreateAutoSave": "false",
                               "renderModeCheckboxPreprocessor": "MenuItemMetadataRolesFormFieldPreprocessor",
-                              "inlineCreate": "true",
+                              "inlineCreate": "false",
                               "inlineCreateLayout": {
                                 "type": "form",
                                 "attrs": {
@@ -8746,6 +8773,13 @@
               "sortable": false
             }
           },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "isPublic",
+              "sortable": true
+            }
+          },
           {
             "type": "field",
             "attrs": {
@@ -8841,6 +8875,14 @@
                   "isSearchable": true
                 }
               },
+              {
+                "type": "field",
+                "attrs": {
+                  "name": "isPublic",
+                  "label": "isPublic",
+                  "isSearchable": true
+                }
+              },
               {
                 "type": "field",
                 "attrs": {
@@ -8909,6 +8951,12 @@
                       "name": "mediaStorageProviderMetadata"
                     }
                   },
+                  {
+                    "type": "field",
+                    "attrs": {
+                      "name": "isPublic"
+                    }
+                  },
                   {
                     "type": "field",
                     "attrs": {
@@ -14461,6 +14509,15 @@
       "description": "Welcome email sent to users after signup.",
       "active": true,
       "type": "text"
+    },
+    {
+      "name": "chatter-mention-notification",
+      "displayName": "Default: Chatter Mention Notification",
+      "body": "chatter-mention-notification.handlebars.html",
+      "subject": "{{mentionedByDisplayName}} mentioned you in {{entityDisplayName}}",
+      "description": "This template notifies users when they are mentioned in a custom chatter note.",
+      "active": true,
+      "type": "text"
     }
   ],
   "smsTemplates": [
@@ -14504,7 +14561,15 @@
   "mediaStorageProviders": [
     {
       "name": "default-filesystem",
-      "type": "filesystem"
+      "type": "filesystem",
+      "isPublic": true,
+      "localPath": "media-files-storage"
+    },
+    {
+      "name": "private-filesystem",
+      "type": "filesystem",
+      "isPublic": false,
+      "localPath": "media-private-files-storage"
     },
     {
       "name": "default-aws-s3",
@@ -14540,6 +14605,47 @@
           }
         }
       }
+    },
+    {
+      "name": "model:Media-role:Internal User-own",
+      "description": "Show Media records owned by the current user",
+      "roleUserKey": "Internal User",
+      "modelMetadataUserKey": "media",
+      "securityRuleConfig": {
+        "filters": {
+          "createdBy": {
+            "$eq": "$activeUserId"
+          }
+        }
+      }
+    },
+    {
+      "name": "model:Media-role:Internal User-public",
+      "description": "Show public Media records",
+      "roleUserKey": "Internal User",
+      "modelMetadataUserKey": "media",
+      "securityRuleConfig": {
+        "filters": {
+          "mediaStorageProviderMetadata": {
+            "isPublic": {
+              "$eq": true
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "model:Media-role:Admin",
+      "description": "Show All Media records",
+      "roleUserKey": "Admin",
+      "modelMetadataUserKey": "media",
+      "securityRuleConfig": {
+        "filters": {
+          "id": {
+            "$ne": "0"
+          }
+        }
+      }
     }
   ],
   "modelSequences": [],

package/src/services/chatter-message.service.ts CHANGED Viewed

@@ -11,6 +11,7 @@ import { PostChatterMessageDto } from 'src/dtos/post-chatter-message.dto';
 import { UpdateChatterNoteMessageDto } from 'src/dtos/update-chatter-note-message.dto';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
 import { lowerFirst } from 'src/helpers/string.helper';
+import { ChatterMentionNotificationPayload } from 'src/interfaces/chatter-mention-notification.interface';
 import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-details.repository';
 import { ChatterMessageRepository } from 'src/repository/chatter-message.repository';
 import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
@@ -24,6 +25,14 @@ import { getMediaStorageProvider } from './mediaStorageProviders';
 import { RequestContextService } from './request-context.service';
 import { Logger } from '@nestjs/common';
 import { SolidIntrospectService } from './solid-introspect.service';
+import { PublisherFactory } from './queues/publisher-factory.service';
+interface ChatterMention {
+    username: string;
+    display_name?: string;
+    displayName?: string;
+    id?: string | number;
+}
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
@@ -47,6 +56,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         private readonly modelMetadataRepo: ModelMetadataRepository,
         readonly requestContextService: RequestContextService,
         private readonly modelMetadataHelperService: ModelMetadataHelperService,
+        private readonly publisherFactory: PublisherFactory<ChatterMentionNotificationPayload>,
     ) {
         super(entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
     }
@@ -106,6 +116,78 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             .filter(v => Number.isInteger(v) && v > 0);
     }
+    private parseMessageBodyMentions(value?: string): ChatterMention[] {
+        if (!value || typeof value !== 'string') return [];
+        try {
+            const parsed = JSON.parse(value);
+            return Array.isArray(parsed) ? parsed : [];
+        } catch {
+            return [];
+        }
+    }
+    private renderMentionTokens(messageBody: string, mentions: ChatterMention[]) {
+        return mentions.reduce((nextMessage, mention, index) => {
+            const username = mention.username;
+            if (!username) return nextMessage;
+            return nextMessage.replace(new RegExp(`\\{\\{\\s*${index}\\s*\\}\\}`, 'g'), `@${username}`);
+        }, messageBody || '');
+    }
+    private async publishChatterMentionNotifications(message: ChatterMessage, model: any) {
+        if (message.messageType !== CHATTER_MESSAGE_TYPE.CUSTOM || message.messageSubType !== CHATTER_MESSAGE_SUBTYPE.NOTE) {
+            return;
+        }
+        const mentions = this.parseMessageBodyMentions(message.messageBodyMentions);
+        const mentionUserIds = mentions
+            .map(mention => Number(mention.id))
+            .filter(id => Number.isInteger(id) && id > 0);
+        const uniqueMentionUserIds = Array.from(new Set(mentionUserIds));
+        if (uniqueMentionUserIds.length === 0) return;
+        const activeUser = this.requestContextService.getActiveUser();
+        const payload: ChatterMentionNotificationPayload = {
+            templateName: 'chatter-mention-notification',
+            mentions: mentions.map(mention => ({
+                id: Number(mention.id) || undefined,
+                username: mention.username,
+                displayName: mention.display_name || mention.displayName || mention.username,
+            })),
+            actor: {
+                id: activeUser?.sub,
+                username: activeUser?.username,
+                email: activeUser?.email,
+            },
+            noteBody: this.renderMentionTokens(message.messageBody, mentions),
+            entity: {
+                id: message.coModelEntityId,
+                modelName: model?.singularName || message.coModelName,
+                moduleName: model?.module?.name,
+                displayName: model?.displayName || message.coModelName,
+                userKey: message.modelUserKey,
+            },
+            parentEntity: 'chatterMessage',
+            parentEntityId: message.id,
+        };
+        try {
+            await this.publisherFactory.publish(
+                {
+                    payload,
+                    parentEntity: 'chatterMessage',
+                    parentEntityId: message.id,
+                    retryCount: 3,
+                    retryInterval: 5000,
+                },
+                'ChatterMentionNotificationEmailQueuePublisher',
+            );
+        } catch (error: any) {
+            this._logger.error(`Failed to publish chatter mention notification email job: ${error.message}`, error.stack);
+        }
+    }
     async markCompleted(id: number) {
         const activeUser = this.requestContextService.getActiveUser();
         if (!activeUser) {
@@ -146,10 +228,11 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const removeAttachmentIds = this.parseAttachmentIds(updateDto?.removeAttachmentIds);
         const hasMessageBody = typeof updateDto?.messageBody === 'string';
+        const hasMessageBodyMentions = typeof updateDto?.messageBodyMentions === 'string';
         const trimmedMessageBody = (updateDto?.messageBody ?? '').trim();
         const hasNewFiles = Array.isArray(files) && files.length > 0;
-        if (!hasMessageBody && removeAttachmentIds.length === 0 && !hasNewFiles) {
+        if (!hasMessageBody && !hasMessageBodyMentions && removeAttachmentIds.length === 0 && !hasNewFiles) {
             throw new BadRequestException('No note changes submitted.');
         }
@@ -160,6 +243,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         if (hasMessageBody) {
             message.messageBody = trimmedMessageBody;
         }
+        if (hasMessageBodyMentions) {
+            message.messageBodyMentions = updateDto.messageBodyMentions;
+        }
+        const model = await this.modelMetadataRepo.findOne({
+            where: { singularName: message.coModelName },
+            relations: { module: true }
+        });
         message.updatedBy = activeUser.sub;
         // Ensure updatedAt changes even for attachment-only edits.
         message.updatedAt = new Date();
@@ -214,6 +304,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
+        await this.publishChatterMentionNotifications(savedMessage, model);
         return savedMessage;
     }
@@ -226,13 +318,14 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         chatterMessage.messageSubType = postDto.messageSubType || CHATTER_MESSAGE_SUBTYPE.CUSTOM;
         chatterMessage.status = postDto.status ?? CHATTER_MESSAGE_STATUS.PENDING;
         chatterMessage.messageBody = postDto.messageBody;
+        chatterMessage.messageBodyMentions = postDto.messageBodyMentions;
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
         chatterMessage.coModelName = coModelName;
         chatterMessage.modelUserKey = postDto.modelUserKey ?? null;
         const model = await this.modelMetadataRepo.findOne({
             where: { singularName: coModelName },
-            relations: { userKeyField: true }
+            relations: { userKeyField: true, module: true }
         });
         chatterMessage.modelDisplayName = model?.displayName ?? null;
@@ -262,6 +355,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             }
         }
+        await this.publishChatterMentionNotifications(savedMessage, model);
         return savedMessage;
     }

package/src/services/media-download-url.service.ts ADDED Viewed

@@ -0,0 +1,67 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { JwtService } from '@nestjs/jwt';
+import { MediaStorageProviderType } from 'src/dtos/create-media-storage-provider-metadata.dto';
+import { MediaStorageProviderMetadata } from 'src/entities/media-storage-provider-metadata.entity';
+import { S3FileService } from 'src/services/file';
+import { getEffectiveS3Region } from 'src/services/media-storage.utils';
+import { SettingService } from 'src/services/setting.service';
+import type { SolidCoreSetting } from 'src/services/settings/default-settings-provider.service';
+export const MEDIA_DOWNLOAD_TOKEN_AUDIENCE = 'media-download';
+const DEFAULT_SIGNED_URL_EXPIRY_MINUTES = 60;
+export interface MediaDownloadTokenPayload {
+  mediaId: number;
+}
+@Injectable()
+export class MediaDownloadUrlService {
+  private readonly logger = new Logger(MediaDownloadUrlService.name);
+  constructor(
+    private readonly jwtService: JwtService,
+    private readonly s3FileService: S3FileService,
+    private readonly settingService: SettingService,
+    private readonly configService: ConfigService,
+  ) { }
+  async resolveDownloadUrl(mediaId: number, relativeUri: string, storageProvider?: MediaStorageProviderMetadata): Promise<string> {
+    const expiryMinutes = storageProvider?.signedUrlExpiry ?? DEFAULT_SIGNED_URL_EXPIRY_MINUTES;
+    if ((storageProvider?.type as MediaStorageProviderType) === MediaStorageProviderType.AwsS3) {
+      if (storageProvider?.bucketName) {
+        return this.s3FileService.getUrl(
+          `${storageProvider.bucketName}:${relativeUri}`,
+          { region: getEffectiveS3Region(this.configService, storageProvider.region), expiresIn: expiryMinutes * 60 },
+        );
+      }
+      this.logger.warn(`Media id ${mediaId}: AwsS3 provider missing bucketName; falling back to app-hosted token URL`);
+    }
+    // Filesystem (or misconfigured S3) has no native presigned-URL mechanism, so mint our
+    // own short-lived token and embed it in the download URL - the token alone authorizes
+    // the request (see MediaSignedUrlGuard), so it works in a plain <img src> with no
+    // Authorization header needed.
+    const token = await this.mintDownloadToken(mediaId, expiryMinutes);
+    const downloadPath = `/api/media/${mediaId}/download?token=${token}`;
+    const baseUrl = this.settingService.getConfigValue<SolidCoreSetting>('baseUrl');
+    return `${String(baseUrl).replace(/\/+$/, '')}${downloadPath}`;
+  }
+  async verifyDownloadToken(token: string): Promise<MediaDownloadTokenPayload> {
+    return this.jwtService.verifyAsync<MediaDownloadTokenPayload>(token, {
+      secret: this.settingService.getConfigValue<SolidCoreSetting>('secret'),
+      audience: MEDIA_DOWNLOAD_TOKEN_AUDIENCE,
+    });
+  }
+  private mintDownloadToken(mediaId: number, expiryMinutes: number): Promise<string> {
+    const payload: MediaDownloadTokenPayload = { mediaId };
+    return this.jwtService.signAsync(payload, {
+      secret: this.settingService.getConfigValue<SolidCoreSetting>('secret'),
+      audience: MEDIA_DOWNLOAD_TOKEN_AUDIENCE,
+      expiresIn: expiryMinutes * 60,
+    });
+  }
+}