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.

Sign up for GitHub

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

Jump to bottom

[Workspace] Fix issues in workspace detail and association modal #8201

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

[Workspace] Fix issues in workspace detail and association modal #8201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3730f4b
Use mdash for the missing descriptions
Kapian1234 Sep 14, 2024
41e62da
The button in modal should read Cancel instead of Close
Kapian1234 Sep 14, 2024
297bbdd
Add a space below the empty prompt
Kapian1234 Sep 14, 2024
4383eb4
Use compressed search bar and filter
Kapian1234 Sep 14, 2024
73a8cc0
Add min-height to the Associate modal
Kapian1234 Sep 14, 2024
9615ec1
Remove the divider above the empty prompt
Kapian1234 Sep 14, 2024
bccba67
Use compressed search bar in the modal
Kapian1234 Sep 14, 2024
f24c40d
Add 2px space between the icon and the label in the Related connectio…
Kapian1234 Sep 14, 2024
403a142
Changeset file for PR #8201 created/updated
opensearch-changeset-bot[bot] Sep 14, 2024
e74ca94
Add indentation to the nested data source connections
Kapian1234 Sep 18, 2024
4b05aac
Merge branch 'workspace_detail_fix' of github.com:Kapian1234/OpenSear…
Kapian1234 Sep 18, 2024
445f40e
format style
Kapian1234 Sep 18, 2024
78f5af0
resolve conflicts
Kapian1234 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/8201.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fix:
- Fix issues in workspace detail and association modal ([#8201](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8201))
3 changes: 3 additions & 0 deletions src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
li[parentid] {
Copy link
Member

Choose a reason for hiding this comment

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

Is this a global css change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, it just adds indentation to DQCs in association modal

padding-left: 25px;
}
5 changes: 4 additions & 1 deletion src/plugins/workspace/public/components/workspace_detail/association_data_source_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { HttpStart, NotificationsStart, SavedObjectsStart } from '../../../../..
import { AssociationDataSourceModalMode } from '../../../common/constants';
import { Logos } from '../../../../../core/common';
import { DirectQueryConnectionIcon } from '../workspace_form';
import './association_data_source_modal.scss';

const ConnectionIcon = ({
connection: { connectionType, type },
Expand Down Expand Up @@ -254,11 +255,13 @@ export const AssociationDataSourceModal = ({
'workspace.detail.dataSources.associateModal.searchPlaceholder',
{ defaultMessage: 'Search' }
),
compressed: true,
}}
options={options}
onChange={handleSelectionChange}
isLoading={isLoading}
renderOption={renderOption}
height={256}
>
{(list, search) => (
<Fragment>
Expand All @@ -273,7 +276,7 @@ export const AssociationDataSourceModal = ({
<EuiSmallButton onClick={closeModal}>
<FormattedMessage
id="workspace.detail.dataSources.associateModal.close.button"
defaultMessage="Close"
defaultMessage="Cancel"
/>
</EuiSmallButton>
<EuiSmallButton
Expand Down
8 changes: 6 additions & 2 deletions src/plugins/workspace/public/components/workspace_detail/select_data_source_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ export const SelectDataSourceDetailPanel = ({
/>
</EuiText>
)}
<EuiSpacer />
</EuiTextAlign>
);

Expand Down Expand Up @@ -295,8 +296,11 @@ export const SelectDataSourceDetailPanel = ({
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>

<EuiHorizontalRule margin="m" />
{formData.selectedDataSourceConnections.length > 0 ? (
<EuiHorizontalRule margin="m" />
) : (
<EuiSpacer size="xl" />
)}
{renderTableContent()}
{isVisible && (
<AssociationDataSourceModal
Expand Down
1 change: 1 addition & 0 deletions ...lugins/workspace/public/components/workspace_detail/workspace_detail_connection_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export const WorkspaceDetailConnectionTable = ({

const search: EuiSearchBarProps = {
toolsLeft: renderToolsLeft(),
compressed: true,
box: {
incremental: true,
},
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/workspace/public/components/workspace_form/data_source_connection_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export const DataSourceConnectionTable = forwardRef<
size="xs"
label={item.name}
icon={<DirectQueryConnectionIcon type={item.type} />}
style={{ maxHeight: '30px' }}
style={{ maxHeight: '30px', gap: '2px' }}
/>
))}
</EuiListGroup>
Expand Down