dispatch notifications asynchronously

concrete-utopia · Oct 20, 2024 · 20f4dc5 · 20f4dc5
1 parent a283b4f
commit 20f4dc5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 24 deletions.
diff --git a/editor/src/core/shared/import/import-operation-service.ts b/editor/src/core/shared/import/import-operation-service.ts
@@ -40,7 +40,9 @@ export function notifyOperationStarted(dispatch: EditorDispatch, operation: Impo
     timeStarted: Date.now(),
     timeDone: null,
   }
-  dispatch([updateImportOperations([operationWithTime], ImportOperationAction.Update)])
+  setTimeout(() => {
+    dispatch([updateImportOperations([operationWithTime], ImportOperationAction.Update)])
+  }, 0)
 }
 
 export function notifyOperationFinished(
@@ -54,7 +56,9 @@ export function notifyOperationFinished(
     timeDone: timeDone,
     result: result,
   }
-  dispatch([updateImportOperations([operationWithTime], ImportOperationAction.Update)])
+  setTimeout(() => {
+    dispatch([updateImportOperations([operationWithTime], ImportOperationAction.Update)])
+  }, 0)
 }
 
 export function areSameOperation(existing: ImportOperation, incoming: ImportOperation): boolean {

diff --git a/editor/src/core/shared/import/proejct-health-check/check-utopia-requirements.ts b/editor/src/core/shared/import/proejct-health-check/check-utopia-requirements.ts
@@ -89,7 +89,7 @@ function checkProjectLanguage(
   let jsCount = 0
   let tsCount = 0
   applyToAllUIJSFiles(projectContents, (filename, uiJSFile) => {
-    if (filename.endsWith('.ts') || filename.endsWith('.tsx')) {
+    if ((filename.endsWith('.ts') || filename.endsWith('.tsx')) && !filename.endsWith('.d.ts')) {
       tsCount++
     } else if (filename.endsWith('.js') || filename.endsWith('.jsx')) {
       jsCount++
@@ -101,7 +101,7 @@ function checkProjectLanguage(
       dispatch,
       'language',
       RequirementResolutionResult.Critical,
-      'Majority of project files are in TS/TSX',
+      'There are Typescript files in the project',
       'typescript',
     )
   } else if (jsCount == 0) {

diff --git a/editor/src/core/shared/import/proejct-health-check/utopia-requirements-service.ts b/editor/src/core/shared/import/proejct-health-check/utopia-requirements-service.ts
@@ -16,9 +16,18 @@ const initialTexts: Record<ProjectRequirement, string> = {
   reactVersion: 'Checking React version',
 }
 
+export function updateProjectRequirementsStatus(
+  dispatch: EditorDispatch,
+  projectRequirements: Partial<ProjectRequirements>,
+) {
+  setTimeout(() => {
+    dispatch([updateProjectRequirements(projectRequirements)])
+  }, 0)
+}
+
 export function resetRequirementsResolutions(dispatch: EditorDispatch) {
   let projectRequirements = emptyProjectRequirements()
-  dispatch([updateProjectRequirements(projectRequirements)])
+  updateProjectRequirementsStatus(dispatch, projectRequirements)
   notifyOperationStarted(dispatch, {
     type: 'checkRequirements',
     children: Object.keys(projectRequirements).map((key) =>
@@ -35,13 +44,11 @@ export function notifyCheckingRequirement(
   requirement: ProjectRequirement,
   text: string,
 ) {
-  dispatch([
-    updateProjectRequirements({
-      [requirement]: {
-        status: RequirementResolutionStatus.Pending,
-      },
-    }),
-  ])
+  updateProjectRequirementsStatus(dispatch, {
+    [requirement]: {
+      status: RequirementResolutionStatus.Pending,
+    },
+  })
   notifyOperationStarted(dispatch, {
     type: 'checkRequirementAndFix',
     id: requirement,
@@ -56,15 +63,13 @@ export function notifyResolveRequirement(
   text: string,
   value?: string,
 ) {
-  dispatch([
-    updateProjectRequirements({
-      [requirementName]: {
-        status: RequirementResolutionStatus.Done,
-        resolution: resolution,
-        value: value,
-      },
-    }),
-  ])
+  updateProjectRequirementsStatus(dispatch, {
+    [requirementName]: {
+      status: RequirementResolutionStatus.Done,
+      resolution: resolution,
+      value: value,
+    },
+  })
   const result =
     resolution === RequirementResolutionResult.Found ||
     resolution === RequirementResolutionResult.Fixed
@@ -100,9 +105,7 @@ export function updateRequirements(
 
   const aggregatedDoneStatus = getAggregatedStatus(result)
   if (aggregatedDoneStatus != null) {
-    setTimeout(() => {
-      notifyOperationFinished(dispatch, { type: 'checkRequirements' }, aggregatedDoneStatus)
-    }, 0)
+    notifyOperationFinished(dispatch, { type: 'checkRequirements' }, aggregatedDoneStatus)
   }
 
   return result