Merge pull request #225 from Open-STEM/kq-bugs

Addressed 217,219,220 and 223

Author: kcq888

package.json

@@ -4,7 +4,7 @@
   "homepage": "https://experientialrobotics.org/",
   "license": "GPL-2.0-only",
   "private": true,
-  "version": "2.0.13",
+  "version": "2.0.14",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/CHANGELOG.txt

@@ -1,4 +1,4 @@
-# Version 2.0.13
+# Version 2.0.14
 
 #### Bluetooth support
 <img height="10%" width="10%" src="src/assets/images/Bluetooth_FM_Black.png"/></img>
@@ -34,8 +34,7 @@
 * Support the New Puppet Protocol for communication with the XRP Bluetooth (advanced users) [See XPP](https://xrpcode.io/docs/puppet_protocol)
 
 #### Bug Fixes
-* [File SaveAs dialog not using name](https://github.com/Open-STEM/XRPWeb/issues/205)
-* [Google Drive Export to PC resulted with zero bytes](https://github.com/Open-STEM/XRPWeb/issues/206)
-* [Google Drive Onetime notification](https://github.com/Open-STEM/XRPWeb/issues/198)
-* [Scroll in a .py file](https://github.com/Open-STEM/XRPWeb/issues)
-* [No way to move files](https://github.com/Open-STEM/XRPWeb/issues/179)
+* [Blockly lost changelistener](https://github.com/Open-STEM/XRPWeb/issues/223)
+* [Check browser support](https://github.com/Open-STEM/XRPWeb/issues/220)
+* [Connect/Reconnect cause duplicate characters in shell](https://github.com/Open-STEM/XRPWeb/issues/219)
+* [Correct spelling in Curriculum help menu](https://github.com/Open-STEM/XRPWeb/issues/217)

src/components/dialogs/connectiondlg.tsx

@@ -1,24 +1,48 @@
+/// <reference types="web-bluetooth" />
 import Bluetooth from '@assets/images/Bluetooth_FM_Black.png';
 import Usb from '@assets/images/USB_icon.svg.png';
 import { ConnectionType, ListItem } from '@/utils/types';
 import { useTranslation } from 'react-i18next';
+import { useEffect, useState } from 'react';
 
 type ConnProps = {
     callback: (connection: ConnectionType) => void;
 };
 
+interface ConnectionItem extends ListItem {
+    disabled?: boolean;
+}
+
 /**
  * Connection Dialog content
  * @param param0
  * @returns
  */
 function ConnectionDlg(connprops: ConnProps) {
     const { t } = useTranslation();
+    const [isBluetoothAvailable, setIsBluetoothAvailable] = useState<boolean>(true);
+
+    useEffect(() => {
+        if (navigator.bluetooth && typeof navigator.bluetooth.getAvailability === 'function') {
+            navigator.bluetooth
+                .getAvailability()
+                .then((available) => {
+                    setIsBluetoothAvailable(available);
+                })
+                .catch(() => {
+                    setIsBluetoothAvailable(false);
+                });
+        } else {
+            setIsBluetoothAvailable(false);
+        }
+    }, []);
+
     // list of items to display
-    const items: ListItem[] = [
+    const items: ConnectionItem[] = [
         {
             label: t('bluetoothConnection'),
             image: Bluetooth,
+            disabled: !isBluetoothAvailable,
         },
         {
             label: t('usbConnection'),
@@ -30,7 +54,8 @@ function ConnectionDlg(connprops: ConnProps) {
      * Connection handler - handledClick
      * @param item
      */
-    const handleItemClick = (item: ListItem) => {
+    const handleItemClick = (item: ConnectionItem) => {
+        if (item.disabled) return;
         console.log(item);
         switch (item.label) {
             case t('bluetoothConnection'):
@@ -53,8 +78,13 @@ function ConnectionDlg(connprops: ConnProps) {
                 {items.map((item) => (
                     <li
                         key={item.label}
-                        className="hover:bg-matisse-300 dark:hover:bg-shark-400 flex flex-row items-center gap-2 px-3 py-1 text-neutral-900 hover:text-neutral-100"
+                        className={`flex flex-row items-center gap-2 px-3 py-1 text-neutral-900 ${
+                            item.disabled
+                                ? 'opacity-50 cursor-not-allowed'
+                                : 'hover:bg-matisse-300 dark:hover:bg-shark-400 hover:text-neutral-100 cursor-pointer'
+                        }`}
                         onClick={() => handleItemClick(item)}
+                        title={item.disabled ? t('bluetooth-not-supported') : ''}
                     >
                         <img data-testid={item.label} src={item.image} height="28px" width="36px" />
                         <span className='text-mountain-mist-700 dark:text-mountain-mist-300'>{item.label}</span>

src/components/xrplayout.tsx

@@ -304,8 +304,8 @@ function XRPLayout({ forwardedref }: XRPLayoutProps) {
                     if (editorType !== undefined) {
                         AppMgr.getInstance().emit(EventType.EVENT_EDITOR, editorType);
                     }
+                    setActiveTab(action.data.tabNode);
                 } 
-                setActiveTab(action.data.tabNode);
             }
             break;
             case Actions.DELETE_TAB: {        

src/managers/editormgr.ts

@@ -145,9 +145,9 @@ export default class EditorMgr {
                     EventType.EVENT_EDITOR,
                     session.type === EditorType.BLOCKLY ? EditorType.BLOCKLY : EditorType.PYTHON,
                 );
-                this.layoutModel?.doAction(Actions.selectTab(session.id));       
+                this.layoutModel?.doAction(Actions.selectTab(session.id));     
+                return session?.id;
             }
-            return session?.id;
         }
         return undefined;
     }

src/utils/i18n/locales/en/en.json

@@ -1,5 +1,6 @@
 {
     "_commentXRP": "This line does not need to be translated; add specific XRP translation below",
+    "bluetooth-not-supported" : "Bluetooth is not supported in your browser or system. Please use a different browser or system to access the full functionality of the XRP Web IDE.",
     "file": "File",
     "file-exists-on-python-convert": "Python file {{ filename }} is already exists. Please rename it before performing conversion.",
     "firefox-not-supported": "The browser ({{ browser }}) that you are using is not supported. Please use a different browser such as Chrome or Edge to access the full functionality of the XRP Web IDE.",

src/utils/i18n/locales/es/es.json

@@ -1,5 +1,6 @@
 {
     "_commentXRP": "Esta línea no necesita ser traducida; agregar traducción específica de XRP a continuación",
+    "bluetooth-not-supported" : "El Bluetooth no está soportado en su navegador o sistema. Por favor use un navegador diferente o sistema para acceder a toda la funcionalidad del IDE Web de XRP.",
     "file": "Archivo",
     "file-exists-on-python-convert": "El archivo de Python {{ filename }} ya existe. Cámbiele el nombre antes de realizar la conversión.",
     "firefox-not-supported": "El navegador ({{ browser }}) que está utilizando no es compatible. Por favor use un navegador diferente como Chrome o Edge para acceder a toda la funcionalidad del IDE Web de XRP.",