starred/openobserve
1
0
Fork 0
mirror of https://github.com/openobserve/openobserve.git synced 2026-11-05 16:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: multiple timestamp columns issue on grid (#3696)

Browse Source 
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Bug Fixes**
  - Improved spacing in error handling to enhance code readability.

- **New Features**
- Enhanced search functionality with additional parameters for more
precise results.
- Dynamically added columns based on specific conditions to improve data
visualization.

- **Tests**
- Updated UI tests to ensure compatibility with the new search and
column addition features.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Neha P <neha@openobserve.ai>
This commit is contained in:
Bhargav
2024-06-10 11:53:35 +05:30
committed by GitHub
co-authored by Neha P
parent 6bd246fd2a
commit 448f98536e
2 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ui-testing/playwright-tests/schema.spec.js
+2 -2
View File
@@ -107,7 +107,7 @@ test.describe("Schema testcases", () => {
await page.locator('button').filter({ hasText: 'close' }).click();
await page.getByRole('button', { name: 'Explore' }).first().click();
await page.waitForTimeout(1000);
await page.locator('[data-test="log-table-column-0-source"] [data-test="table-row-expand-menu"]').click();
await page.locator('[data-test="log-table-column-1-\\@timestamp"] [data-test="table-row-expand-menu"]').click();
await page.getByText('{ arrow_drop_down_all:{"code').click();
await page.locator('[data-test="menu-link-\\/streams-item"]').click();
await page.getByPlaceholder('Search Stream').click();
@@ -123,7 +123,7 @@ test.describe("Schema testcases", () => {
await ingestion(page);
await page.waitForTimeout(5000);
await page.getByRole('button', { name: 'Explore' }).first().click();
await page.locator('[data-test="log-table-column-0-source"] [data-test="table-row-expand-menu"]').click();
await page.locator('[data-test="log-table-column-1-\\@timestamp"] [data-test="table-row-expand-menu"]').click();
await page.getByText('{ arrow_drop_down_timestamp:').click();
})
web/src/composables/useLogs.ts
+99 -59
View File
@@ -837,7 +837,7 @@ const useLogs = () => {
};
const getQueryPartitions = async (queryReq: any) => {
try{
try {
// const queryReq = buildSearch();
searchObj.data.queryResults.hits = [];
searchObj.data.histogram = {
@@ -930,7 +930,8 @@ const useLogs = () => {
// searchObj.data.queryResults.total = res.data.records;
const partitions = res.data.partitions;
searchObj.data.queryResults.partitionDetail.partitions = partitions;
searchObj.data.queryResults.partitionDetail.partitions =
partitions;
let pageObject: any = [];
// partitions.forEach((item: any, index: number) => {
@@ -1487,11 +1488,14 @@ const useLogs = () => {
queryReq.query.track_total_hits = true;
searchService
.search({
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},"UI")
.search(
{
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},
"UI"
)
.then(async (res) => {
// check for total records update for the partition and update pagination accordingly
// searchObj.data.queryResults.partitionDetail.partitions.forEach(
@@ -1590,11 +1594,14 @@ const useLogs = () => {
}
searchService
.search({
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},"UI")
.search(
{
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},
"UI"
)
.then(async (res) => {
searchObjDebug["paginatedDataReceivedStartTime"] = performance.now();
// check for total records update for the partition and update pagination accordingly
@@ -1819,11 +1826,14 @@ const useLogs = () => {
// }
searchService
.search({
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},"UI")
.search(
{
org_identifier: searchObj.organizationIdetifier,
query: queryReq,
page_type: searchObj.data.stream.streamType,
},
"UI"
)
.then(async (res) => {
searchObjDebug["histogramProcessingStartTime"] = performance.now();
searchObj.loading = false;
@@ -2171,35 +2181,39 @@ const useLogs = () => {
searchObj.data.stream.selectedFields = selectedFields;
const parsedSQL: any = fnParsedSQL();
if (
(searchObj.meta.sqlMode == true &&
parsedSQL.hasOwnProperty("columns") &&
hasTimeStampColumn(parsedSQL.columns)) ||
searchObj.data.stream.selectedFields.includes(
store.state.zoConfig.timestamp_column
)
) {
searchObj.data.resultGrid.columns.push({
name: "@timestamp",
field: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
prop: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
label: t("search.timestamp") + ` (${store.state.timezone})`,
align: "left",
sortable: true,
});
}
if (searchObj.data.stream.selectedFields.length == 0) {
searchObj.meta.resultGrid.manualRemoveFields = false;
if (
(searchObj.meta.sqlMode == true &&
parsedSQL.hasOwnProperty("columns") &&
hasTimeStampColumn(parsedSQL.columns)) ||
searchObj.meta.sqlMode == false ||
searchObj.data.stream.selectedFields.includes(
store.state.zoConfig.timestamp_column
)
) {
searchObj.data.resultGrid.columns.push({
name: "@timestamp",
field: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
prop: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
label: t("search.timestamp") + ` (${store.state.timezone})`,
align: "left",
sortable: true,
});
}
if (searchObj.data.stream.selectedFields.length == 0) {
searchObj.data.resultGrid.columns.push({
name: "source",
@@ -2213,21 +2227,47 @@ const useLogs = () => {
} else {
// searchObj.data.stream.selectedFields.forEach((field: any) => {
for (const field of searchObj.data.stream.selectedFields) {
searchObj.data.resultGrid.columns.push({
name: field,
field: (row: { [x: string]: any; source: any }) => {
return byString(row, field);
},
prop: (row: { [x: string]: any; source: any }) => {
return byString(row, field);
},
label: field,
align: "left",
sortable: true,
closable: true,
showWrap: true,
wrapContent: false,
});
if (
(searchObj.meta.sqlMode == true &&
parsedSQL.hasOwnProperty("columns") &&
hasTimeStampColumn(parsedSQL.columns)) ||
field == store.state.zoConfig.timestamp_column
) {
searchObj.data.resultGrid.columns.unshift({
name: "@timestamp",
field: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
prop: (row: any) =>
timestampToTimezoneDate(
row[store.state.zoConfig.timestamp_column] / 1000,
store.state.timezone,
"yyyy-MM-dd HH:mm:ss.SSS"
),
label: t("search.timestamp") + ` (${store.state.timezone})`,
align: "left",
sortable: true,
});
} else {
searchObj.data.resultGrid.columns.push({
name: field,
field: (row: { [x: string]: any; source: any }) => {
return byString(row, field);
},
prop: (row: { [x: string]: any; source: any }) => {
return byString(row, field);
},
label: field,
align: "left",
sortable: true,
closable: true,
showWrap: true,
wrapContent: false,
});
}
}
}
extractFTSFields();