Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-7684' into 'master'

Browse Source 
RED-7684: Convert line endings in rule editors to LF

Closes RED-7684

See merge request redactmanager/red-ui!130
This commit is contained in:
Timo Bejan 2023-10-06 08:53:49 +02:00
commit de355ad080
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/modules/admin/screens/rules/rules-screen/rules-screen.component.ts
View File

@ -105,7 +105,7 @@ export class RulesScreenComponent implements OnInit, ComponentCanDeactivate {
this._removeErrorMarkers(); this._removeErrorMarkers();
await firstValueFrom( await firstValueFrom(
this._rulesService.uploadRules({ this._rulesService.uploadRules({
rules: this._codeEditor.getModel().getValue(), rules: this._getValue(),
dossierTemplateId: this.#dossierTemplateId, dossierTemplateId: this.#dossierTemplateId,
ruleFileType: this.type, ruleFileType: this.type,
}), }),
@ -131,6 +131,11 @@ export class RulesScreenComponent implements OnInit, ComponentCanDeactivate {
this._loadingService.stop(); this._loadingService.stop();
} }
private _getValue(): string {
this._codeEditor.getModel().setEOL(monaco.editor.EndOfLineSequence.LF);
return this._codeEditor.getModel().getValue();
}
private async _configureSyntaxHighlighting() { private async _configureSyntaxHighlighting() {
const languages = (window as any).monaco.languages.getLanguages(); const languages = (window as any).monaco.languages.getLanguages();
const javaLang = languages.find(l => l.id === 'java'); const javaLang = languages.find(l => l.id === 'java');