From 147fa9558484c0fd054b666f0d42dce172c6e938 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Thu, 11 Oct 2018 15:22:29 +0200
Subject: [PATCH] model-server: fixed AtomSiteSchema type
---
src/servers/model/query/atoms.ts | 12 ++++++------
src/servers/model/server/api.ts | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/servers/model/query/atoms.ts b/src/servers/model/query/atoms.ts
index 0901023f9..4f38ba3d2 100644
--- a/src/servers/model/query/atoms.ts
+++ b/src/servers/model/query/atoms.ts
@@ -6,7 +6,7 @@
import { QueryPredicate, StructureElement, StructureProperties as Props } from 'mol-model/structure';
import { AtomsQueryParams } from 'mol-model/structure/query/queries/generators';
-import { AtomSiteSchema } from '../server/api';
+import { AtomSiteSchema, AtomSiteSchemaElement } from '../server/api';
export function getAtomsTests(params: AtomSiteSchema): Partial<AtomsQueryParams>[] {
if (!params) return [{ }];
@@ -17,7 +17,7 @@ export function getAtomsTests(params: AtomSiteSchema): Partial<AtomsQueryParams>
}
}
-function atomsTest(params: AtomSiteSchema): Partial<AtomsQueryParams> {
+function atomsTest(params: AtomSiteSchemaElement): Partial<AtomsQueryParams> {
return {
entityTest: entityTest(params),
chainTest: chainTest(params),
@@ -26,13 +26,13 @@ function atomsTest(params: AtomSiteSchema): Partial<AtomsQueryParams> {
};
}
-function entityTest(params: AtomSiteSchema): QueryPredicate | undefined {
+function entityTest(params: AtomSiteSchemaElement): QueryPredicate | undefined {
if (!params || typeof params.label_entity_id === 'undefined') return void 0;
const p = Props.entity.id, id = '' + params.label_entity_id;
return ctx => p(ctx.element) === id;
}
-function chainTest(params: AtomSiteSchema): QueryPredicate | undefined {
+function chainTest(params: AtomSiteSchemaElement): QueryPredicate | undefined {
if (!params) return void 0;
if (typeof params.label_asym_id !== 'undefined') {
@@ -46,7 +46,7 @@ function chainTest(params: AtomSiteSchema): QueryPredicate | undefined {
return void 0;
}
-function residueTest(params: AtomSiteSchema): QueryPredicate | undefined {
+function residueTest(params: AtomSiteSchemaElement): QueryPredicate | undefined {
if (!params) return void 0;
const props: StructureElement.Property<any>[] = [], values: any[] = [];
@@ -79,7 +79,7 @@ function residueTest(params: AtomSiteSchema): QueryPredicate | undefined {
return andEqual(props, values);
}
-function atomTest(params: AtomSiteSchema): QueryPredicate | undefined {
+function atomTest(params: AtomSiteSchemaElement): QueryPredicate | undefined {
if (!params) return void 0;
const props: StructureElement.Property<any>[] = [], values: any[] = [];
diff --git a/src/servers/model/server/api.ts b/src/servers/model/server/api.ts
index 7744f3489..ced5f7016 100644
--- a/src/servers/model/server/api.ts
+++ b/src/servers/model/server/api.ts
@@ -35,7 +35,7 @@ export interface QueryDefinition<Params = any> {
'@params': Params
}
-export interface AtomSiteSchema {
+export interface AtomSiteSchemaElement {
label_entity_id?: string,
label_asym_id?: string,
@@ -52,6 +52,8 @@ export interface AtomSiteSchema {
type_symbol?: string
}
+export type AtomSiteSchema = AtomSiteSchemaElement | AtomSiteSchemaElement[]
+
const AtomSiteTestParams: QueryParamInfo = {
name: 'atom_site',
type: QueryParamType.JSON,
--
GitLab