@rcsb/rcsb-saguaro-app 6.2.5-dev-js-seqcoord.4 → 6.2.5-dev-js-seqcoord.6

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.
Files changed (7) hide show
  1. package/build/app.js +1 -1
  2. package/lib/RcsbFvExamples/SequenceIdentityGroupAlignmentFv.js +1 -1
  3. package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js +30 -26
  4. package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js.map +1 -1
  5. package/lib/commonjs/RcsbFvExamples/SequenceIdentityGroupAlignmentFv.js +1 -1
  6. package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js +30 -26
  7. package/package.json +1 -1
package/lib/RcsbFvExamples/SequenceIdentityGroupAlignmentFv.js CHANGED
@@ -11,7 +11,7 @@ class UiComponent extends React.Component {
11
11
  }, children: this.props.text }));
12
12
  }
13
13
  }
14
- buildSequenceIdentityAlignmentFv("pfv", "5_30", undefined, {
14
+ buildSequenceIdentityAlignmentFv("pfv", "1_30", undefined, {
15
15
  boardConfig: {
16
16
  selectionChangeCallback: (selection) => {
17
17
  console.log(selection);
package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js CHANGED
@@ -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* () {
@@ -27,7 +28,6 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
27
28
  sequencePrefix: (_f = (_e = buildConfig.additionalConfig) === null || _e === void 0 ? void 0 : _e.sequencePrefix) !== null && _f !== void 0 ? _f : "",
28
29
  externalTrackBuilder: (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.externalTrackBuilder
29
30
  };
30
- collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
31
31
  const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.alignmentFilter);
32
32
  const trackFactory = new MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
33
33
  const targetList = uniqueTargetList(alignmentResponse);
@@ -40,6 +40,7 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
40
40
  yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
41
41
  alignmentTrackFactory: trackFactory
42
42
  });
43
+ collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
43
44
  return void 0;
44
45
  });
45
46
  }
@@ -54,16 +55,17 @@ 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 alignmentCollector.collect(Object.assign(Object.assign({}, alignmentRequestContext), { excludeLogo: true, page: {
58
- first: alignmentRequestContext.page.first,
59
- after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
60
- } }));
58
+ const alignmentResponse = yield rcsbClient.requestGroupAlignment({
59
+ group: alignmentRequestContext.group,
60
+ groupId: alignmentRequestContext.groupId,
61
+ page: alignmentRequestContext.page
62
+ });
61
63
  const targetList = uniqueTargetList(alignmentResponse);
62
64
  if (alignmentRequestContext.groupId) {
63
- const alignmentFeatures = yield collectFeatures({
65
+ const alignmentFeatures = yield rcsbClient.requestRcsbPdbGroupAnnotations(buildGroupAnnotationQuery({
64
66
  groupId: alignmentRequestContext.groupId,
65
67
  targetList
66
- }, annotationCollector);
68
+ }));
67
69
  const featureTargetList = Operator.uniqueValues(alignmentFeatures.map(af => { var _a; return TagDelimiter.parseInstance((_a = af.target_id) !== null && _a !== void 0 ? _a : "").entryId; }));
68
70
  Operator.arrayChunk(featureTargetList, 100).forEach(ids => rcsbRequestCtxManager.getEntryProperties(ids));
69
71
  }
@@ -78,25 +80,27 @@ function uniqueTargetList(alignmentResponse) {
78
80
  }
79
81
  function collectFeatures(annotationsContext, annotationCollector) {
80
82
  return __awaiter(this, void 0, void 0, function* () {
81
- const annotationsRequestContext = {
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);
83
+ return yield annotationCollector.collect(buildGroupAnnotationQuery(annotationsContext));
100
84
  });
101
85
  }
86
+ function buildGroupAnnotationQuery(annotationsContext) {
87
+ return {
88
+ groupId: annotationsContext.groupId,
89
+ group: GroupReference.SequenceIdentity,
90
+ sources: [AnnotationReference.PdbInstance],
91
+ isSummary: false,
92
+ filters: [{
93
+ source: AnnotationReference.PdbInstance,
94
+ operation: OperationType.Equals,
95
+ field: FieldName.Type,
96
+ values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
97
+ }, {
98
+ source: AnnotationReference.PdbInstance,
99
+ operation: OperationType.Contains,
100
+ field: FieldName.TargetId,
101
+ values: annotationsContext.targetList
102
+ }],
103
+ externalTrackBuilder: annotationsContext.externalTrackBuilder
104
+ };
105
+ }
102
106
  //# sourceMappingURL=RcsbFvGroupAlignment.js.map
package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":"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"}
package/lib/commonjs/RcsbFvExamples/SequenceIdentityGroupAlignmentFv.js CHANGED
@@ -14,7 +14,7 @@ class UiComponent extends react_1.default.Component {
14
14
  }, children: this.props.text }));
