Skip to content

Commit

Permalink
Fix initValue not initialized
Browse files Browse the repository at this point in the history
  • Loading branch information
dana-cfc4 committed Jan 10, 2023
1 parent 1af2d0d commit bbe5802
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
20 changes: 13 additions & 7 deletions src/Widgets/VisualizationWidget.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const VisualizationWidget = (props) => {
return (
<div className="tableau-block not_displayed_tableau">
<div className="tableau-info">
{!intValue.general.url ? (
{intValue && intValue.general && !intValue.general.url ? (
<p className="tableau-error">URL required</p>
) : tableauError ? (
<p className="tableau-error">{tableauError}</p>
Expand Down Expand Up @@ -107,7 +107,8 @@ const VisualizationWidget = (props) => {
/>
</Grid.Column>
<Grid.Column mobile={12} tablet={12} computer={7}>
{!intValue.general.url || tableauError ? (
{(intValue && intValue.general && !intValue.general.url) ||
tableauError ? (
<TableauNotDisplayed />
) : (
''
Expand All @@ -116,9 +117,9 @@ const VisualizationWidget = (props) => {
<TableauView
setTableauError={setTableauError}
data={{
...intValue.general,
...intValue.options,
...intValue.extraOptions,
...intValue?.general,
...intValue?.options,
...intValue?.extraOptions,
}}
/>
</div>
Expand All @@ -139,11 +140,16 @@ const VisualizationWidget = (props) => {
</Modal.Actions>
</Modal>
)}
{!intValue.general.url || tableauError ? <TableauNotDisplayed /> : ''}
{(intValue && intValue.general && !intValue.general.url) ||
tableauError ? (
<TableauNotDisplayed />
) : (
''
)}

<TableauView
setTableauError={setTableauError}
data={{ ...value.general, ...value.options, ...value.extraOptions }}
data={{ ...value?.general, ...value?.options, ...value?.extraOptions }}
/>
</FormFieldWrapper>
);
Expand Down
4 changes: 2 additions & 2 deletions src/less/tableau.less
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
}

.not_displayed_tableau {
background-color: #ebebeb;
height: 100%;
width: 100%;
height: 100%;
background-color: #ebebeb;
min-width: 633px;
min-height: 200px;
}
Expand Down

0 comments on commit bbe5802

Please sign in to comment.