From 60a3a62d6ede95d28bc5bf849a7e17050c264779 Mon Sep 17 00:00:00 2001 From: Marvin Bechtold Date: Tue, 18 Jan 2022 16:33:06 +0100 Subject: [PATCH 1/4] Add functionality to hide empty sections of a pattern Signed-off-by: Marvin Bechtold --- .../markdown-pattern-section-content.component.html | 2 +- .../markdown-pattern-section-content.component.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html index e8a72936..6ac5772b 100644 --- a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html +++ b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html @@ -1,4 +1,4 @@ - + {{title}} diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts index 9adc12a5..f4a9e519 100644 --- a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts +++ b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts @@ -45,6 +45,7 @@ export class MarkdownPatternSectionContentComponent extends DataRenderingCompone showCommentButton = true; showActionButtons = false; editingFromConfigServer = false + showSection = true @ViewChild('markdownContent') markdownDiv: ElementRef; @Input() content: string; private markdown: MarkdownIt; @@ -71,6 +72,7 @@ export class MarkdownPatternSectionContentComponent extends DataRenderingCompone changeText(value: string): void { this.markdownDiv.nativeElement.innerHTML = ''; this.renderedData = value; + this.showSection = this.renderedData.length > 0 this.renderSVGTags(value); this.cdr.detectChanges(); From c4bf29868413e1b213e3b1638ff7f174a6c8f5d1 Mon Sep 17 00:00:00 2001 From: Marvin Bechtold Date: Wed, 19 Jan 2022 09:22:30 +0100 Subject: [PATCH 2/4] Fix hide empty pattern sections only in read only mode Signed-off-by: Marvin Bechtold --- .../markdown-pattern-section-content.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html index 6ac5772b..76291a40 100644 --- a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html +++ b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.html @@ -1,4 +1,4 @@ - + {{title}} From 3a39651ffabc16bdc1caa5533ac9b40519fd0983 Mon Sep 17 00:00:00 2001 From: Marvin Bechtold Date: Wed, 19 Jan 2022 15:14:46 +0100 Subject: [PATCH 3/4] Fix possible NPE Signed-off-by: Marvin Bechtold --- .../markdown-pattern-section-content.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts index f4a9e519..d123cd2c 100644 --- a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts +++ b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts @@ -72,7 +72,7 @@ export class MarkdownPatternSectionContentComponent extends DataRenderingCompone changeText(value: string): void { this.markdownDiv.nativeElement.innerHTML = ''; this.renderedData = value; - this.showSection = this.renderedData.length > 0 + this.showSection = this.renderedData && this.renderedData.length > 0; this.renderSVGTags(value); this.cdr.detectChanges(); From 45c59c75f2fc5f91677dcb83f47e2eda2a346c30 Mon Sep 17 00:00:00 2001 From: Marvin Bechtold Date: Wed, 19 Jan 2022 16:10:48 +0100 Subject: [PATCH 4/4] Fix semicolons Signed-off-by: Marvin Bechtold --- .../markdown-pattern-section-content.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts index d123cd2c..d0ecde25 100644 --- a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts +++ b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts @@ -44,8 +44,8 @@ export class MarkdownPatternSectionContentComponent extends DataRenderingCompone isCommentingEnabled = false; showCommentButton = true; showActionButtons = false; - editingFromConfigServer = false - showSection = true + editingFromConfigServer = false; + showSection = true; @ViewChild('markdownContent') markdownDiv: ElementRef; @Input() content: string; private markdown: MarkdownIt;