From 6e0d5b15fee87bcd32672663ce3142b2d3787a4a Mon Sep 17 00:00:00 2001 From: chiayin Date: Fri, 6 Oct 2023 15:39:16 +0800 Subject: [PATCH] Issue #168: Done. --- package-lock.json | 43 ++------------------------------ package.json | 1 - src/stores/allMapData.js | 11 ++++++-- src/views/Discover/Map/index.vue | 1 + 4 files changed, 12 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2999df7..45f57bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "0.99.1", + "version": "0.99.1.01", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frontend", - "version": "0.99.1", + "version": "0.99.1.01", "dependencies": { "autoprefixer": "^10.4.13", "axios": "^1.2.2", @@ -19,7 +19,6 @@ "cytoscape-popper": "^2.0.0", "date-fns": "^2.30.0", "decimal.js": "^10.4.3", - "infinite-scroll": "^4.0.1", "javascript-color-gradient": "^2.4.4", "mitt": "^3.0.0", "moment": "^2.29.4", @@ -3063,11 +3062,6 @@ "node": ">=0.10.0" } }, - "node_modules/ev-emitter": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-2.1.2.tgz", - "integrity": "sha512-jQ5Ql18hdCQ4qS+RCrbLfz1n+Pags27q5TwMKvZyhp5hh2UULUYZUy1keqj6k6SYsdqIYjnmz7xyyEY0V67B8Q==" - }, "node_modules/event-stream": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", @@ -3403,11 +3397,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/fizzy-ui-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-3.0.0.tgz", - "integrity": "sha512-uJj38QFQiJ/KCio5tiZhwAjIbTXSIgzBCKdKVbaYfLS053F6z23Nb0o1ZoO9gnxOQWN7BCc35jsvrCtAq3gY9g==" - }, "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -3946,15 +3935,6 @@ "node": ">=4" } }, - "node_modules/infinite-scroll": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/infinite-scroll/-/infinite-scroll-4.0.1.tgz", - "integrity": "sha512-14Utu6d8g6mO5PmwUxfAUK5uaKdClIkrJqLmBYXj/AMBRy5ApsCWkkY84HvsSq4MM1A062gtf58S9OiD5WBfRA==", - "dependencies": { - "ev-emitter": "^2.1.0", - "fizzy-ui-utils": "^3.0.0" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -9629,11 +9609,6 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "ev-emitter": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-2.1.2.tgz", - "integrity": "sha512-jQ5Ql18hdCQ4qS+RCrbLfz1n+Pags27q5TwMKvZyhp5hh2UULUYZUy1keqj6k6SYsdqIYjnmz7xyyEY0V67B8Q==" - }, "event-stream": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", @@ -9911,11 +9886,6 @@ "path-exists": "^4.0.0" } }, - "fizzy-ui-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-3.0.0.tgz", - "integrity": "sha512-uJj38QFQiJ/KCio5tiZhwAjIbTXSIgzBCKdKVbaYfLS053F6z23Nb0o1ZoO9gnxOQWN7BCc35jsvrCtAq3gY9g==" - }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -10304,15 +10274,6 @@ "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==", "dev": true }, - "infinite-scroll": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/infinite-scroll/-/infinite-scroll-4.0.1.tgz", - "integrity": "sha512-14Utu6d8g6mO5PmwUxfAUK5uaKdClIkrJqLmBYXj/AMBRy5ApsCWkkY84HvsSq4MM1A062gtf58S9OiD5WBfRA==", - "requires": { - "ev-emitter": "^2.1.0", - "fizzy-ui-utils": "^3.0.0" - } - }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", diff --git a/package.json b/package.json index 129d13b..df34b2d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "cytoscape-popper": "^2.0.0", "date-fns": "^2.30.0", "decimal.js": "^10.4.3", - "infinite-scroll": "^4.0.1", "javascript-color-gradient": "^2.4.4", "mitt": "^3.0.0", "moment": "^2.29.4", diff --git a/src/stores/allMapData.js b/src/stores/allMapData.js index 5163ecd..4ba02a5 100644 --- a/src/stores/allMapData.js +++ b/src/stores/allMapData.js @@ -122,7 +122,7 @@ export default defineStore('allMapDataStore', { async getAllTrace() { let logId = this.logId; let tempFilterId = this.tempFilterId; - let createfilterId = this.createFilterId + let createfilterId = this.createFilterId; let api = ''; // 先判斷暫存 再判斷 filter 最後 log @@ -151,7 +151,14 @@ export default defineStore('allMapDataStore', { async getTraceDetail() { let logId = this.logId; let traceId = this.traceId; - const api = `/api/logs/${logId}/traces/${traceId}`; + let tempFilterId = this.tempFilterId; + let createfilterId = this.createFilterId; + let api = ''; + + // 先判斷暫存 再判斷 filter 最後 log + if(tempFilterId != null) api = `/api/temp-filters/${tempFilterId}/traces/${traceId}`; + else if(createfilterId!= null) api = `/api/filters/${createfilterId}/traces/${traceId}`; + else api = `/api/logs/${logId}/traces/${traceId}`; try { const response = await this.$axios.get(api); diff --git a/src/views/Discover/Map/index.vue b/src/views/Discover/Map/index.vue index c5a8450..e1061a1 100644 --- a/src/views/Discover/Map/index.vue +++ b/src/views/Discover/Map/index.vue @@ -310,6 +310,7 @@ export default { // 取得 logId 後才 call api await this.allMapDataStore.getAllMapData(); await this.allMapDataStore.getAllTrace(); + this.traceId = await this.traces[0]?.id; // log、filter 檔切換過程中， trace id 不同，將初始 trace id 設定為該檔案的 trace 幣一筆資料的 id。 await this.allMapDataStore.getTraceDetail(); this.createCy(this.mapType); await this.allMapDataStore.getFilterParams();