Fix sonar

betaflight · Jan 7, 2025 · 69626de · 69626de
1 parent c40d626
commit 69626de
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 17,642 deletions.
diff --git a/src/components/data-flash/DataFlash.vue b/src/components/data-flash/DataFlash.vue
@@ -28,48 +28,30 @@ export default defineComponent({
   },
   computed: {
     supportDataflash() {
-      if (this.fcTotalSize > 0) return true;
-      else return false;
+      return this.fcTotalSize > 0;
     },
-    computed: {
-      supportDataflash() {
-        if (this.fcTotalSize > 0) return true;
-          else return false;
-        },
-        freeSpace() {
-          if (!this.supportDataflash) return;
-          const bytes = this.fcTotalSize - this.fcUsedSize;
-          if (this.fcUsedSize >= this.fcTotalSize) {
-              return "0B";
-          }
-          if (bytes < 1024) {
-              return `${bytes}B`;
-          }
-          const kilobytes = bytes / 1024;
-          if (kilobytes < 1024) {
-              return `${Math.round(kilobytes)}KB`;
-          }
-          const megabytes = kilobytes / 1024;
-          if (megabytes < 1024) {
-              return `${megabytes.toFixed(1)}MB`;
-          }
-          const gigabytes = megabytes / 1024;
-          return `${gigabytes.toFixed(1)}GB`;
-        },
-        indicatorWidth() {
-          if (!this.supportDataflash) return;
-          return `${Math.min(
-            (this.fcUsedSize / this.fcTotalSize) * 100,
-            100,
-          )}%`;
-      },
+    freeSpace() {
+      if (!this.supportDataflash) { return; }
+      const bytes = this.fcTotalSize - this.fcUsedSize;
+      if (this.fcUsedSize >= this.fcTotalSize) {
+        return "0B";
+      }
+      if (bytes < 1024) {
+        return `${bytes}B`;
+      }
+      const kilobytes = bytes / 1024;
+      if (kilobytes < 1024) {
+        return `${Math.round(kilobytes)}KB`;
+      }
+      const megabytes = kilobytes / 1024;
+      if (megabytes < 1024) {
+        return `${megabytes.toFixed(1)}MB`;
+      }
+      const gigabytes = megabytes / 1024;
+        return `${gigabytes.toFixed(1)}GB`;
     },
     indicatorWidth() {
-      if (!this.supportDataflash) return;
-      return `${Math.min(
-        (this.fcUsedSize / this.fcTotalSize) * 100,
-        100,
-      )}%`;
+      return this.supportDataflash ? `${Math.min((this.fcUsedSize / this.fcTotalSize) * 100, 100)}%` : "0%";
     },
   },
 });

diff --git a/src/components/init.js b/src/components/init.js
@@ -48,7 +48,7 @@ i18next.on('initialized', function() {
 
     if (process.env.NODE_ENV === 'development') {
         console.log("Development mode enabled, installing Vue tools");
-        // Vue.config.devtools = true;
+        // TODO Vue.config.devtools = true;
         app.config.performance = true;
     }
 });

diff --git a/src/components/port-picker/PortPicker.vue b/src/components/port-picker/PortPicker.vue
@@ -1,123 +1,96 @@
 <template>
-<<<<<<< HEAD
     <div class="web-port-picker">
         <PortOverrideOption
-            v-if="value.selectedPort === 'manual'"
-            :value="value.portOverride"
-            @input="updateValue('portOverride', $event)"
+            v-if="modelValue.selectedPort === 'manual'"
+            :model-value="modelValue.portOverride"
+            @update:modelValue="updateValue('portOverride', $event)"
         />
         <FirmwareVirtualOption
-            v-if="value.selectedPort === 'virtual' && !isConnected"
-            :value="value.virtualMspVersion"
-            @input="updateValue('virtualMspVersion', $event)"
+            v-if="modelValue.selectedPort === 'virtual' && !isConnected"
+            :model-value="modelValue.virtualMspVersion"
+            @update:modelValue="updateValue('virtualMspVersion', $event)"
         />
         <PortsInput
-            :value="value"
+            :model-value="modelValue.selectedPort"
             :connected-bluetooth-devices="connectedBluetoothDevices"
             :connected-serial-devices="connectedSerialDevices"
             :connected-usb-devices="connectedUsbDevices"
             :disabled="disabled"
             :show-virtual-option="showVirtualOption"
             :show-manual-option="showManualOption"
