Fix condition to determine if the date field's value is an array #299

rupal-bq · 2024-02-18T06:48:28Z

Description

Fix condition to determine if the date field's value is an array
Add loose flag to OSD bootstrap to fix

ERROR [single_version_dependencies] Multiple version ranges for the same dependency
      were found declared across different package.json files. Please consolidate
      those to match across all package.json files. Different versions for the
      same dependency is not supported.

      If you have questions about this please reach out to the operations team.

      The conflicting dependencies are:

        cypress
          9.5.4 => opensearch-dashboards
          ^13.6.0 => reports-dashboards
error Command failed with exit code 1.

Issues Resolved

opensearch-project/reporting#932
#257

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

codecov · 2024-02-18T06:55:42Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (58d52f7) 74.47% compared to head (b026112) 74.47%.
Report is 2 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #299   +/-   ##
=======================================
  Coverage   74.47%   74.47%           
=======================================
  Files          30       30           
  Lines        1904     1904           
  Branches      410      410           
=======================================
  Hits         1418     1418           
  Misses        483      483           
  Partials        3        3

Flag	Coverage Δ
dashboards-report	`74.47% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

This reverts commit 0db4d73. Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

RyanL1997

Thanks for putting this together @rupal-bq! I just left some minor reviews

RyanL1997 · 2024-02-19T22:41:46Z

.github/workflows/cypress-e2e-reporting-test.yml

@@ -150,7 +150,7 @@ jobs:

      - name: Run Cypress tests
        run: |
-          yarn cypress:run --browser chrome --headless --spec '.cypress/integration/*'
+          yarn cypress:run --browser chrome --headless


Oops good catch on this, seems like we don't need to specify the spec for this directory setup. Thanks!

RyanL1997 · 2024-02-19T22:42:26Z

DEVELOPER_GUIDE.md

@@ -27,7 +27,7 @@ another JDK installation, e.g. `RUNTIME_JAVA_HOME=/usr/lib/jvm/jdk-8`.
   cd plugins
   git clone https://github.com/opensearch-project/dashboards-reporting.git
   ```
-1. Run `yarn osd bootstrap` inside `OpenSearch-Dashboards/plugins/dashboards-reporting`.
+1. Run `yarn osd bootstrap --single-version=loose` inside `OpenSearch-Dashboards/plugins/dashboards-reporting`.


RyanL1997 · 2024-02-19T22:44:51Z

server/routes/utils/dataReportHelpers.ts

-              fieldDateValue.length !== 0 &&
-              fieldDateValue instanceof Array
+              dateValue.length !== 0 &&
+              dateValue instanceof Array
            ) {
              fieldDateValue.forEach((element, index) => {


Just for my knowledge, why whats the difference between fieldDateValue and dateValue above. Cuz I saw the change was trying to switch to dateValue .

Originally the variable was dateValue for this condition but was mistakenly changed in different PR which caused TypeError: Cannot create property '0' on number '1700813322772'. Reverting to fix the issue.

* Change cypress version Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix condition to check if date field Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix cypress test Signed-off-by: Rupal Mahajan <maharup@amazon.com> * update cypress e2e workflow Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Revert "update cypress e2e workflow" This reverts commit 0db4d73. Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Fix cypress error Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Try cypress CI without --spec Signed-off-by: Rupal Mahajan <maharup@amazon.com> * Revert cypress to v13.6.0 Signed-off-by: Rupal Mahajan <maharup@amazon.com> --------- Signed-off-by: Rupal Mahajan <maharup@amazon.com> (cherry picked from commit 2d39d24) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

… (#305) * Change cypress version * Fix condition to check if date field * Fix cypress test * update cypress e2e workflow * Revert "update cypress e2e workflow" This reverts commit 0db4d73. * Fix cypress error * Try cypress CI without --spec * Revert cypress to v13.6.0 --------- (cherry picked from commit 2d39d24) Signed-off-by: Rupal Mahajan <maharup@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

rupal-bq added 2 commits February 17, 2024 22:04

Change cypress version

0453721

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Fix condition to check if date field

d493e8e

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

rupal-bq requested review from ps48, kavithacm, derek-ho, joshuali925, dai-chen, YANG-DB, mengweieric, vamsi-amazon, Swiddis, penghuo, seankao-az and anirudha as code owners February 18, 2024 06:48

rupal-bq added the backport 2.x label Feb 18, 2024

YANG-DB approved these changes Feb 18, 2024

View reviewed changes

rupal-bq added 6 commits February 18, 2024 22:32

Fix cypress test

8b9af0a

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

update cypress e2e workflow

0db4d73

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Revert "update cypress e2e workflow"

b0ed35e

This reverts commit 0db4d73. Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Fix cypress error

cb41949

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Try cypress CI without --spec

a0ea513

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

Revert cypress to v13.6.0

5bda259

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

ps48 approved these changes Feb 19, 2024

View reviewed changes

RyanL1997 mentioned this pull request Feb 19, 2024

[CI/CD] Add single version flag during bootstrap to fix version conflicts #303

Merged

6 tasks

Merge branch 'main' into fix-csv-date-error

b026112

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

RyanL1997 approved these changes Feb 19, 2024

View reviewed changes

rupal-bq merged commit 2d39d24 into opensearch-project:main Feb 20, 2024
11 of 12 checks passed

opensearch-trigger-bot bot mentioned this pull request Feb 20, 2024

[Backport 2.x] Fix condition to determine if the date field's value is an array #305

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix condition to determine if the date field's value is an array #299

Fix condition to determine if the date field's value is an array #299

rupal-bq commented Feb 18, 2024 •

edited

Loading

codecov bot commented Feb 18, 2024 •

edited

Loading

RyanL1997 left a comment

RyanL1997 Feb 19, 2024

RyanL1997 Feb 19, 2024

RyanL1997 Feb 19, 2024

rupal-bq Feb 20, 2024

Fix condition to determine if the date field's value is an array #299

Fix condition to determine if the date field's value is an array #299

Conversation

rupal-bq commented Feb 18, 2024 • edited Loading

Description

Issues Resolved

Check List

codecov bot commented Feb 18, 2024 • edited Loading

Codecov Report

RyanL1997 left a comment

Choose a reason for hiding this comment

RyanL1997 Feb 19, 2024

Choose a reason for hiding this comment

RyanL1997 Feb 19, 2024

Choose a reason for hiding this comment

RyanL1997 Feb 19, 2024

Choose a reason for hiding this comment

rupal-bq Feb 20, 2024

Choose a reason for hiding this comment

rupal-bq commented Feb 18, 2024 •

edited

Loading

codecov bot commented Feb 18, 2024 •

edited

Loading