akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/CW-6944

Browse Source
This commit is contained in:
Sivin Varghese
2026-05-05 14:19:18 +05:30
committed by GitHub
parent ce4ea484bd 8cc36e1938
commit 28c5bb6a75
16 changed files with 260 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/dashboard/components-next/CustomAttributes/OtherAttribute.vue
+5 -1
View File
@@ -49,7 +49,11 @@ const rules = computed(() => ({
props.attribute.regexPattern && {
regexValidation: value => {
if (!value) return true;
return getRegexp(props.attribute.regexPattern).test(value);
try {
return getRegexp(props.attribute.regexPattern).test(value);
} catch {
return false;
}
},
}),
},
app/javascript/dashboard/components/CustomAttribute.vue
+12 -8
View File
@@ -102,13 +102,14 @@ export default {
return this.v$.editedValue.$error;
},
errorMessage() {
if (this.v$.editedValue.url) {
if (this.v$.editedValue.url?.$invalid) {
return this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.INVALID_URL');
}
if (!this.v$.editedValue.regexValidation) {
return this.regexCue
? this.regexCue
: this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.INVALID_INPUT');
if (this.v$.editedValue.regexValidation?.$invalid) {
return (
this.regexCue ||
this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.INVALID_INPUT')
);
}
return this.$t('CUSTOM_ATTRIBUTES.VALIDATIONS.REQUIRED');
},
@@ -134,9 +135,12 @@ export default {
editedValue: {
required,
regexValidation: value => {
return !(
this.attributeRegex && !getRegexp(this.attributeRegex).test(value)
);
if (!this.attributeRegex || !value) return true;
try {
return getRegexp(this.attributeRegex).test(value);
} catch {
return false;
}
},
},
};
app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
+16
View File
@@ -13,6 +13,9 @@ import {
triggerCharacters,
} from '@chatwoot/prosemirror-schema/src/mentions/plugin';
import imagePastePlugin from '@chatwoot/prosemirror-schema/src/plugins/image';
import embedPreviewPlugin from '@chatwoot/prosemirror-schema/src/plugins/embedPreview';
import trailingParagraphPlugin from '@chatwoot/prosemirror-schema/src/plugins/trailingParagraph';
import { embeds as markdownEmbeds } from 'dashboard/helper/markdownEmbeds';
import { toggleMark } from 'prosemirror-commands';
import { wrapInList } from 'prosemirror-schema-list';
import { toggleBlockType } from '@chatwoot/prosemirror-schema/src/menu/common';
@@ -77,6 +80,8 @@ export default {
plugins: [
imagePastePlugin(this.handleImageUpload),
this.createSlashPlugin(),
embedPreviewPlugin(markdownEmbeds),
trailingParagraphPlugin(),
],
isTextSelected: false, // Tracks text selection and prevents unnecessary re-renders on mouse selection
showSlashMenu: false,
@@ -113,6 +118,12 @@ export default {
this.focusEditorInputField();
}
},
beforeUnmount() {
if (editorView) {
editorView.destroy();
editorView = null;
}
},
methods: {
createSlashPlugin() {
return suggestionsPlugin({
@@ -488,4 +499,9 @@ export default {
max-height: 7.5rem;
overflow: auto;
}
.ProseMirror .cw-embed-preview {
max-width: 36rem;
margin: 0.5rem 0 1rem;
}
</style>
app/javascript/dashboard/helper/editorHelper.js
+14 -1
View File
@@ -123,6 +123,13 @@ export function cleanSignature(signature) {
}
}
// Strip `\<newline>` hardbreak markers trailing `--` after a signature slice
const stripDelimiterHardbreaks = body =>
body.replace(/(--)\s*(?:\\\s*)+$/, '$1');
// Strip standalone blank-paragraph markers (`\` on their own lines).
const stripTrailingBlankLine = body => body.replace(/\n(?:\s*\\\n)+$/, '');
/**
* Adds the signature delimiter to the beginning of the signature.
*
@@ -227,13 +234,19 @@ export function removeSignature(body, signature, channelType) {
// trimming will ensure any spaces or new lines before the signature are removed
// This means we will have the delimiter at the end
if (signatureIndex > -1) {
newBody = newBody.substring(0, signatureIndex).trimEnd();
newBody = stripDelimiterHardbreaks(
newBody.substring(0, signatureIndex)
).trimEnd();
}
// Remove delimiter if it's at the end
if (newBody.endsWith(SIGNATURE_DELIMITER)) {
// if the delimiter is at the end, remove it
newBody = newBody.slice(0, -SIGNATURE_DELIMITER.length);
// strip any trailing blank-line markers
if (signatureIndex > -1) {
newBody = stripTrailingBlankLine(newBody);
}
}
return newBody;
app/javascript/dashboard/helper/markdownEmbeds.js
+11
View File
@@ -0,0 +1,11 @@
import config from '../../../../config/markdown_embeds.yml';
// Gists rely on document.write() and can't render inline in the editor.
const NON_PREVIEWABLE_EMBEDS = new Set(['github_gist']);
export const embeds = Object.entries(config)
.filter(([key]) => !NON_PREVIEWABLE_EMBEDS.has(key))
.map(([, { regex, template }]) => ({
regex: new RegExp(regex),
template,
}));
app/javascript/dashboard/helper/specs/editorHelper.spec.js
+32
View File
@@ -336,6 +336,38 @@ describe('removeSignature', () => {
'This is a test\n\n'
);
});
it('strips blank-paragraph marker before the delimiter', () => {
expect(removeSignature('hey\n\n\\\n--\n\nHello there', 'Hello there')).toBe(
'hey'
);
});
it('strips multiple consecutive blank-paragraph markers before the delimiter', () => {
expect(
removeSignature('wewe\n\n\\\n\\\n\\\n--\n\nHello there', 'Hello there')
).toBe('wewe');
});
it('strips dangling hardbreak when signature shared a paragraph with "--"', () => {
expect(removeSignature('hey\n\n--\\\nHello there', 'Hello there')).toBe(
'hey\n\n'
);
});
it('preserves trailing backslash in user text when appending', () => {
expect(appendSignature('The path is C:\\', 'Best\nAgent')).toContain(
'C:\\'
);
expect(appendSignature('C:\\\n', 'Best\nAgent')).toContain('C:\\');
expect(appendSignature('C:\\\n\n', 'Best\nAgent')).toContain('C:\\');
});
it('preserves trailing backslash in user text when removing', () => {
expect(removeSignature('C:\\\n--\n\nBest\nAgent', 'Best\nAgent')).toContain(
'C:\\'
);
expect(removeSignature('C:\\\n--', 'no matching sig')).toContain('C:\\');
expect(removeSignature('C:\\\nBest\\\nAgent', 'Best\nAgent')).toContain(
'C:\\'
);
expect(removeSignature('notes\n\\\n--', 'no matching sig')).toContain('\\');
});
});
describe('removeSignature with stripped signature', () => {
app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue
+6 -16
View File
@@ -4,6 +4,7 @@ import { required, minLength } from '@vuelidate/validators';
import { mapGetters } from 'vuex';
import { useAlert } from 'dashboard/composables';
import { convertToAttributeSlug } from 'dashboard/helper/commons.js';
import { normalizeRegexPattern } from 'shared/helpers/Validators';
import { ATTRIBUTE_MODELS, ATTRIBUTE_TYPES } from './constants';
import NextButton from 'dashboard/components-next/button/Button.vue';
@@ -99,19 +100,10 @@ export default {
},
validations: {
displayName: {
required,
minLength: minLength(1),
},
description: {
required,
},
attributeModel: {
required,
},
attributeType: {
required,
},
displayName: { required, minLength: minLength(1) },
description: { required },
attributeModel: { required },
attributeType: { required },
attributeKey: {
required,
isKey(value) {
@@ -151,9 +143,7 @@ export default {
attribute_display_type: this.attributeType,
attribute_key: this.attributeKey,
attribute_values: this.attributeListValues,
regex_pattern: this.regexPattern
? new RegExp(this.regexPattern).toString()
: null,
regex_pattern: normalizeRegexPattern(this.regexPattern),
regex_cue: this.regexCue,
});
this.alertMessage = this.$t('ATTRIBUTES_MGMT.ADD.API.SUCCESS_MESSAGE');
app/javascript/dashboard/routes/dashboard/settings/attributes/EditAttribute.vue
+6 -15
View File
@@ -2,7 +2,7 @@
import { useVuelidate } from '@vuelidate/core';
import { useAlert } from 'dashboard/composables';
import { required, minLength } from '@vuelidate/validators';
import { getRegexp } from 'shared/helpers/Validators';
import { getRegexp, normalizeRegexPattern } from 'shared/helpers/Validators';
import { ATTRIBUTE_TYPES } from './constants';
import NextButton from 'dashboard/components-next/button/Button.vue';
import TagInput from 'dashboard/components-next/taginput/TagInput.vue';
@@ -41,16 +41,9 @@ export default {
};
},
validations: {
displayName: {
required,
},
attributeType: {
required,
},
description: {
required,
minLength: minLength(1),
},
displayName: { required },
attributeType: { required },
description: { required, minLength: minLength(1) },
attributeKey: {
required,
isKey(value) {
@@ -118,7 +111,7 @@ export default {
},
setFormValues() {
const regexPattern = this.selectedAttribute.regex_pattern
? getRegexp(this.selectedAttribute.regex_pattern).source
? getRegexp(this.selectedAttribute.regex_pattern).toString()
: null;
this.displayName = this.selectedAttribute.attribute_display_name;
this.description = this.selectedAttribute.attribute_description;
@@ -144,9 +137,7 @@ export default {
attribute_description: this.description,
attribute_display_name: this.displayName,
attribute_values: this.updatedAttributeListValues,
regex_pattern: this.regexPattern
? new RegExp(this.regexPattern).toString()
: null,
regex_pattern: normalizeRegexPattern(this.regexPattern),
regex_cue: this.regexCue,
});
this.alertMessage = this.$t('ATTRIBUTES_MGMT.EDIT.API.SUCCESS_MESSAGE');
app/javascript/shared/helpers/MessageFormatter.js
+1
View File
@@ -42,6 +42,7 @@ const createMarkdownInstance = (linkify = true) => {
quotes: '\u201c\u201d\u2018\u2019',
maxNesting: 20,
})
.disable(['lheading'])
.use(mentionPlugin)
.use(imgResizeManager)
.use(mila, {
app/javascript/shared/helpers/Validators.js
+16
View File
@@ -101,6 +101,22 @@ export const getRegexp = regexPatternValue => {
);
};
/**
* Normalises a user-entered regex pattern into canonical `/source/flags` form.
* Strips `/.../flags` wrapping if the user included it, so `new RegExp` does
* not double-escape the slashes on save.
*
* @param {string} pattern - Raw pattern string from the form.
* @returns {?string} Canonical `/source/flags` string, or null when empty.
*/
export const normalizeRegexPattern = pattern => {
if (!pattern) return null;
const match = pattern.match(/^\/(.+)\/([gimsuy]*)$/);
const source = match ? match[1] : pattern;
const flags = match ? match[2] : '';
return new RegExp(source, flags).toString();
};
/**
* Checks if a string is a valid slug (letters, numbers, hyphens only, no spaces or other symbols).
* @param {string} value - The slug to validate.
app/javascript/shared/helpers/specs/MessageFormatter.spec.js
+7
View File
@@ -33,6 +33,13 @@ describe('#MessageFormatter', () => {
<h2>tool</h2>`
);
});
it('should not render a setext heading when text is followed by "--"', () => {
const message = 'hy\n\n\\\n\\-\\-\n\nHello there';
const result = new MessageFormatter(message).formattedMessage;
expect(result).not.toMatch('<h2>');
expect(result).not.toMatch('<h1>');
});
});
describe('content with image and has "cw_image_height" query at the end of URL', () => {
app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
+25
View File
@@ -9,6 +9,7 @@ import {
isNumber,
isDomain,
getRegexp,
normalizeRegexPattern,
isValidSlug,
} from '../Validators';
@@ -155,6 +156,30 @@ describe('#getRegexp', () => {
});
});
describe('#normalizeRegexPattern', () => {
it('returns null for empty values', () => {
expect(normalizeRegexPattern('')).toBeNull();
expect(normalizeRegexPattern(null)).toBeNull();
expect(normalizeRegexPattern(undefined)).toBeNull();
});
it('canonicalises a bare source', () => {
expect(normalizeRegexPattern('^[0-9]+$')).toBe('/^[0-9]+$/');
});
it('strips slash wrapping the user may include', () => {
expect(normalizeRegexPattern('/^[0-9]+$/')).toBe('/^[0-9]+$/');
});
it('preserves flags on wrapped input', () => {
expect(normalizeRegexPattern('/hello/gi')).toBe('/hello/gi');
});
it('throws for an invalid regex source', () => {
expect(() => normalizeRegexPattern('[')).toThrow();
});
});
describe('#isValidSlug', () => {
it('should return true for valid slugs', () => {
expect(isValidSlug('abc')).toEqual(true);
app/javascript/widget/components/PreChat/Form.vue
+39 -33
View File
@@ -140,24 +140,15 @@ export default {
},
},
methods: {
labelClass(input) {
const { state } = input.context;
const hasErrors = state.invalid;
return !hasErrors ? 'text-n-slate-12' : 'text-n-ruby-10';
},
inputClass(input) {
const { state, family: classification, type } = input.context;
const hasErrors = state.invalid;
if (classification === 'box' && type === 'checkbox') {
return '';
}
if (type === 'phoneInput') {
this.hasErrorInPhoneInput = hasErrors;
this.hasErrorInPhoneInput = state.invalid;
}
if (!hasErrors) {
return `mt-1 rounded w-full py-2 px-3`;
}
return `mt-1 rounded w-full py-2 px-3 error`;
return 'mt-1 rounded w-full py-2 px-3';
},
isContactFieldRequired(field) {
return this.preChatFields.find(option => option.name === field).required;
@@ -176,7 +167,12 @@ export default {
return this.formValues[name] || null;
},
getValidation({ type, name, field_type, regex_pattern }) {
let regex = regex_pattern ? getRegexp(regex_pattern) : null;
const regex = regex_pattern ? getRegexp(regex_pattern) : null;
// FormKit caches the RegExp and calls .test() across keystrokes, so
// drop stateful g/y flags to stop lastIndex mutation flipping validity.
const matchRegex = regex
? new RegExp(regex.source, regex.flags.replace(/[gy]/g, ''))
: null;
const validations = {
emailAddress: 'email',
phoneNumber: ['startsWithPlus', 'isValidPhoneNumber'],
@@ -186,27 +182,32 @@ export default {
select: null,
number: null,
checkbox: false,
contact_attribute: regex ? [['matches', regex]] : null,
conversation_attribute: regex ? [['matches', regex]] : null,
contact_attribute: matchRegex ? [['matches', matchRegex]] : null,
conversation_attribute: matchRegex ? [['matches', matchRegex]] : null,
};
const validationKeys = Object.keys(validations);
const isRequired = this.isContactFieldRequired(name);
const validation = isRequired ? ['required'] : ['optional'];
const baseRules = isRequired ? [['required']] : [['optional']];
if (
validationKeys.includes(name) ||
validationKeys.includes(type) ||
validationKeys.includes(field_type)
!validationKeys.includes(name) &&
!validationKeys.includes(type) &&
!validationKeys.includes(field_type)
) {
const validationType =
validations[type] || validations[name] || validations[field_type];
const allValidations = validationType
? validation.concat(validationType)
: validation;
return allValidations.join('|');
return '';
}
return '';
const validationType =
validations[type] || validations[name] || validations[field_type];
if (!validationType) return baseRules;
// Normalise into array-of-arrays so RegExp objects in `['matches', regex]`
// survive without being stringified by FormKit.
const extraRules = Array.isArray(validationType)
? validationType.map(rule => (Array.isArray(rule) ? rule : [rule]))
: [[validationType]];
return baseRules.concat(extraRules);
},
findFieldType(type) {
if (type === 'link') {
@@ -283,7 +284,7 @@ export default {
}
: undefined
"
:label-class="context => `text-sm font-medium ${labelClass(context)}`"
label-class="text-sm font-medium text-n-slate-12"
:input-class="context => inputClass(context)"
:validation-messages="{
startsWithPlus: $t(
@@ -302,7 +303,7 @@ export default {
v-if="!hasActiveCampaign"
name="message"
type="textarea"
:label-class="context => `text-sm font-medium ${labelClass(context)}`"
label-class="text-sm font-medium text-n-slate-12"
:input-class="context => inputClass(context)"
:label="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.LABEL')"
:placeholder="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.PLACEHOLDER')"
@@ -330,16 +331,21 @@ export default {
@apply mt-2;
.formkit-inner {
input.error,
textarea.error,
select.error {
@apply outline-n-ruby-8 dark:outline-n-ruby-8 hover:outline-n-ruby-9 dark:hover:outline-n-ruby-9 focus:outline-n-ruby-9 dark:focus:outline-n-ruby-9;
}
input[type='checkbox'] {
@apply size-4 outline-none;
}
}
&[data-invalid] {
.formkit-label {
@apply text-n-ruby-10;
}
.formkit-inner input,
.formkit-inner textarea,
.formkit-inner select {
@apply outline-n-ruby-8 dark:outline-n-ruby-8 hover:outline-n-ruby-9 dark:hover:outline-n-ruby-9 focus:outline-n-ruby-9 dark:focus:outline-n-ruby-9;
}
}
}
[data-invalid] .formkit-message {