bsserver-demo: show path to delete in Config column of bootstrap view.

eclipse-leshan · Nov 30, 2021 · 6ff40bb · 6ff40bb
1 parent 609ffbf
commit 6ff40bb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/ClientConfigDialog.vue b/leshan-bsserver-demo/webapp/src/components/wizard/ClientConfigDialog.vue
@@ -177,6 +177,7 @@ export default {
           security: null,
           dm: { mode: "no_sec" },
           bs: null,
+          toDelete: ["/0", "/1"],
         };
         this.currentStep = 1;
         for (let i = 1; i <= this.nbSteps; i++) {

diff --git a/leshan-bsserver-demo/webapp/src/js/bsconfigutil.js b/leshan-bsserver-demo/webapp/src/js/bsconfigutil.js
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2021 Sierra Wireless and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
- * 
+ *
  * The Eclipse Public License is available at
  *    http://www.eclipse.org/legal/epl-v20.html
  * and the Eclipse Distribution License is available at
@@ -34,6 +34,7 @@ var configFromRestToUI = function(config) {
       }
     }
   }
+  newConfig.toDelete = config.toDelete;
   return newConfig;
 };
 var configsFromRestToUI = function(configs) {
@@ -62,7 +63,7 @@ var configFromUIToRest = function(c) {
     delete dm.security;
     newConfig.servers[j] = dm;
   }
-  newConfig.toDelete = ["/0", "/1"];
+  newConfig.toDelete = config.toDelete;
   return newConfig;
 };
 

diff --git a/leshan-bsserver-demo/webapp/src/views/Bootstrap.vue b/leshan-bsserver-demo/webapp/src/views/Bootstrap.vue
@@ -64,6 +64,16 @@
       <!--custom display for "config" column-->
       <template v-slot:item.config="{ item }">
         <div class="pa-2">
+          <!-- Path to delete -->
+          <span v-if="item.toDelete && item.toDelete.length > 0">
+            Delete :
+            <span v-for="path in item.toDelete" :key="path">
+              <code>{{ path }}</code
+              >,
+            </span>
+            <br />
+          </span>
+          <!-- LWM2M Server to add -->
           <span v-for="server in item.dm" :key="server.shortid">
             Add Server: <code>{{ server.security.uri }}</code>
             <span v-if="server.security.securityMode.toLowerCase() != 'no_sec'">
@@ -77,6 +87,7 @@
             </span>
             <br />
           </span>
+          <!-- LWM2M Bootstrap Server to add -->
           <span v-for="server in item.bs" :key="server.security.uri">
             Add Bootstrap Server: <code>{{ server.security.uri }}</code>
             <span v-if="server.security.securityMode.toLowerCase() != 'no_sec'">
@@ -276,6 +287,9 @@ export default {
       if (config.security) {
         c.security = config.security;
       }
+      if (config.toDelete) {
+        c.toDelete = config.toDelete;
+      }
 
       this.axios
         .post(