From 2d01b7f7a5f86e278b0b04aad5cc8cc3cdb8ac38 Mon Sep 17 00:00:00 2001
From: pmario <pmariojo@gmail.com>
Date: Wed, 1 Mar 2023 14:06:59 +0100
Subject: [PATCH 1/2] make import listing more configurable

---
 core/ui/ImportListing.tid                        | 6 +++++-
 core/ui/ImportListing/overwrite/default-text.tid | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 core/ui/ImportListing/overwrite/default-text.tid

diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid
index 4db1d4757fc..6fa5931788e 100644
--- a/core/ui/ImportListing.tid
+++ b/core/ui/ImportListing.tid
@@ -9,7 +9,11 @@ title: $:/core/ui/ImportListing
 \define overWriteWarning()
 \whitespace trim
 <$list filter="[<currentTiddler>!has<suppressedField>]">
-<$text text={{{[subfilter<payloadTitleFilter>!is[tiddler]then[]] ~[<lingo-base>addsuffix[Listing/Rename/OverwriteWarning]get[text]]}}}/>
+	<$list filter="[subfilter<payloadTitleFilter>is[tiddler]]" variable="ignore">
+		<$list filter="[all[shadows+tiddlers]tag[$:/tags/ImportOverwrite]]" variable="overwrite">
+			<$transclude tiddler=<<overwrite>> mode="block"/>
+		</$list>
+	</$list>
 </$list>
 \end
 
diff --git a/core/ui/ImportListing/overwrite/default-text.tid b/core/ui/ImportListing/overwrite/default-text.tid
new file mode 100644
index 00000000000..35ebbfa0806
--- /dev/null
+++ b/core/ui/ImportListing/overwrite/default-text.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ImportListing/overwrite/default-text
+tags: $:/tags/ImportOverwrite
+
+<$text text={{{ [<lingo-base>addsuffix[Listing/Rename/OverwriteWarning]get[text]] }}}/>
\ No newline at end of file

From ab2afaa4356dc7fd5c6c2854962ebdacbb0ccc49 Mon Sep 17 00:00:00 2001
From: pmario <pmariojo@gmail.com>
Date: Thu, 2 Mar 2023 00:26:46 +0100
Subject: [PATCH 2/2] Add !is[draft] to list filter. list emptyMessage <-
 default text

---
 core/ui/ImportListing.tid                        | 5 ++++-
 core/ui/ImportListing/overwrite/default-text.tid | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid
index 6fa5931788e..2adb4105ab6 100644
--- a/core/ui/ImportListing.tid
+++ b/core/ui/ImportListing.tid
@@ -10,7 +10,10 @@ title: $:/core/ui/ImportListing
 \whitespace trim
 <$list filter="[<currentTiddler>!has<suppressedField>]">
 	<$list filter="[subfilter<payloadTitleFilter>is[tiddler]]" variable="ignore">
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/ImportOverwrite]]" variable="overwrite">
+		<$list filter="[all[shadows+tiddlers]!is[draft]tag[$:/tags/ImportOverwrite]]" 
+			variable="overwrite"
+			emptyMessage={{$:/core/ui/ImportListing/overwrite/default-text}}
+		>
 			<$transclude tiddler=<<overwrite>> mode="block"/>
 		</$list>
 	</$list>
diff --git a/core/ui/ImportListing/overwrite/default-text.tid b/core/ui/ImportListing/overwrite/default-text.tid
index 35ebbfa0806..a56accba796 100644
--- a/core/ui/ImportListing/overwrite/default-text.tid
+++ b/core/ui/ImportListing/overwrite/default-text.tid
@@ -1,4 +1,3 @@
 title: $:/core/ui/ImportListing/overwrite/default-text
-tags: $:/tags/ImportOverwrite
 
 <$text text={{{ [<lingo-base>addsuffix[Listing/Rename/OverwriteWarning]get[text]] }}}/>
\ No newline at end of file