Remove need to add devices to vendor.

Author: brocaar

interface/api/api.proto

@@ -73,7 +73,6 @@ message Vendor {
   string name = 2;
   uint32 lora_alliance_vendor_id = 3;
   repeated string ouis = 4;
-  repeated string devices = 5;
   VendorMetadata metadata = 6;
 }
 

interface/api/grpc-web/api_pb.d.ts

@@ -21,11 +21,6 @@ export class Vendor extends jspb.Message {
   clearOuisList(): Vendor;
   addOuis(value: string, index?: number): Vendor;
 
-  getDevicesList(): Array<string>;
-  setDevicesList(value: Array<string>): Vendor;
-  clearDevicesList(): Vendor;
-  addDevices(value: string, index?: number): Vendor;
-
   getMetadata(): VendorMetadata | undefined;
   setMetadata(value?: VendorMetadata): Vendor;
   hasMetadata(): boolean;
@@ -46,7 +41,6 @@ export namespace Vendor {
     name: string,
     loraAllianceVendorId: number,
     ouisList: Array<string>,
-    devicesList: Array<string>,
     metadata?: VendorMetadata.AsObject,
   }
 }

interface/api/grpc-web/api_pb.js

@@ -890,7 +890,7 @@ if (goog.DEBUG && !COMPILED) {
  * @private {!Array<number>}
  * @const
  */
-proto.api.Vendor.repeatedFields_ = [4,5];
+proto.api.Vendor.repeatedFields_ = [4];
 
 
 
@@ -928,7 +928,6 @@ proto.api.Vendor.toObject = function(includeInstance, msg) {
     name: jspb.Message.getFieldWithDefault(msg, 2, ""),
     loraAllianceVendorId: jspb.Message.getFieldWithDefault(msg, 3, 0),
     ouisList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f,
-    devicesList: (f = jspb.Message.getRepeatedField(msg, 5)) == null ? undefined : f,
     metadata: (f = msg.getMetadata()) && proto.api.VendorMetadata.toObject(includeInstance, f)
   };
 
@@ -986,10 +985,6 @@ proto.api.Vendor.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {string} */ (reader.readString());
       msg.addOuis(value);
       break;
-    case 5:
-      var value = /** @type {string} */ (reader.readString());
-      msg.addDevices(value);
-      break;
     case 6:
       var value = new proto.api.VendorMetadata;
       reader.readMessage(value,proto.api.VendorMetadata.deserializeBinaryFromReader);
@@ -1059,13 +1054,6 @@ proto.api.Vendor.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
-  f = message.getDevicesList();
-  if (f.length > 0) {
-    writer.writeRepeatedString(
-      5,
-      f
-    );
-  }
   f = message.getMetadata();
   if (f != null) {
     writer.writeMessage(
@@ -1186,43 +1174,6 @@ proto.api.Vendor.prototype.clearOuisList = function() {
 };
 
 
-/**
- * repeated string devices = 5;
- * @return {!Array<string>}
- */
-proto.api.Vendor.prototype.getDevicesList = function() {
-  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 5));
-};
-
-
-/**
- * @param {!Array<string>} value
- * @return {!proto.api.Vendor} returns this
- */
-proto.api.Vendor.prototype.setDevicesList = function(value) {
-  return jspb.Message.setField(this, 5, value || []);
-};
-
-
-/**
- * @param {string} value
- * @param {number=} opt_index
- * @return {!proto.api.Vendor} returns this
- */
-proto.api.Vendor.prototype.addDevices = function(value, opt_index) {
-  return jspb.Message.addToRepeatedField(this, 5, value, opt_index);
-};
-
-
-/**
- * Clears the list making it empty but non-null.
- * @return {!proto.api.Vendor} returns this
- */
-proto.api.Vendor.prototype.clearDevicesList = function() {
-  return this.setDevicesList([]);
-};
-
-
 /**
  * optional VendorMetadata metadata = 6;
  * @return {?proto.api.VendorMetadata}

interface/src/structs.rs

@@ -18,7 +18,6 @@ pub struct Vendor {
     pub name: String,
     pub vendor_id: u32,
     pub ouis: Vec<String>,
-    pub devices: Vec<String>,
     pub metadata: VendorMetadata,
 }
 
@@ -29,7 +28,6 @@ impl Default for Vendor {
             name: "".into(),
             vendor_id: 0,
             ouis: vec![],
-            devices: vec![],
             metadata: VendorMetadata::default(),
         }
     }
@@ -163,7 +161,6 @@ impl From<&api::Vendor> for VendorConfiguration {
                 name: value.name.clone(),
                 vendor_id: value.lora_alliance_vendor_id,
                 ouis: value.ouis.clone(),
-                devices: value.devices.clone(),
                 metadata: VendorMetadata {
                     homepage: value.metadata.as_ref().map(|v| v.homepage.clone()),
                 },
@@ -180,7 +177,6 @@ impl From<&VendorConfiguration> for api::Vendor {
             name: value.vendor.name.clone(),
             lora_alliance_vendor_id: value.vendor.vendor_id,
             ouis: value.vendor.ouis.clone(),
-            devices: value.vendor.devices.clone(),
             metadata: Some(api::VendorMetadata {
                 homepage: value.vendor.metadata.homepage.clone().unwrap_or_default(),
             }),

interface/ui/src/views/vendors/VendorForm.tsx

@@ -1,10 +1,7 @@
-import { useState, useEffect } from "react";
-
 import { Form, Input, InputNumber, Button, Select } from "antd";
 import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
 
-import { Vendor, VendorMetadata, ListDevicesRequest, ListDevicesResponse, Device } from "@api/grpc-web/api_pb";
-import DeviceProfileStore from "../../stores/DeviceProfileStore";
+import { Vendor, VendorMetadata } from "@api/grpc-web/api_pb";
 import { slugify } from "../helpers";
 
 interface IProps {
@@ -15,21 +12,6 @@ interface IProps {
 
 function VendorForm(props: IProps) {
   const [form] = Form.useForm();
-  const [devices, setDevices] = useState<Device[]>([]);
-
-  useEffect(() => {
-    if (!props.update) {
-      return;
-    }
-
-    const v = props.initialValues;
-
-    const req = new ListDevicesRequest();
-    req.setVendorDir(v.getDir());
-    DeviceProfileStore.listDevices(req, (resp: ListDevicesResponse) => {
-      setDevices(resp.getResultList());
-    });
-  }, [props.initialValues]);
 
   const onFinish = (values: Vendor.AsObject) => {
     const v = Object.assign(props.initialValues.toObject(), values);
@@ -42,7 +24,6 @@ function VendorForm(props: IProps) {
     vendor.setName(v.name);
     vendor.setLoraAllianceVendorId(v.loraAllianceVendorId);
     vendor.setOuisList(v.ouisList);
-    vendor.setDevicesList(v.devicesList);
 
     vendorMetadata.setHomepage(v.metadata?.homepage || "");
     vendor.setMetadata(vendorMetadata);
@@ -58,36 +39,30 @@ function VendorForm(props: IProps) {
     form.setFieldsValue({
       dir: slugify(e.target.value),
     });
-  }
-
+  };
 
   return (
-    <Form
-      layout="vertical"
-      initialValues={props.initialValues.toObject()}
-      onFinish={onFinish}
-      form={form}
-    >
+    <Form layout="vertical" initialValues={props.initialValues.toObject()} onFinish={onFinish} form={form}>
       <Form.Item label="Name" name="name" rules={[{ required: true, message: "Please enter a name!" }]}>
         <Input onChange={onChangeName} placeholder="Vendor Name" />
       </Form.Item>
-      <Form.Item label="Directory name" name="dir" rules={[
-        { required: true, message: "Please enter a directory name!" },
-        { pattern: /^[\w-]+$/g, message: "The directory name can only contain a-z, A-Z, 0-9 and - characters!" },
-      ]}>
+      <Form.Item
+        label="Directory name"
+        name="dir"
+        rules={[
+          { required: true, message: "Please enter a directory name!" },
+          { pattern: /^[\w-]+$/g, message: "The directory name can only contain a-z, A-Z, 0-9 and - characters!" },
+        ]}
+      >
         <Input disabled={props.update} placeholder="vendor-name" />
       </Form.Item>
-      <Form.Item label="LoRa Alliance Vendor ID" name="loraAllianceVendorId" tooltip="This ID is provided by the LoRa Alliance.">
+      <Form.Item
+        label="LoRa Alliance Vendor ID"
+        name="loraAllianceVendorId"
+        tooltip="This ID is provided by the LoRa Alliance."
+      >
         <InputNumber min={0} />
       </Form.Item>
-      <Form.Item label="Devices" name="devicesList">
-        <Select mode="multiple" options={devices.map((v) => {
-          return {
-            label: v.getFile(),
-            value: v.getFile(),
-          };
-        })} />
-      </Form.Item>
       <Form.List name="ouisList">
         {(fields, { add, remove }) => (
           <>
@@ -96,12 +71,10 @@ function VendorForm(props: IProps) {
                 {...restField}
                 label="OUI"
                 name={[name]}
-                rules={[{ required: true, message: 'Please enter an OUI!' }]}
+                rules={[{ required: true, message: "Please enter an OUI!" }]}
                 key={key}
               >
-                <Input addonAfter={
-                  <MinusCircleOutlined onClick={() => remove(name)} />
-                } />
+                <Input addonAfter={<MinusCircleOutlined onClick={() => remove(name)} />} />
               </Form.Item>
             ))}
             <Form.Item>