Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
Signed-off-by: Su <szhongna@amazon.com>
  • Loading branch information
zhongnansu committed Apr 4, 2023
1 parent 9de647f commit 2a4b2e2
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions src/plugins/console/public/lib/mappings/mappings.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const POLL_INTERVAL = 60000;
let pollTimeoutId;

let perIndexTypes = {};
let perAliasIndexes = {};
let perAliasIndices = {};
let templates = [];

export function expandAliases(indicesOrAliases) {
Expand All @@ -53,8 +53,8 @@ export function expandAliases(indicesOrAliases) {
}

indicesOrAliases = indicesOrAliases.map((iOrA) => {
if (perAliasIndexes[iOrA]) {
return perAliasIndexes[iOrA];
if (perAliasIndices[iOrA]) {
return perAliasIndices[iOrA];
}
return [iOrA];
});
Expand Down Expand Up @@ -148,15 +148,9 @@ export function getTypes(indices) {

export function getIndices(includeAliases) {
const ret = [];
Object.keys(perIndexTypes).forEach((index) => {
// ignore .ds* indices in the suggested indices list.
if (!index.startsWith('.ds')) {
ret.push(index);
}
});

if (typeof includeAliases === 'undefined' ? true : includeAliases) {
Object.keys(perAliasIndexes).forEach((alias) => {
Object.keys(perAliasIndices).forEach((alias) => {
ret.push(alias);
});
}
Expand Down Expand Up @@ -245,7 +239,7 @@ export function loadMappings(mappings) {
}

export function loadAliases(aliases) {
perAliasIndexes = {};
perAliasIndices = {};
Object.entries(aliases).forEach(([index, omdexAliases]) => {
// verify we have an index defined. useful when mapping loading is disabled
perIndexTypes[index] = perIndexTypes[index] || {};
Expand All @@ -254,21 +248,21 @@ export function loadAliases(aliases) {
if (alias === index) {
return;
} // alias which is identical to index means no index.
let curAliases = perAliasIndexes[alias];
let curAliases = perAliasIndices[alias];
if (!curAliases) {
curAliases = [];
perAliasIndexes[alias] = curAliases;
perAliasIndices[alias] = curAliases;
}
curAliases.push(index);
});
});

perAliasIndexes._all = getIndices(false);
perAliasIndices._all = getIndices(false);
}

export function clear() {
perIndexTypes = {};
perAliasIndexes = {};
perAliasIndices = {};
templates = [];
}

Expand All @@ -283,7 +277,6 @@ function retrieveSettings(http, settingsKey, settingsToRetrieve) {
if (settingsToRetrieve[settingsKey] === true) {
return opensearch.send(http, 'GET', settingKeyToPathMap[settingsKey], null);
} else {
// const settingsPromise = new $.Deferred();
if (settingsToRetrieve[settingsKey] === false) {
// If the user doesn't want autocomplete suggestions, then clear any that exist
return Promise.resolve({});
Expand Down

0 comments on commit 2a4b2e2

Please sign in to comment.