address PR comments

Author: paula-stacho

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

@@ -399,7 +399,7 @@ const Schema: React.FunctionComponent<{
         toolbar={
           <SchemaToolbar
             onAnalyzeSchemaClicked={onApplyClicked}
-            onResetClicked={onStartAnalysis}
+            onResetClicked={onApplyClicked}
             analysisState={analysisState}
             errorMessage={errorMessage || ''}
             isOutdated={!!outdated}

packages/compass-schema/src/stores/reducer.ts

@@ -43,7 +43,6 @@ export const enum SchemaActions {
   analysisStarted = 'schema-service/schema/analysisStarted',
   analysisFinished = 'schema-service/schema/analysisFinished',
   analysisFailed = 'schema-service/schema/analysisFailed',
-  analysisCancelled = 'schema-service/schema/analysisCancelled',
 }
 
 export type AnalysisStartedAction = {
@@ -119,8 +118,10 @@ function resultId(): string {
 export const handleSchemaShare = (): SchemaThunkAction<void> => {
   return (dispatch, getState, { namespace }) => {
     const { schema } = getState();
-    void navigator.clipboard.writeText(JSON.stringify(schema, null, '  '));
     const hasSchema = schema !== null;
+    if (hasSchema) {
+      void navigator.clipboard.writeText(JSON.stringify(schema, null, '  '));
+    }
     dispatch(_trackSchemaShared(hasSchema));
     openToast(
       'share-schema',
@@ -209,6 +210,7 @@ export const geoLayersDeleted = (
 
 export const stopAnalysis = (): SchemaThunkAction<void> => {
   return (dispatch, getState, { abortControllerRef }) => {
+    if (!abortControllerRef) return;
     abortControllerRef.current?.abort();
   };
 };
@@ -234,6 +236,11 @@ export const startAnalysis = (): SchemaThunkAction<
       track,
     }
   ) => {
+    const { analysisState } = getState();
+    if (analysisState === ANALYSIS_STATE_ANALYZING) {
+      debug('analysis already in progress. ignoring subsequent start');
+      return;
+    }
     const query = queryBar.getLastAppliedQuery('schema');
 
     const sampleSize = query.limit

packages/compass-schema/src/stores/store.ts

@@ -12,7 +12,7 @@ import type { PreferencesAccess } from 'compass-preferences-model/provider';
 import type { FieldStoreService } from '@mongodb-js/compass-field-store';
 import type { QueryBarService } from '@mongodb-js/compass-query-bar';
 import type { TrackFunction } from '@mongodb-js/compass-telemetry';
-import reducer, { handleSchemaShare } from './reducer';
+import reducer, { handleSchemaShare, stopAnalysis } from './reducer';
 import type { InternalLayer } from '../modules/geo';
 
 export type DataService = Pick<OriginalDataService, 'sample' | 'isCancelError'>;
@@ -53,7 +53,7 @@ export type SchemaThunkDispatch<A extends AnyAction = AnyAction> =
 export function activateSchemaPlugin(
   { namespace }: Pick<CollectionTabPluginMetadata, 'namespace'>,
   services: SchemaPluginServices,
-  { on, cleanup }: ActivateHelpers
+  { on, cleanup, addCleanup }: ActivateHelpers
 ) {
   const store = configureStore(services, namespace);
   /**
@@ -66,6 +66,8 @@ export function activateSchemaPlugin(
     () => store.dispatch(handleSchemaShare()) // TODO: get the action
   );
 
+  addCleanup(() => store.dispatch(stopAnalysis()));
+
   return {
     store,
     deactivate() {