-            @input="updateValue(null, $event)"
+            @update:modelValue="updateValue(null, $event)"
         />
     </div>
-=======
-  <div class="web-port-picker">
-    <PortOverrideOption
-      v-if="modelValue.selectedPort === 'manual'"
-      :model-value="modelValue.portOverride"
-      @update:modelValue="updateValue('portOverride', $event)"
-    />
-    <FirmwareVirtualOption
-      v-if="modelValue.selectedPort === 'virtual' && !isConnected"
-      :model-value="modelValue.virtualMspVersion"
-      @update:modelValue="updateValue('virtualMspVersion', $event)"
-    />
-    <PortsInput
-      :model-value="modelValue.selectedPort"
-      :connected-bluetooth-devices="connectedBluetoothDevices"
-      :connected-serial-devices="connectedSerialDevices"
-      :connected-usb-devices="connectedUsbDevices"
-      :disabled="disabled"
-      :show-virtual-option="showVirtualOption"
-      :show-manual-option="showManualOption"
-      @update:modelValue="updateValue(null, $event)"
-    />
-  </div>
->>>>>>> c85044e6 (Update Vue)
 </template>
 
 <script>
-import { defineComponent } from 'vue';
-import PortOverrideOption from './PortOverrideOption.vue';
-import FirmwareVirtualOption from './FirmwareVirtualOption.vue';
-import PortsInput from './PortsInput.vue';
-import CONFIGURATOR from '../../js/data_storage';
+import { defineComponent } from "vue";
+import PortOverrideOption from "./PortOverrideOption.vue";
+import FirmwareVirtualOption from "./FirmwareVirtualOption.vue";
+import PortsInput from "./PortsInput.vue";
+import CONFIGURATOR from "../../js/data_storage";
 
 export default defineComponent({
-  components: {
-    PortOverrideOption,
-    FirmwareVirtualOption,
-    PortsInput,
-  },
-
-  props: {
-    modelValue: {
-      type: Object,
-      default: () => ({
-        selectedPort: 'noselection',
-        selectedBaud: 115200,
-        portOverride: '/dev/rfcomm0',
-        virtualMspVersion: '1.46.0',
-        autoConnect: true,
-      }),
-    },
-    connectedBluetoothDevices: {
-      type: Array,
-      default: () => [],
-    },
-    connectedSerialDevices: {
-      type: Array,
-      default: () => [],
-    },
-    connectedUsbDevices: {
-      type: Array,
-      default: () => [],
+    components: {
+        PortOverrideOption,
+        FirmwareVirtualOption,
+        PortsInput,
     },
-    showVirtualOption: {
-      type: Boolean,
-      default: true,
-    },
-    showManualOption: {
-      type: Boolean,
-      default: true,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
+
+    props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                selectedPort: "noselection",
+                selectedBaud: 115200,
+                portOverride: "/dev/rfcomm0",
+                virtualMspVersion: "1.46.0",
+                autoConnect: true,
+            }),
+        },
+        connectedBluetoothDevices: {
+            type: Array,
+            default: () => [],
+        },
+        connectedSerialDevices: {
+            type: Array,
+            default: () => [],
+        },
+        connectedUsbDevices: {
+            type: Array,
+            default: () => [],
+        },
+        showVirtualOption: {
+            type: Boolean,
+            default: true,
+        },
+        showManualOption: {
+            type: Boolean,
+            default: true,
+        },
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
     },
-  },
 
-  emits: [
-    'update:modelValue',
-  ],
+    emits: ["update:modelValue"],
 
-  computed: {
-    isConnected() {
-      return CONFIGURATOR.connectionValid;
+    computed: {
+        isConnected() {
+            return CONFIGURATOR.connectionValid;
+        },
     },
-  },
 
-  methods: {
-    updateValue(key, value) {
-      if (key != null) {
-        this.$emit('update:modelValue', { ...this.modelValue, [key]: value });
-      } else {
-        this.$emit('update:modelValue', { ...this.modelValue, ...value});
-      }
+    methods: {
+        updateValue(key, value) {
+            if (key != null) {
+                this.$emit("update:modelValue", { ...this.modelValue, [key]: value });
+            } else {
+                this.$emit("update:modelValue", { ...this.modelValue, ...value });
+            }
+        },
     },
-  },
 });
 </script>