cleanup and ellipsis

Author: paula-stacho

packages/compass-data-modeling/src/components/analysis-progress-status.spec.tsx

@@ -33,7 +33,7 @@ describe('AnalysisProgressStatus', () => {
 
   it('Allows cancellation', async () => {
     const store = await renderAnalysisProgressStatus();
-    expect(screen.getByText('Sampling collections..')).to.be.visible;
+    expect(screen.getByText('Sampling collections…')).to.be.visible;
     expect(screen.getByText('Cancel')).to.be.visible;
     screen.getByText('Cancel').click();
     await waitFor(() => {
@@ -47,7 +47,7 @@ describe('AnalysisProgressStatus', () => {
       const store = await renderAnalysisProgressStatus({
         automaticallyInferRelations: false,
       });
-      expect(screen.getByText('Sampling collections..')).to.be.visible;
+      expect(screen.getByText('Sampling collections…')).to.be.visible;
       expect(screen.getByText('0/3')).to.be.visible;
 
       // 2 out of 3 samples fetched, 1 analyzed
@@ -61,15 +61,15 @@ describe('AnalysisProgressStatus', () => {
         type: AnalysisProcessActionTypes.NAMESPACE_SCHEMA_ANALYZED,
       });
 
-      expect(screen.getByText('Sampling collections..')).to.be.visible;
+      expect(screen.getByText('Sampling collections…')).to.be.visible;
       expect(screen.getByText('2/3')).to.be.visible;
 
       // Last sample fetched
       store.dispatch({
         type: AnalysisProcessActionTypes.NAMESPACE_SAMPLE_FETCHED,
       });
 
-      expect(screen.getByText('Analyzing collection schemas..')).to.be.visible;
+      expect(screen.getByText('Analyzing collection schemas…')).to.be.visible;
       expect(screen.getByText('1/3')).to.be.visible;
 
       // Finish analyzing
@@ -80,17 +80,16 @@ describe('AnalysisProgressStatus', () => {
         type: AnalysisProcessActionTypes.NAMESPACE_SCHEMA_ANALYZED,
       });
 
-      expect(
-        screen.queryByText('Inferring relationships between collections..')
-      ).not.to.exist;
-      expect(screen.getByText('Preparing diagram..')).to.be.visible;
+      expect(screen.queryByText('Inferring relationships between collections…'))
+        .not.to.exist;
+      expect(screen.getByText('Preparing diagram…')).to.be.visible;
     });
 
     it('With relationship inferring', async () => {
       const store = await renderAnalysisProgressStatus({
         automaticallyInferRelations: true,
       });
-      expect(screen.getByText('Sampling collections..')).to.be.visible;
+      expect(screen.getByText('Sampling collections…')).to.be.visible;
       expect(screen.getByText('0/3')).to.be.visible;
 
       // Fetch and analyze all samples
@@ -113,7 +112,7 @@ describe('AnalysisProgressStatus', () => {
         type: AnalysisProcessActionTypes.NAMESPACE_SCHEMA_ANALYZED,
       });
 
-      expect(screen.getByText('Inferring relationships between collections..'))
+      expect(screen.getByText('Inferring relationships between collections…'))
         .to.be.visible;
       expect(screen.queryByText('0/3')).not.to.exist;
 
@@ -125,7 +124,7 @@ describe('AnalysisProgressStatus', () => {
         type: AnalysisProcessActionTypes.NAMESPACE_RELATIONS_INFERRED,
       });
 
-      expect(screen.getByText('Inferring relationships between collections..'))
+      expect(screen.getByText('Inferring relationships between collections…'))
         .to.be.visible;
       expect(screen.queryByText('2/3')).not.to.exist;
 
@@ -134,7 +133,7 @@ describe('AnalysisProgressStatus', () => {
         type: AnalysisProcessActionTypes.NAMESPACE_RELATIONS_INFERRED,
       });
 
-      expect(screen.getByText('Preparing diagram..')).to.be.visible;
+      expect(screen.getByText('Preparing diagram…')).to.be.visible;
     });
   });
 });

packages/compass-data-modeling/src/components/analysis-progress-status.tsx

@@ -35,7 +35,7 @@ function getProgressPropsFromStatus({
   if (step === 'SAMPLING') {
     return {
       isIndeterminate: false,
-      label: `Sampling collections..`,
+      label: 'Sampling collections…',
       maxValue: totalCollections,
       value: sampledCollections,
       formatValue: 'fraction',
@@ -44,7 +44,7 @@ function getProgressPropsFromStatus({
   if (step === 'ANALYZING_SCHEMA') {
     return {
       isIndeterminate: false,
-      label: `Analyzing collection schemas..`,
+      label: 'Analyzing collection schemas…',
       maxValue: totalCollections,
       value: analyzedCollections,
       formatValue: 'fraction',
@@ -53,15 +53,15 @@ function getProgressPropsFromStatus({
   if (step === 'INFERRING_RELATIONSHIPS') {
     return {
       isIndeterminate: false,
-      label: 'Inferring relationships between collections..',
+      label: 'Inferring relationships between collections…',
       maxValue: totalCollections,
       value: collectionRelationsInferred,
       formatValue: undefined,
     };
   }
   return {
     isIndeterminate: true,
-    label: 'Preparing diagram..',
+    label: 'Preparing diagram…',
   };
 }
 

packages/compass-data-modeling/src/components/diagram-editor.tsx

@@ -551,7 +551,6 @@ const DiagramEditor: React.FunctionComponent<{
   step: DataModelingState['step'];
   diagramId?: string;
   onRetryClick: () => void;
-  onCancelClick: () => void;
   onAddCollectionClick: () => void;
   DiagramComponent?: typeof Diagram;
 }> = ({

packages/compass-data-modeling/src/components/new-diagram-form.tsx

@@ -39,6 +39,7 @@ import {
   Checkbox,
 } from '@mongodb-js/compass-components';
 import { usePreference } from 'compass-preferences-model/provider';
+import { selectIsAnalysisInProgress } from '../store/analysis-process';
 
 const footerStyles = css({
   flexDirection: 'row',
@@ -559,8 +560,7 @@ export default connect(
       collections: databaseCollections ?? [],
       selectedCollections: selectedCollections ?? [],
       error,
-      analysisInProgress:
-        state.analysisProgress.analysisProcessStatus === 'in-progress',
+      analysisInProgress: selectIsAnalysisInProgress(state),
       automaticallyInferRelationships:
         state.generateDiagramWizard.automaticallyInferRelations,
     };

packages/compass-data-modeling/src/store/analysis-process.ts

@@ -417,3 +417,7 @@ export function cancelAnalysis(): DataModelingThunkAction<void, never> {
     cancelAnalysisControllerRef.current = null;
   };
 }
+
+export const selectIsAnalysisInProgress = (state: {
+  analysisProgress: AnalysisProcessState;
+}): boolean => state.analysisProgress.step !== 'IDLE';