From b1cf576c5e2d46d54a996a3ae47489d7b2d9c57e Mon Sep 17 00:00:00 2001
From: Chris Thompson <christhompson@google.com>
Date: Mon, 14 Aug 2023 15:15:59 -0700
Subject: [PATCH 1/5] Fix labels on some callout icons.

---
 src/components/Database/DatabaseContainer.tsx |  2 +-
 src/components/common/Callout.tsx             | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/Database/DatabaseContainer.tsx b/src/components/Database/DatabaseContainer.tsx
index 2293c71c0..507705fbf 100644
--- a/src/components/Database/DatabaseContainer.tsx
+++ b/src/components/Database/DatabaseContainer.tsx
@@ -60,7 +60,7 @@ export const DatabaseContainer: React.FC<React.PropsWithChildren<Props>> = ({
       <GridCell span={12} className="Database-Container">
         {hasNewDbs && (
           <Callout
-            icon="info"
+            type="note"
             actions={
               <Button theme="secondary" onClick={() => setDbs(databases)}>
                 Reload
diff --git a/src/components/common/Callout.tsx b/src/components/common/Callout.tsx
index c0ac2659d..de612cbfa 100644
--- a/src/components/common/Callout.tsx
+++ b/src/components/common/Callout.tsx
@@ -24,17 +24,16 @@ import React, { ReactNode } from 'react';
 import { CustomThemeProvider, CustomThemeType, Type } from '../../themes';
 
 export interface CalloutProps {
-  /** Custom icon to override the default */
-  icon?: string;
   /** Show a lighter version of the callout */
   aside?: true;
   /** The color scheme of the callout. Defaults to 'note' */
   type?: CustomThemeType;
-
   /** Action buttons */
   actions?: ReactNode;
 }
 
+// Using a type from the map ensures we can apply the correct aria label in
+// addition to providing easy-to-use defailts.
 const DEFAULT_ICON_MAP: Record<string, string> = {
   [Type.CAUTION]: 'error',
   [Type.NOTE]: 'info',
@@ -45,12 +44,11 @@ const DEFAULT_ICON_MAP: Record<string, string> = {
 
 export const Callout: React.FC<React.PropsWithChildren<CalloutProps>> = ({
   children,
-  actions,
-  icon,
   aside,
   type = Type.NOTE,
+  actions,
 }) => {
-  const iconName = icon || DEFAULT_ICON_MAP[type];
+  const iconName = DEFAULT_ICON_MAP[type];
   const asideClass = aside ? ' Callout-aside' : '';
   const classes = `Callout Callout-${type}${asideClass}`;
 
@@ -66,7 +64,7 @@ export const Callout: React.FC<React.PropsWithChildren<CalloutProps>> = ({
             {iconName && (
               <Icon
                 icon={iconName}
-                aria-hidden="true"
+                aria-label={iconName + " icon"}
                 className="Callout-icon"
               />
             )}

From 235c11d4d2bf42da3f83733b4946d6425d263fb8 Mon Sep 17 00:00:00 2001
From: Chris Thompson <christhompson@google.com>
Date: Mon, 14 Aug 2023 17:36:53 -0700
Subject: [PATCH 2/5] Selected RTDB

---
 src/components/Database/DatabasePicker.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/Database/DatabasePicker.tsx b/src/components/Database/DatabasePicker.tsx
index 66c11ff1a..d66321256 100644
--- a/src/components/Database/DatabasePicker.tsx
+++ b/src/components/Database/DatabasePicker.tsx
@@ -53,6 +53,10 @@ const DatabaseListItem: React.FC<
     <ListItem
       activated={activated}
       tag={Link}
+      aria-label={
+        // If this is the active DB, adjust the screen reader label to indicate as much.
+        activated ? name + ', currently selected' : ''
+      }
       to={to}
       data-testid={`nav-${name}`}
     >

From 1b61705d9b552e01076b10cb0603c085ede653d2 Mon Sep 17 00:00:00 2001
From: Chris Thompson <christhompson@google.com>
Date: Mon, 14 Aug 2023 17:45:50 -0700
Subject: [PATCH 3/5] More

---
 test-data/database_export/someotherdb.json |  1 +
 test-data/firebase-export-metadata.json    | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test-data/database_export/someotherdb.json

diff --git a/test-data/database_export/someotherdb.json b/test-data/database_export/someotherdb.json
new file mode 100644
index 000000000..7f228f99e
--- /dev/null
+++ b/test-data/database_export/someotherdb.json
@@ -0,0 +1 @@
+{"a":"b"}
\ No newline at end of file
diff --git a/test-data/firebase-export-metadata.json b/test-data/firebase-export-metadata.json
index 8eeba6c66..9e3cc1962 100644
--- a/test-data/firebase-export-metadata.json
+++ b/test-data/firebase-export-metadata.json
@@ -1 +1,20 @@
-{"version":"7.15.1","firestore":{"version":"1.11.1","path":"firestore_export","metadata_file":"firestore_export/firestore_export.overall_export_metadata"}}
\ No newline at end of file
+{
+  "version": "12.4.4",
+  "firestore": {
+    "version": "1.18.1",
+    "path": "firestore_export",
+    "metadata_file": "firestore_export/firestore_export.overall_export_metadata"
+  },
+  "database": {
+    "version": "4.11.2",
+    "path": "database_export"
+  },
+  "auth": {
+    "version": "12.4.4",
+    "path": "auth_export"
+  },
+  "storage": {
+    "version": "12.4.4",
+    "path": "storage_export"
+  }
+}
\ No newline at end of file

From 67775e47f9c91d2e60556e4a817dc855fa481166 Mon Sep 17 00:00:00 2001
From: christhompsongoogle
 <106194718+christhompsongoogle@users.noreply.github.com>
Date: Mon, 14 Aug 2023 17:49:50 -0700
Subject: [PATCH 4/5] Update Callout.tsx

---
 src/components/common/Callout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/Callout.tsx b/src/components/common/Callout.tsx
index de612cbfa..91da4bb5e 100644
--- a/src/components/common/Callout.tsx
+++ b/src/components/common/Callout.tsx
@@ -33,7 +33,7 @@ export interface CalloutProps {
 }
 
 // Using a type from the map ensures we can apply the correct aria label in
-// addition to providing easy-to-use defailts.
+// addition to providing easy-to-use defaults.
 const DEFAULT_ICON_MAP: Record<string, string> = {
   [Type.CAUTION]: 'error',
   [Type.NOTE]: 'info',

From 9aa636bd24cd08b883824a70ac29581ba3f814bf Mon Sep 17 00:00:00 2001
From: Chris Thompson <christhompson@google.com>
Date: Mon, 14 Aug 2023 17:55:49 -0700
Subject: [PATCH 5/5] format

---
 src/components/common/Callout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/Callout.tsx b/src/components/common/Callout.tsx
index de612cbfa..9a5019cb4 100644
--- a/src/components/common/Callout.tsx
+++ b/src/components/common/Callout.tsx
@@ -64,7 +64,7 @@ export const Callout: React.FC<React.PropsWithChildren<CalloutProps>> = ({
             {iconName && (
               <Icon
                 icon={iconName}
-                aria-label={iconName + " icon"}
+                aria-label={iconName + ' icon'}
                 className="Callout-icon"
               />
             )}