From 7cf56480420aab5e8b16cc4f445d1ac4167c5c12 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Tue, 3 May 2022 10:19:17 +0100 Subject: [PATCH 01/91] moved filtes to Tab --- src/types/components.d.ts | 3 +- src/views/dashboard/controls/Trace.vue | 5 +- src/views/dashboard/panel/Tool.vue | 4 +- yarn.lock | 13674 +++++++++++++++++++++++ 4 files changed, 13682 insertions(+), 4 deletions(-) create mode 100644 yarn.lock diff --git a/src/types/components.d.ts b/src/types/components.d.ts index d3ce40a6..da5d949d 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -1,6 +1,7 @@ // generated by unplugin-vue-components // We suggest you to commit this file into source control // Read more: https://github.com/vuejs/vue-next/pull/3399 +import '@vue/runtime-core' declare module '@vue/runtime-core' { export interface GlobalComponents { @@ -45,4 +46,4 @@ declare module '@vue/runtime-core' { } } -export { } +export {} diff --git a/src/views/dashboard/controls/Trace.vue b/src/views/dashboard/controls/Trace.vue index 0682fcf4..03ba37a6 100644 --- a/src/views/dashboard/controls/Trace.vue +++ b/src/views/dashboard/controls/Trace.vue @@ -30,7 +30,8 @@ limitations under the License. -->
- + +
@@ -40,7 +41,7 @@ limitations under the License. --> diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue index e6fb5d8b..59a2058a 100644 --- a/src/views/dashboard/related/trace/Detail.vue +++ b/src/views/dashboard/related/trace/Detail.vue @@ -181,9 +181,7 @@ export default defineComponent({ const pageSize = 10; const dateFormat = (date: number, pattern = "YYYY-MM-DD HH:mm:ss") => dayjs(date).format(pattern); - const showTraceLogs = ref(false); - - // const emit = defineEmits(["show:list"]) + const showTraceLogs = ref(false); function showTraceList() { ctx.emit("show:list"); diff --git a/src/views/dashboard/related/trace/Filter.vue b/src/views/dashboard/related/trace/Filter.vue index 4cf63785..f12b0344 100644 --- a/src/views/dashboard/related/trace/Filter.vue +++ b/src/views/dashboard/related/trace/Filter.vue @@ -158,7 +158,6 @@ limitations under the License. --> type="primary" @click="searchTraces" > - (""); -// const showAllBtns = ref(true); function setFilter(filter: string) { activeFilter.value = filter; } @@ -363,7 +361,6 @@ watch( padding: 0 10px; display: flex; flex-wrap: wrap; - // flex-direction: column; align-items: center; .filter { margin: 0; @@ -374,14 +371,3 @@ watch( } -// -
-//
-// {{ t("timeRange") }}: -// -//
diff --git a/src/views/dashboard/related/trace/TraceList.vue b/src/views/dashboard/related/trace/TraceList.vue index 8c30cb53..c0a24f13 100644 --- a/src/views/dashboard/related/trace/TraceList.vue +++ b/src/views/dashboard/related/trace/TraceList.vue @@ -166,12 +166,10 @@ async function queryTraces() { } .trace-t { - width: 100%; - // width: 420px; + width: 100%; } .list { - // width: 400px; width: 100%; } From 55eea72bd34d3c00e8e227de2df6320380138578 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Thu, 5 May 2022 11:24:23 +0100 Subject: [PATCH 18/91] svain before checkout --- src/types/components.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 973b71b1..da5d949d 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -9,7 +9,6 @@ declare module '@vue/runtime-core' { ElButton: typeof import('element-plus/es')['ElButton'] ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] From 01cd5014592d39096d59fc9c0f2590d1fde25790 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Fri, 6 May 2022 03:10:28 +0100 Subject: [PATCH 19/91] fix table not showing on the index page --- src/views/dashboard/panel/Tool.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 01ee217a..44e02119 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -200,7 +200,7 @@ const appStore = useAppStoreWithOut(); const params = useRoute().params; const selectedSelector = ref(""); const showFilter = computed( - () => dashboardStore.layout[0].activedTabIndex === 2 + () => dashboardStore.layout[0]?.activedTabIndex === 2 ); const { query } = useRoute(); From f48ecba356a40f132354cea8dad86183922fc863 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Fri, 6 May 2022 03:32:04 +0100 Subject: [PATCH 20/91] fixed table issue --- src/views/dashboard/panel/Tool.vue | 1 + src/views/dashboard/related/trace/Detail.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 44e02119..2513b899 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -169,6 +169,7 @@ limitations under the License. -->
+ diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue index 59a2058a..a1b4eb48 100644 --- a/src/views/dashboard/related/trace/Detail.vue +++ b/src/views/dashboard/related/trace/Detail.vue @@ -54,7 +54,7 @@ limitations under the License. --> :small="true" :total="traceStore.traceSpanLogsTotal" @current-change="turnLogsPage" - /> + /> Date: Fri, 6 May 2022 03:46:15 +0100 Subject: [PATCH 21/91] created a component to house trace details tools --- .../panel/component/TraceDetailsTools.vue | 217 ++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 src/views/dashboard/panel/component/TraceDetailsTools.vue diff --git a/src/views/dashboard/panel/component/TraceDetailsTools.vue b/src/views/dashboard/panel/component/TraceDetailsTools.vue new file mode 100644 index 00000000..bf43b494 --- /dev/null +++ b/src/views/dashboard/panel/component/TraceDetailsTools.vue @@ -0,0 +1,217 @@ + + + From 31b0d49234aa5ca69ec56a40440d2376d694b0f6 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Fri, 6 May 2022 03:59:09 +0100 Subject: [PATCH 22/91] init test of tracedetailTools --- src/views/dashboard/panel/Tool.vue | 2 ++ .../dashboard/panel/component/TraceDetailsTools.vue | 3 +-- src/views/dashboard/related/trace/Detail.vue | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 2513b899..d97fdfb9 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -170,6 +170,7 @@ limitations under the License. --> + @@ -193,6 +194,7 @@ import { useSelectorStore } from "@/store/modules/selectors"; import { ElMessage } from "element-plus"; import { Option } from "@/types/app"; import { useI18n } from "vue-i18n"; +import TraceDetailsTools from './component/TraceDetailsTools' const { t } = useI18n(); const dashboardStore = useDashboardStore(); diff --git a/src/views/dashboard/panel/component/TraceDetailsTools.vue b/src/views/dashboard/panel/component/TraceDetailsTools.vue index bf43b494..d5acb8d3 100644 --- a/src/views/dashboard/panel/component/TraceDetailsTools.vue +++ b/src/views/dashboard/panel/component/TraceDetailsTools.vue @@ -124,6 +124,7 @@ +
{{ t("noData") }}
+ + diff --git a/src/views/dashboard/related/trace/Detail.vue b/src/views/dashboard/related/trace/Detail.vue index 4c7fd6b6..8e4e48dc 100644 --- a/src/views/dashboard/related/trace/Detail.vue +++ b/src/views/dashboard/related/trace/Detail.vue @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. --> From d17939a116155280e8e623d1a20ee6ab0cdcdcc0 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Sat, 7 May 2022 12:33:38 +0100 Subject: [PATCH 35/91] log header layout look better now --- src/views/dashboard/related/log/Header.vue | 85 +++++++++++++++++----- 1 file changed, 65 insertions(+), 20 deletions(-) diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index 0c9baca7..aa63d1fe 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -66,26 +66,45 @@ limitations under the License. --> {{ t("conditionNotice") }} -->
-
- + - {{ t("traceID") }} + + Trace ID -
- {{ t("traceID") }}: - -
-
- Tags + + Keywords + + + Exclude keywords + +
+
+ +
+ {{ t("traceID") }}: + +
+
+ /> -
-
+
+
{{ t("keywordsOfContent") }}: @change="addLabels('keywordsOfContent')" />
-
+
{{ t("excludingKeywordsOfContent") }}:
- - {{ t("search") }} - + + +
+ + + + + + +
@@ -330,6 +372,9 @@ function removeExcludeContent(index: number) { function setSearchTerm(term: string) { currentSearchTerm.value = term; } +function cancelSearchTerm() { + currentSearchTerm.value = ''; +} watch( () => selectorStore.currentService, () => { From 36a86dff1d525894dcf88c348ddbcb70634d9e3d Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Sat, 7 May 2022 12:53:25 +0100 Subject: [PATCH 36/91] showing logs active state --- src/views/dashboard/related/log/Header.vue | 73 +++++++++++----------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index aa63d1fe..d76ae824 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -14,8 +14,38 @@ See the License for the specific language governing permissions and limitations under the License. -->