Custom channel emoticons WIP (#130) + various fix/refactoring

This commit is contained in:
John Livingston
2024-06-05 18:27:57 +02:00
parent 04403225fb
commit 5c87eef915
7 changed files with 139 additions and 47 deletions

View File

@ -45,23 +45,30 @@ export class ChannelConfigurationElement extends LivechatElement {
args: () => [this.registerClientOptions]
})
private readonly _saveConfig = (event?: Event): void => {
private readonly _saveConfig = async (event?: Event): Promise<void> => {
event?.preventDefault()
if (this._channelDetailsService && this._channelConfiguration) {
this._channelDetailsService.saveOptions(this._channelConfiguration.channel.id,
this._channelConfiguration.configuration)
.then(() => {
this._validationError = undefined
this.registerClientOptions
?.peertubeHelpers.notifier.info('Livechat configuration has been properly updated.')
this.registerClientOptions?.peertubeHelpers.translate(LOC_SUCCESSFULLY_SAVED).then((msg) => {
this.registerClientOptions
?.peertubeHelpers.notifier.info(msg)
})
this.requestUpdate('_validationError')
})
.catch((error: ValidationError) => {
this._validationError = error
.catch(async (error: Error) => {
this._validationError = undefined
if (error instanceof ValidationError) {
this._validationError = error
}
console.warn(`A validation error occurred in saving configuration. ${error.name}: ${error.message}`)
this.registerClientOptions
?.peertubeHelpers.notifier.error(
`An error occurred. ${(error.message) ? `${error.message}` : ''}`)
this.registerClientOptions?.peertubeHelpers.notifier.error(
error.message
? error.message
: await this.registerClientOptions.peertubeHelpers.translate('error')
)
this.requestUpdate('_validationError')
})
}

View File

@ -38,21 +38,21 @@ export class ChannelEmojisElement extends LivechatElement {
protected override render = (): unknown => {
const tableHeaderList: DynamicFormHeader = {
shortname: {
sn: {
colName: ptTr(LOC_LIVECHAT_EMOJIS_SHORTNAME),
description: ptTr(LOC_LIVECHAT_EMOJIS_SHORTNAME_DESC)
},
file: {
url: {
colName: ptTr(LOC_LIVECHAT_EMOJIS_FILE),
description: ptTr(LOC_LIVECHAT_EMOJIS_FILE_DESC)
}
}
const tableSchema: DynamicFormSchema = {
shortname: {
sn: {
inputType: 'text',
default: ''
},
file: {
url: {
inputType: 'image-file',
default: ''
}
@ -81,11 +81,11 @@ export class ChannelEmojisElement extends LivechatElement {
.validation=${this._validationError?.properties}
.validationPrefix=${'emojis'}
.rows=${this._channelEmojisConfiguration?.emojis.customEmojis}
@update=${(_e: CustomEvent) => {
// if (this._channelEmojisConfiguration) {
// this._channelEmojisConfiguration.configuration.emojis.customEmojis = e.detail
// this.requestUpdate('_channelEmojisConfiguration')
// }
@update=${(e: CustomEvent) => {
if (this._channelEmojisConfiguration) {
this._channelEmojisConfiguration.emojis.customEmojis = e.detail
this.requestUpdate('_channelEmojisConfiguration')
}
}
}
></livechat-dynamic-table-form>
@ -118,9 +118,32 @@ export class ChannelEmojisElement extends LivechatElement {
args: () => []
})
private readonly _saveEmojis = (ev?: Event): void => {
private async _saveEmojis (ev?: Event): Promise<void> {
ev?.preventDefault()
// TODO
this.registerClientOptions?.peertubeHelpers.notifier.error('TODO')
const peertubeHelpers = this.registerClientOptions?.peertubeHelpers
if (!peertubeHelpers) { return } // Should not happen
if (!this._channelDetailsService || !this._channelEmojisConfiguration || !this.channelId) {
peertubeHelpers.notifier.error(await peertubeHelpers.translate(LOC_ERROR))
return
}
try {
await this._channelDetailsService.saveEmojisConfiguration(this.channelId, this._channelEmojisConfiguration.emojis)
this._validationError = undefined
this.requestUpdate('_validationError')
} catch (error) {
this._validationError = undefined
let msg: string
if ((error instanceof ValidationError)) {
this._validationError = error
if (error.message) {
msg = error.message
}
}
msg ??= await peertubeHelpers.translate(LOC_ERROR)
peertubeHelpers.notifier.error(msg)
this.requestUpdate('_validationError')
}
}
}