Skip to content

Commit

Permalink
Hide incompatible index patterns (#354)
Browse files Browse the repository at this point in the history
* Display a message when there is no supported data source

Signed-off-by: Kapian1234 <[email protected]>

* filter out incompatible index patterns

Signed-off-by: Kapian1234 <[email protected]>

* Display a message when there is no supported data source

Signed-off-by: Kapian1234 <[email protected]>

* remove log

Signed-off-by: Kapian1234 <[email protected]>

* remove unused import

Signed-off-by: Kapian1234 <[email protected]>

* add changelog

Signed-off-by: Kapian1234 <[email protected]>

* modify changelog

Signed-off-by: Kapian1234 <[email protected]>

* resolve some issues

Signed-off-by: Kapian1234 <[email protected]>

---------

Signed-off-by: Kapian1234 <[email protected]>
Signed-off-by: Jincheng Wan <[email protected]>
  • Loading branch information
Kapian1234 authored Oct 21, 2024
1 parent 98bf315 commit e3ec245
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- refactor: Add data source info in discover url when navigating([#347](https://github.com/opensearch-project/dashboards-assistant/pull/347))
- feat: only display ai actions that compatible with the datasource([#350](https://github.com/opensearch-project/dashboards-assistant/pull/350))
- feat: take index pattern and query assistant input to text2viz app([#349](https://github.com/opensearch-project/dashboards-assistant/pull/349))
- feat: Hide incompatible index patterns ([#354] (https://github.com/opensearch-project/dashboards-assistant/pull/354))


### 📈 Features/Enhancements
Expand Down
34 changes: 25 additions & 9 deletions public/components/visualization/source_selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import React, { useCallback, useMemo, useState, useEffect, useRef } from 'react';
import { i18n } from '@osd/i18n';

import { useOpenSearchDashboards } from '../../../../../src/plugins/opensearch_dashboards_react/public';
import {
DataSource,
Expand Down Expand Up @@ -139,13 +138,9 @@ export const SourceSelector = ({
}
);
if (!res.exists) {
dataSourceIdToIndexPatternIds[key].forEach((indexPatternId) => {
indexPatternOptions.options.forEach((option) => {
if (option.value === indexPatternId) {
option.disabled = true;
}
});
});
indexPatternOptions.options = indexPatternOptions.options.filter(
(option) => !dataSourceIdToIndexPatternIds[key].includes(option.value)
);
}
}
);
Expand All @@ -171,10 +166,31 @@ export const SourceSelector = ({
dataSources.dataSourceService.reload();
}, [dataSources.dataSourceService]);

const options = useMemo(() => {
if (dataSourceOptions[0] && dataSourceOptions[0].options.length > 0) {
return dataSourceOptions;
}
return [
{
label: i18n.translate('dashboardAssistant.datasource.selector.group.label', {
defaultMessage: 'Index patterns',
}),
options: [
{
label: i18n.translate('dashboardAssistant.datasource.selector.emptyMessage.label', {
defaultMessage: 'No supported index patterns',
}),
disabled: true,
},
],
},
];
}, [dataSourceOptions]);

return (
<DataSourceSelectable
dataSources={currentDataSources}
dataSourceOptionList={dataSourceOptions}
dataSourceOptionList={options}
setDataSourceOptionList={onSetDataSourceOptions}
onDataSourceSelect={onDataSourceSelect}
selectedSources={selectedSources}
Expand Down

0 comments on commit e3ec245

Please sign in to comment.