Merge branch 'main' into 706-refactor-roles-dialogs-add-edit-delete-permissions

This commit is contained in:
yassinedorbozgithub 2025-02-08 10:56:07 +01:00
commit 24bf9a9cb0
21 changed files with 868 additions and 758 deletions

44
api/package-lock.json generated
View File

@ -35,7 +35,6 @@
"dotenv": "^16.3.1",
"ejs": "^3.1.9",
"express-session": "^1.17.3",
"joi": "^17.11.0",
"module-alias": "^2.2.3",
"mongoose": "^8.0.0",
"mongoose-lean-defaults": "^2.2.1",
@ -3646,19 +3645,6 @@
"@nestjs/core": "^10.x"
}
},
"node_modules/@hapi/hoek": {
"version": "9.3.0",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
"integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
},
"node_modules/@hapi/topo": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
"dependencies": {
"@hapi/hoek": "^9.0.0"
}
},
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.13",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
@ -5329,24 +5315,6 @@
"url": "https://ko-fi.com/killymxi"
}
},
"node_modules/@sideway/address": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
"dependencies": {
"@hapi/hoek": "^9.0.0"
}
},
"node_modules/@sideway/formula": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
},
"node_modules/@sideway/pinpoint": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
},
"node_modules/@sinclair/typebox": {
"version": "0.27.8",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@ -13186,18 +13154,6 @@
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
"node_modules/joi": {
"version": "17.11.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
"integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
"dependencies": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
"@sideway/address": "^4.1.3",
"@sideway/formula": "^3.0.1",
"@sideway/pinpoint": "^2.0.0"
}
},
"node_modules/js-stringify": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",

View File

@ -70,7 +70,6 @@
"dotenv": "^16.3.1",
"ejs": "^3.1.9",
"express-session": "^1.17.3",
"joi": "^17.11.0",
"module-alias": "^2.2.3",
"mongoose": "^8.0.0",
"mongoose-lean-defaults": "^2.2.1",

View File

