Skip to content

Commit 9b57f0c

Browse files
opensearch-trigger-bot[bot]github-actions[bot]opensearch-changeset-bot[bot]
authored andcommitted
[Workspace] Refactor data source association panel (opensearch-project#8383) (opensearch-project#8419)
* refactor association panel * Changeset file for PR opensearch-project#8383 created/updated * resolve some issues * update title style * update title style * update placeholder * update placeholder * / --------- (cherry picked from commit 83d5fba) Signed-off-by: Kapian1234 <[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> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
1 parent 26c817b commit 9b57f0c

File tree

3 files changed

+39
-29
lines changed

3 files changed

+39
-29
lines changed

changelogs/fragments/8383.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Refactor data source association panel ([#8383](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8383))

src/plugins/workspace/public/components/workspace_creator/workspace_creator_form.tsx

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@
44
*/
55

66
import React, { useCallback, useRef } from 'react';
7-
import { EuiSpacer, EuiTitle, EuiForm, EuiText, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
7+
import {
8+
EuiSpacer,
9+
EuiTitle,
10+
EuiForm,
11+
EuiText,
12+
EuiFlexItem,
13+
EuiFlexGroup,
14+
EuiPanel,
15+
} from '@elastic/eui';
816
import { i18n } from '@osd/i18n';
917
import {
1018
useWorkspaceForm,
@@ -108,29 +116,31 @@ export const WorkspaceCreatorForm = (props: WorkspaceCreatorFormProps) => {
108116
{/* SelectDataSourcePanel is only visible for dashboard admin and when data source is enabled*/}
109117
{isDashboardAdmin && isDataSourceEnabled && (
110118
<>
111-
<EuiTitle
112-
{...generateRightSidebarScrollProps(RightSidebarScrollField.DataSource)}
113-
size="s"
114-
>
115-
<h3>
116-
{i18n.translate('workspace.creator.form.associateDataSourceTitle', {
117-
defaultMessage: 'Associate data sources',
119+
<EuiPanel>
120+
<EuiText
121+
{...generateRightSidebarScrollProps(RightSidebarScrollField.DataSource)}
122+
size="s"
123+
>
124+
<h2>
125+
{i18n.translate('workspace.creator.form.associateDataSourceTitle', {
126+
defaultMessage: 'Associate data sources',
127+
})}
128+
</h2>
129+
</EuiText>
130+
<EuiText size="xs">
131+
{i18n.translate('workspace.creator.form.associateDataSourceDescription', {
132+
defaultMessage:
133+
'Add at least one data source that will be available in the workspace. If a selected OpenSearch connection has related Direct Query connections, they will also be available in the workspace.',
118134
})}
119-
</h3>
120-
</EuiTitle>
121-
<EuiText size="xs">
122-
{i18n.translate('workspace.creator.form.associateDataSourceDescription', {
123-
defaultMessage:
124-
'Add data sources that will be available in the workspace. If a selected OpenSearch connection has embedded Direct Query connection, they will also be available in the workspace.',
125-
})}
126-
</EuiText>
127-
<SelectDataSourcePanel
128-
onChange={setSelectedDataSourceConnections}
129-
savedObjects={savedObjects}
130-
assignedDataSourceConnections={formData.selectedDataSourceConnections}
131-
data-test-subj={`workspaceForm-dataSourcePanel`}
132-
showDataSourceManagement={true}
133-
/>
135+
</EuiText>
136+
<SelectDataSourcePanel
137+
onChange={setSelectedDataSourceConnections}
138+
savedObjects={savedObjects}
139+
assignedDataSourceConnections={formData.selectedDataSourceConnections}
140+
data-test-subj={`workspaceForm-dataSourcePanel`}
141+
showDataSourceManagement={true}
142+
/>
143+
</EuiPanel>
134144
<EuiSpacer size="s" />
135145
<EuiSpacer size="s" />
136146
</>

src/plugins/workspace/public/components/workspace_form/select_data_source_panel.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const SelectDataSourcePanel = ({
7979
data-test-subj="workspace-creator-dataSources-assign-button"
8080
>
8181
{i18n.translate('workspace.form.selectDataSourcePanel.addNew', {
82-
defaultMessage: 'Add OpenSearch connections',
82+
defaultMessage: 'Associate OpenSearch connections',
8383
})}
8484
</EuiSmallButton>
8585
);
@@ -94,7 +94,7 @@ export const SelectDataSourcePanel = ({
9494
data-test-subj="workspace-creator-dqc-assign-button"
9595
>
9696
{i18n.translate('workspace.form.selectDataSourcePanel.addNewDQCs', {
97-
defaultMessage: 'Add direct query connections',
97+
defaultMessage: 'Associate direct query connections',
9898
})}
9999
</EuiSmallButton>
100100
);
@@ -130,10 +130,8 @@ export const SelectDataSourcePanel = ({
130130
<EuiFlexItem grow={false}>{addDirectQueryConnectionsButton}</EuiFlexItem>
131131
)}
132132
</EuiFlexGroup>
133-
<EuiSpacer size="m" />
134-
<EuiFlexItem style={{ maxWidth: 768 }}>
135-
{assignedDataSourceConnections.length > 0 && renderTableContent()}
136-
</EuiFlexItem>
133+
{assignedDataSourceConnections.length > 0 && <EuiSpacer size="m" />}
134+
{assignedDataSourceConnections.length > 0 && renderTableContent()}
137135
{modalVisible && chrome && (
138136
<AssociationDataSourceModal
139137
savedObjects={savedObjects}

0 commit comments

Comments
 (0)