From f0654a19f8e46744d3daea0d82e736dbf4f3aeab Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 9 Oct 2019 12:50:52 +0530 Subject: [PATCH 01/55] Fixed bug with removing answers to hidden questions while evaluating conditions for estimation calculator. --- src/config/projectWizard/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/projectWizard/index.js b/src/config/projectWizard/index.js index 50841339d..632252241 100644 --- a/src/config/projectWizard/index.js +++ b/src/config/projectWizard/index.js @@ -580,13 +580,13 @@ export function getProductEstimate(projectTemplate, projectData) { let minTime = 0 let maxTime = 0 let matchedBlocks = [] - const flatProjectData = flatten(removeValuesOfHiddenNodes(projectTemplate, projectData), { safe: true }) if (projectTemplate) { const sections = _.get(projectTemplate, 'scope.sections') const addonPriceConfig = _.get(projectTemplate, 'scope.addonPriceConfig', {}) const priceConfig = _.get(projectTemplate, 'scope.priceConfig', {}) const buildingBlocks = _.get(projectTemplate, 'scope.buildingBlocks', {}) const preparedConditions = _.cloneDeep(_.get(projectTemplate, 'scope.preparedConditions', {})) + const flatProjectData = flatten(removeValuesOfHiddenNodes(projectTemplate.scope, projectData), { safe: true }) _.forOwn(preparedConditions, (cond, placeholder) => { preparedConditions[placeholder] = evaluate(cond, flatProjectData) === true ? '1 == 1' : '1 == 2' }) From 7c936c0458e3ae91ea5f330bdb3f1056ca20c673 Mon Sep 17 00:00:00 2001 From: Maksym Mykhailenko Date: Thu, 10 Oct 2019 14:16:04 +0800 Subject: [PATCH 02/55] chore: commented config for quick switch to local Project Service setup --- src/config/constants.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config/constants.js b/src/config/constants.js index 7b5c72844..ecefc6203 100644 --- a/src/config/constants.js +++ b/src/config/constants.js @@ -722,6 +722,8 @@ export const LS_INCOMPLETE_PROJECT_QUERY_PARAMS = 'incompleteProjectQueryParams' export const SPECIAL_QUERY_PARAMS = ['returnUrl', 'refCode'] export const PROJECTS_API_URL = process.env.PROJECTS_API_URL || TC_API_URL +// for local testing Connect App with Project Service, comment the previous line and uncomment the next one +// export const PROJECTS_API_URL = 'http://localhost:8001' export const CONNECT_MESSAGE_API_URL = process.env.CONNECT_MESSAGE_API_URL || TC_API_URL export const NEW_PROJECT_PATH = '/new-project' From 154b911176227e6e7fb5b6a261e46390489fb57f Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 15 Oct 2019 14:28:53 +0530 Subject: [PATCH 03/55] Deferring loading of google analytics --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index c727369d3..01e9dd83b 100644 --- a/src/index.html +++ b/src/index.html @@ -10,7 +10,7 @@
-