fix: Org switcher displays the correct selection [EP-3007]

natgeosociety · Oct 5, 2020 · aa9e4d4 · aa9e4d4
1 parent e687b8c
commit aa9e4d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/packages/earth-admin/src/layouts/Sidebar.tsx b/packages/earth-admin/src/layouts/Sidebar.tsx
@@ -55,7 +55,7 @@ const SidebarLayout = (props: IProps) => {
         <AppContextSwitcher
           logo={logo}
           label={selectedGroup}
-          defaultValue={selectedGroup}
+          value={selectedGroup}
           onChange={(selectedValue) => {
             if (selectedValue === 'map-view') {
               window.location.assign(urljoin(MAP_PATH, 'earth'));

diff --git a/packages/earth-map/src/components/header/component.tsx b/packages/earth-map/src/components/header/component.tsx
@@ -184,7 +184,7 @@ const Header = (props: IProps) => {
     <AppContextSwitcher
       logo={logo}
       label="Map View"
-      defaultValue="map-view"
+      value="map-view"
       checkedCount={selectedGroups.length}
       renderDropdown={isAuthenticated}
       onChange={(g) => window.location.assign(`${ADMIN_URL}${g}`)}

diff --git a/packages/earth-shared/src/components/app-context-switcher/AppContextSwitcher.tsx b/packages/earth-shared/src/components/app-context-switcher/AppContextSwitcher.tsx
@@ -30,7 +30,7 @@ import { Option } from './Option';
 interface IProps {
   label: string;
   logo?: React.ReactNode;
-  defaultValue?: string;
+  value?: any;
   checkedCount?: number;
   renderDropdown?: boolean;
   children?: React.ReactChildren | Array<React.ReactChildren>;
@@ -41,14 +41,13 @@ const AppContextSwitcher = (props: IProps) => {
   const {
     label,
     logo,
-    defaultValue,
+    value,
     checkedCount = 0,
     renderDropdown = true,
     children,
     onChange = noop,
   } = props;
 
-  const [selectedValue, setSelectedValue] = useState(defaultValue);
   const [isOpen, setIsOpen] = useState(false);
   const toggleDropdown = () => setIsOpen(!isOpen);
   const closeDropdown = () => setIsOpen(false);
@@ -96,13 +95,12 @@ const AppContextSwitcher = (props: IProps) => {
                       return;
                     }
                     const isOptionElement = child.props.value;
-                    const selected = child.props.value === selectedValue;
+                    const selected = child.props.value === value;
                     return isOptionElement
                       ? cloneElement(child, {
                           selected,
                           onClick: (value: any) => {
                             if (!selected) {
-                              setSelectedValue(value);
                               onChange(value);
                             }
                             closeDropdown();