15
15
  }
16
16
  }
17
- (0, RcsbFvBuilder_1.buildSequenceIdentityAlignmentFv)("pfv", "5_30", undefined, {
17
+ (0, RcsbFvBuilder_1.buildSequenceIdentityAlignmentFv)("pfv", "1_30", undefined, {
18
18
  boardConfig: {
19
19
  selectionChangeCallback: (selection) => {
20
20
  console.log(selection);
package/lib/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js CHANGED
@@ -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* () {
@@ -30,7 +31,6 @@ class RcsbFvGroupAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
30
31
  sequencePrefix: (_f = (_e = buildConfig.additionalConfig) === null || _e === void 0 ? void 0 : _e.sequencePrefix) !== null && _f !== void 0 ? _f : "",
31
32
  externalTrackBuilder: (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.externalTrackBuilder
32
33
  };
33
- collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
34
34
  const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.alignmentFilter);
35
35
  const trackFactory = new MsaAlignmentTrackFactory_1.MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
36
36
  const targetList = uniqueTargetList(alignmentResponse);
@@ -43,6 +43,7 @@ class RcsbFvGroupAlignment extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
43
43
  yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
44
44
  alignmentTrackFactory: trackFactory
45
45
  });
46
+ collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
46
47
  return void 0;
47
48
  });
48
49
  }
@@ -58,16 +59,17 @@ 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 alignmentCollector.collect(Object.assign(Object.assign({}, alignmentRequestContext), { excludeLogo: true, page: {
62
- first: alignmentRequestContext.page.first,
63
- after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
64
- } }));
62
+ const alignmentResponse = yield RcsbClient_1.rcsbClient.requestGroupAlignment({
63
+ group: alignmentRequestContext.group,
64
+ groupId: alignmentRequestContext.groupId,
65
+ page: alignmentRequestContext.page
66
+ });
65
67
  const targetList = uniqueTargetList(alignmentResponse);
66
68
  if (alignmentRequestContext.groupId) {
67
- const alignmentFeatures = yield collectFeatures({
69
+ const alignmentFeatures = yield RcsbClient_1.rcsbClient.requestRcsbPdbGroupAnnotations(buildGroupAnnotationQuery({
68
70
  groupId: alignmentRequestContext.groupId,
69
71
  targetList
70
- }, annotationCollector);
72
+ }));
71
73
  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
74
  Operator_1.Operator.arrayChunk(featureTargetList, 100).forEach(ids => RcsbRequestContextManager_1.rcsbRequestCtxManager.getEntryProperties(ids));
73
75
  }
@@ -82,24 +84,26 @@ function uniqueTargetList(alignmentResponse) {
82
84
  }
83
85
  function collectFeatures(annotationsContext, annotationCollector) {
84
86
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
85
- const annotationsRequestContext = {
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);
87
+ return yield annotationCollector.collect(buildGroupAnnotationQuery(annotationsContext));
104
88
  });
105
89
  }
90
+ function buildGroupAnnotationQuery(annotationsContext) {
91
+ return {
92
+ groupId: annotationsContext.groupId,
93
+ group: GqlTypes_1.GroupReference.SequenceIdentity,
94
+ sources: [GqlTypes_1.AnnotationReference.PdbInstance],
95
+ isSummary: false,
96
+ filters: [{
97
+ source: GqlTypes_1.AnnotationReference.PdbInstance,
98
+ operation: GqlTypes_1.OperationType.Equals,
99
+ field: GqlTypes_1.FieldName.Type,
100
+ values: [GqlTypes_1.FeaturesType.UnobservedResidueXyz, GqlTypes_1.FeaturesType.MaQaMetricLocalTypePlddt]
101
+ }, {
102
+ source: GqlTypes_1.AnnotationReference.PdbInstance,
103
+ operation: GqlTypes_1.OperationType.Contains,
104
+ field: GqlTypes_1.FieldName.TargetId,
105
+ values: annotationsContext.targetList
106
+ }],
107
+ externalTrackBuilder: annotationsContext.externalTrackBuilder
108
+ };
109
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rcsb/rcsb-saguaro-app",
3
- "version": "6.2.5-dev-js-seqcoord.4",
3
+ "version": "6.2.5-dev-js-seqcoord.6",
4
4
  "description": "RCSB 1D Saguaro Web App",
5
5
  "main": "build/app.js",
6
6
  "files": [