Merge remote-tracking branch 'origin/main' into update-model-page

microbit-foundation · Dec 12, 2023 · e9815e2 · e9815e2
2 parents f3037db + b4e31fe
commit e9815e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 32 deletions.
diff --git a/src/components/TrainModelFirstTitle.svelte b/src/components/TrainModelFirstTitle.svelte
@@ -27,6 +27,6 @@
     <StandardButton onClick={() => navigate(Paths.DATA)}>
       {$t('content.model.addData')}
     </StandardButton>
-    <TrainingButton type="secondary" />
+    <TrainingButton type="secondary" action="navigate" />
   </div>
 </div>
diff --git a/src/pages/DataPage.svelte b/src/pages/DataPage.svelte
@@ -123,6 +123,6 @@
 
       <NewGestureButton />
     </div>
-    <TrainingButton />
+    <TrainingButton action="navigate" />
   {/if}
 </main>
diff --git a/src/pages/model/stackview/ModelPageStackView.svelte b/src/pages/model/stackview/ModelPageStackView.svelte
@@ -1,6 +1,6 @@
 <!--
   (c) 2023, Center for Computational Thinking and Design at Aarhus University and contributors
- 
+
   SPDX-License-Identifier: MIT
  -->
 
@@ -91,11 +91,7 @@
 <!-- Main pane -->
 <main class="h-full flex flex-col">
   {#if $state.isPredicting}
-    {#if $state.isInputReady}
-      <ModelPageStackViewContent />
-    {:else}
-      <PleaseConnectFirst />
-    {/if}
+    <ModelPageStackViewContent />
   {:else}
     <TrainModelFirstTitle />
   {/if}

diff --git a/src/pages/training/TrainingButton.svelte b/src/pages/training/TrainingButton.svelte
@@ -9,11 +9,11 @@
   import StandardButton, { ButtonVariant } from '../../components/StandardButton.svelte';
   import { trainModel } from '../../script/ml';
   import { t } from '../../i18n';
-  import StandardDialog from '../../components/dialogs/StandardDialog.svelte';
   import { Paths, navigate } from '../../router/paths';
   import { gestures } from '../../script/stores/Stores';
 
   export let type: ButtonVariant = 'primary';
+  export let action: 'navigate' | 'train' = 'train';
 
   $: trainButtonLabel = !$state.isPredicting
     ? 'menu.trainer.trainModelButton'
@@ -30,36 +30,19 @@
     trainingDialogOpen = false;
   };
 
-  const startTraining = async (): Promise<void> => {
+  const startTraining = () => {
     closeTrainingDialog();
+    trainModel();
+  };
+
+  const navitgateToTrainingPage = () => {
     navigate(Paths.TRAINING);
-    const shouldRedirect = await trainModel();
-    if (shouldRedirect) {
-      navigate(Paths.MODEL);
-    }
   };
 </script>
 
 <StandardButton
-  onClick={() => {
-    trainingDialogOpen = true;
-  }}
+  onClick={action === 'navigate' ? navitgateToTrainingPage : startTraining}
   disabled={trainingButtonDisabled}
   {type}
   >{$t(trainButtonLabel)}
 </StandardButton>
-
-<StandardDialog
-  isOpen={trainingDialogOpen && !$state.isTraining}
-  onClose={closeTrainingDialog}>
-  <div class="w-150">
-    <h1 class="text-xl font-bold mb-4">{$t('content.data.trainDialog.title')}</h1>
-    <p>{$t('content.data.trainDialog.text')}</p>
-    <div class="flex justify-end gap-3">
-      <StandardButton onClick={closeTrainingDialog}
-        >{$t('connectMB.backButton')}</StandardButton>
-      <StandardButton {type} onClick={startTraining}
-        >{$t('content.data.trainDialog.title')}</StandardButton>
-    </div>
-  </div>
-</StandardDialog>