#1016: try some optimization

eclipse-leshan · Jun 2, 2021 · 045f2b9 · 045f2b9
1 parent 3963c82
commit 045f2b9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 37 deletions.
diff --git a/leshan-server-demo/webapp2/src/components/InstanceView.vue b/leshan-server-demo/webapp2/src/components/InstanceView.vue
@@ -23,8 +23,8 @@
       multiple
       dense
       tile
-      v-model="expanded[objectdef.id]"
-    >
+      v-if="objectdef && instanceId && endpoint"
+     >
       <v-expansion-panel v-for="resource in resources" :key="resource.path">
         <v-expansion-panel-header style="min-height:32px" class="pa-3">
           <!-- min-width is needed for avoid shift about truncated text 
@@ -100,11 +100,7 @@ export default {
     instanceId: String,
     endpoint: String,
   },
-  data() {
-    return {
-      expanded: {},
-    };
-  },
+
   computed: {
     state() {
       return this.$store.state[this.endpoint];

diff --git a/leshan-server-demo/webapp2/src/components/ResourceControl.vue b/leshan-server-demo/webapp2/src/components/ResourceControl.vue
@@ -1,27 +1,19 @@
 <template>
   <div>
-    <request-button @on-click="observe" v-if="readable(resourcedef)"
-      >Obs</request-button
-    >
-    <request-button @on-click="stopObserve" v-if="readable(resourcedef)">
+    <request-button @on-click="observe" v-if="readable">Obs</request-button>
+    <request-button @on-click="stopObserve" v-if="readable">
       <v-icon dense small>mdi-eye-remove-outline</v-icon></request-button
     >
-    <request-button @on-click="read" v-if="readable(resourcedef)"
-      >R</request-button
-    >
-    <request-button
-      @on-click="openWriteDialog"
-      v-if="writable(resourcedef)"
-      ref="W"
+    <request-button @on-click="read" v-if="readable">R</request-button>
+    <request-button @on-click="openWriteDialog" v-if="writable" ref="W"
       >W</request-button
     >
-    <request-button @on-click="exec" v-if="executable(resourcedef)"
-      >Exe</request-button
-    >
-    <request-button @on-click="execWithParams" v-if="executable(resourcedef)"
+    <request-button @on-click="exec" v-if="executable">Exe</request-button>
+    <request-button @on-click="execWithParams" v-if="executable"
       ><v-icon dense small>mdi-cog-outline</v-icon></request-button
     >
     <resource-write-dialog
+      v-if="showDialog"
       v-model="showDialog"
       :resourcedef="resourcedef"
       :path="path"
@@ -37,6 +29,7 @@ import { preference } from "vue-preferences";
 const timeout = preference("timeout", { defaultValue: 5 });
 const format = preference("singleformat", { defaultValue: "TLV" });
 
+
 export default {
   components: { RequestButton, ResourceWriteDialog },
   props: { resourcedef: Object, path: String, endpoint: String },
@@ -55,6 +48,15 @@ export default {
         this.$refs.W.resetState();
       },
     },
+    readable() {
+      return this.resourcedef.operations.includes("R");
+    },
+    writable() {
+      return this.resourcedef.operations.includes("W");
+    },
+    executable() {
+      return this.resourcedef.operations.includes("E");
+    },
   },
   methods: {
     requestPath() {
@@ -63,15 +65,7 @@ export default {
     requestOption() {
       return `?timeout=${timeout.get()}&format=${format.get()}`;
     },
-    readable(resourcedef) {
-      return resourcedef.operations.includes("R");
-    },
-    writable(resourcedef) {
-      return resourcedef.operations.includes("W");
-    },
-    executable(resourcedef) {
-      return resourcedef.operations.includes("E");
-    },
+
     updateState(content, requestButton) {
       let state = !content.valid
         ? "warning"
@@ -170,7 +164,7 @@ export default {
               .catch(() => {
                 requestButton.resetState();
               });
-          }else{
+          } else {
             requestButton.resetState();
           }
         });

diff --git a/leshan-server-demo/webapp2/src/main.js b/leshan-server-demo/webapp2/src/main.js
@@ -18,10 +18,6 @@ Vue.directive('visible', function(el, binding) {
   el.style.visibility = binding.value ? 'visible' : 'hidden';
 });
 
-// TODO remove it activate debug tools in prod to check performance issue.
-Vue.config.devtools = true
-Vue.config.performance = true
-
 new Vue({
   vuetify,
   router,

diff --git a/leshan-server-demo/webapp2/src/views/Client.vue b/leshan-server-demo/webapp2/src/views/Client.vue
@@ -65,7 +65,7 @@ export default {
         .get(
           "api/objectspecs/" + encodeURIComponent(this.$route.params.endpoint)
         )
-        .then((response) => (this.objectdefs = response.data));
+        .then((response) => (this.objectdefs = Object.freeze(response.data)));
     },
   },
   computed: {