Use undefined featureData by default instead of empty object

GMOD · Dec 21, 2020 · 2eaf1c2 · 2eaf1c2
1 parent 6521039
commit 2eaf1c2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail.tsx b/packages/core/BaseFeatureWidget/BaseFeatureDetail.tsx
@@ -433,6 +433,10 @@ const Subfeature = (props: BaseProps) => {
 export const BaseFeatureDetails = observer((props: BaseInputProps) => {
   const classes = useStyles()
   const { model } = props
+
+  if (!model.featureData) {
+    return null
+  }
   const feature = JSON.parse(JSON.stringify(model.featureData))
   return (
     <Paper className={classes.paperRoot}>

diff --git a/packages/core/BaseFeatureWidget/index.ts b/packages/core/BaseFeatureWidget/index.ts
@@ -8,14 +8,14 @@ const stateModel = types
   .model('BaseFeatureWidget', {
     id: ElementId,
     type: types.literal('BaseFeatureWidget'),
-    featureData: types.frozen({}),
+    featureData: types.frozen(),
   })
   .actions(self => ({
     setFeatureData(data: Record<string, unknown>) {
       self.featureData = data
     },
     clearFeatureData() {
-      self.featureData = {}
+      self.featureData = undefined
     },
   }))
 

diff --git a/plugins/alignments/src/AlignmentsFeatureDetail/index.js b/plugins/alignments/src/AlignmentsFeatureDetail/index.js
@@ -8,14 +8,14 @@ const stateModel = types
   .model('AlignmentsFeatureWidget', {
     id: ElementId,
     type: types.literal('AlignmentsFeatureWidget'),
-    featureData: types.frozen({}),
+    featureData: types.frozen(),
   })
   .actions(self => ({
     setFeatureData(data) {
       self.featureData = data
     },
     clearFeatureData() {
-      self.featureData = {}
+      self.featureData = undefined
     },
   }))
 

diff --git a/plugins/alignments/src/AlignmentsFeatureDetail/index.test.js b/plugins/alignments/src/AlignmentsFeatureDetail/index.test.js
@@ -5,7 +5,6 @@ import ReactComponent from './AlignmentsFeatureDetail'
 
 test('open up a widget', () => {
   const model = stateModel.create({ type: 'AlignmentsFeatureWidget' })
-  const { container, getByText } = render(<ReactComponent model={model} />)
   model.setFeatureData({
     seq:
       'TTGTTGCGGAGTTGAACAACGGCATTAGGAACACTTCCGTCTCTCACTTTTATACGATTATGATTGGTTCTTTAGCCTTGGTTTAGATTGGTAGTAGTAG',
@@ -29,6 +28,7 @@ test('open up a widget', () => {
     refName: 'ctgA',
     type: 'match',
   })
+  const { container, getByText } = render(<ReactComponent model={model} />)
   expect(container.firstChild).toMatchSnapshot()
   expect(getByText('ctgA:3..102 (+)')).toBeTruthy()
 })
diff --git a/plugins/breakpoint-split-view/src/BreakpointAlignmentsFeatureDetail/index.js b/plugins/breakpoint-split-view/src/BreakpointAlignmentsFeatureDetail/index.js
@@ -8,14 +8,14 @@ const stateModel = types
   .model('BreakpointAlignmentsWidget', {
     id: ElementId,
     type: types.literal('BreakpointAlignmentsWidget'),
-    featureData: types.frozen({}),
+    featureData: types.frozen(),
   })
   .actions(self => ({
     setFeatureData(data) {
       self.featureData = data
     },
     clearFeatureData() {
-      self.featureData = {}
+      self.featureData = undefined
     },
   }))
 

diff --git a/plugins/variants/src/VariantFeatureWidget/index.js b/plugins/variants/src/VariantFeatureWidget/index.js
@@ -7,14 +7,14 @@ export const stateModel = types
   .model('VariantFeatureWidget', {
     id: ElementId,
     type: types.literal('VariantFeatureWidget'),
-    featureData: types.frozen({}),
+    featureData: types.frozen(),
   })
   .actions(self => ({
     setFeatureData(data) {
       self.featureData = data
     },
     clearFeatureData() {
-      self.featureData = {}
+      self.featureData = undefined
     },
   }))