#19 download complete table

clarity-h2020 · Jul 22, 2020 · 1b8b046 · 1b8b046
1 parent 72c7594
commit 1b8b046
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/components/HazardLocalEffectsTable.js b/src/components/HazardLocalEffectsTable.js
@@ -54,7 +54,8 @@ const HazardLocalEffectsTable = (props) => {
 			<p>The table lists mean-, UTCI (Universal Thermal Climate Index)- and Apperent Temperature and Discomfort level for the selected RCP Scenario.</p>
 			<ParameterSelectionComponent
 				{...props}
-				emikatTemplateUrl={emikatTemplateUrl + columns}
+				emikatTemplateUrl={emikatTemplateUrl}
+				columns={columns}
 				client={GenericEmikatClient}
 				render={GenericEmikatTable}
 				props={{ resolveData: resolveData }}>

diff --git a/src/components/RiskAndImpactTable.js b/src/components/RiskAndImpactTable.js
@@ -30,7 +30,8 @@ const RiskAndImpactTable = (props) => {
   return (
     <ParameterSelectionComponent
       {...props}
-      emikatTemplateUrl={emikatTemplateUrl + columns}
+      emikatTemplateUrl={emikatTemplateUrl}
+      columns={columns}
       client={GenericEmikatClient}
       render={GenericEmikatTable}>
     </ParameterSelectionComponent>);

diff --git a/src/components/commons/ParameterSelectionComponent.js b/src/components/commons/ParameterSelectionComponent.js
@@ -21,7 +21,7 @@ import DownloadButton from './DownloadButton.js';
  * 
  * @param {*} props props
  */
-const ParameterSelectionComponent = ({ emikatTemplateUrl, emikatParameters, emikatCredentials, selectionUiVisible, client: EmikatClientComponent, render: EmikatVisualisationComponent, props }) => {
+const ParameterSelectionComponent = ({ emikatTemplateUrl, columns, emikatParameters, emikatCredentials, selectionUiVisible, client: EmikatClientComponent, render: EmikatVisualisationComponent, props }) => {
 
   log.info('creating new ParameterSelectionComponent');
   //log.debug(props);
@@ -131,13 +131,13 @@ const ParameterSelectionComponent = ({ emikatTemplateUrl, emikatParameters, emik
             OK, but how does the EmikatVisualisationComponent get it's props? -> From EmikatClientComponent, not from the outside!
             Passing dynamic props from parent to children  is not as straightforward as one might imagine. See https://stackoverflow.com/a/32371612
           */}
-          <EmikatClientComponent emikatUrl={parametriseEmikatTemplateUrl(emikatTemplateUrl, state)} emikatCredentials={emikatCredentials} render={EmikatVisualisationComponent} props={props} />
+          <EmikatClientComponent emikatUrl={parametriseEmikatTemplateUrl(emikatTemplateUrl+columns, state)} emikatCredentials={emikatCredentials} render={EmikatVisualisationComponent} props={props} />
           <DownloadButton emikatTemplateUrl={emikatTemplateUrl} emikatParameters={state} emikatCredentials={emikatCredentials} />
         </>);
     } else {
       return (
         <>
-          <EmikatClientComponent emikatUrl={parametriseEmikatTemplateUrl(emikatTemplateUrl, state)} emikatCredentials={emikatCredentials} render={EmikatVisualisationComponent} props={props} />
+          <EmikatClientComponent emikatUrl={parametriseEmikatTemplateUrl(emikatTemplateUrl+columns, state)} emikatCredentials={emikatCredentials} render={EmikatVisualisationComponent} props={props} />
           <DownloadButton emikatTemplateUrl={emikatTemplateUrl} emikatParameters={state} emikatCredentials={emikatCredentials} />
         </>
       );
@@ -172,6 +172,11 @@ ParameterSelectionComponent.propTypes = {
     emissionsScenario: PropTypes.oneOf(EMIKATHelpers.EMISSIONS_SCENARIO_VALUES),
     eventFrequency: PropTypes.oneOf(EMIKATHelpers.EVENT_FREQUENCY_VALUES),
   }).isRequired,
+
+  /**
+   * Columns to be shown in table
+   */
+  columns: PropTypes.string,
 
   /**
    * The Basic Auth credentials
@@ -202,6 +207,7 @@ ParameterSelectionComponent.propTypes = {
 ParameterSelectionComponent.defaultProps = {
 
   emikatTemplateUrl: 'https://service.emikat.at/EmiKatTst/api/',
+  columns: '',
   emikatParameters: {
     emikatStudyId: undefined,
     dataFormat: EMIKATHelpers.DATA_FORMAT_VALUES[0],