Skip to content

Commit

Permalink
Merge pull request #1901 from yext/hotfix/v1.17.6
Browse files Browse the repository at this point in the history
Version 1.17.6
  • Loading branch information
k-gerner authored Sep 17, 2024
2 parents 302b2fe + 05844f4 commit 65ba461
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yext/answers-search-ui",
"version": "1.17.5",
"version": "1.17.6",
"description": "Javascript Search Programming Interface",
"main": "dist/answers-umd.js",
"repository": {
Expand Down
3 changes: 2 additions & 1 deletion src/answers-search-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ class AnswersSearchBar {
onVerticalSearch: parsedConfig.onVerticalSearch,
onUniversalSearch: parsedConfig.onUniversalSearch,
environment: parsedConfig.environment,
componentManager: this.components
componentManager: this.components,
cloudChoice: parsedConfig.cloudChoice
});

if (parsedConfig.onStateChange && typeof parsedConfig.onStateChange === 'function') {
Expand Down
3 changes: 2 additions & 1 deletion src/answers-umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,8 @@ class Answers {
onUniversalSearch: parsedConfig.onUniversalSearch,
environment: parsedConfig.environment,
componentManager: this.components,
additionalHttpHeaders: parsedConfig.additionalHttpHeaders
additionalHttpHeaders: parsedConfig.additionalHttpHeaders,
cloudChoice: parsedConfig.cloudChoice
});

if (parsedConfig.onStateChange && typeof parsedConfig.onStateChange === 'function') {
Expand Down
5 changes: 5 additions & 0 deletions src/core/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ export const SPEECH_RECOGNITION_LOCALES_SUPPORTED_BY_EDGE = '@@SPEECH_RECOGNITIO

/** The cloud region being used, injected by the build process */
export const CLOUD_REGION = '@@CLOUD_REGION';
/** The identifier for all cloud providers */
export const GLOBAL_MULTI = 'multi';

/** The identifier for using GCP */
export const GLOBAL_GCP = 'gcp';

/** The identifier of the production environment */
export const PRODUCTION = 'production';
Expand Down
7 changes: 4 additions & 3 deletions src/core/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import FilterRegistry from './filters/filterregistry';
import DirectAnswer from './models/directanswer';
import AutoCompleteResponseTransformer from './search/autocompleteresponsetransformer';

import { PRODUCTION, LIB_VERSION, CLOUD_REGION, SANDBOX } from './constants';
import { PRODUCTION, LIB_VERSION, CLOUD_REGION, SANDBOX, GLOBAL_MULTI, GLOBAL_GCP } from './constants';
import { SearchParams } from '../ui';
import SearchStates from './storage/searchstates';
import Searcher from './models/searcher';
Expand Down Expand Up @@ -124,7 +124,7 @@ export default class Core {
* Determines the cloud choice of the api endpoints used when making search requests.
* @type {string}
*/
this._cloudChoice = config.cloudChoice || CloudChoice.GLOBAL_MULTI;
this._cloudChoice = config.cloudChoice || GLOBAL_MULTI;

/** @type {string} */
this._verticalKey = config.verticalKey;
Expand All @@ -150,6 +150,7 @@ export default class Core {
*/
init (config) {
const environment = this._environment === SANDBOX ? Environment.SANDBOX : Environment.PROD;
const cloudChoice = this._cloudChoice === GLOBAL_GCP ? CloudChoice.GLOBAL_GCP : CloudChoice.GLOBAL_MULTI;
const params = {
...(this._token && { token: this._token }),
...(this._apiKey && { apiKey: this._apiKey }),
Expand All @@ -160,7 +161,7 @@ export default class Core {
jsLibVersion: LIB_VERSION
},
cloudRegion: this._cloudRegion,
cloudChoice: this._cloudChoice,
cloudChoice,
environment,
...config
};
Expand Down

0 comments on commit 65ba461

Please sign in to comment.