#2717 remove conditional from isDataSGroup

epam · May 31, 2023 · 9d255b4 · 9d255b4
1 parent c0ac2a8
commit 9d255b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -632,13 +632,10 @@ export class SGroup {
     if (!sGroup) {
       return false
     }
-    return sGroup.type === SGroup.TYPES.SUP
+    return sGroup?.type === SGroup.TYPES.SUP
   }
 
   static isDataSGroup(sGroup: SGroup): boolean {
-    if (!sGroup) {
-      return false
-    }
     return sGroup.type === SGroup.TYPES.DAT
   }
 

diff --git a/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx b/packages/ketcher-react/src/script/ui/views/components/StructEditor/InfoPanel.tsx
@@ -119,7 +119,7 @@ const InfoPanel: FC<InfoPanelProps> = (props) => {
   const width = size.x
   const height = size.y
 
-  const showMolecule = molecule && !SGroup.isDataSGroup(sGroup)
+  const showMolecule = molecule && sGroup && !SGroup.isDataSGroup(sGroup)
 
   return showMolecule ? (
     <div