Merge branch 'main' of https://github.com/microbit-foundation/ml-trainer

 into redirect-to-prototype

.github/workflows/pr-url.yml

@@ -8,5 +8,5 @@ jobs:
     steps:
       - uses: microbit-foundation/action-pr-url-template@v0.1.2
         with:
-          uri-template: 'https://review-ml.microbit.org/{branch}/thenextgen/'
+          uri-template: 'https://review-ml.microbit.org/{branch}'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

deployment.cjs

@@ -21,8 +21,8 @@ const { s3Config } = createDeploymentDetailsFromOptions({
 module.exports = {
   deploymentDir: './dist',
   ...s3Config,
-  // We deploy to a fixed path for the nextgen version
-  bucketPrefix: posixPath.join(s3Config.bucketPrefix || '', 'thenextgen'),
+  // For non-review versions deploy to the prototype URL
+  bucketPrefix: s3Config.bucketPrefix ?? 'v/prototype',
   region: 'eu-west-1',
   removeNonexistentObjects: true,
   enableS3StaticWebsiteHosting: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ml-machine",
-  "version": "1.0.0",
+  "version": "0.6.0-local",
   "author": "Center for Computational Thinking and Design at Aarhus University",
   "private": true,
   "type": "module",

src/__tests__/i18n.test.ts

@@ -23,7 +23,8 @@ describe('Initialization tests', () => {
     vitest.resetModules();
   });
 
-  test('Language is set to welsh when it is the preferred browser option', async () => {
+  // Welsh disabled for now
+  test.skip('Language is set to welsh when it is the preferred browser option', async () => {
     windowSpy.mockImplementation(() => ({
       navigator: {
         languages: ['cy', 'en'],
@@ -57,7 +58,8 @@ describe('Initialization tests', () => {
     expect(translatedText).toBe('You are currently recording!');
   });
 
-  test('Language is set to welsh when it is defined query string', async () => {
+  // Welsh disabled for now
+  test.skip('Language is set to welsh when it is defined query string', async () => {
     windowSpy.mockImplementation(() => ({
       navigator: {
         languages: ['some languages'],

src/__tests__/translations.test.ts

@@ -6,8 +6,9 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import da from './../messages/ui.da.json';
 import en from './../messages/ui.en.json';
+// TODO: actually import the right one!
+const da = en;
 
 // We're moving translations to Crowdin so expect the English to be the only
 // updated language for now

src/components/control-bar/control-bar-items/HelpMenu.svelte

@@ -37,7 +37,7 @@
     openLink('https://microbit.org/terms-of-use/');
   };
   const onPrivacyPolicyClick = () => {
-    openLink('https://microbit.org/privacy/#the-playground-survey');
+    openLink('https://microbit.org/privacy/');
   };
   const onHelpAndSupportClick = () => {
     openLink('https://support.microbit.org/support/home');

src/i18n.ts

@@ -38,22 +38,20 @@ export const allLanguages = [
     name: 'English',
     enName: 'English',
   },
-  // There are no Welsh translations yet but enabled to demo the language feature
-  {
+  // Welsh translations disabled on this branch. Danish has never worked in this fork.
+  /*{
     id: 'cy',
     name: 'Cymraeg',
     enName: 'Welsh',
   },
-  // Disabled for now as this fork doesn't have full Danish translations
-  /*{
+  {
     id: 'da',
     name: 'Dansk',
     enName: 'Danish',
   },*/
 ];
 
 register('en', () => import('./messages/ui.en.json'));
-register('cy', () => import('./messages/ui.cy.json'));
 
 const initialLocale =
   getLocaleFromQueryString('l') ||

src/messages/ui.en.json

@@ -21,7 +21,6 @@
   "alert.recordingsPerGesture": "You need at least three examples per action",
 
   "content.index.title": "machine learning tool",
-  "content.index.toolInfo": "Use this tool with the <link>BBC micro:bit playground survey</link>",
   "content.index.toolProcessCards.main.title": "How this tool works",
   "content.index.toolProcessCards.data.title": "Add data",
   "content.index.toolProcessCards.data.description": "Add samples of the actions you would like your model to recognise (e.g. waving and clapping).",

src/pages/Homepage.svelte

@@ -36,11 +36,6 @@
   import { locale as currentLocale } from 'svelte-i18n';
   import { get } from 'svelte/store';
 
-  const playgroundSurveyUrlByLang: Record<string, string> = {
-    en: 'https://microbit.org/teach/playground-survey/exploring-machine-learning/',
-    cy: 'https://microbit.org/cy/teach/playground-survey/exploring-machine-learning/',
-  };
-
   $: hasExistingSession = $gestures.some(g => g.name || g.recordings.length);
   let showDataLossWarning = false;
 
@@ -71,9 +66,6 @@
   };
 
   $: title = getTitle(Paths.HOME, $t);
-  $: playgroundSurveyUrl =
-    ($currentLocale ? playgroundSurveyUrlByLang[$currentLocale] : undefined) ??
-    playgroundSurveyUrlByLang.en;
 </script>
 
 <svelte:head>
@@ -94,19 +86,6 @@
         frameBorder="0"
         allowFullScreen>
       </iframe>
-      <p>
-        <HtmlFormattedMessage
-          id="content.index.toolInfo"
-          options={{
-            values: {
-              link: linkWithProps({
-                href: playgroundSurveyUrl,
-                target: '_blank',
-                rel: 'noopener',
-              }),
-            },
-          }} />
-      </p>
     </div>
 
     <div class="flex flex-col flex-wrap items-center max-w-325">

src/script/stores/uiStore.ts

@@ -14,8 +14,8 @@ import MBSpecs from '../microbit-interfacing/MBSpecs';
 import { gestures } from './Stores';
 import { HexOrigin } from '../../StaticConfiguration';
 import { DeviceRequestStates } from '../microbit-interfacing/MicrobitConnection';
-import { logError } from '../utils/logging';
 import { persistantWritable } from './storeUtil';
+import { logError, logEvent } from '../utils/logging';
 
 // TODO: Rename? Split up further?
 
@@ -29,6 +29,11 @@ if (compatibilityResult.bluetooth) {
     .getAvailability()
     .then(bluetoothAvailable => {
       compatibility.update(s => {
+        logEvent({
+          type: 'Device',
+          action: 'Bluetooth available',
+          value: s.bluetooth && bluetoothAvailable ? 1 : 0,
+        });
         s.bluetooth = s.bluetooth && bluetoothAvailable;
         return s;
       });