From abab1523ab7a298b6637b5224e05f3504135d8fc Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 12 Mar 2024 19:40:26 +0100 Subject: [PATCH] Ignore that error. --- .../features/settings/pages/jobs/job.component.html | 2 +- .../features/settings/pages/jobs/job.component.scss | 11 +++++++++-- .../angular/forms/editors/code-editor.component.ts | 13 ++++++++++--- .../app/framework/angular/global-error-handler.ts | 2 -- .../src/app/framework/angular/stateful.component.ts | 6 +++++- .../src/app/framework/angular/template.directive.ts | 1 - 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/features/settings/pages/jobs/job.component.html b/frontend/src/app/features/settings/pages/jobs/job.component.html index 9a7f5d3de..94a5db804 100644 --- a/frontend/src/app/features/settings/pages/jobs/job.component.html +++ b/frontend/src/app/features/settings/pages/jobs/job.component.html @@ -53,7 +53,7 @@
- +
diff --git a/frontend/src/app/features/settings/pages/jobs/job.component.scss b/frontend/src/app/features/settings/pages/jobs/job.component.scss index 060ce4a14..6fdb59b4d 100644 --- a/frontend/src/app/features/settings/pages/jobs/job.component.scss +++ b/frontend/src/app/features/settings/pages/jobs/job.component.scss @@ -8,8 +8,7 @@ } .job { - &-header, - &-dump { + &-header { padding: .75rem 1.25rem; } @@ -27,6 +26,14 @@ } } +:host ::ng-deep { + .ace_editor { + background: none !important; + border: 0 !important; + border-radius: 0 !important; + } +} + .btn-expand.expanded::before { bottom: -1.35rem; } \ No newline at end of file diff --git a/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts b/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts index b438aa857..d7be93f7a 100644 --- a/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts +++ b/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts @@ -51,6 +51,9 @@ export class CodeEditorComponent extends StatefulControlComponent<{}, any> imple @Input({ transform: numberAttribute }) public maxLines: number | undefined; + @Input({ transform: numberAttribute }) + public minLines: number | undefined; + @Input({ transform: booleanAttribute }) public singleLine = false; @@ -71,7 +74,11 @@ export class CodeEditorComponent extends StatefulControlComponent<{}, any> imple @Input() public set completion(value: ScriptCompletions | undefined | null) { if (value) { - this.completions = value.map(({ path, description, type, ...other }) => ({ value: path, name: path, description, meta: type?.toLowerCase(), path, ...other })); + this.completions = value.map(source => { + const { path, description, type, ...other } = source; + + return { value: path, name: path, description, meta: type?.toLowerCase(), path, ...other }; + }); } else { this.completions = []; } @@ -88,7 +95,7 @@ export class CodeEditorComponent extends StatefulControlComponent<{}, any> imple this.setMode(); } - if (changes.height || changes.maxLines || changes.singleLine || changes.snippets) { + if (changes.height || changes.maxLines || changes.minLines || changes.singleLine || changes.snippets) { this.setOptions(); } @@ -279,7 +286,7 @@ export class CodeEditorComponent extends StatefulControlComponent<{}, any> imple minLines = lines; } else if (this.height === 'auto') { maxLines = this.maxLines || 500; - minLines = Math.min(3, maxLines); + minLines = Math.max(this.minLines || 0, Math.min(3, maxLines)); } } else { maxLines = 1; diff --git a/frontend/src/app/framework/angular/global-error-handler.ts b/frontend/src/app/framework/angular/global-error-handler.ts index 9977c8746..465a20f11 100644 --- a/frontend/src/app/framework/angular/global-error-handler.ts +++ b/frontend/src/app/framework/angular/global-error-handler.ts @@ -27,7 +27,5 @@ export class GlobalErrorHandler implements ErrorHandler { }); }); } - - console.error(error); } } \ No newline at end of file diff --git a/frontend/src/app/framework/angular/stateful.component.ts b/frontend/src/app/framework/angular/stateful.component.ts index 12aca7621..105f12e48 100644 --- a/frontend/src/app/framework/angular/stateful.component.ts +++ b/frontend/src/app/framework/angular/stateful.component.ts @@ -20,7 +20,11 @@ export abstract class StatefulComponent extends State this.subscription = this.changes.pipe(skip(1)).subscribe(() => { - this.changeDetector.detectChanges(); + try { + this.changeDetector.detectChanges(); + } catch { + return; + } }); } diff --git a/frontend/src/app/framework/angular/template.directive.ts b/frontend/src/app/framework/angular/template.directive.ts index de31bec85..bc3fd4bd2 100644 --- a/frontend/src/app/framework/angular/template.directive.ts +++ b/frontend/src/app/framework/angular/template.directive.ts @@ -17,6 +17,5 @@ export class SidebarMenuDirective { constructor( public readonly templateRef: TemplateRef, ) { - console.log('FAsd'); } } \ No newline at end of file