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

[Bug] Removed defualt option in MDS selector #454

Merged
merged 3 commits into from
Oct 15, 2024
Merged

[Bug] Removed defualt option in MDS selector #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34fdd55
removed default option which was causing issue to fetch index
sumukhswamy Oct 10, 2024
cfe3dd4
removed console logs
sumukhswamy Oct 11, 2024
0f00197
updated api calls to not trigger on initial load
sumukhswamy Oct 15, 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
194 changes: 97 additions & 97 deletions public/components/query_compare/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
*/

import React, { useEffect, useMemo, useState } from 'react';
import { ChromeBreadcrumb, CoreStart, MountPoint, NotificationsStart, SavedObject } from '../../../../../src/core/public';
import { DataSourceAggregatedViewConfig, DataSourceManagementPluginSetup } from '../../../../../src/plugins/data_source_management/public';
import {
ChromeBreadcrumb,
CoreStart,
MountPoint,
NotificationsStart,
SavedObject,
} from '../../../../../src/core/public';
import {
DataSourceAggregatedViewConfig,
DataSourceManagementPluginSetup,
} from '../../../../../src/plugins/data_source_management/public';
import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public';
import { QUERY_NUMBER_ONE, QUERY_NUMBER_TWO, ServiceEndpoints } from '../../../common';
import '../../ace-themes/sql_console';
Expand All @@ -15,11 +24,15 @@ import { Flyout } from '../common/flyout';
import { CreateIndex } from './create_index';
import { SearchResult } from './search_result';

import semver from "semver";
import semver from 'semver';
import { DataSourceAttributes } from '../../../../../src/plugins/data_source/common/data_sources';
import { DataSourceMenuProps, DataSourceOption } from '../../../../../src/plugins/data_source_management/public/components/data_source_menu/types';
import * as pluginManifest from "../../../opensearch_dashboards.json";
import {
DataSourceMenuProps,
DataSourceOption,
} from '../../../../../src/plugins/data_source_management/public/components/data_source_menu/types';
import * as pluginManifest from '../../../opensearch_dashboards.json';
import './home.scss';
import { uiSettingsService } from '../common/utils';

