From a45dd99b9084c660ef57f7e240df98f3e43a3ed3 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Fri, 19 Feb 2021 13:28:54 -0500
Subject: [PATCH 1/5] Remove unused deps

---
 plugins/scaffolder/package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index c5b264154d..ebb7f2afad 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -38,14 +38,12 @@
     "@backstage/theme": "^0.2.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "4.0.0-alpha.45",
     "@rjsf/core": "^2.4.0",
     "@rjsf/material-ui": "^2.4.0",
     "classnames": "^2.2.6",
     "git-url-parse": "^11.4.4",
     "humanize-duration": "^3.25.1",
     "luxon": "^1.25.0",
-    "moment": "^2.26.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-lazylog": "^4.5.2",

From 38c8c8a538084374fe917e63cba276b6a96e8093 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Fri, 19 Feb 2021 14:12:21 -0500
Subject: [PATCH 2/5] Changing loading and error msg

---
 .../ScaffolderPage/ScaffolderPage.tsx         | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 74582d0762..4462c333b1 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -156,21 +156,24 @@ export const ScaffolderPageContents = () => {
             <ResultsFilter availableCategories={availableCategories} />
           </div>
           <div>
-            {!matchingEntities && loading && <Progress />}
-            {matchingEntities && !matchingEntities.length && (
-              <Typography variant="body2">
-                Shoot! Looks like you don't have any templates. Check out the
-                documentation{' '}
-                <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
-                  here!
-                </Link>
-              </Typography>
-            )}
+
+            {loading && <Progress />}
+
             {error && (
               <WarningPanel title="Oops! Something went wrong loading the templates">
                 {error.message}
               </WarningPanel>
             )}
+
+            {!error && !loading && matchingEntities && !matchingEntities.length && (
+              <Typography variant="body2">
+                No templates found that match your filter. Learn more about{' '}
+                <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
+                  adding templates
+                </Link>.
+              </Typography>
+            )}
+
             <Grid container>
               {matchingEntities &&
                 matchingEntities?.length > 0 &&

From e488f050266ba21db2fb85a9058ac8b8d3e38bc3 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Fri, 19 Feb 2021 14:13:08 -0500
Subject: [PATCH 3/5] add changeset

---
 .changeset/curly-poems-boil.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/curly-poems-boil.md

diff --git a/.changeset/curly-poems-boil.md b/.changeset/curly-poems-boil.md
new file mode 100644
index 0000000000..22d5df4665
--- /dev/null
+++ b/.changeset/curly-poems-boil.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Update messages that process during loading, error, and no templates found.
+Remove unused dependencies.

From d171e60c2cec8d4c7881ee25faea2ca77dd7b962 Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Fri, 19 Feb 2021 14:14:07 -0500
Subject: [PATCH 4/5] Prettier

---
 .../ScaffolderPage/ScaffolderPage.tsx         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 4462c333b1..e4ebc75b2e 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -156,7 +156,6 @@ export const ScaffolderPageContents = () => {
             <ResultsFilter availableCategories={availableCategories} />
           </div>
           <div>
-
             {loading && <Progress />}
 
             {error && (
@@ -165,14 +164,18 @@ export const ScaffolderPageContents = () => {
               </WarningPanel>
             )}
 
-            {!error && !loading && matchingEntities && !matchingEntities.length && (
-              <Typography variant="body2">
-                No templates found that match your filter. Learn more about{' '}
-                <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
-                  adding templates
-                </Link>.
-              </Typography>
-            )}
+            {!error &&
+              !loading &&
+              matchingEntities &&
+              !matchingEntities.length && (
+                <Typography variant="body2">
+                  No templates found that match your filter. Learn more about{' '}
+                  <Link href="https://backstage.io/docs/features/software-templates/adding-templates">
+                    adding templates
+                  </Link>
+                  .
+                </Typography>
+              )}
 
             <Grid container>
               {matchingEntities &&

From c46bc07d0e6d9d62ccffd32124c1783d2db4ee4b Mon Sep 17 00:00:00 2001
From: Adam Harvey <adam.harvey@dxc.com>
Date: Fri, 19 Feb 2021 15:41:40 -0500
Subject: [PATCH 5/5] Return material-ui/lab

---
 plugins/scaffolder/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index ebb7f2afad..2018887013 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -38,6 +38,7 @@
     "@backstage/theme": "^0.2.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.45",
     "@rjsf/core": "^2.4.0",
     "@rjsf/material-ui": "^2.4.0",
     "classnames": "^2.2.6",