fixes

Author: paula-stacho

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

@@ -21,6 +21,7 @@ import { ZeroGraphic } from './zero-graphic';
 import {
   clearRulesGenerationError,
   generateValidationRules,
+  stopRulesGeneration,
 } from '../modules/validation';
 
 const validationStatesStyles = css({
@@ -71,6 +72,7 @@ type ValidationStatesProps = {
   changeZeroState: (value: boolean) => void;
   generateValidationRules: () => void;
   clearRulesGenerationError: () => void;
+  stopRulesGeneration: () => void;
   editMode: {
     collectionTimeSeries?: boolean;
     collectionReadOnly?: boolean;
@@ -150,6 +152,7 @@ export function ValidationStates({
   changeZeroState,
   generateValidationRules,
   clearRulesGenerationError,
+  stopRulesGeneration,
   editMode,
 }: ValidationStatesProps) {
   const { readOnly, enableExportSchema } = usePreferences([
@@ -173,7 +176,7 @@ export function ValidationStates({
         <ErrorSummary
           errors={rulesGenerationError}
           dismissible={true}
-          onDismiss={clearRulesGenerationError}
+          onClose={clearRulesGenerationError}
         />
       )}
       <ValidationBanners editMode={editMode} />
@@ -183,7 +186,11 @@ export function ValidationStates({
             <EmptyContent
               icon={ZeroGraphic}
               title="Create validation rules"
-              subTitle="Generate rules via schema analysis from existing sample data or add them manually to enforce document structure during updates and inserts"
+              subTitle={
+                enableExportSchema
+                  ? 'Generate rules via schema analysis from existing sample data or add them manually to enforce document structure during updates and inserts'
+                  : 'Create rules to enforce data structure of documents on updates and inserts.'
+              }
               callToAction={
                 <div className={zeroStateButtonsStyles}>
                   {enableExportSchema && (
@@ -216,7 +223,7 @@ export function ValidationStates({
             />
           )}
           {isZeroState && isRulesGenerationInProgress && (
-            <GeneratingScreen onCancelClicked={() => ({})} />
+            <GeneratingScreen onCancelClicked={stopRulesGeneration} />
           )}
           {!isZeroState && (
             <div className={contentContainerStyles}>
@@ -252,4 +259,5 @@ export default connect(mapStateToProps, {
   changeZeroState,
   generateValidationRules,
   clearRulesGenerationError,
+  stopRulesGeneration,
 })(ValidationStates);

packages/compass-schema-validation/src/modules/validation.ts

@@ -14,6 +14,7 @@ export type ValidationServerAction = 'error' | 'warn';
 export type ValidationLevel = 'off' | 'moderate' | 'strict';
 
 const SAMPLE_SIZE = 1000;
+const ABORT_MESSAGE = 'Operation cancelled';
 
 /**
  * The module action prefix.
@@ -609,24 +610,9 @@ export const activateValidation = (): SchemaValidationThunkAction<void> => {
 };
 
 export const stopRulesGeneration = (): SchemaValidationThunkAction<void> => {
-  return (
-    dispatch,
-    getState,
-    { rulesGenerationAbortControllerRef, connectionInfoRef, track }
-  ) => {
+  return (dispatch, getState, { rulesGenerationAbortControllerRef }) => {
     if (!rulesGenerationAbortControllerRef.current) return;
-    // const analysisTime =
-    //   Date.now() - (getState().schemaAnalysis.analysisStartTime ?? 0);
-    // track(
-    //   'Schema Analysis Cancelled',
-    //   {
-    //     analysis_time_ms: analysisTime,
-    //     with_filter: Object.entries(query.filter ?? {}).length > 0,
-    //   },
-    //   connectionInfoRef.current
-    // );
-
-    rulesGenerationAbortControllerRef.current?.abort('Analysis cancelled');
+    rulesGenerationAbortControllerRef.current?.abort(ABORT_MESSAGE);
   };
 };
 
@@ -643,7 +629,6 @@ export const generateValidationRules = (): SchemaValidationThunkAction<
     { dataService, logger, preferences, rulesGenerationAbortControllerRef }
   ) => {
     dispatch({ type: RULES_GENERATION_STARTED });
-    console.log('START');
 
     rulesGenerationAbortControllerRef.current = new AbortController();
     const abortSignal = rulesGenerationAbortControllerRef.current.signal;
@@ -670,14 +655,14 @@ export const generateValidationRules = (): SchemaValidationThunkAction<
         preferences
       );
       if (abortSignal?.aborted) {
-        throw new Error(abortSignal?.reason || new Error('Operation aborted'));
+        throw new Error(ABORT_MESSAGE);
       }
 
       const jsonSchema = await schemaAccessor?.getMongoDBJsonSchema({
         signal: abortSignal,
       });
       if (abortSignal?.aborted) {
-        throw new Error(abortSignal?.reason || new Error('Operation aborted'));
+        throw new Error(ABORT_MESSAGE);
       }
       const validator = JSON.stringify(
         { $jsonSchema: jsonSchema },
@@ -690,6 +675,10 @@ export const generateValidationRules = (): SchemaValidationThunkAction<
       dispatch({ type: RULES_GENERATION_FINISHED });
       dispatch(zeroStateChanged(false));
     } catch (error) {
+      if (abortSignal.aborted) {
+        dispatch({ type: RULES_GENERATION_FINISHED });
+        return;
+      }
       dispatch({
         type: RULES_GENERATION_FAILED,
         message: `Rules generation failed: ${(error as Error).message}`,