@ -6,14 +6,24 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { z } from 'zod';
import { PluginName } from '@/plugins/types';
import { Message } from '../message.schema';
import { AttachmentPayload } from './attachment';
import { Button } from './button';
import { ContentOptions } from './options';
import { StdQuickReply } from './quick-reply';
import { attachmentPayloadSchema } from './attachment';
import { buttonSchema } from './button';
import { contentOptionsSchema } from './options';
import { QuickReplyType, stdQuickReplySchema } from './quick-reply';
/**
* StdEventType enum is declared, and currently not used
@ -41,6 +51,10 @@ export enum IncomingMessageType {
unknown = '',
}
export const incomingMessageType = z.nativeEnum(IncomingMessageType);
export type IncomingMessageTypeLiteral = z.infer<typeof incomingMessageType>;
export enum OutgoingMessageFormat {
text = 'text',
quickReplies = 'quickReplies',
@ -50,6 +64,12 @@ export enum OutgoingMessageFormat {
carousel = 'carousel',
}
export const outgoingMessageFormatSchema = z.nativeEnum(OutgoingMessageFormat);
export type OutgoingMessageFormatLiteral = z.infer<
typeof outgoingMessageFormatSchema
>;
/**
* FileType enum is declared, and currently not used
**/
@ -61,6 +81,10 @@ export enum FileType {
unknown = 'unknown',
}
export const fileTypeSchema = z.nativeEnum(FileType);
export type FileTypeLiteral = z.infer<typeof fileTypeSchema>;
export enum PayloadType {
location = 'location',
attachments = 'attachments',
@ -68,85 +92,151 @@ export enum PayloadType {
button = 'button',
}
export type StdOutgoingTextMessage = { text: string };
export const payloadTypeSchema = z.nativeEnum(PayloadType);
export type StdOutgoingQuickRepliesMessage = {
text: string;
quickReplies: StdQuickReply[];
};
export type PayloadTypeLiteral = z.infer<typeof payloadTypeSchema>;
export type StdOutgoingButtonsMessage = {
text: string;
buttons: Button[];
};
export const stdOutgoingTextMessageSchema = z.object({
text: z.string(),
});
export type ContentElement = { id: string; title: string } & Record<
string,
any
export type StdOutgoingTextMessage = z.infer<
typeof stdOutgoingTextMessageSchema
>;
export type StdOutgoingListMessage = {
options: ContentOptions;
elements: ContentElement[];
pagination: {
total: number;
skip: number;
limit: number;
};
};
export const stdOutgoingQuickRepliesMessageSchema = z.object({
text: z.string(),
quickReplies: z.array(stdQuickReplySchema),
});
export type StdOutgoingAttachmentMessage = {
// Stored in DB as `AttachmentPayload`, `Attachment` when populated for channels relaying
attachment: AttachmentPayload;
quickReplies?: StdQuickReply[];
};
export type StdOutgoingQuickRepliesMessage = z.infer<
typeof stdOutgoingQuickRepliesMessageSchema
>;
export type StdPluginMessage = {
plugin: PluginName;
args: { [key: string]: any };
};
export const stdOutgoingButtonsMessageSchema = z.object({
text: z.string(),
buttons: z.array(buttonSchema),
});
export type BlockMessage =
| string[]
| StdOutgoingTextMessage
| StdOutgoingQuickRepliesMessage
| StdOutgoingButtonsMessage
| StdOutgoingListMessage
| StdOutgoingAttachmentMessage
| StdPluginMessage;
export type StdOutgoingButtonsMessage = z.infer<
typeof stdOutgoingButtonsMessageSchema
>;
export type StdOutgoingMessage =
| StdOutgoingTextMessage
| StdOutgoingQuickRepliesMessage
| StdOutgoingButtonsMessage
| StdOutgoingListMessage
| StdOutgoingAttachmentMessage;
export const contentElementSchema = z
.object({
id: z.string(),
title: z.string(),
})
.catchall(z.any());
type StdIncomingTextMessage = { text: string };
export type ContentElement = z.infer<typeof contentElementSchema>;
export type StdIncomingPostBackMessage = StdIncomingTextMessage & {
postback: string;
};
export const stdOutgoingListMessageSchema = z.object({
options: contentOptionsSchema,
elements: z.array(contentElementSchema),
pagination: z.object({
total: z.number(),
skip: z.number(),
limit: z.number(),
}),
});
export type StdIncomingLocationMessage = {
type: PayloadType.location;
coordinates: {
lat: number;
lon: number;
};
};
export type StdOutgoingListMessage = z.infer<
typeof stdOutgoingListMessageSchema
>;
export type StdIncomingAttachmentMessage = {
type: PayloadType.attachments;
serialized_text: string;
attachment: AttachmentPayload | AttachmentPayload[];
};
export const stdOutgoingAttachmentMessageSchema = z.object({
attachment: attachmentPayloadSchema,
quickReplies: z.array(stdQuickReplySchema).optional(),
});
export type StdIncomingMessage =
| StdIncomingTextMessage
| StdIncomingPostBackMessage
| StdIncomingLocationMessage
| StdIncomingAttachmentMessage;
export type StdOutgoingAttachmentMessage = z.infer<
typeof stdOutgoingAttachmentMessageSchema
>;
export const pluginNameSchema = z
.string()
.regex(/-plugin$/) as z.ZodType<PluginName>;
export const stdPluginMessageSchema = z.object({
plugin: pluginNameSchema,
args: z.record(z.any()),
});
export type StdPluginMessage = z.infer<typeof stdPluginMessageSchema>;
export const blockMessageSchema = z.union([
z.array(z.string()),
stdOutgoingTextMessageSchema,
stdOutgoingQuickRepliesMessageSchema,
stdOutgoingButtonsMessageSchema,
stdOutgoingListMessageSchema,
stdOutgoingAttachmentMessageSchema,
stdPluginMessageSchema,
]);
export type BlockMessage = z.infer<typeof blockMessageSchema>;
export const StdOutgoingMessageSchema = z.union([
stdOutgoingTextMessageSchema,
stdOutgoingQuickRepliesMessageSchema,
stdOutgoingButtonsMessageSchema,
stdOutgoingListMessageSchema,
stdOutgoingAttachmentMessageSchema,
]);
export type StdOutgoingMessage = z.infer<typeof StdOutgoingMessageSchema>;
export const stdIncomingTextMessageSchema = z.object({
text: z.string(),
});
export type StdIncomingTextMessage = z.infer<
typeof stdIncomingTextMessageSchema
>;
export const stdIncomingPostBackMessageSchema =
stdIncomingTextMessageSchema.extend({
postback: z.string(),
});
export type StdIncomingPostBackMessage = z.infer<
typeof stdIncomingPostBackMessageSchema
>;
export const stdIncomingLocationMessageSchema = z.object({
type: z.literal(PayloadType.location),
coordinates: z.object({
lat: z.number(),
lon: z.number(),
}),
});
export type StdIncomingLocationMessage = z.infer<
typeof stdIncomingLocationMessageSchema
>;
export const stdIncomingAttachmentMessageSchema = z.object({
type: z.literal(PayloadType.attachments),
serialized_text: z.string(),
attachment: z.union([
attachmentPayloadSchema,
z.array(attachmentPayloadSchema),
]),
});
export type StdIncomingAttachmentMessage = z.infer<
typeof stdIncomingAttachmentMessageSchema
>;
export const stdIncomingMessageSchema = z.union([
stdIncomingTextMessageSchema,
stdIncomingPostBackMessageSchema,
stdIncomingLocationMessageSchema,
stdIncomingAttachmentMessageSchema,
]);
export type StdIncomingMessage = z.infer<typeof stdIncomingMessageSchema>;
export interface IncomingMessage extends Omit<Message, 'recipient' | 'sentBy'> {
message: StdIncomingMessage;
@ -162,34 +252,149 @@ export interface OutgoingMessage extends Omit<Message, 'sender'> {
export type AnyMessage = IncomingMessage | OutgoingMessage;
export interface StdOutgoingTextEnvelope {
format: OutgoingMessageFormat.text;
message: StdOutgoingTextMessage;
}
export const stdOutgoingTextEnvelopeSchema = z.object({
format: z.literal(OutgoingMessageFormat.text),
message: stdOutgoingTextMessageSchema,
});
export interface StdOutgoingQuickRepliesEnvelope {
format: OutgoingMessageFormat.quickReplies;
message: StdOutgoingQuickRepliesMessage;
}
export type StdOutgoingTextEnvelope = z.infer<
typeof stdOutgoingTextEnvelopeSchema
>;
export interface StdOutgoingButtonsEnvelope {
format: OutgoingMessageFormat.buttons;
message: StdOutgoingButtonsMessage;
}
export const stdOutgoingQuickRepliesEnvelopeSchema = z.object({
format: z.literal(OutgoingMessageFormat.quickReplies),
message: stdOutgoingQuickRepliesMessageSchema,
});
export interface StdOutgoingListEnvelope {
format: OutgoingMessageFormat.list | OutgoingMessageFormat.carousel;
message: StdOutgoingListMessage;
}
export type StdOutgoingQuickRepliesEnvelope = z.infer<
typeof stdOutgoingQuickRepliesEnvelopeSchema
>;
export interface StdOutgoingAttachmentEnvelope {
format: OutgoingMessageFormat.attachment;
message: StdOutgoingAttachmentMessage;
}
export const stdOutgoingButtonsEnvelopeSchema = z.object({
format: z.literal(OutgoingMessageFormat.buttons),
message: stdOutgoingButtonsMessageSchema,
});
export type StdOutgoingEnvelope =
| StdOutgoingTextEnvelope
| StdOutgoingQuickRepliesEnvelope
| StdOutgoingButtonsEnvelope
| StdOutgoingListEnvelope
| StdOutgoingAttachmentEnvelope;
export type StdOutgoingButtonsEnvelope = z.infer<
typeof stdOutgoingButtonsEnvelopeSchema
>;
export const stdOutgoingListEnvelopeSchema = z.object({
format: z.enum(['list', 'carousel']),
message: stdOutgoingListMessageSchema,
});
export type StdOutgoingListEnvelope = z.infer<
typeof stdOutgoingListEnvelopeSchema
>;
export const stdOutgoingAttachmentEnvelopeSchema = z.object({
format: z.literal(OutgoingMessageFormat.attachment),
message: stdOutgoingAttachmentMessageSchema,
});
export type StdOutgoingAttachmentEnvelope = z.infer<
typeof stdOutgoingAttachmentEnvelopeSchema
>;
export const stdOutgoingEnvelopeSchema = z.union([
stdOutgoingTextEnvelopeSchema,
stdOutgoingQuickRepliesEnvelopeSchema,
stdOutgoingButtonsEnvelopeSchema,
stdOutgoingListEnvelopeSchema,
stdOutgoingAttachmentEnvelopeSchema,
]);
export type StdOutgoingEnvelope = z.infer<typeof stdOutgoingEnvelopeSchema>;
// is-valid-message-text validation
export const validMessageTextSchema = z.object({
message: z.string(),
});
// is-message validation
const MESSAGE_REGEX = /^function \(context\) \{[^]+\}/;
export const messageRegexSchema = z.string().regex(MESSAGE_REGEX);
export const textSchema = z.array(z.string().max(1000));
const quickReplySchema = z
.object({
content_type: z.nativeEnum(QuickReplyType),
title: z.string().max(20).optional(),
payload: z.string().max(1000).optional(),
})
.superRefine((data, ctx) => {
// When content_type is 'text', title and payload are required.
if (data.content_type === QuickReplyType.text) {
if (data.title == null) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Title is required when content_type is 'text'",
path: ['title'],
});
}
if (data.payload == null) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Payload is required when content_type is 'text'",
path: ['payload'],
});
}
}
});
// pluginBlockMessageSchema in case of Plugin Block
export const pluginBlockMessageSchema = z
.record(z.any())
.superRefine((data, ctx) => {
if (!('plugin' in data)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "The object must contain the 'plugin' attribute",
path: ['plugin'],
});
}
});
// textBlockMessageSchema in case of Text Block
const textBlockMessageSchema = z.string().max(1000);
const buttonMessageSchema = z.object({
text: z.string(),
buttons: z.array(buttonSchema).max(3),
});
// quickReplyMessageSchema in case of QuickReply Block
const quickReplyMessageSchema = z.object({
text: z.string(),
quickReplies: z.array(quickReplySchema).max(11).optional(),
});
// listBlockMessageSchema in case of List Block
const listBlockMessageSchema = z.object({
elements: z.boolean(),
});
// attachmentBlockMessageSchema in case of Attachment Block
const attachmentBlockMessageSchema = z.object({
text: z.string().max(1000).optional(),
attachment: z.object({
type: z.nativeEnum(FileType),
payload: z.union([
z.object({ url: z.string().url() }),
z.object({ id: z.string().nullable() }),
]),
}),
});
// BlockMessage Schema
export const blockMessageObjectSchema = z.union([
pluginBlockMessageSchema,
textBlockMessageSchema,
buttonMessageSchema,
quickReplyMessageSchema,
listBlockMessageSchema,
attachmentBlockMessageSchema,
]);

