@rcsb/rcsb-saguaro-app 6.2.5-dev-js-seqcoord.5 → 6.2.5-dev-js-seqcoord.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,6 +7,7 @@ var assertDefined = Assertions.assertDefined;
|
|
|
7
7
|
import { TagDelimiter } from "@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter";
|
|
8
8
|
import { Operator } from "../../RcsbUtils/Helpers/Operator";
|
|
9
9
|
import { rcsbRequestCtxManager } from "../../RcsbRequest/RcsbRequestContextManager";
|
|
10
|
+
import { rcsbClient } from "../../RcsbGraphQL/RcsbClient";
|
|
10
11
|
export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
|
|
11
12
|
protectedBuild() {
|
|
12
13
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -54,16 +55,21 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
|
|
|
54
55
|
}
|
|
55
56
|
function collectNextPage(alignmentRequestContext, alignmentCollector, annotationCollector) {
|
|
56
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
-
const alignmentResponse = yield
|
|
58
|
+
const alignmentResponse = yield rcsbClient.requestGroupAlignment({
|
|
59
|
+
group: alignmentRequestContext.group,
|
|
60
|
+
groupId: alignmentRequestContext.groupId,
|
|
61
|
+
page: {
|
|
58
62
|
first: alignmentRequestContext.page.first,
|
|
59
63
|
after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
|
|
60
|
-
}
|
|
64
|
+
},
|
|
65
|
+
excludeLogo: true
|
|
66
|
+
});
|
|
61
67
|
const targetList = uniqueTargetList(alignmentResponse);
|
|
62
68
|
if (alignmentRequestContext.groupId) {
|
|
63
|
-
const alignmentFeatures = yield
|
|
69
|
+
const alignmentFeatures = yield rcsbClient.requestRcsbPdbGroupAnnotations(buildGroupAnnotationQuery({
|
|
64
70
|
groupId: alignmentRequestContext.groupId,
|
|
65
71
|
targetList
|
|
66
|
-
}
|
|
72
|
+
}));
|
|
67
73
|
const featureTargetList = Operator.uniqueValues(alignmentFeatures.map(af => { var _a; return TagDelimiter.parseInstance((_a = af.target_id) !== null && _a !== void 0 ? _a : "").entryId; }));
|
|
68
74
|
Operator.arrayChunk(featureTargetList, 100).forEach(ids => rcsbRequestCtxManager.getEntryProperties(ids));
|
|
69
75
|
}
|
|
@@ -78,25 +84,25 @@ function uniqueTargetList(alignmentResponse) {
|
|
|
78
84
|
}
|
|
79
85
|
function collectFeatures(annotationsContext, annotationCollector) {
|
|
80
86
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
-
|
|
82
|
-
groupId: annotationsContext.groupId,
|
|
83
|
-
group: GroupReference.SequenceIdentity,
|
|
84
|
-
sources: [AnnotationReference.PdbInstance],
|
|
85
|
-
isSummary: false,
|
|
86
|
-
filters: [{
|
|
87
|
-
source: AnnotationReference.PdbInstance,
|
|
88
|
-
operation: OperationType.Equals,
|
|
89
|
-
field: FieldName.Type,
|
|
90
|
-
values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
|
|
91
|
-
}, {
|
|
92
|
-
source: AnnotationReference.PdbInstance,
|
|
93
|
-
operation: OperationType.Contains,
|
|
94
|
-
field: FieldName.TargetId,
|
|
95
|
-
values: annotationsContext.targetList
|
|
96
|
-
}],
|
|
97
|
-
externalTrackBuilder: annotationsContext.externalTrackBuilder
|
|
98
|
-
};
|
|
99
|
-
return yield annotationCollector.collect(annotationsRequestContext);
|
|
87
|
+
return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
|
|
100
88
|
});
|
|
101
89
|
}
|
|
90
|
+
function buildGroupAnnotationQuery(annotationsContext) {
|
|
91
|
+
return {
|
|
92
|
+
groupId: annotationsContext.groupId,
|
|
93
|
+
group: GroupReference.SequenceIdentity,
|
|
94
|
+
sources: [AnnotationReference.PdbInstance],
|
|
95
|
+
filters: [{
|
|
96
|
+
source: AnnotationReference.PdbInstance,
|
|
97
|
+
operation: OperationType.Equals,
|
|
98
|
+
field: FieldName.Type,
|
|
99
|
+
values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
|
|
100
|
+
}, {
|
|
101
|
+
source: AnnotationReference.PdbInstance,
|
|
102
|
+
operation: OperationType.Contains,
|
|
103
|
+
field: FieldName.TargetId,
|
|
104
|
+
values: annotationsContext.targetList
|
|
105
|
+
}]
|
|
106
|
+
};
|
|
107
|
+
}
|
|
102
108
|
//# sourceMappingURL=RcsbFvGroupAlignment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAGH,SAAS,EACT,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,YAAY,EACf,MAAM,+DAA+D,CAAC;AACvE,OAAO,EACH,wBAAwB,EAC3B,MAAM,iFAAiF,CAAC;AAKzF,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,IAAO,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,mDAAmD,CAAC;AAC/E,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,qBAAqB,EAAC,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ var assertDefined = Assertions_1.Assertions.assertDefined;
|
|
|
10
10
|
const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
|
|
11
11
|
const Operator_1 = require("../../RcsbUtils/Helpers/Operator");
|
|
12
12
|
const RcsbRequestContextManager_1 = require("../../RcsbRequest/RcsbRequestContextManager");
|
|
13
|
+
const RcsbClient_1 = require("../../RcsbGraphQL/RcsbClient");
|
|
13
14
|
class RcsbFvGroupAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
|
|
14
15
|
protectedBuild() {
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -58,16 +59,21 @@ class RcsbFvGroupAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
|
|
|
58
59
|
exports.RcsbFvGroupAlignment = RcsbFvGroupAlignment;
|
|
59
60
|
function collectNextPage(alignmentRequestContext, alignmentCollector, annotationCollector) {
|
|
60
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
const alignmentResponse = yield
|
|
62
|
+
const alignmentResponse = yield RcsbClient_1.rcsbClient.requestGroupAlignment({
|
|
63
|
+
group: alignmentRequestContext.group,
|
|
64
|
+
groupId: alignmentRequestContext.groupId,
|
|
65
|
+
page: {
|
|
62
66
|
first: alignmentRequestContext.page.first,
|
|
63
67
|
after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
|
|
64
|
-
}
|
|
68
|
+
},
|
|
69
|
+
excludeLogo: true
|
|
70
|
+
});
|
|
65
71
|
const targetList = uniqueTargetList(alignmentResponse);
|
|
66
72
|
if (alignmentRequestContext.groupId) {
|
|
67
|
-
const alignmentFeatures = yield
|
|
73
|
+
const alignmentFeatures = yield RcsbClient_1.rcsbClient.requestRcsbPdbGroupAnnotations(buildGroupAnnotationQuery({
|
|
68
74
|
groupId: alignmentRequestContext.groupId,
|
|
69
75
|
targetList
|
|
70
|
-
}
|
|
76
|
+
}));
|
|
71
77
|
const featureTargetList = Operator_1.Operator.uniqueValues(alignmentFeatures.map(af => { var _a; return TagDelimiter_1.TagDelimiter.parseInstance((_a = af.target_id) !== null && _a !== void 0 ? _a : "").entryId; }));
|
|
72
78
|
Operator_1.Operator.arrayChunk(featureTargetList, 100).forEach(ids => RcsbRequestContextManager_1.rcsbRequestCtxManager.getEntryProperties(ids));
|
|
73
79
|
}
|
|
@@ -82,24 +88,24 @@ function uniqueTargetList(alignmentResponse) {
|
|
|
82
88
|
}
|
|
83
89
|
function collectFeatures(annotationsContext, annotationCollector) {
|
|
84
90
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
85
|
-
|
|
86
|
-
groupId: annotationsContext.groupId,
|
|
87
|
-
group: GqlTypes_1.GroupReference.SequenceIdentity,
|
|
88
|
-
sources: [GqlTypes_1.AnnotationReference.PdbInstance],
|
|
89
|
-
isSummary: false,
|
|
90
|
-
filters: [{
|
|
91
|
-
source: GqlTypes_1.AnnotationReference.PdbInstance,
|
|
92
|
-
operation: GqlTypes_1.OperationType.Equals,
|
|
93
|
-
field: GqlTypes_1.FieldName.Type,
|
|
94
|
-
values: [GqlTypes_1.FeaturesType.UnobservedResidueXyz, GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt]
|
|
95
|
-
}, {
|
|
96
|
-
source: GqlTypes_1.AnnotationReference.PdbInstance,
|
|
97
|
-
operation: GqlTypes_1.OperationType.Contains,
|
|
98
|
-
field: GqlTypes_1.FieldName.TargetId,
|
|
99
|
-
values: annotationsContext.targetList
|
|
100
|
-
}],
|
|
101
|
-
externalTrackBuilder: annotationsContext.externalTrackBuilder
|
|
102
|
-
};
|
|
103
|
-
return yield annotationCollector.collect(annotationsRequestContext);
|
|
91
|
+
return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
|
|
104
92
|
});
|
|
105
93
|
}
|
|
94
|
+
function buildGroupAnnotationQuery(annotationsContext) {
|
|
95
|
+
return {
|
|
96
|
+
groupId: annotationsContext.groupId,
|
|
97
|
+
group: GqlTypes_1.GroupReference.SequenceIdentity,
|
|
98
|
+
sources: [GqlTypes_1.AnnotationReference.PdbInstance],
|
|
99
|
+
filters: [{
|
|
100
|
+
source: GqlTypes_1.AnnotationReference.PdbInstance,
|
|
101
|
+
operation: GqlTypes_1.OperationType.Equals,
|
|
102
|
+
field: GqlTypes_1.FieldName.Type,
|
|
103
|
+
values: [GqlTypes_1.FeaturesType.UnobservedResidueXyz, GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt]
|
|
104
|
+
}, {
|
|
105
|
+
source: GqlTypes_1.AnnotationReference.PdbInstance,
|
|
106
|
+
operation: GqlTypes_1.OperationType.Contains,
|
|
107
|
+
field: GqlTypes_1.FieldName.TargetId,
|
|
108
|
+
values: annotationsContext.targetList
|
|
109
|
+
}]
|
|
110
|
+
};
|
|
111
|
+
}
|