Check the version before displaying datasets (#245)

* check version before displaying datasets

* format

* using version from the top level

* add move checks

---------

Co-authored-by: generall <[email protected]>

Author: trean

src/lib/common-helpers.js

@@ -7,3 +7,27 @@ export const resizeObserverWithCallback = (callback) => {
     }
   });
 };
+
+/**
+ * Compare two semver strings.
+ * @param {string} version1 - The first version string.
+ * @param {string} version2 - The second version string.
+ * @return {number} - Returns 0 if the versions are equal, 1 if version1 is greater, and -1 if version2 is greater.
+ */
+export const compareSemver = function (version1, version2) {
+  const parseVersion = (version) => version.split('.').map(Number);
+
+  const [major1, minor1, patch1] = parseVersion(version1);
+  const [major2, minor2, patch2] = parseVersion(version2);
+
+  if (major1 !== major2) {
+    return major1 > major2 ? 1 : -1;
+  }
+  if (minor1 !== minor2) {
+    return minor1 > minor2 ? 1 : -1;
+  }
+  if (patch1 !== patch2) {
+    return patch1 > patch2 ? 1 : -1;
+  }
+  return 0;
+};

src/lib/tests/common-helpers.test.js

@@ -0,0 +1,25 @@
+import { describe, it, expect } from 'vitest';
+import { compareSemver } from '../common-helpers';
+
+describe('compareSemver', () => {
+  it('should return 0 if the versions are equal', () => {
+    const version1 = '1.0.0';
+    const version2 = '1.0.0';
+    const result = compareSemver(version1, version2);
+    expect(result).toEqual(0);
+  });
+
+  it('should return 1 if version1 is greater', () => {
+    const version1 = '1.0.1';
+    const version2 = '1.0.0';
+    const result = compareSemver(version1, version2);
+    expect(result).toEqual(1);
+  });
+
+  it('should return -1 if version2 is greater', () => {
+    const version1 = '1.0.0';
+    const version2 = '1.0.1';
+    const result = compareSemver(version1, version2);
+    expect(result).toEqual(-1);
+  });
+});

src/pages/Datasets.jsx

@@ -7,30 +7,52 @@ import { DatasetsTableRow } from '../components/Datasets/DatasetsTableRow';
 import { useClient } from '../context/client-context';
 import { useSnackbar } from 'notistack';
 import { getSnackbarOptions } from '../components/Common/utils/snackbarOptions';
+import { compareSemver } from '../lib/common-helpers';
+import { useOutletContext } from 'react-router-dom';
 
 function Datasets() {
   const [datasets, setDatasets] = useState([]);
   const { client: qdrantClient } = useClient();
   const [isLoading, setIsLoading] = useState(false);
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
   const errorSnackbarOptions = getSnackbarOptions('error', closeSnackbar);
+  const { version } = useOutletContext();
 
   useEffect(() => {
     const fetchData = async () => {
       setIsLoading(true);
       try {
         const response = await fetch('https://snapshots.qdrant.io/manifest.json');
         const responseJson = await response.json();
-        const datasets = responseJson.map((dataset) => {
-          return {
-            name: dataset.name,
-            fileName: dataset.file_name,
-            size: dataset.size,
-            vectors: dataset.vectors,
-            vectorCount: dataset.vector_count,
-            description: dataset.description,
-          };
-        });
+        const datasets = responseJson
+          .filter((dataset) => {
+            if (dataset.version === undefined) {
+              return true;
+            }
+            // There are a few exceptions:
+            // - dev version is always allowed, it includes `dev` as a substring
+            // - `???` means we can't display the version, so we only allow unversioned datasets
+            // - empty or underfined means the same as `???`
+
+            if (version || version === '???') {
+              return false;
+            }
+
+            if (version.includes('dev')) {
+              return true;
+            }
+            return compareSemver(version, dataset.version) >= 0;
+          })
+          .map((dataset) => {
+            return {
+              name: dataset.name,
+              fileName: dataset.file_name,
+              size: dataset.size,
+              vectors: dataset.vectors,
+              vectorCount: dataset.vector_count,
+              description: dataset.description,
+            };
+          });
         setDatasets(datasets);
       } catch (error) {
         enqueueSnackbar(error.message, errorSnackbarOptions);
@@ -52,10 +74,9 @@ function Datasets() {
       setImporting(true);
 
       try {
-        const response = await qdrantClient.recoverSnapshot(collectionName, {
+        await qdrantClient.recoverSnapshot(collectionName, {
           location: `https://snapshots.qdrant.io/${fileName}`,
         });
-        console.log(response);
         enqueueSnackbar('Snapshot successfully imported', getSnackbarOptions('success', closeSnackbar, 2000));
       } catch (e) {
         enqueueSnackbar(e.message, errorSnackbarOptions);

src/pages/Home.jsx

@@ -106,7 +106,7 @@ export default function MiniDrawer() {
       <Sidebar open={open} version={version} jwtEnabled={jwtEnabled} jwtVisible={jwtVisible} />
       <Box component="main" sx={{ flexGrow: 1, overflow: 'hidden' }}>
         <DrawerHeader />
-        <Outlet />
+        <Outlet context={{ version }} />
       </Box>
       <ApiKeyDialog open={apiKeyDialogOpen} setOpen={setApiKeyDialogOpen} onApply={OnApyKeyApply} />
     </Box>