View File

@ -1,42 +1,46 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { Button } from './button';
import { OutgoingMessageFormat } from './message';
import { z } from 'zod';
export interface ContentOptions {
display: OutgoingMessageFormat.list | OutgoingMessageFormat.carousel;
fields: {
title: string;
subtitle: string | null;
image_url: string | null;
url?: string;
action_title?: string;
action_payload?: string;
};
buttons: Button[];
limit: number;
query?: any; // Waterline model criteria
entity?: string | number; // ContentTypeID
top_element_style?: 'large' | 'compact';
}
import { buttonSchema } from './button';
export interface BlockOptions {
typing?: number;
// In case of carousel/list message
content?: ContentOptions;
// Only if the block has next blocks
fallback?: {
active: boolean;
message: string[];
max_attempts: number;
};
assignTo?: string;
// plugins effects
effects?: string[];
}
export const contentOptionsSchema = z.object({
display: z.enum(['list', 'carousel']),
fields: z.object({
title: z.string(),
subtitle: z.string().nullable(),
image_url: z.string().nullable(),
url: z.string().optional(),
action_title: z.string().optional(),
action_payload: z.string().optional(),
}),
buttons: z.array(buttonSchema),
limit: z.number().finite(),
query: z.any().optional(),
entity: z.union([z.string(), z.number().finite()]).optional(),
top_element_style: z.enum(['large', 'compact']).optional(),
});
export type ContentOptions = z.infer<typeof contentOptionsSchema>;
export const BlockOptionsSchema = z.object({
typing: z.number().optional(),
content: contentOptionsSchema.optional(),
fallback: z
.object({
active: z.boolean(),
message: z.array(z.string()),
max_attempts: z.number().finite(),
})
.optional(),
assignTo: z.string().optional(),
effects: z.array(z.string()).optional(),
});
export type BlockOptions = z.infer<typeof BlockOptionsSchema>;

View File