interface QueryExplorerProps {
parentBreadCrumbs: ChromeBreadcrumb[];
Expand All @@ -30,7 +43,7 @@ interface QueryExplorerProps {
setToast: (title: string, color?: string, text?: any, side?: string) => void;
chrome: CoreStart['chrome'];
savedObjects: CoreStart['savedObjects'];
dataSourceEnabled: boolean
dataSourceEnabled: boolean;
dataSourceManagement: DataSourceManagementPluginSetup;
setActionMenu: (menuMount: MountPoint | undefined) => void;
application: CoreStart['application'];
Expand Down Expand Up @@ -59,117 +72,104 @@ export const Home = ({
datasource2,
setFetchedPipelines1,
setFetchedPipelines2,
setDataSource1,
setDataSource2,
} = useSearchRelevanceContext();

useEffect(() => {
setBreadcrumbs([...parentBreadCrumbs]);
}, [setBreadcrumbs, parentBreadCrumbs]);
const [dataSourceOptions, setDataSourceOptions] = useState<DataSourceOption[]>([]);
const [shouldShowCreateIndex, setShouldShowCreateIndex] = useState(false);
const fetchIndexes = (dataConnectionId: string, queryNumber: string) => {
if(dataConnectionId){
http.get(`${ServiceEndpoints.GetIndexes}/${dataConnectionId}`).then((res: DocumentsIndex[]) => {
if(queryNumber == QUERY_NUMBER_ONE){
setDocumentsIndexes1(res)
}
else{
setDocumentsIndexes2(res)
}
}).catch((err) => {
if(queryNumber === QUERY_NUMBER_ONE){
setDocumentsIndexes1([])
}
else{
setDocumentsIndexes2([])
}
console.log(err)
});
}
else{
http.get(ServiceEndpoints.GetIndexes).then((res: DocumentsIndex[]) => {
if(queryNumber == QUERY_NUMBER_ONE){
setDocumentsIndexes1(res)
http
.get(`${ServiceEndpoints.GetIndexes}/${dataConnectionId}`)
.then((res: DocumentsIndex[]) => {
if (queryNumber == QUERY_NUMBER_ONE) {
setDocumentsIndexes1(res);
} else {
setDocumentsIndexes2(res);
}
else{
setDocumentsIndexes2(res)
})
.catch((err) => {
if (queryNumber === QUERY_NUMBER_ONE) {
setDocumentsIndexes1([]);
} else {
setDocumentsIndexes2([]);
}
}).catch((err) => {
if(queryNumber === QUERY_NUMBER_ONE){
setDocumentsIndexes1([])
console.log(err);
});
};
const fetchPipelines = (dataConnectionId: string, queryNumber: string) => {
http
.get(`${ServiceEndpoints.GetPipelines}/${dataConnectionId}`)
.then((res: {}) => {
if (queryNumber === QUERY_NUMBER_ONE) {
setFetchedPipelines1(res);
} else {
setFetchedPipelines2(res);
}
else{
setDocumentsIndexes2([])
})
.catch((err) => {
if (queryNumber === QUERY_NUMBER_ONE) {
setFetchedPipelines1('');
} else {
setFetchedPipelines2('');
}
console.log(err)
console.log(err);
});
}
}
const fetchPipelines = (dataConnectionId: string, queryNumber: string) => {
if(dataConnectionId){
http.get(`${ServiceEndpoints.GetPipelines}/${dataConnectionId}`).then((res: {}) => {
if(queryNumber === QUERY_NUMBER_ONE){
console.log(res)
setFetchedPipelines1(res)
}
else{
setFetchedPipelines2(res)
}
}).catch((err) => {
if(queryNumber === QUERY_NUMBER_ONE){
setFetchedPipelines1('')
}
else{
setFetchedPipelines2('')
}
console.log(err)
});
}
else{
http.get(ServiceEndpoints.GetPipelines).then((res: {}) => {
if(queryNumber === QUERY_NUMBER_ONE){
console.log(res)
setFetchedPipelines1(res)
}
else{
setFetchedPipelines2(res)
}
}).catch((err) => {
if(queryNumber === QUERY_NUMBER_ONE){
setFetchedPipelines1('')
}
else{
setFetchedPipelines2('')
}
console.log(err)
});
}
}
let DataSourceMenu: React.JSX.IntrinsicAttributes | React.ComponentType<DataSourceMenuProps<DataSourceAggregatedViewConfig>>;
if(dataSourceEnabled){
DataSourceMenu = dataSourceManagement.ui.getDataSourceMenu<DataSourceAggregatedViewConfig>();
}

const dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || "";
return (
semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions)
);
};

// Get Indexes and Pipelines
useEffect(() => {
if (!documentsIndexes1.length && !documentsIndexes2.length) {
setShouldShowCreateIndex(true);
} else {
setShouldShowCreateIndex(false);
}
}, [documentsIndexes1, documentsIndexes2]);

fetchIndexes(datasource1,QUERY_NUMBER_ONE)
fetchIndexes(datasource2,QUERY_NUMBER_TWO)
fetchPipelines(datasource1,QUERY_NUMBER_ONE)
fetchPipelines(datasource2,QUERY_NUMBER_TWO)

}, [http, setDocumentsIndexes1, setDocumentsIndexes2, setFetchedPipelines1, setFetchedPipelines2, datasource1, datasource2]);
// Get Indexes and Pipelines
useEffect(() => {
if (dataSourceEnabled && datasource1 !== null && datasource2 !== null) {
fetchIndexes(datasource1, QUERY_NUMBER_ONE);
fetchIndexes(datasource2, QUERY_NUMBER_TWO);
fetchPipelines(datasource1, QUERY_NUMBER_ONE);
fetchPipelines(datasource2, QUERY_NUMBER_TWO);
} else if (!dataSourceEnabled) {
fetchIndexes('', QUERY_NUMBER_ONE);
fetchIndexes('', QUERY_NUMBER_TWO);
fetchPipelines('', QUERY_NUMBER_ONE);
fetchPipelines('', QUERY_NUMBER_TWO);
}
}, [
http,
setDocumentsIndexes1,
setDocumentsIndexes2,
setFetchedPipelines1,
setFetchedPipelines2,
datasource1,
datasource2,
]);

return (
<>
{dataSourceEnabled}
<div className="osdOverviewWrapper">
{documentsIndexes1.length || documentsIndexes2.length ? <SearchResult application={application} chrome={chrome} http={http} savedObjects={savedObjects} dataSourceEnabled={dataSourceEnabled} dataSourceManagement={dataSourceManagement} navigation={navigation} setActionMenu={setActionMenu} dataSourceOptions={dataSourceOptions} notifications={notifications}/> : <CreateIndex />}
{shouldShowCreateIndex ? (
<CreateIndex />
) : (
<SearchResult
application={application}
chrome={chrome}
http={http}
savedObjects={savedObjects}
dataSourceEnabled={dataSourceEnabled}
dataSourceManagement={dataSourceManagement}
navigation={navigation}
setActionMenu={setActionMenu}
dataSourceOptions={dataSourceOptions}
notifications={notifications}
/>
)}
</div>
{showFlyout && <Flyout />}
</>
Expand Down
14 changes: 11 additions & 3 deletions ...components/query_compare/search_result/search_components/search_configs/search_config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ import {
} from '@elastic/eui';
import React, { FunctionComponent, useEffect } from 'react';

import { AppMountParameters, CoreStart, MountPoint, NotificationsStart, SavedObjectsStart, ToastsStart } from '../../../../../../../../src/core/public';
import { AppMountParameters, CoreStart, MountPoint, NotificationsStart, SavedObject, SavedObjectsStart, ToastsStart } from '../../../../../../../../src/core/public';
import { DataSourceManagementPluginSetup } from '../../../../../../../../src/plugins/data_source_management/public';
import { DataSourceOption } from '../../../../../../../../src/plugins/data_source_management/public/components/data_source_menu/types';
import { NavigationPublicPluginStart } from '../../../../../../../../src/plugins/navigation/public';
import { useSearchRelevanceContext } from '../../../../../contexts';
import { QueryError, QueryStringError, SelectIndexError } from '../../../../../types/index';
import semver from "semver";
import { DataSourceAttributes } from '../../../../../../../../src/plugins/data_source/common/data_sources';
import * as pluginManifest from "../../../../../../opensearch_dashboards.json";

export interface SearchRelevanceServices extends CoreStart {
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
Expand Down Expand Up @@ -86,7 +89,6 @@ export const SearchConfig: FunctionComponent<SearchConfigProps> = ({
};

const documentIndex = queryNumber === 1? documentsIndexes1: documentsIndexes2
console.log(fetchedPipelines1)
const pipelines = queryNumber === 1? fetchedPipelines1: fetchedPipelines2
// Sort search pipelines based off of each individual pipeline name.
const sortedPipelines = [...Object.keys(pipelines)]
Expand Down Expand Up @@ -156,6 +158,12 @@ export const SearchConfig: FunctionComponent<SearchConfigProps> = ({
if (dataSourceEnabled) {
DataSourceSelector = dataSourceManagement.ui.DataSourceSelector;
}
const dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || "";
return (
semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions)
);
};
return (
<>
<EuiTitle size="xs">
Expand All @@ -177,7 +185,7 @@ export const SearchConfig: FunctionComponent<SearchConfigProps> = ({
disabled={false}
fullWidth={false}
removePrepend={true}
defaultOption= {[]}
dataSourceFilter={dataSourceFilterFn}
/>
</EuiCompressedFormRow>
<EuiSpacer size="s" />
Expand Down
4 changes: 2 additions & 2 deletions public/contexts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ export const SearchRelevanceContextProvider = ({ children }: { children: React.R
const [pipelines, setPipelines] = useState<{}>({});
const [pipeline1, setPipeline1] = useState('');
const [pipeline2, setPipeline2] = useState('');
const [datasource1, setDataSource1] = useState('');
const [datasource2, setDataSource2] = useState('');
const [datasource1, setDataSource1] = useState(null);
const [datasource2, setDataSource2] = useState(null);
const [fetchedPipelines1, setFetchedPipelines1] = useState<{}>({});
const [fetchedPipelines2, setFetchedPipelines2] = useState<{}>({});
const [dataSourceOptions, setDataSourceOptions] = useState<DataSourceOption[]>([])
Expand Down
2 changes: 0 additions & 2 deletions server/routes/dsl_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ export function registerDslRoute(router: IRouter, openSearchServiceSetup: OpenS
});
}
resBody = resp.body;
console.log('inside pipleine',resBody)
const end = performance.now();
context.searchRelevance.metricsService.addMetric(
METRIC_NAME.SEARCH_RELEVANCE,
Expand All @@ -255,7 +254,6 @@ export function registerDslRoute(router: IRouter, openSearchServiceSetup: OpenS
end - start
);
if (error.statusCode !== 404) console.error(error);
console.log(error,'inside error')
return response.customError({
statusCode: 404,
body: error,
Expand Down
Loading