Skip to content

Address feedback on new IndexPatterns implementation. #42646

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

Merged
lukeelmers merged 4 commits into from
Aug 6, 2019
Merged

Address feedback on new IndexPatterns implementation. #42646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1be8334
Make the `refresh` param in IndexPatterns get methods optional.
lukeelmers Aug 5, 2019
62fb97f
Replace IndexPatterns usage of `_.get` with `idx`.
lukeelmers Aug 5, 2019
861fb26
Ensure methods always return a value.
lukeelmers Aug 5, 2019
6c7d205
Merge branch 'master' of github.com:elastic/kibana into feat/index-pa…
lukeelmers Aug 6, 2019
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
32 changes: 18 additions & 14 deletions src/legacy/ui/public/index_patterns/index_patterns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* under the License.
*/

import { idx } from '@kbn/elastic-idx';
import { SavedObjectsClientContract, SimpleSavedObject, UiSettingsClient } from 'src/core/public';
// @ts-ignore
import { fieldFormats } from '../registry/field_formats';
Expand All @@ -33,7 +34,7 @@ export class IndexPatterns {

private config: UiSettingsClient;
private savedObjectsClient: SavedObjectsClientContract;
private savedObjectsCache?: Array<SimpleSavedObject<{}>> | null;
private savedObjectsCache?: Array<SimpleSavedObject<Record<string, any>>> | null;

constructor(config: UiSettingsClient, savedObjectsClient: SavedObjectsClientContract) {
this.config = config;
Expand All @@ -48,35 +49,38 @@ export class IndexPatterns {
})).savedObjects;
}

getIds = async (refresh: boolean) => {
getIds = async (refresh: boolean = false) => {
if (!this.savedObjectsCache || refresh) {
await this.refreshSavedObjectsCache();
}
if (this.savedObjectsCache) {
return this.savedObjectsCache.map(obj => _.get(obj, 'id'));
if (!this.savedObjectsCache) {
return [];
}
return this.savedObjectsCache.map(obj => idx(obj, _ => _.id));
};

getTitles = async (refresh: boolean) => {
getTitles = async (refresh: boolean = false): Promise<string[]> => {
if (!this.savedObjectsCache || refresh) {
await this.refreshSavedObjectsCache();
}
if (this.savedObjectsCache) {
return this.savedObjectsCache.map(obj => _.get(obj, 'attributes.title'));
if (!this.savedObjectsCache) {
return [];
}
return this.savedObjectsCache.map(obj => idx(obj, _ => _.attributes.title));
};

getFields = async (fields: string[], refresh: boolean) => {
getFields = async (fields: string[], refresh: boolean = false) => {
if (!this.savedObjectsCache || refresh) {
await this.refreshSavedObjectsCache();
}
if (this.savedObjectsCache) {
return this.savedObjectsCache.map(obj => {
const result: Record<string, any> = {};
fields.forEach(f => (result[f] = _.get(obj, f) || _.get(obj, `attributes.${f}`)));
return result;
});
if (!this.savedObjectsCache) {
return [];
}
return this.savedObjectsCache.map((obj: Record<string, any>) => {
const result: Record<string, any> = {};
fields.forEach((f: string) => (result[f] = obj[f] || idx(obj, _ => _.attributes[f])));
return result;
});
};

clearCache = (id?: string) => {
Expand Down
2 changes: 1 addition & 1 deletion ...ublic/data_frame/pages/data_frame_new_pivot/components/step_details/step_details_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const StepDetailsForm: SFC<Props> = React.memo(({ overrides = {}, onChang
}

try {
setIndexPatternTitles((await kibanaContext.indexPatterns.getTitles(false)) as string[]);
setIndexPatternTitles(await kibanaContext.indexPatterns.getTitles());
} catch (e) {
toastNotifications.addDanger(
i18n.translate('xpack.ml.dataframe.stepDetailsForm.errorGettingIndexPatternTitles', {
Expand Down