move function

Author: DarshanaVenkatesh

packages/compass-indexes/src/components/indexes-toolbar/indexes-toolbar.tsx

@@ -23,12 +23,14 @@ import { useConnectionInfo } from '@mongodb-js/compass-connections/provider';
 import semver from 'semver';
 
 import type { RootState } from '../../modules';
-import { createSearchIndexOpened } from '../../modules/search-indexes';
+import {
+  compareVersionForViewSearchCompatibility,
+  createSearchIndexOpened,
+} from '../../modules/search-indexes';
 import { getAtlasSearchIndexesLink } from '../../utils/atlas-search-indexes-link';
 import { createIndexOpened } from '../../modules/create-index';
 import type { IndexView } from '../../modules/index-view';
 import { indexViewChanged } from '../../modules/index-view';
-import { compareVersionForViewCompatibility } from '../indexes/indexes';
 
 const toolbarButtonsContainer = css({
   display: 'flex',
@@ -110,7 +112,8 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
   const { atlasMetadata } = useConnectionInfo();
   const showInsights = usePreference('showInsights') && !errorMessage;
   const showCreateIndexButton =
-    (!isReadonlyView || compareVersionForViewCompatibility(serverVersion)) &&
+    (!isReadonlyView ||
+      compareVersionForViewSearchCompatibility(serverVersion)) &&
     !readOnly &&
     !errorMessage;
   const refreshButtonIcon = isRefreshing ? (
@@ -127,7 +130,7 @@ export const IndexesToolbar: React.FunctionComponent<IndexesToolbarProps> = ({
       data-testid="indexes-toolbar-container"
     >
       {(!isReadonlyView ||
-        compareVersionForViewCompatibility(serverVersion)) && (
+        compareVersionForViewSearchCompatibility(serverVersion)) && (
         <div data-testid="indexes-toolbar">
           <div className={toolbarButtonsContainer}>
             {showCreateIndexButton && (

packages/compass-indexes/src/components/indexes/indexes.tsx

@@ -15,7 +15,10 @@ import IndexesToolbar from '../indexes-toolbar/indexes-toolbar';
 import RegularIndexesTable from '../regular-indexes-table/regular-indexes-table';
 import SearchIndexesTable from '../search-indexes-table/search-indexes-table';
 import { refreshRegularIndexes } from '../../modules/regular-indexes';
-import { refreshSearchIndexes } from '../../modules/search-indexes';
+import {
+  compareVersionForViewSearchCompatibility,
+  refreshSearchIndexes,
+} from '../../modules/search-indexes';
 import type { State as RegularIndexesState } from '../../modules/regular-indexes';
 import type { State as SearchIndexesState } from '../../modules/search-indexes';
 import { FetchStatuses } from '../../utils/fetch-status';
@@ -32,7 +35,6 @@ import { getAtlasSearchIndexesLink } from '../../utils/atlas-search-indexes-link
 import CreateIndexModal from '../create-index-modal/create-index-modal';
 import { ZeroGraphic } from '../search-indexes-table/zero-graphic';
 import { ViewVersionIncompatibleBanner } from '../view-version-incompatible-banners/view-version-incompatible-banners';
-import semver from 'semver';
 
 // This constant is used as a trigger to show an insight whenever number of
 // indexes in a collection is more than what is specified here.
@@ -52,20 +54,6 @@ const linkTitle = 'Search and Vector Search.';
 const DISMISSED_SEARCH_INDEXES_BANNER_LOCAL_STORAGE_KEY =
   'mongodb_compass_dismissedSearchIndexesBanner' as const;
 
-const MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS = '8.1.0';
-export const compareVersionForViewCompatibility = (
-  //default to 8.1+
-  serverVersion: string,
-  comparator: 'gt' | 'gte' | 'lt' | 'lte' = 'gte',
-  compareVersion: string = MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS
-) => {
-  try {
-    return semver[comparator](serverVersion, compareVersion);
-  } catch {
-    return false;
-  }
-};
-
 const ViewVersionIncompatibleEmptyState = ({
   serverVersion,
   enableAtlasSearchIndexes,
@@ -74,7 +62,7 @@ const ViewVersionIncompatibleEmptyState = ({
   enableAtlasSearchIndexes: boolean;
 }) => {
   if (
-    compareVersionForViewCompatibility(serverVersion) &&
+    compareVersionForViewSearchCompatibility(serverVersion) &&
     enableAtlasSearchIndexes
   ) {
     return null;
@@ -222,7 +210,7 @@ export function Indexes({
             />
           )}
           {(!isReadonlyView ||
-            compareVersionForViewCompatibility(serverVersion, 'gte')) &&
+            compareVersionForViewSearchCompatibility(serverVersion, 'gte')) &&
             !enableAtlasSearchIndexes && (
               <AtlasIndexesBanner
                 namespace={namespace}
@@ -236,7 +224,7 @@ export function Indexes({
             <RegularIndexesTable />
           )}
           {(!isReadonlyView ||
-            compareVersionForViewCompatibility(serverVersion)) &&
+            compareVersionForViewSearchCompatibility(serverVersion)) &&
             currentIndexesView === 'search-indexes' && <SearchIndexesTable />}
           {isReadonlyView && searchIndexes.indexes.length === 0 && (
             <ViewVersionIncompatibleEmptyState

packages/compass-indexes/src/components/view-version-incompatible-banners/view-version-incompatible-banners.tsx

@@ -7,7 +7,7 @@ import {
 import { getAtlasUpgradeClusterLink } from '../../utils/atlas-upgrade-cluster-link';
 import React from 'react';
 import type { AtlasClusterMetadata } from '@mongodb-js/connection-info';
-import { compareVersionForViewCompatibility } from '../indexes/indexes';
+import { compareVersionForViewSearchCompatibility } from '../../modules/search-indexes';
 
 const viewContentStyles = css({
   display: 'flex',
@@ -28,15 +28,15 @@ export const ViewVersionIncompatibleBanner = ({
   const searchIndexOnViewsVersion = enableAtlasSearchIndexes ? '8.1' : '8.0';
 
   if (
-    compareVersionForViewCompatibility(serverVersion) ||
-    (compareVersionForViewCompatibility(serverVersion, 'gte', '8.0.0') &&
+    compareVersionForViewSearchCompatibility(serverVersion) ||
+    (compareVersionForViewSearchCompatibility(serverVersion, 'gte', '8.0.0') &&
       !enableAtlasSearchIndexes)
   ) {
     // return if 8.1+ on compass or 8.0+ for data explorer
     return null;
   }
 
-  if (compareVersionForViewCompatibility(serverVersion, 'lt', '8.0.0')) {
+  if (compareVersionForViewSearchCompatibility(serverVersion, 'lt', '8.0.0')) {
     // data explorer <8.0 and compass <8.0
     return (
       <Banner
@@ -73,8 +73,8 @@ export const ViewVersionIncompatibleBanner = ({
   }
 
   if (
-    compareVersionForViewCompatibility(serverVersion, 'gte', '8.0.0') &&
-    compareVersionForViewCompatibility(serverVersion, 'lt', '8.1.0') &&
+    compareVersionForViewSearchCompatibility(serverVersion, 'gte', '8.0.0') &&
+    compareVersionForViewSearchCompatibility(serverVersion, 'lt', '8.1.0') &&
     enableAtlasSearchIndexes
   ) {
     // compass 8.0

packages/compass-indexes/src/modules/search-indexes.ts

@@ -25,17 +25,31 @@ const ATLAS_SEARCH_SERVER_ERRORS: Record<string, string> = {
     'This index name is already in use. Please choose another one.',
 };
 
-const MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS = '8.1.0';
+/*const MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS = '8.1.0';
 
 const isVersionSearchCompatibleForViews = (serverVersion: string) => {
   try {
     return semver.gte(
-      serverVersion,
-      MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS
+        serverVersion,
+        MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS
     );
   } catch {
     return false;
   }
+};*/
+
+const MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS = '8.1.0';
+export const compareVersionForViewSearchCompatibility = (
+  //default to 8.1+
+  serverVersion: string,
+  comparator: 'gt' | 'gte' | 'lt' | 'lte' = 'gte',
+  compareVersion: string = MIN_VERSION_FOR_VIEW_SEARCH_COMPATIBILITY_COMPASS
+) => {
+  try {
+    return semver[comparator](serverVersion, compareVersion);
+  } catch {
+    return false;
+  }
 };
 
 export enum ActionTypes {
@@ -621,7 +635,8 @@ const fetchIndexes = (
     } = getState();
 
     if (
-      (isReadonlyView && !isVersionSearchCompatibleForViews(serverVersion)) ||
+      (isReadonlyView &&
+        !compareVersionForViewSearchCompatibility(serverVersion)) ||
       !isWritable
     ) {
       return; // return if view is not search compatible