Merge branch 'tweaks' of github.com:voxel51/fiftyone into tweaks

voxel51 · Nov 10, 2022 · cc75aa1 · cc75aa1
2 parents 29a1d77 + 4476b06
commit cc75aa1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/packages/core/src/components/Filters/withSuspense.tsx b/app/packages/core/src/components/Filters/withSuspense.tsx
@@ -28,7 +28,7 @@ const Body = styled.div`
 export const LoadingContainer = ({ path }: { path?: string; text: string }) => {
   return (
     <Container>
-      {path && <Header>{path}</Header>}
+      {path && <Header>{path.split(".").slice(-1)[0]}</Header>}
       <Body>
         <LoadingDots text={"Loading"} />
       </Body>

diff --git a/app/packages/state/src/recoil/sidebar.ts b/app/packages/state/src/recoil/sidebar.ts
@@ -98,7 +98,7 @@ export const useLabelTagText = (modal: boolean) => {
     useRecoilValueLoadable(readableTags({ modal, group: "label tags" }))
       .state === "loading";
 
-  return { text: loading ? "Loading label tags..." : "No label tags", loading };
+  return { text: loading ? "Loading label tags" : "No label tags", loading };
 };
 
 export const useTagText = (modal: boolean) => {
@@ -108,7 +108,7 @@ export const useTagText = (modal: boolean) => {
     "loading";
 
   return {
-    text: loading ? `Loading ${singular} tags...` : `No ${singular} tags`,
+    text: loading ? `Loading ${singular} tags` : `No ${singular} tags`,
     loading,
   };
 };

diff --git a/app/packages/utilities/src/index.ts b/app/packages/utilities/src/index.ts
@@ -354,7 +354,6 @@ const isURL = (() => {
   const nonLocalhostDomainRE = /^[^\s\.]+\.\S{2,}$/;
 
   return (string) => {
-    return true;
     if (string.startsWith("gs://")) {
       return false;
     }