hotfixes compvariables

Datawheel · Aug 16, 2022 · ecbcced · ecbcced
1 parent b64f84a
commit ecbcced
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/packages/cms/src/components/ProfileRenderer.jsx b/packages/cms/src/components/ProfileRenderer.jsx
@@ -121,7 +121,8 @@ class ProfileRenderer extends Component {
       onOpenModal: this.onOpenModal.bind(this),
       onTabSelect: this.onTabSelect.bind(this),
       variables,
-      compVariables: comparison ? comparison.variables : false,
+      comparison,
+      compVariables: comparison ? comparison.variables : {},
       initialVariables,
       locale,
       print
@@ -641,6 +642,7 @@ ProfileRenderer.childContextTypes = {
   router: PropTypes.object,
   variables: PropTypes.object,
   initialVariables: PropTypes.object,
+  comparison: PropTypes.boolean,
   compVariables: PropTypes.object,
   onSelector: PropTypes.func,
   onOpenModal: PropTypes.func,

diff --git a/packages/cms/src/components/Viz/Viz.jsx b/packages/cms/src/components/Viz/Viz.jsx
@@ -56,7 +56,7 @@ class Viz extends Component {
     // Variables come from props in the CMS, and Context in the Front-end.
     const variables = this.props.variables || this.context.variables;
     const compVariables = this.context.compVariables;
-    const isComparison = compVariables && compVariables.id === variables.id;
+    const isComparison = this.context.comparison && compVariables.id === variables.id;
     // onSetVariables will either come from ProfileBuilder (CMS) or Profile (Front-end)
     // But either way, it is delivered via context. Have a backup no-op just in case.
     let onSetVariables = d => d;
@@ -198,7 +198,8 @@ Viz.contextTypes = {
   onOpenModal: PropTypes.func,
   updateSource: PropTypes.func,
   variables: PropTypes.object,
-  compVariables: PropTypes.object
+  compVariables: PropTypes.object,
+  comparison: PropTypes.boolean
 };
 
 Viz.defaultProps = {

diff --git a/packages/cms/src/components/sections/components/Selector.jsx b/packages/cms/src/components/sections/components/Selector.jsx
@@ -33,8 +33,8 @@ class Selector extends Component {
   }
 
   onSelectorWrapper(name, value) {
-    const {onSelector, variables, compVariables} = this.context;
-    const isComparison = compVariables && compVariables.id === variables.id;
+    const {onSelector, variables, compVariables, comparison} = this.context;
+    const isComparison = comparison && compVariables.id === variables.id;
     onSelector(name, value, isComparison);
   }
 
@@ -158,7 +158,8 @@ Selector.contextTypes = {
   onSelector: PropTypes.func,
   print: PropTypes.bool,
   variables: PropTypes.object,
-  compVariables: PropTypes.object
+  compVariables: PropTypes.object,
+  comparison: PropTypes.boolean
 };
 
 Selector.defaultProps = {