Skip to content

Commit

Permalink
[Lens] Fixes the dark theme inconcistency in text based mode (elastic…
Browse files Browse the repository at this point in the history
  • Loading branch information
stratoula authored Oct 13, 2022
1 parent 3971a98 commit 04ebe4e
Showing 1 changed file with 74 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
import type { AggregateQuery } from '@kbn/es-query';
import type { SavedObjectReference } from '@kbn/core/public';
import { EuiButtonEmpty, EuiFormRow } from '@elastic/eui';
import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
import type { ExpressionsStart, DatatableColumnType } from '@kbn/expressions-plugin/public';
import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
import { DataPublicPluginStart } from '@kbn/data-plugin/public';
Expand Down Expand Up @@ -343,15 +344,17 @@ export function getTextBasedDatasource({
renderDataPanel(domElement: Element, props: DatasourceDataPanelProps<TextBasedPrivateState>) {
const layerFields = TextBasedDatasource?.getSelectedFields?.(props.state);
render(
<I18nProvider>
<TextBasedDataPanel
data={data}
dataViews={dataViews}
expressions={expressions}
layerFields={layerFields}
{...props}
/>
</I18nProvider>,
<KibanaThemeProvider theme$={core.theme.theme$}>
<I18nProvider>
<TextBasedDataPanel
data={data}
dataViews={dataViews}
expressions={expressions}
layerFields={layerFields}
{...props}
/>
</I18nProvider>
</KibanaThemeProvider>,
domElement
);
},
Expand Down Expand Up @@ -398,60 +401,65 @@ export function getTextBasedDatasource({
(column) => column.columnId === props.columnId
);
render(
<EuiFormRow
data-test-subj="text-based-languages-field-selection-row"
label={i18n.translate('xpack.lens.textBasedLanguages.chooseField', {
defaultMessage: 'Field',
})}
fullWidth
className="lnsIndexPatternDimensionEditor--padded"
>
<FieldSelect
existingFields={fields}
selectedField={selectedField}
onChoose={(choice) => {
const meta = fields.find((f) => f.name === choice.field)?.meta;
const newColumn = {
columnId: props.columnId,
fieldName: choice.field,
meta,
};
return props.setState(
!selectedField
? {
...props.state,
layers: {
...props.state.layers,
[props.layerId]: {
...props.state.layers[props.layerId],
columns: [...props.state.layers[props.layerId].columns, newColumn],
allColumns: [...props.state.layers[props.layerId].allColumns, newColumn],
<KibanaThemeProvider theme$={core.theme.theme$}>
<EuiFormRow
data-test-subj="text-based-languages-field-selection-row"
label={i18n.translate('xpack.lens.textBasedLanguages.chooseField', {
defaultMessage: 'Field',
})}
fullWidth
className="lnsIndexPatternDimensionEditor--padded"
>
<FieldSelect
existingFields={fields}
selectedField={selectedField}
onChoose={(choice) => {
const meta = fields.find((f) => f.name === choice.field)?.meta;
const newColumn = {
columnId: props.columnId,
fieldName: choice.field,
meta,
};
return props.setState(
!selectedField
? {
...props.state,
layers: {
...props.state.layers,
[props.layerId]: {
...props.state.layers[props.layerId],
columns: [...props.state.layers[props.layerId].columns, newColumn],
allColumns: [
...props.state.layers[props.layerId].allColumns,
newColumn,
],
},
},
},
}
: {
...props.state,
layers: {
...props.state.layers,
[props.layerId]: {
...props.state.layers[props.layerId],
columns: props.state.layers[props.layerId].columns.map((col) =>
col.columnId !== props.columnId
? col
: { ...col, fieldName: choice.field }
),
allColumns: props.state.layers[props.layerId].allColumns.map((col) =>
col.columnId !== props.columnId
? col
: { ...col, fieldName: choice.field }
),
}
: {
...props.state,
layers: {
...props.state.layers,
[props.layerId]: {
...props.state.layers[props.layerId],
columns: props.state.layers[props.layerId].columns.map((col) =>
col.columnId !== props.columnId
? col
: { ...col, fieldName: choice.field }
),
allColumns: props.state.layers[props.layerId].allColumns.map((col) =>
col.columnId !== props.columnId
? col
: { ...col, fieldName: choice.field }
),
},
},
},
}
);
}}
/>
</EuiFormRow>,
}
);
}}
/>
</EuiFormRow>
</KibanaThemeProvider>,
domElement
);
},
Expand All @@ -461,9 +469,11 @@ export function getTextBasedDatasource({
props: DatasourceLayerPanelProps<TextBasedPrivateState>
) => {
render(
<I18nProvider>
<LayerPanel {...props} />
</I18nProvider>,
<KibanaThemeProvider theme$={core.theme.theme$}>
<I18nProvider>
<LayerPanel {...props} />
</I18nProvider>
</KibanaThemeProvider>,
domElement
);
},
Expand Down

0 comments on commit 04ebe4e

Please sign in to comment.