[Discover] use roundUp when converting timestamp for PPL (opensearch-…

…project#8935)

Signed-off-by: Joshua Li <[email protected]>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Signed-off-by: Federico Silva <[email protected]>

changelogs/fragments/8935.yml

@@ -0,0 +1,2 @@
+fix:
+- Use roundUp when converting timestamp for PPL ([#8935](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8935))

packages/opensearch-datemath/index.d.ts

@@ -47,6 +47,8 @@ declare const datemath: {
 
   /**
    * Parses a string into a moment object. The string can be something like "now - 15m".
+   * @param options.roundUp - If true, rounds the parsed date to the end of the
+   * unit. Only works for string with "/" like "now/d".
    * @param options.forceNow If this optional parameter is supplied, "now" will be treated as this
    * date, rather than the real "now".
    */

src/plugins/data/common/data_frames/utils.test.ts

@@ -0,0 +1,27 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import datemath from '@opensearch/datemath';
+import { formatTimePickerDate } from '.';
+
+describe('formatTimePickerDate', () => {
+  const mockDateFormat = 'YYYY-MM-DD HH:mm:ss';
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should handle date range with rounding', () => {
+    jest.spyOn(datemath, 'parse');
+
+    const result = formatTimePickerDate({ from: 'now/d', to: 'now/d' }, mockDateFormat);
+
+    expect(result.fromDate).not.toEqual(result.toDate);
+
+    expect(datemath.parse).toHaveBeenCalledTimes(2);
+    expect(datemath.parse).toHaveBeenCalledWith('now/d', { roundUp: undefined });
+    expect(datemath.parse).toHaveBeenCalledWith('now/d', { roundUp: true });
+  });
+});

src/plugins/data/common/data_frames/utils.ts

@@ -156,13 +156,13 @@ export const getTimeField = (
  * the `dateFormat` parameter
  */
 export const formatTimePickerDate = (dateRange: TimeRange, dateFormat: string) => {
-  const dateMathParse = (date: string) => {
-    const parsedDate = datemath.parse(date);
+  const dateMathParse = (date: string, roundUp?: boolean) => {
+    const parsedDate = datemath.parse(date, { roundUp });
     return parsedDate ? parsedDate.utc().format(dateFormat) : '';
   };
 
   const fromDate = dateMathParse(dateRange.from);
-  const toDate = dateMathParse(dateRange.to);
+  const toDate = dateMathParse(dateRange.to, true);
 
   return { fromDate, toDate };
 };