websocket

harvester · Aug 30, 2023 · 6156b26 · 6156b26
1 parent 0398665
commit 6156b26
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/pkg/harvester/components/SettingList.vue b/pkg/harvester/components/SettingList.vue
@@ -34,15 +34,7 @@ export default {
   },
 
   data() {
-    const categorySettings = this.settings.filter((s) => {
-      if (this.category !== 'advanced') {
-        return (CATEGORY[this.category] || []).find(item => item === s.id);
-      } else if (this.category === 'advanced') {
-        const allCategory = Object.keys(CATEGORY);
-
-        return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
-      }
-    }) || [];
+    const categorySettings = this.filterCategorySettings();
 
     return {
       HCI_SETTING,
@@ -53,6 +45,20 @@ export default {
   computed: { ...mapGetters({ t: 'i18n/t' }) },
 
   methods: {
+    filterCategorySettings() {
+      console.log('------this.settings', this.settings);
+
+      return this.settings.filter((s) => {
+        if (this.category !== 'advanced') {
+          return (CATEGORY[this.category] || []).find(item => item === s.id);
+        } else if (this.category === 'advanced') {
+          const allCategory = Object.keys(CATEGORY);
+
+          return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
+        }
+      }) || [];
+    },
+
     showActionMenu(e, setting) {
       const actionElement = e.srcElement;
 
@@ -99,6 +105,17 @@ export default {
       }
     }
   },
+
+  watch: {
+    settings: {
+      deep: true,
+      handler(neu, old) {
+        this.$set(this, 'categorySettings', this.filterCategorySettings());
+        console.log('------settings changed', neu, old);
+        console.log('------categorySettings changed', this.categorySettings);
+      }
+    }
+  }
 };
 </script>
 

diff --git a/pkg/harvester/list/harvesterhci.io.setting.vue b/pkg/harvester/list/harvesterhci.io.setting.vue
@@ -105,8 +105,17 @@ export default {
       return this.initSettings.map((setting) => {
         const s = setting;
 
+        console.log('----s', s);
         const isHarvester = s.data?.type?.includes('harvesterhci');
 
+        if (isHarvester) {
+          const setting = this.$store.getters['harvester/all'](HCI.SETTING)?.find(item => item.id === s.id);
+
+          if (setting) {
+            s.data = setting;
+          }
+        }
+
         if (s.kind === 'json') {
           try {
             s.json = JSON.stringify(JSON.parse(s.data.value || s.data.default || '{}'), null, 2);