Merge pull request #672 from SynBioHub/displaymembersbug

added null checks for compare strings, fixed issue with filters not w…

frontend/components/Admin/Plugins.js

@@ -356,7 +356,14 @@ const options = [
 ];
 
 const compareStrings = (string1, string2) => {
-  return (string1.toLowerCase() > string2.toLowerCase() && 1) || -1;
+  if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+  if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+  if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
+
+  const lowerString1 = string1.toLowerCase();
+  const lowerString2 = string2.toLowerCase();
+
+  return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
 };
 
 const sortMethods = {

frontend/components/Admin/Registries.js

@@ -336,7 +336,14 @@ const options = [
 ];
 
 const compareStrings = (string1, string2) => {
-  return (string1.toLowerCase() > string2.toLowerCase() && 1) || -1;
+  if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+  if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+  if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
+
+  const lowerString1 = string1.toLowerCase();
+  const lowerString2 = string2.toLowerCase();
+
+  return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
 };
 
 const sortMethods = {

frontend/components/Admin/Remotes.js

@@ -212,14 +212,21 @@ function Dropdown() {
 }
 
 
-const compareStrings = (string1, string2) => {
-  return (string1?.toLowerCase() > string2?.toLowerCase() && 1) || -1;
-};
+// const compareStrings = (string1, string2) => {
+//   if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+//   if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+//   if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
 
-const sortMethods = {
-  uri: (registry1, registry2) => compareStrings(registry1.uri, registry2.uri),
-  url: (registry1, registry2) => compareStrings(registry1.url, registry2.url)
-};
+//   const lowerString1 = string1.toLowerCase();
+//   const lowerString2 = string2.toLowerCase();
+
+//   return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
+// };
+
+// const sortMethods = {
+//   uri: (registry1, registry2) => compareStrings(registry1.uri, registry2.uri),
+//   url: (registry1, registry2) => compareStrings(registry1.url, registry2.url)
+// };
 
 const useRegistries = (token, dispatch) => {
   const { data, error } = useSWR(

frontend/components/Admin/Users.js

@@ -416,7 +416,14 @@ const options = [
 ];
 
 const compareStrings = (string1, string2) => {
-  return (string1.toLowerCase() > string2.toLowerCase() && 1) || -1;
+  if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+  if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+  if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
+
+  const lowerString1 = string1.toLowerCase();
+  const lowerString2 = string2.toLowerCase();
+
+  return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
 };
 
 const compareBools = (bool1, bool2) => {

frontend/components/Basket/Basket.js

@@ -264,7 +264,14 @@ const options = [
 ];
 
 const compareStrings = (string1, string2) => {
-  return (string1.toLowerCase() > string2.toLowerCase() && 1) || -1;
+  if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+  if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+  if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
+
+  const lowerString1 = string1.toLowerCase();
+  const lowerString2 = string2.toLowerCase();
+
+  return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
 };
 
 const sortMethods = {

frontend/components/Viewing/Collection/Members.js

@@ -88,9 +88,13 @@ export default function Members(properties) {
   } else {
   }
 
-  const searchQuery = preparedSearch || typeFilter !== 'Show Only Root Objects';
+  const searchQuery = typeFilter !== 'Show Only Root Objects';
 
-  let query = searchQuery ? getCollectionMembersSearch : getCollectionMembers;
+  let query = getCollectionMembers;
+
+  if (typeFilter === 'Show All Objects') {
+    query = getCollectionMembersSearch;
+  }
 
   const { members, mutate } = privateGraph
     ? useMembers(query, parameters, token, dispatch)

frontend/pages/submissions.js

@@ -130,7 +130,14 @@ const options = [
 ];
 
 const compareStrings = (string1, string2) => {
-  return (string1.toLowerCase() > string2.toLowerCase() && 1) || -1;
+  if (!string1 && !string2) return 0; // Both strings are undefined or null, they are equal
+  if (!string1) return -1; // Only string1 is undefined or null, string1 is less
+  if (!string2) return 1;  // Only string2 is undefined or null, string1 is greater
+
+  const lowerString1 = string1.toLowerCase();
+  const lowerString2 = string2.toLowerCase();
+
+  return (lowerString1 > lowerString2 && 1) || (lowerString1 < lowerString2 && -1) || 0;
 };
 
 const sortMethods = {

frontend/public/commitHash.txt

@@ -1 +1 @@
-666013bbfabf3b5ea9144e3288d10ee391901bab
+ee02edf1d93748a2bab27328c0a80bf7e9e82515

frontend/sparql/getCollectionMembersSearch.js

@@ -7,7 +7,7 @@ SELECT ?uri
        ?type
        ?sbolType
        ?role
-
+$from
 WHERE { {
 SELECT DISTINCT ?uri 
        ?displayId