Merge remote-tracking branch 'upstream/release_23.1' into dev

esg-epfl-apc · Oct 24, 2023 · 74ef0d8 · 74ef0d8
2 parents 0d74680 + bdbcd72
commit 74ef0d8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/client/src/components/Form/FormDisplay.vue b/client/src/components/Form/FormDisplay.vue
@@ -111,7 +111,7 @@ export default {
             visitInputs(this.formInputs, (input, name) => {
                 const newValue = newAttributes[name];
                 if (newValue != undefined) {
-                    input.attributes = newValue;
+                    Vue.set(input, "attributes", newValue);
                 }
             });
             this.onChangeForm();

diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -316,6 +316,15 @@ export default {
         historyUpdateTime() {
             this.loadHistoryItems();
         },
+        itemsLoaded(newItems) {
+            if (this.invisible) {
+                newItems.forEach((item) => {
+                    if (this.invisible[item.hid]) {
+                        Vue.set(this.invisible, item.hid, false);
+                    }
+                });
+            }
+        },
     },
     async mounted() {
         // `filterable` here indicates if this is the current history panel
@@ -329,13 +338,15 @@ export default {
         ...mapActions(useHistoryItemsStore, ["fetchHistoryItems"]),
         getHighlight(item) {
             const highlightsKey = this.filterClass.getFilterValue(this.filterText, "related");
-            if (highlightsKey == item.hid) {
-                return "active";
-            } else if (highlightsKey) {
-                if (item.hid > highlightsKey) {
-                    return "output";
-                } else {
-                    return "input";
+            if (!this.loading) {
+                if (highlightsKey == item.hid) {
+                    return "active";
+                } else if (highlightsKey) {
+                    if (item.hid > highlightsKey) {
+                        return "output";
+                    } else {
+                        return "input";
+                    }
                 }
             } else {
                 return null;
@@ -352,14 +363,14 @@ export default {
             try {
                 await this.fetchHistoryItems(this.historyId, this.filterText, this.offset);
                 this.searchError = null;
-                this.loading = false;
             } catch (error) {
                 if (error.response && error.response.data && error.response.data.err_msg) {
                     console.debug("HistoryPanel - Load items error:", error.response.data.err_msg);
                     this.searchError = error.response.data;
                 } else {
                     console.debug("HistoryPanel - Load items error.", error);
                 }
+            } finally {
                 this.loading = false;
             }
         },