fix some bugs with selecting an org

2024-09-19 00:42:45 -04:00 · 2024-09-19 00:42:45 -04:00 · c92ab6d41c
commit c92ab6d41c
parent 2a1cfa4994
1 changed files with 13 additions and 3 deletions
--- a/src/components/dashboard/sidebar/organization-selector.tsx
+++ b/src/components/dashboard/sidebar/organization-selector.tsx
@ -44,11 +44,21 @@ const OrganizationSelector = (): ReactElement => {

    // Set the selected organization
    useEffect(() => {
-        setSelected(
-            organizations.find((organization: Organization) => {
+        const toSelect: Organization | undefined = organizations.find(
+            (organization: Organization) => {
                return organization.snowflake === selectedOrganization;
-            })
+            }
        );
+        // Update the state for this page
+        setSelected(
+            toSelect ||
+                (organizations.length > 0 ? organizations[0] : undefined)
+        );
+
+        // Update the state for all pages
+        if (!toSelect && organizations.length > 0) {
+            setSelectedOrganization(organizations[0].snowflake);
+        }
    }, [organizations, selectedOrganization]);

    /**