fix query name

src/mol-plugin/state/transforms/model.ts

@@ -638,7 +638,7 @@ const StructureSelectionFromBundle = PluginStateTransform.BuiltIn({
 });
 
 export const StructureComplexElementTypes = {
-    'protein-and-nucleic': 'protein-and-nucleic',
+    'protein-or-nucleic': 'protein-or-nucleic',
 
     'protein': 'protein',
     'nucleic': 'nucleic',
@@ -672,7 +672,7 @@ const StructureComplexElement = PluginStateTransform.BuiltIn({
 
         let query: StructureQuery, label: string;
         switch (params.type) {
-            case 'protein-and-nucleic': query = StructureSelectionQueries.proteinAndNucleic.query; label = 'Sequence'; break;
+            case 'protein-or-nucleic': query = StructureSelectionQueries.proteinOrNucleic.query; label = 'Sequence'; break;
 
             case 'protein': query = StructureSelectionQueries.protein.query; label = 'Protein'; break;
             case 'nucleic': query = StructureSelectionQueries.nucleic.query; label = 'Nucleic'; break;

src/mol-plugin/util/structure-complex-helper.ts

@@ -14,7 +14,7 @@ import { StructureComplexElementTypes } from '../state/transforms/model';
 export function createDefaultStructureComplex(
     ctx: PluginContext, root: StateBuilder.To<PluginStateObject.Molecule.Structure>
 ) {
-    root.apply(StateTransforms.Model.StructureComplexElement, { type: 'protein-and-nucleic' }, { tags: StructureComplexElementTypes['protein-and-nucleic'] })
+    root.apply(StateTransforms.Model.StructureComplexElement, { type: 'protein-or-nucleic' }, { tags: StructureComplexElementTypes['protein-or-nucleic'] })
         .apply(StateTransforms.Representation.StructureRepresentation3D,
             StructureRepresentation3DHelpers.getDefaultParamsStatic(ctx, 'cartoon'));
 

src/mol-plugin/util/structure-selection-helper.ts

@@ -78,7 +78,7 @@ const nucleic = StructureSelectionQuery('Nucleic', MS.struct.modifier.union([
     })
 ]))
 
-const proteinAndNucleic = StructureSelectionQuery('Protein | Nucleic', MS.struct.modifier.union([
+const proteinOrNucleic = StructureSelectionQuery('Protein or Nucleic', MS.struct.modifier.union([
     MS.struct.generator.atomGroups({
         'entity-test': MS.core.logic.and([
             MS.core.rel.eq([MS.ammp('entityType'), 'polymer']),
@@ -186,7 +186,7 @@ const ligandConnectedOnly = StructureSelectionQuery('Connected to Ligand', MS.st
 ]))
 
 // residues connected to ligands or branched entities
-const connectedOnly = StructureSelectionQuery('Connected to Ligand | Carbohydrate', MS.struct.modifier.union([
+const connectedOnly = StructureSelectionQuery('Connected to Ligand or Carbohydrate', MS.struct.modifier.union([
     MS.struct.combinator.merge([
         branchedConnectedOnly.expression,
         ligandConnectedOnly.expression
@@ -259,7 +259,7 @@ export const StructureSelectionQueries = {
     trace,
     protein,
     nucleic,
-    proteinAndNucleic,
+    proteinOrNucleic,
     water,
     branched,
     branchedPlusConnected,