@ -9,7 +9,6 @@
import { z } from 'zod';
import { attachmentPayloadSchema } from './attachment';
import { PayloadType } from './message';
export enum QuickReplyType {
text = 'text',
@ -25,11 +24,11 @@ export const cordinatesSchema = z.object({
export const payloadSchema = z.discriminatedUnion('type', [
z.object({
type: z.literal(PayloadType.location),
type: z.literal('location'),
coordinates: cordinatesSchema,
}),
z.object({
type: z.literal(PayloadType.attachments),
type: z.literal('attachments'),
attachment: attachmentPayloadSchema,
}),
]);

View File

@ -17,7 +17,7 @@ import { I18nService } from '@/i18n/services/i18n.service';
import { LanguageService } from '@/i18n/services/language.service';
import { LoggerService } from '@/logger/logger.service';
import { PluginService } from '@/plugins/plugins.service';
import { PluginName, PluginType } from '@/plugins/types';
import { PluginType } from '@/plugins/types';
import { SettingService } from '@/setting/services/setting.service';
import { BaseService } from '@/utils/generics/base-service';
import { getRandom } from '@/utils/helpers/safeRandom';
@ -568,7 +568,6 @@ export class BlockService extends BaseService<
contentBlockOptions,
skip,
);
const envelope: StdOutgoingEnvelope = {
format: contentBlockOptions.display,
message: {
@ -576,7 +575,6 @@ export class BlockService extends BaseService<
options: contentBlockOptions,
},
};
return envelope;
} catch (err) {
this.logger.error(
@ -588,7 +586,7 @@ export class BlockService extends BaseService<
} else if (blockMessage && 'plugin' in blockMessage) {
const plugin = this.pluginService.findPlugin(
PluginType.block,
blockMessage.plugin as PluginName,
blockMessage.plugin,
);
// Process custom plugin block
try {

View File

@ -12,103 +12,40 @@ import {
ValidatorConstraint,
ValidatorConstraintInterface,
} from 'class-validator';
import Joi from 'joi';
import { BlockMessage } from '../schemas/types/message';
import {
BlockMessage,
blockMessageObjectSchema,
messageRegexSchema,
textSchema,
} from '../schemas/types/message';
/* eslint-disable no-console */
export function isValidMessage(msg: any) {
if (typeof msg === 'string' && msg !== '') {
// Custom code
const MESSAGE_REGEX = /^function \(context\) \{[^]+\}/;
if (!MESSAGE_REGEX.test(msg)) {
// eslint-disable-next-line
console.error('Block Model : Invalid custom code.', msg);
const result = messageRegexSchema.safeParse(msg);
if (!result.success) {
console.error('Block Model: Invalid custom code.', result.error);
return false;
} else {
return true;
}
return true;
} else if (Array.isArray(msg)) {
// Simple text message
const textSchema = Joi.array().items(Joi.string().max(1000).required());
const textCheck = textSchema.validate(msg);
return !textCheck.error;
} else if (typeof msg === 'object') {
if ('plugin' in msg) {
return true;
} else {
const buttonsSchema = Joi.array().items(
Joi.object().keys({
type: Joi.string().valid('postback', 'web_url').required(),
title: Joi.string().max(20),
payload: Joi.alternatives().conditional('type', {
is: 'postback',
then: Joi.string().max(1000).required(),
otherwise: Joi.forbidden(),
}),
url: Joi.alternatives().conditional('type', {
is: 'web_url',
then: Joi.string().uri(),
otherwise: Joi.forbidden(),
}),
messenger_extensions: Joi.alternatives().conditional('type', {
is: 'web_url',
then: Joi.boolean(),
otherwise: Joi.forbidden(),
}),
webview_height_ratio: Joi.alternatives().conditional('type', {
is: 'web_url',
then: Joi.string().valid('compact', 'tall', 'full'),
otherwise: Joi.forbidden(),
}),
}),
);
// Attachment message
const objectSchema = Joi.object().keys({
text: Joi.string().max(1000),
attachment: Joi.object().keys({
type: Joi.string()
.valid('image', 'audio', 'video', 'file', 'unknown')
.required(),
payload: Joi.object().keys({
url: Joi.string().uri(),
id: Joi.string().allow(null),
}),
}),
elements: Joi.boolean(),
cards: Joi.object().keys({
default_action: buttonsSchema.max(1),
buttons: buttonsSchema.max(3),
}),
buttons: buttonsSchema.max(3),
quickReplies: Joi.array()
.items(
Joi.object().keys({
content_type: Joi.string()
.valid('text', 'location', 'user_phone_number', 'user_email')
.required(),
title: Joi.alternatives().conditional('content_type', {
is: 'text',
then: Joi.string().max(20).required(),
}),
payload: Joi.alternatives().conditional('content_type', {
is: 'text',
then: Joi.string().max(1000).required(),
}),
}),
)
.max(11),
});
const objectCheck = objectSchema.validate(msg);
if (objectCheck.error) {
// eslint-disable-next-line
console.log('Message validation failed! ', objectCheck);
}
return !objectCheck.error;
const result = textSchema.safeParse(msg);
if (!result.success) {
console.error('Block Model: Invalid text message array.', result.error);
}
} else {
return false;
return result.success;
} else if (typeof msg === 'object' && msg !== null) {
const result = blockMessageObjectSchema.safeParse(msg);
if (!result.success) {
console.error('Block Model: Object validation failed!', result.error);
}
return result.success;
}
console.log('Validation reached default false');
return false;
}
/* eslint-enable no-console */
@ValidatorConstraint({ async: false })
export class MessageValidator implements ValidatorConstraintInterface {

View File

@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -11,6 +11,7 @@ import { registerDecorator, ValidationOptions } from 'class-validator';
import {
StdIncomingMessage,
StdOutgoingTextMessage,
validMessageTextSchema,
} from '../schemas/types/message';
export function IsValidMessageText(validationOptions?: ValidationOptions) {
@ -21,7 +22,7 @@ export function IsValidMessageText(validationOptions?: ValidationOptions) {
options: validationOptions,
validator: {
validate(message: StdOutgoingTextMessage | StdIncomingMessage) {
return !!(message as StdOutgoingTextMessage).text;
return validMessageTextSchema.safeParse(message).success;
},
},
});

View File

@ -1,188 +0,0 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import {
Dialog,
DialogActions,
DialogContent,
DialogProps,
MenuItem,
} from "@mui/material";
import { FC, useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import DialogButtons from "@/app-components/buttons/DialogButtons";
import { DialogTitle } from "@/app-components/dialogs/DialogTitle";
import { ContentContainer } from "@/app-components/dialogs/layouts/ContentContainer";
import { ContentItem } from "@/app-components/dialogs/layouts/ContentItem";
import { Input } from "@/app-components/inputs/Input";
import { ToggleableInput } from "@/app-components/inputs/ToggleableInput";
import { useTranslate } from "@/hooks/useTranslate";
import { IMenuItem, IMenuItemAttributes, MenuType } from "@/types/menu.types";
import { isAbsoluteUrl } from "@/utils/URL";
export type MenuDialogProps = DialogProps & {
open: boolean;
closeFunction?: () => void;
createFunction?: (_menu: IMenuItemAttributes) => void;
editFunction?: (_menu: IMenuItemAttributes) => void;
row?: IMenuItem;
parentId?: string;
};
const DEFAULT_VALUES = { title: "", type: MenuType.web_url, url: undefined };
export const MenuDialog: FC<MenuDialogProps> = ({
open,
closeFunction,
createFunction,
editFunction,
row,
parentId,
...rest
}) => {
const { t } = useTranslate();
const {
reset,
resetField,
control,
formState: { errors },
handleSubmit,
register,
watch,
} = useForm<IMenuItemAttributes>({
defaultValues: DEFAULT_VALUES,
});
const validationRules = {
type: {
required: t("message.type_is_required"),
},
title: { required: t("message.title_is_required") },
url: {
required: t("message.url_is_invalid"),
validate: (value: string = "") =>
isAbsoluteUrl(value) || t("message.url_is_invalid"),
},
payload: {},
};
const onSubmitForm = async (data: IMenuItemAttributes) => {
if (createFunction) {
createFunction({ ...data, parent: parentId });
} else if (editFunction) {
editFunction({ ...data, parent: parentId });
}
};
useEffect(() => {
if (open) {
if (row) {
reset(row);
} else {
reset(DEFAULT_VALUES);
}
}
}, [open, reset, row]);
const typeValue = watch("type");
const titleValue = watch("title");
return (
<Dialog open={open} fullWidth onClose={closeFunction} {...rest}>
<form onSubmit={handleSubmit(onSubmitForm)}>
<DialogTitle onClose={closeFunction}>
{createFunction
? t("title.add_menu_item")
: t("title.edit_menu_item")}
</DialogTitle>
<DialogContent>
<ContentContainer>
<ContentContainer flexDirection="row">
<ContentItem>
<Controller
name="type"
rules={validationRules.type}
control={control}
render={({ field }) => {
const { onChange, ...rest } = field;
return (
<Input
select
label={t("placeholder.type")}
error={!!errors.type}
inputRef={field.ref}
required
onChange={({ target: { value } }) => {
onChange(value);
resetField("url");
}}
helperText={errors.type ? errors.type.message : null}
{...rest}
>
{Object.keys(MenuType).map((value, key) => (
<MenuItem value={value} key={key}>
{t(`label.${value}`)}
</MenuItem>
))}
</Input>
);
}}
/>
</ContentItem>
<ContentItem flex={1}>
<Input
label={t("placeholder.title")}
error={!!errors.title}
required
autoFocus
helperText={errors.title ? errors.title.message : null}
{...register("title", validationRules.title)}
/>
</ContentItem>
</ContentContainer>
<ContentItem>
{typeValue === MenuType.web_url ? (
<Input
label={t("label.web_url")}
error={!!errors.url}
required
helperText={errors.url ? errors.url.message : null}
{...register("url", validationRules.url)}
/>
) : typeValue === MenuType.postback ? (
<Controller
name="payload"
control={control}
render={({ field }) => {
return (
<ToggleableInput
label={t("label.payload")}
error={!!errors.payload}
required
defaultValue={row?.payload || ""}
readOnlyValue={titleValue}
helperText={
errors.payload ? errors.payload.message : null
}
{...field}
/>
);
}}
/>
) : null}
</ContentItem>
</ContentContainer>
</DialogContent>
<DialogActions>
<DialogButtons closeDialog={closeFunction} />
</DialogActions>
</form>
</Dialog>
);
};

View File

@ -0,0 +1,187 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { MenuItem } from "@mui/material";
import { FC, Fragment, useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { ContentContainer, ContentItem } from "@/app-components/dialogs/";
import { Input } from "@/app-components/inputs/Input";
import { ToggleableInput } from "@/app-components/inputs/ToggleableInput";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ComponentFormProps } from "@/types/common/dialogs.types";
import { IMenuItem, IMenuItemAttributes, MenuType } from "@/types/menu.types";
import { isAbsoluteUrl } from "@/utils/URL";
const DEFAULT_VALUES = { title: "", type: MenuType.web_url, url: undefined };
export type MenuFormData = {
row?: IMenuItem;
rowId?: string;
parentId?: string;
};
export const MenuForm: FC<ComponentFormProps<MenuFormData>> = ({
data,
Wrapper = Fragment,
WrapperProps,
...rest
}) => {
const { t } = useTranslate();
const { toast } = useToast();
const options = {
onError: (error: Error) => {
rest.onError?.();
toast.error(error || t("message.internal_server_error"));
},
onSuccess: () => {
rest.onSuccess?.();
toast.success(t("message.success_save"));
},
};
const { mutate: createMenu } = useCreate(EntityType.MENU, options);
const { mutate: updateMenu } = useUpdate(EntityType.MENU, options);
const {
watch,
reset,
control,
register,
formState: { errors },
resetField,
handleSubmit,
} = useForm<IMenuItemAttributes>({
defaultValues: DEFAULT_VALUES,
});
const validationRules = {
type: {
required: t("message.type_is_required"),
},
title: { required: t("message.title_is_required") },
url: {
required: t("message.url_is_invalid"),
validate: (value: string = "") =>
isAbsoluteUrl(value) || t("message.url_is_invalid"),
},
payload: {},
};
const typeValue = watch("type");
const titleValue = watch("title");
const onSubmitForm = (params: IMenuItemAttributes) => {
const { url, ...rest } = params;
const payload = typeValue === "web_url" ? { ...rest, url } : rest;
if (data?.row?.id) {
updateMenu({
id: data.row.id,
params: payload,
});
} else {
createMenu({ ...payload, parent: data?.parentId });
}
};
useEffect(() => {
if (data?.row) {
reset(data.row);
} else {
reset(DEFAULT_VALUES);
}
}, [reset, data?.row]);
return (
<Wrapper
open={!!WrapperProps?.open}
onSubmit={handleSubmit(onSubmitForm)}
{...WrapperProps}
>
<form onSubmit={handleSubmit(onSubmitForm)}>
<ContentContainer>
<ContentContainer flexDirection="row">
<ContentItem>
<Controller
name="type"
rules={validationRules.type}
control={control}
render={({ field }) => {
const { onChange, ...rest } = field;
return (
<Input
select
label={t("placeholder.type")}
error={!!errors.type}
inputRef={field.ref}
required
onChange={({ target: { value } }) => {
onChange(value);
resetField("url");
}}
helperText={errors.type ? errors.type.message : null}
{...rest}
>
{Object.keys(MenuType).map((value, key) => (
<MenuItem value={value} key={key}>
{t(`label.${value}`)}
</MenuItem>
))}
</Input>
);
}}
/>
</ContentItem>
<ContentItem flex={1}>
<Input
label={t("placeholder.title")}
error={!!errors.title}
required
autoFocus
helperText={errors.title ? errors.title.message : null}
{...register("title", validationRules.title)}
/>
</ContentItem>
</ContentContainer>
<ContentItem>
{typeValue === MenuType.web_url ? (
<Input
label={t("label.web_url")}
error={!!errors.url}
required
helperText={errors.url ? errors.url.message : null}
{...register("url", validationRules.url)}
/>
) : typeValue === MenuType.postback ? (
<Controller
name="payload"
control={control}
render={({ field }) => {
return (
<ToggleableInput
label={t("label.payload")}
error={!!errors.payload}
required
defaultValue={data?.row?.payload || ""}
readOnlyValue={titleValue}
helperText={
errors.payload ? errors.payload.message : null
}
{...field}
/>
);
}}
/>
) : null}
</ContentItem>
</ContentContainer>
</form>
</Wrapper>
);
};

View File

@ -0,0 +1,23 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { GenericFormDialog } from "@/app-components/dialogs";
import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
import { MenuForm, MenuFormData } from "./MenuForm";
export const MenuFormDialog = <T extends MenuFormData = MenuFormData>(
props: ComponentFormDialogProps<T>,
) => (
<GenericFormDialog<T>
Form={MenuForm}
addText="title.add_menu_item"
editText="title.edit_menu_item"
{...props}
/>
);

View File

@ -8,35 +8,26 @@
import { faBars } from "@fortawesome/free-solid-svg-icons";
import AddIcon from "@mui/icons-material/Add";
import { Grid, Paper, Button, Box, debounce } from "@mui/material";
import React, { useRef, useState } from "react";
import { Box, Button, debounce, Grid, Paper } from "@mui/material";
import { useRef, useState } from "react";
import { DeleteDialog } from "@/app-components/dialogs/DeleteDialog";
import { ConfirmDialogBody } from "@/app-components/dialogs";
import { NoDataOverlay } from "@/app-components/tables/NoDataOverlay";
import { useCreate } from "@/hooks/crud/useCreate";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useDialogs } from "@/hooks/useDialogs";
import { useHasPermission } from "@/hooks/useHasPermission";
import { useTranslate } from "@/hooks/useTranslate";
import { PageHeader } from "@/layout/content/PageHeader";
import { EntityType } from "@/services/types";
import { IMenuItem } from "@/types/menu.types";
import { PermissionAction } from "@/types/permission.types";
import MenuAccordion from "./MenuAccordion";
import { MenuDialog } from "./MenuDialog";
import { MenuFormDialog } from "./MenuFormDialog";
export const Menu = () => {
const { t } = useTranslate();
const [addDialogOpened, setAddDialogOpened] = useState(false);
const [editDialogOpened, setEditDialogOpened] = useState(false);
const [selectedMenuId, setSelectedMenuId] = useState<string | undefined>(
undefined,
);
const [editRow, setEditRow] = useState<IMenuItem | null>(null);
const [deleteDialogOpened, setDeleteDialogOpened] = useState(false);
const [deleteRowId, setDeleteRowId] = useState<string>();
const dialogs = useDialogs();
const hasPermission = useHasPermission();
const { data: menus, refetch } = useFind(
{ entity: EntityType.MENUTREE },
@ -44,38 +35,11 @@ export const Menu = () => {
hasCount: false,
},
);
const { mutateAsync: createMenu } = useCreate(EntityType.MENU, {
const { mutate: deleteMenu } = useDelete(EntityType.MENU, {
onSuccess: () => {
setAddDialogOpened(false);
refetch();
},
});
const { mutateAsync: updateMenu } = useUpdate(EntityType.MENU, {
onSuccess: () => {
setEditDialogOpened(false);
setEditRow(null);
refetch();
},
});
const { mutateAsync: deleteMenu } = useDelete(EntityType.MENU, {
onSuccess: () => {
setDeleteDialogOpened(false);
refetch();
},
});
const handleAppend = (menuId: string) => {
setSelectedMenuId(menuId);
setAddDialogOpened(true);
refetch();
};
const handleUpdate = (menu: IMenuItem) => {
setEditRow(menu);
setEditDialogOpened(true);
};
const handleDelete = (menu: IMenuItem) => {
setDeleteRowId(menu.id);
setDeleteDialogOpened(true);
};
const [position, setPosition] = useState(0);
const ref = useRef<HTMLDivElement>(null);
const [shadowVisible, setShadowVisible] = useState(false);
@ -95,10 +59,7 @@ export const Menu = () => {
{hasPermission(EntityType.MENU, PermissionAction.CREATE) ? (
<Button
variant="contained"
onClick={() => {
setSelectedMenuId(undefined);
setAddDialogOpened(true);
}}
onClick={() => dialogs.open(MenuFormDialog, null)}
disabled={menus?.length === 10}
startIcon={<AddIcon />}
>
@ -108,17 +69,16 @@ export const Menu = () => {
</Grid>
</Grid>
</PageHeader>
<Paper
ref={ref}
onMouseMove={debounce((e) => {
if (!ref.current) return;
const padding = 16;
const boxHeight = 56;
const mousePositonInsideElement =
const mousePositionInsideElement =
e.clientY - ref.current?.getBoundingClientRect().top - padding;
const currentBlock = Math.floor(
mousePositonInsideElement / boxHeight,
mousePositionInsideElement / boxHeight,
);
const maxBlock = Math.floor(
(ref.current.getBoundingClientRect().height - padding - 1) /
@ -137,41 +97,6 @@ export const Menu = () => {
onMouseLeave={() => setShadowVisible(false)}
onMouseEnter={() => setShadowVisible(true)}
>
<MenuDialog
open={addDialogOpened}
parentId={selectedMenuId}
closeFunction={() => {
setAddDialogOpened(false);
setEditDialogOpened(false);
}}
createFunction={createMenu}
/>
{editRow ? (
<MenuDialog
row={editRow}
open={editDialogOpened}
editFunction={(params) => {
if (editRow.id) updateMenu({ id: editRow.id, params });
}}
closeFunction={() => {
setEditDialogOpened(false);
setEditRow(null);
}}
/>
) : null}
<DeleteDialog
open={deleteDialogOpened}
openDialog={() => setDeleteDialogOpened(true)}
closeDialog={() => setDeleteDialogOpened(false)}
callback={() => {
if (deleteRowId) {
deleteMenu(deleteRowId);
}
}}
/>
{menus?.length > 0 && (
<Box
sx={{
@ -194,9 +119,15 @@ export const Menu = () => {
<MenuAccordion
key={menu.id}
menu={menu}
onAppend={handleAppend}
onUpdate={handleUpdate}
onDelete={handleDelete}
onAppend={(parentId) => dialogs.open(MenuFormDialog, { parentId })}
onUpdate={(row) => dialogs.open(MenuFormDialog, { row })}
onDelete={async (row) => {
const isConfirmed = await dialogs.confirm(ConfirmDialogBody);
if (isConfirmed) {
deleteMenu(row.id);
}
}}
/>
))}
</Paper>

View File

@ -1,178 +0,0 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import { Button, Dialog, DialogActions, DialogContent } from "@mui/material";
import { FC, useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form";
import DialogButtons from "@/app-components/buttons/DialogButtons";
import { DialogTitle } from "@/app-components/dialogs/DialogTitle";
import { ContentContainer } from "@/app-components/dialogs/layouts/ContentContainer";
import { ContentItem } from "@/app-components/dialogs/layouts/ContentItem";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { DialogControlProps } from "@/hooks/useDialog";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ContentFieldType, IContentType } from "@/types/content-type.types";
import { FieldInput } from "./components/FieldInput";
import { FIELDS_FORM_DEFAULT_VALUES, READ_ONLY_FIELDS } from "./constants";
export type ContentTypeDialogProps = DialogControlProps<IContentType>;
export const ContentTypeDialog: FC<ContentTypeDialogProps> = ({
open,
data,
closeDialog,
}) => {
const { toast } = useToast();
const { t } = useTranslate();
const {
handleSubmit,
register,
control,
reset,
setValue,
formState: { errors },
} = useForm<Partial<IContentType>>({
defaultValues: {
name: data?.name || "",
fields: data?.fields || FIELDS_FORM_DEFAULT_VALUES,
},
});
const { append, fields, remove } = useFieldArray({
name: "fields",
control,
});
const closeAndReset = () => {
closeDialog();
reset({
name: "",
fields: FIELDS_FORM_DEFAULT_VALUES,
});
};
const { mutate: createContentType } = useCreate(EntityType.CONTENT_TYPE, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
closeDialog();
toast.success(t("message.success_save"));
},
});
const { mutate: updateContentType } = useUpdate(EntityType.CONTENT_TYPE, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
closeDialog();
toast.success(t("message.success_save"));
},
});
const onSubmitForm = async (params) => {
const labelCounts: Record<string, number> = params.fields.reduce(
(acc, field) => {
if (!field.label.trim()) return acc;
acc[field.label] = (acc[field.label] || 0) + 1;
return acc;
},
{} as Record<string, number>,
);
const hasDuplicates = Object.values(labelCounts).some(
(count: number) => count > 1,
);
if (hasDuplicates) {
toast.error(t("message.duplicate_labels_not_allowed"));
return;
}
if (data) {
updateContentType({ id: data.id, params });
} else {
createContentType(params);
}
};
useEffect(() => {
if (open) reset();
}, [open, reset]);
useEffect(() => {
if (data) {
reset({
name: data.name,
fields: data.fields || FIELDS_FORM_DEFAULT_VALUES,
});
} else {
reset({ name: "", fields: FIELDS_FORM_DEFAULT_VALUES });
}
}, [data, reset]);
return (
<Dialog open={open} fullWidth onClose={closeAndReset}>
<form onSubmit={handleSubmit(onSubmitForm)}>
<DialogTitle onClose={closeAndReset}>
{data ? t("title.edit_content_type") : t("title.new_content_type")}
</DialogTitle>
<DialogContent>
<ContentContainer>
<ContentItem>
<Input
label={t("label.name")}
error={!!errors.name}
{...register("name", {
required: t("message.name_is_required"),
})}
helperText={errors.name ? errors.name.message : null}
required
autoFocus
/>
</ContentItem>
{fields.map((f, index) => (
<ContentItem
key={f.id}
display="flex"
justifyContent="space-between"
gap={2}
>
<FieldInput
setValue={setValue}
control={control}
remove={remove}
index={index}
disabled={READ_ONLY_FIELDS.includes(f.label as any)}
/>
</ContentItem>
))}
<ContentItem>
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() =>
append({ label: "", name: "", type: ContentFieldType.TEXT })
}
>
{t("button.add")}
</Button>
</ContentItem>
</ContentContainer>
</DialogContent>
<DialogActions>
<DialogButtons closeDialog={closeAndReset} />
</DialogActions>
</form>
</Dialog>
);
};

View File

@ -0,0 +1,160 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import { Button } from "@mui/material";
import { FC, Fragment, useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form";
import { ContentContainer, ContentItem } from "@/app-components/dialogs/";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ComponentFormProps } from "@/types/common/dialogs.types";
import { ContentFieldType, IContentType } from "@/types/content-type.types";
import { FieldInput } from "./components/FieldInput";
import { FIELDS_FORM_DEFAULT_VALUES, READ_ONLY_FIELDS } from "./constants";
export const ContentTypeForm: FC<ComponentFormProps<IContentType>> = ({
data,
Wrapper = Fragment,
WrapperProps,
...rest
}) => {
const { toast } = useToast();
const { t } = useTranslate();
const {
reset,
control,
register,
setValue,
formState: { errors },
handleSubmit,
} = useForm<Partial<IContentType>>({
defaultValues: {
name: data?.name || "",
fields: data?.fields || FIELDS_FORM_DEFAULT_VALUES,
},
});
const { append, fields, remove } = useFieldArray({
name: "fields",
control,
});
const options = {
onError: (error: Error) => {
rest.onError?.();
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
rest.onSuccess?.();
toast.success(t("message.success_save"));
},
};
const { mutate: createContentType } = useCreate(
EntityType.CONTENT_TYPE,
options,
);
const { mutate: updateContentType } = useUpdate(
EntityType.CONTENT_TYPE,
options,
);
const onSubmitForm = (params) => {
const labelCounts: Record<string, number> = params.fields.reduce(
(acc, field) => {
if (!field.label.trim()) return acc;
acc[field.label] = (acc[field.label] || 0) + 1;
return acc;
},
{} as Record<string, number>,
);
const hasDuplicates = Object.values(labelCounts).some(
(count: number) => count > 1,
);
if (hasDuplicates) {
toast.error(t("message.duplicate_labels_not_allowed"));
return;
}
if (data) {
updateContentType({ id: data.id, params });
} else {
createContentType(params);
}
};
useEffect(() => {
if (data) {
reset({
name: data.name,
fields: data.fields || FIELDS_FORM_DEFAULT_VALUES,
});
} else {
reset({ name: "", fields: FIELDS_FORM_DEFAULT_VALUES });
}
}, [data, reset]);
return (
<Wrapper
open={!!WrapperProps?.open}
onSubmit={handleSubmit(onSubmitForm)}
{...WrapperProps}
>
<form onSubmit={handleSubmit(onSubmitForm)}>
<ContentContainer>
<ContentItem>
<Input
label={t("label.name")}
error={!!errors.name}
{...register("name", {
required: t("message.name_is_required"),
})}
helperText={errors.name ? errors.name.message : null}
required
autoFocus
/>
</ContentItem>
{fields.map((f, index) => (
<ContentItem
key={f.id}
display="flex"
justifyContent="space-between"
gap={2}
>
<FieldInput
setValue={setValue}
control={control}
remove={remove}
index={index}
disabled={READ_ONLY_FIELDS.includes(f.label as any)}
/>
</ContentItem>
))}
<ContentItem>
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() =>
append({ label: "", name: "", type: ContentFieldType.TEXT })
}
>
{t("button.add")}
</Button>
</ContentItem>
</ContentContainer>
</form>
</Wrapper>
);
};

View File

@ -0,0 +1,24 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { GenericFormDialog } from "@/app-components/dialogs";
import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
import { IContentType } from "@/types/content-type.types";
import { ContentTypeForm } from "./ContentTypeForm";
export const ContentTypeFormDialog = <T extends IContentType = IContentType>(
props: ComponentFormDialogProps<T>,
) => (
<GenericFormDialog<T>
Form={ContentTypeForm}
addText="title.new_content_type"
editText="title.edit_content_type"
{...props}
/>
);

View File

@ -6,13 +6,12 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { faAlignLeft } from "@fortawesome/free-solid-svg-icons";
import AddIcon from "@mui/icons-material/Add";
import { Button, Grid, Paper } from "@mui/material";
import { useRouter } from "next/router";
import { DeleteDialog } from "@/app-components/dialogs";
import { ConfirmDialogBody } from "@/app-components/dialogs";
import { FilterTextfield } from "@/app-components/inputs/FilterTextfield";
import {
ActionColumnLabel,
@ -22,7 +21,7 @@ import { renderHeader } from "@/app-components/tables/columns/renderHeader";
import { DataGrid } from "@/app-components/tables/DataGrid";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { getDisplayDialogs, useDialog } from "@/hooks/useDialog";
import { useDialogs } from "@/hooks/useDialogs";
import { useHasPermission } from "@/hooks/useHasPermission";
import { useSearch } from "@/hooks/useSearch";
import { useToast } from "@/hooks/useToast";
@ -33,16 +32,13 @@ import { IContentType } from "@/types/content-type.types";
import { PermissionAction } from "@/types/permission.types";
import { getDateTimeFormatter } from "@/utils/date";
import { ContentTypeDialog } from "./ContentTypeDialog";
import { ContentTypeFormDialog } from "./ContentTypeFormDialog";
export const ContentTypes = () => {
const { t } = useTranslate();
const { toast } = useToast();
const router = useRouter();
// Dialog Controls
const addDialogCtl = useDialog<IContentType>(false);
const deleteDialogCtl = useDialog<string>(false);
const fieldsDialogCtl = useDialog<IContentType>(false);
const dialogs = useDialogs();
// data fetching
const { onSearch, searchPayload } = useSearch<IContentType>({
$iLike: ["name"],
@ -53,18 +49,14 @@ export const ContentTypes = () => {
params: searchPayload,
},
);
const { mutateAsync: deleteContentType } = useDelete(
EntityType.CONTENT_TYPE,
{
onSuccess: () => {
deleteDialogCtl.closeDialog();
toast.success(t("message.item_delete_success"));
},
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
const { mutate: deleteContentType } = useDelete(EntityType.CONTENT_TYPE, {
onSuccess: () => {
toast.success(t("message.item_delete_success"));
},
);
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
});
const hasPermission = useHasPermission();
const actionColumns = useActionColumns<IContentType>(
EntityType.CONTENT_TYPE,
@ -75,12 +67,18 @@ export const ContentTypes = () => {
},
{
label: ActionColumnLabel.Edit,
action: (row) => fieldsDialogCtl.openDialog(row),
action: (row) => dialogs.open(ContentTypeFormDialog, row),
requires: [PermissionAction.UPDATE],
},
{
label: ActionColumnLabel.Delete,
action: (row) => deleteDialogCtl.openDialog(row.id),
action: async ({ id }) => {
const isConfirmed = await dialogs.confirm(ConfirmDialogBody);
if (isConfirmed) {
deleteContentType(id);
}
},
requires: [PermissionAction.DELETE],
},
],
@ -106,7 +104,7 @@ export const ContentTypes = () => {
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() => addDialogCtl.openDialog()}
onClick={() => dialogs.open(ContentTypeFormDialog, null)}
sx={{ float: "right" }}
>
{t("button.add")}
@ -117,15 +115,6 @@ export const ContentTypes = () => {
</PageHeader>
<Grid item xs={12}>
<Paper>
<ContentTypeDialog {...getDisplayDialogs(addDialogCtl)} />
<DeleteDialog
{...deleteDialogCtl}
callback={() => {
if (deleteDialogCtl?.data)
deleteContentType(deleteDialogCtl.data);
}}
/>
<ContentTypeDialog {...getDisplayDialogs(fieldsDialogCtl)} />
<Grid padding={2} container>
<Grid item width="100%">
<DataGrid

View File

@ -6,7 +6,6 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import {
Avatar,
ChatContainer,

View File

@ -0,0 +1,54 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { useRef } from "react";
import { StdIncomingLocationMessage } from "@/types/message.types";
export interface GeolocationMessageProps {
message: StdIncomingLocationMessage;
}
const GeolocationMessage: React.FC<GeolocationMessageProps> = ({ message }) => {
const iframeRef = useRef<HTMLDivElement>(null);
if (!("coordinates" in message)) {
throw new Error("Unable to find coordinates");
}
const { lat, lon } = message.coordinates || { lat: 0.0, lng: 0.0 };
const openStreetMapUrl = `https://www.openstreetmap.org/export/embed.html?bbox=${
lon - 0.1
},${lat - 0.1},${lon + 0.1},${lat + 0.1}&layer=mapnik&marker=${lat},${lon}`;
return (
<div
style={{
borderRadius: "0.5rem",
width: "200px",
}}
ref={iframeRef}
>
<iframe
style={{
width: "200px",
height: "150px",
borderRadius: "0.5rem",
}}
loading="lazy"
frameBorder="0"
scrolling="no"
marginHeight={0}
marginWidth={0}
src={openStreetMapUrl}
/>
</div>
);
};
export default GeolocationMessage;

View File

@ -6,7 +6,6 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { Message, MessageModel } from "@chatscope/chat-ui-kit-react";
import MenuRoundedIcon from "@mui/icons-material/MenuRounded";
import ReplyIcon from "@mui/icons-material/Reply";
@ -20,6 +19,7 @@ import { buildURL } from "@/utils/URL";
import { MessageAttachmentsViewer } from "../components/AttachmentViewer";
import { Carousel } from "../components/Carousel";
import GeolocationMessage from "../components/GeolocationMessage";
function hasSameSender(
m1: IMessage | IMessageFull,
@ -69,6 +69,14 @@ export function getMessageContent(
const message = messageEntity.message;
let content: ReactNode[] = [];
if ("coordinates" in message) {
content.push(
<Message.CustomContent>
<GeolocationMessage message={message} key={message.type} />
</Message.CustomContent>,
);
}
if ("text" in message) {
content.push(
<Message.TextContent key={messageEntity.id} text={message.text} />,
@ -85,6 +93,7 @@ export function getMessageContent(
chips = message.quickReplies as { title: string }[];
chipsIcon = <ReplyIcon color="disabled" />;
}
if (chips.length > 0)
content.push(
<Message.Footer style={{ marginTop: "5px" }}>

View File

@ -6,7 +6,6 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { EntityType } from "@/services/types";
import { IAttachment } from "./attachment.types";

View File

@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -48,6 +48,8 @@ export const isAbsoluteUrl = (value: string = ""): boolean => {
return (
(url.protocol === "http:" || url.protocol === "https:") &&
((url.href.startsWith("http://") && value.startsWith("http://")) ||
(url.href.startsWith("https://") && value.startsWith("https://"))) &&
hostnameParts.length > 1 &&
hostnameParts[hostnameParts.length - 1].length > 1
);