add change on preset detection, fix diff-type wrong load content

Author: feyruzb

web/api/py/codechecker_api/dist/codechecker_api.tar.gz

@@ -1,5 +1,6 @@
 <template>
   <v-select
+    v-model="activePresetId"
     clearable
     :items="presets"
     item-text="name"
@@ -10,6 +11,12 @@
     @focus="fetchPresets"
     @click:clear="handleClear"
   >
+    <template #selection="{ item }">
+      <span :class="{ 'preset-modified': isModified }">
+        {{ item.name }}<template v-if="isModified"> *</template>
+      </span>
+    </template>
+
     <template #item="{ item }">
       <v-list-item-content
         @click="applyPreset(item.id)"
@@ -40,23 +47,19 @@
 </template>
 
 <script>
+import isEqual from "lodash/isEqual";
 import {
   authService,
   ccService,
   handleThriftError,
   prodService } from "@cc-api";
 import { Permission } from "@cc/shared-types";
 
-// import { is } froAEm "core-js/core/object";
-// import { ccService, handleThriftError } from "@cc-api";
-
 
 export default {
   name: "PresetMenu",
 
-  props: {
-
-  },
+  expose : [ "onPresetApplied", "clearPresetState" ],
 
   data() {
     return {
@@ -68,16 +71,43 @@ export default {
       error: null,
       isSuperUser: false,
       isAdminOfAnyProduct: false,
+      activePresetId: null,
+      querySnapshot: null,
+      isModified: false,
     };
   },
 
   computed: {
     canSeeActions() {
       return this.isSuperUser || this.isAdminOfAnyProduct;
-    }
+    },
   },
 
   watch: {
+    "$route.query": {
+      handler(newQuery) {
+        if (!this.activePresetId || !this.querySnapshot) {
+          this.isModified = false;
+          return;
+        }
+        const normalize = q => {
+          const sorted = {};
+          for (const k of Object.keys(q).sort()) {
+            const v = q[k];
+            if (Array.isArray(v)) {
+              sorted[ k ] = v.length === 1 ? v[ 0 ] : [ ...v ].sort();
+            } else {
+              sorted[k] = v;
+            }
+          }
+          return sorted;
+        };
+        const normNew = normalize(newQuery);
+        const normSnap = normalize(this.querySnapshot);
+        this.isModified = !isEqual(normNew, normSnap);
+      },
+      deep: true,
+    },
   },
 
   created() {
@@ -133,7 +163,9 @@ export default {
     async applyPreset(id) {
       this.error = null;
       this.applyingId = id;
+      this.querySnapshot = null;
       try {
+        this.activePresetId = id;
         this.$emit("apply-preset", id);
       } catch (e) {
         this.error = (e && e.message) ? e.message : "Failed to apply preset";
@@ -142,6 +174,17 @@ export default {
       }
     },
 
+    onPresetApplied(settledQuery) {
+      this.querySnapshot = settledQuery
+        ? { ...settledQuery }
+        : { ...this.$route.query };
+    },
+
+    clearPresetState() {
+      this.activePresetId = null;
+      this.querySnapshot = null;
+    },
+
     async deletePreset(id) {
       this.error = null;
       this.deletingId = id;
@@ -155,6 +198,10 @@ export default {
         });
 
         this.presets = this.presets.filter(p => p.id !== id);
+
+        if (this.activePresetId === id) {
+          this.clearPresetState();
+        }
       } catch (e) {
         this.error = (e && e.message) ? e.message : "Failed to delete preset";
       } finally {
@@ -163,8 +210,16 @@ export default {
     },
 
     handleClear() {
+      this.clearPresetState();
       this.$emit("clear-preset");
     },
   },
 };
-</script>
+</script>
+
+<style scoped>
+.preset-modified {
+  color: orange;
+  font-weight: bold;
+}
+</style>

web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz

@@ -31,9 +31,7 @@
         <v-list-item-content>
           <preset-menu
             ref="FilterMenu"
-            :namespace="namespace"
             @apply-preset="getFilterPreset"
-            @update:url="updateUrl"
             @clear-preset="clearAllFilters"
           />
         </v-list-item-content>
@@ -465,7 +463,6 @@ export default {
       activeDatePanelId: 0,
       open_preset_save: false,
       presetName: "",
-      currentlyAppliedPreset: null,
       isSuperUser: false,
       isAdminOfAnyProduct: false,
     };
@@ -581,7 +578,7 @@ export default {
       });
 
       // If all filters are initalized call a post function.
-      Promise.all(results).then(() => {
+      return Promise.all(results).then(() => {
         filters.forEach(filter => filter.afterInit());
         this.afterInit();
 
@@ -781,7 +778,7 @@ export default {
           [ "fixed-before", toISO(rawValue?.before) || "" ],
         ],
         isUnique: (_, rawValue) => [
-          [ "is-unique", rawValue ? "true" : "false" ],
+          [ "is-unique", rawValue ? "on" : "off" ],
         ],
         runName: (_, rawValue) => [ //PTR
           [ "run-name", rawValue || "" ],
@@ -884,9 +881,19 @@ export default {
       await new Promise(resolve => setTimeout(resolve, 100));
 
       const nextQuery = { ...presetQueryParams };
-      await this.$router.replace({ query: nextQuery });
+      await this.$router.replace({ query: nextQuery }).catch(() => {});
 
       await this.initByUrl();
+
+      const filters = this.$refs.filters;
+      const states = filters.map(f => f.getUrlState());
+      const settledQuery = Object.assign({}, this.$route.query, ...states);
+
+      this.updateUrl();
+
+      if (this.$refs.FilterMenu && this.$refs.FilterMenu[0]) {
+        this.$refs.FilterMenu[0].onPresetApplied(settledQuery);
+      }
     },
 
     async clearToolbarSilently() {
@@ -915,6 +922,10 @@ export default {
     async clearAllFilters() {
       const filters = this.$refs.filters;
 
+      if (this.$refs.FilterMenu && this.$refs.FilterMenu[0]) {
+        this.$refs.FilterMenu[0].clearPresetState();
+      }
+
       // Unregister watchers.
       this.unregisterWatchers();
       filters.forEach(filter => filter.unregisterWatchers());