fix: STRF-10081 stencil pull overrides only variation config (#1105)

lib/stencil-pull.js

@@ -12,6 +12,7 @@ function stencilPull(options = {}, callback) {
  stencilPushUtils.promptUserForChannel,
  stencilPullUtils.getChannelActiveTheme,
  stencilPullUtils.getThemeConfiguration,
+ stencilPullUtils.getCurrentVariation,
  stencilPullUtils.mergeThemeConfiguration,
  ],
  callback,

lib/stencil-pull.utils.js

@@ -26,6 +26,28 @@ utils.getChannelActiveTheme = async (options) => {
  return { ...options, activeTheme };
 };
 
+utils.getCurrentVariation = async (options) => {
+ const {
+ config: { accessToken },
+ storeHash,
+ activeTheme,
+ saved,
+ remoteThemeConfiguration,
+ } = options;
+ const apiHost = options.apiHost || options.config.apiHost;
+ const themeId = activeTheme.active_theme_uuid;
+ const variations = await themeApiClient.getVariationsByThemeId({
+ accessToken,
+ apiHost,
+ storeHash,
+ themeId,
+ });
+ const variation = variations.find((v) => v.uuid === remoteThemeConfiguration.variation_uuid);
+
+ console.log('ok'.green + ` -- Fetched ${saved ? 'saved' : 'active'} variation name`);
+ return { ...options, variation };
+};
+
 utils.getThemeConfiguration = async (options) => {
  const {
  config: { accessToken },
@@ -59,6 +81,7 @@ utils.mergeThemeConfiguration = async (options) => {
  const { remoteThemeConfiguration } = options;
 
  const localConfig = await parseJsonFile('config.json');
+ const variation = localConfig.variations.find((v) => v.name === options.variation.name);
  let diffDetected = false;
 
  // For any keys the remote configuration has in common with the local configuration,
@@ -67,19 +90,22 @@ utils.mergeThemeConfiguration = async (options) => {
  if (!(key in localConfig.settings)) {
  continue;
  }
- const localVal = localConfig.settings[key];
+ const defaultVal = localConfig.settings[key];
 
  // Check for different types, and throw an error if they are found
- if (typeof localVal !== typeof remoteVal) {
+ if (typeof defaultVal !== typeof remoteVal) {
  throw new Error(
  `Theme configuration key "${key}" cannot be merged because it is not of the same type. ` +
- `Remote configuration is of type ${typeof remoteVal} while local configuration is of type ${typeof localVal}.`,
+ `Remote configuration is of type ${typeof remoteVal} while local configuration is of type ${typeof defaultVal}.`,
  );
  }
 
  // If a different value is found, overwrite the local config
- if (!_.isEqual(localVal, remoteVal)) {
- localConfig.settings[key] = remoteVal;
+ if (!_.isEqual(defaultVal, remoteVal)) {
+ if (!variation.settings) {
+ variation.settings = {};
+ }
+ variation.settings[key] = remoteVal;
  diffDetected = true;
  }
  }