Skip to content

Commit

Permalink
fix(UnlinkedDataset): fix bug that erroneously shows Unlinked Dataset…
Browse files Browse the repository at this point in the history
… component

UnlinkedDataset component is flashing before the dataset is loaded (so we don't know if it is linked or not). Wait until the working dataset is loaded before showing the `UnlinkedDataset` component
  • Loading branch information
ramfox committed Sep 10, 2019
1 parent 6fe1ed3 commit 88c70d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/components/Dataset.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ export default class Dataset extends React.Component<DatasetProps> {
<div className='content-wrapper'>
<div className='transition-group' >
<CSSTransition
in={(activeTab === 'status') && !isLinked}
in={(activeTab === 'status') && !isLinked && !workingDataset.isLoading}
classNames='fade'
timeout={300}
mountOnEnter
Expand Down
2 changes: 1 addition & 1 deletion app/components/chrome/HeaderColumnButtonDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const HeaderColumnButtonDropdown: React.FunctionComponent<HeaderColumnButtonDrop
const dropdown: any = React.useRef(null)

const handleClick = (e: MouseEvent) => {
if (dropdown.current.contains(e.target)) {
if (dropdown.current !== null && dropdown.current.contains(e.target)) {
// inside click
return
}
Expand Down

0 comments on commit 88c70d2

Please sign in to comment.