Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add actual integration queries to table #1544

Merged

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Mar 15, 2024

Description

Adds the ability to dynamically load integrations into the installed integrations table, and reactivates the tab. Also adds some terminal spacing to the S3 setup page since it was getting clipped by the bottom bar.

TODO: Cypress tests

Empty Table:
image

When an empty test integration is added that matches the data source:
image

Issues Resolved

N/A

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.

@Swiddis
Copy link
Collaborator Author

Swiddis commented Mar 15, 2024

Depends on #1530

@Swiddis Swiddis added enhancement New feature or request integrations Used to denote items related to the Integrations project labels Mar 15, 2024
@@ -124,6 +124,7 @@ interface AssetReference {
assetId: string;
isDefaultAsset: boolean;
description: string;
status?: string;
Copy link
Member

@ps48 ps48 Mar 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the status be from an enum? I think these should be know types

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a few things to fix with status so I made #1545, will work on it soon

@@ -415,6 +415,9 @@ export function SetupIntegrationForm({
</EuiFormRow>
</>
) : null}
{/* Bottom bar will overlap content if there isn't some space at the end */}
<EuiSpacer />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit. Euispacer has props for size="l"/"xl". May be use that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried xxl but it was still too small, 2 default spacers did the trick

Comment on lines +38 to +44
return <EuiHealth color="warning">Unknown</EuiHealth>;
case 'available':
return <EuiHealth color="success">Active</EuiHealth>;
case 'partially-available':
return <EuiHealth color="warning">Partially Available</EuiHealth>;
default:
return <EuiHealth color="danger">Critical</EuiHealth>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a blocker: Is there any documentation or comment where i can learn about how we determine the status?
As a user I would like to learn more about what statuses represent

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We documented it in the design somewhere but I don't think we've added it to OSS docs, I'll see about finding a home for the info

Copy link

codecov bot commented Mar 15, 2024

Codecov Report

Attention: Patch coverage is 80.85106% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 57.96%. Comparing base (a07b3c1) to head (47727f9).

Files Patch % Lines
...ents/integrations/components/added_integration.tsx 60.00% 4 Missing ⚠️
...nage/integrations/installed_integrations_table.tsx 88.46% 3 Missing ⚠️
.../datasources/components/manage/data_connection.tsx 81.81% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1544      +/-   ##
==========================================
+ Coverage   57.74%   57.96%   +0.22%     
==========================================
  Files         362      363       +1     
  Lines       13301    13340      +39     
  Branches     3461     3468       +7     
==========================================
+ Hits         7680     7733      +53     
+ Misses       5562     5548      -14     
  Partials       59       59              
Flag Coverage Δ
dashboards-observability 57.96% <80.85%> (+0.22%) ⬆️

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.

@Swiddis Swiddis merged commit ecb8fb3 into opensearch-project:main Mar 15, 2024
17 of 24 checks passed
@Swiddis Swiddis deleted the feature/ds-load-installed-integs branch March 15, 2024 23:57
ps48 added a commit that referenced this pull request Mar 15, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1544-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ecb8fb394dc6f795b99cbb43b4b42055533456b6
# Push it to GitHub
git push --set-upstream origin backport/backport-1544-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1544-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 16, 2024
* Stub integration type

Signed-off-by: Simeon Widdis <[email protected]>

* Fix links and statuses on integration table stub

Signed-off-by: Simeon Widdis <[email protected]>

* Add search bar and tests

Signed-off-by: Simeon Widdis <[email protected]>

* Add 'add integrations' button to installed integrations table

Signed-off-by: Simeon Widdis <[email protected]>

* Update added integration snapshot

Signed-off-by: Simeon Widdis <[email protected]>

* Add dynamic loading of integrations from store

Signed-off-by: Simeon Widdis <[email protected]>

* Add space after integration setup page

Signed-off-by: Simeon Widdis <[email protected]>

* Add empty integration state

Signed-off-by: Simeon Widdis <[email protected]>

---------

Signed-off-by: Simeon Widdis <[email protected]>
(cherry picked from commit ecb8fb3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ps48 pushed a commit that referenced this pull request Mar 16, 2024
* Stub integration type



* Fix links and statuses on integration table stub



* Add search bar and tests



* Add 'add integrations' button to installed integrations table



* Update added integration snapshot



* Add dynamic loading of integrations from store



* Add space after integration setup page



* Add empty integration state



---------


(cherry picked from commit ecb8fb3)

Signed-off-by: Simeon Widdis <[email protected]>
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>
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
…ensearch-project#1547)

* Stub integration type

* Fix links and statuses on integration table stub

* Add search bar and tests

* Add 'add integrations' button to installed integrations table

* Update added integration snapshot

* Add dynamic loading of integrations from store

* Add space after integration setup page

* Add empty integration state

---------

(cherry picked from commit ecb8fb3)

Signed-off-by: Simeon Widdis <[email protected]>
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>
(cherry picked from commit ba00bb8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x enhancement New feature or request integrations Used to denote items related to the Integrations project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants