Fixing server switch list and default view

OpenConceptLab · Oct 18, 2022 · 376f487 · 376f487
1 parent df59f8e
commit 376f487
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/common/utils.js b/src/common/utils.js
@@ -421,8 +421,8 @@ export const getAppliedServerConfig = () => {
 }
 
 export const isServerSwitched = () => {
-  const selectedConfig = getSelectedServerConfig();
-  return selectedConfig && selectedConfig.url !== (window.API_URL || process.env.API_URL);
+  const selectedServer = getSelectedServerConfig()
+  return selectedServer && selectedServer.id !== getDefaultServerConfig()?.id;
 };
 
 export const getDefaultServerConfig = () => {
@@ -513,7 +513,7 @@ export const getServerConfigsForCurrentUser = () => {
   }
 
   eligible = compact([defaultConfig, appliedConfig, ...eligible]);
-  return uniqBy(eligible, 'url');
+  return uniqBy(eligible, 'id');
 }
 
 export const arrayToSentence = (arr, separator, lastSeparator=' and ') => {

diff --git a/src/components/common/ServerConfigList.jsx b/src/components/common/ServerConfigList.jsx
@@ -19,7 +19,7 @@ const ServerConfigList = ({ onClose }) => {
   const onChange = (event, config) => {
     event.preventDefault();
     event.stopPropagation();
-    if(get(selectedConfig, 'url') === config.url){
+    if(selectedConfig?.id ? selectedConfig.id === config.id : selectedConfig?.url === config.url){
       onClose();
       return;
     }
@@ -45,8 +45,8 @@ const ServerConfigList = ({ onClose }) => {
     <List component="div" disablePadding>
       {
         map(eligibleServerConfigs, config => {
-          const selected = get(selectedConfig, 'url') === config.url;
-          const isDefault = config.url === defaultConfig.url;
+          const selected = selectedConfig.id ? selectedConfig.id === config.id : get(selectedConfig, 'url') === config.url;
+          const isDefault = defaultConfig.id ? defaultConfig.id === config.id : config.url === defaultConfig.url;
           return (
             <ListItem disabled={config.disabled} selected={selected} className='btn' button key={config.id} onClick={event => onChange(event, config)} style={{cursor: config.disabled ? 'not-allowed' : 'pointer'}}>
               <ListItemIcon style={{minWidth: 'auto', marginRight: '15px', width: '22px', height: '22px'}}>