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

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.
@@ -58,7 +58,11 @@ function collectNextPage(alignmentRequestContext, alignmentCollector, annotation
58
58
  const alignmentResponse = yield rcsbClient.requestGroupAlignment({
59
59
  group: alignmentRequestContext.group,
60
60
  groupId: alignmentRequestContext.groupId,
61
- page: alignmentRequestContext.page
61
+ page: {
62
+ first: alignmentRequestContext.page.first,
63
+ after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
64
+ },
65
+ excludeLogo: true
62
66
  });
63
67
  const targetList = uniqueTargetList(alignmentResponse);
64
68
  if (alignmentRequestContext.groupId) {
@@ -80,7 +84,7 @@ function uniqueTargetList(alignmentResponse) {
80
84
  }
81
85
  function collectFeatures(annotationsContext, annotationCollector) {
82
86
  return __awaiter(this, void 0, void 0, function* () {
83
- return yield annotationCollector.collect(buildGroupAnnotationQuery(annotationsContext));
87
+ return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
84
88
  });
85
89
  }
86
90
  function buildGroupAnnotationQuery(annotationsContext) {
@@ -88,7 +92,6 @@ function buildGroupAnnotationQuery(annotationsContext) {
88
92
  groupId: annotationsContext.groupId,
89
93
  group: GroupReference.SequenceIdentity,
90
94
  sources: [AnnotationReference.PdbInstance],
91
- isSummary: false,
92
95
  filters: [{
93
96
  source: AnnotationReference.PdbInstance,
94
97
  operation: OperationType.Equals,
@@ -99,8 +102,7 @@ function buildGroupAnnotationQuery(annotationsContext) {
99
102
  operation: OperationType.Contains,
100
103
  field: FieldName.TargetId,
101
104
  values: annotationsContext.targetList
102
- }],
103
- externalTrackBuilder: annotationsContext.externalTrackBuilder
105
+ }]
104
106
  };
105
107
  }
106
108
  //# sourceMappingURL=RcsbFvGroupAlignment.js.map
@@ -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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"}
@@ -17,18 +17,20 @@ export var RcsbRequestTools;
17
17
  if (!Array.isArray(ids))
18
18
  ids = [ids];
19
19
  const missing = ids.filter(id => !map.has(id));
20
- const collectorPromise = collector.collect({ [collectorKey]: missing });
21
- missing.forEach(id => {
22
- map.set(id, new Promise((resolve, reject) => {
23
- collectorPromise.then(t => {
24
- const d = t.find(t => propertyKey(t) == id);
25
- if (d)
26
- resolve(d);
27
- else
28
- reject(`${id} not available`);
29
- });
30
- }));
31
- });
20
+ if (missing.length > 0) {
21
+ const collectorPromise = collector.collect({ [collectorKey]: missing });
22
+ missing.forEach(id => {
23
+ map.set(id, new Promise((resolve, reject) => {
24
+ collectorPromise.then(t => {
25
+ const d = t.find(t => propertyKey(t) == id);
26
+ if (d)
27
+ resolve(d);
28
+ else
29
+ reject(`${id} not available`);
30
+ });
31
+ }));
32
+ });
33
+ }
32
34
  return Promise.all(ids.map(i => map.get(i)).filter((x) => typeof x !== undefined));
33
35
  });
34
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RcsbRequestTools.js","sourceRoot":"","sources":["../../src/RcsbRequest/RcsbRequestTools.ts"],"names":[],"mappings":";AAKA,MAAM,KAAW,gBAAgB,CAuChC;AAvCD,WAAiB,gBAAgB;IAE7B,SAAsB,mBAAmB,CAAI,EAAS,EAAE,GAA2B,EAAE,SAAwB;;YACzG,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAG,OAAO;gBACN,OAAO,OAAO,CAAC;YACnB,MAAM,CAAC,GAAe,SAAS,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAC,CAAC,CAAC,CAAA;YACb,OAAO,CAAC,CAAC;QACb,CAAC;KAAA;IAPqB,oCAAmB,sBAOxC,CAAA;IAED,SAAsB,2BAA2B,CAC7C,GAAyB,EACzB,GAA2B,EAC3B,SAAyD,EACzD,YAAe,EACf,WAAyB;;YAEzB,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;gBAClB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA,EAAE,CAAA,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7C,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,EAAC,CAAC,YAAY,CAAC,EAAC,OAAO,EAA6B,CAAC,CAAC;YACjG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA,EAAE;gBAChB,GAAG,CAAC,GAAG,CACH,EAAE,EACF,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC5B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE;wBACrB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,WAAW,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,CAAC;wBACxC,IAAG,CAAC;4BACA,OAAO,CAAC,CAAC,CAAC,CAAC;;4BAEX,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;oBACtC,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CACL,CAAA;YACL,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;QACtG,CAAC;KAAA;IA1BqB,4CAA2B,8BA0BhD,CAAA;AAEL,CAAC,EAvCgB,gBAAgB,KAAhB,gBAAgB,QAuChC"}
1
+ {"version":3,"file":"RcsbRequestTools.js","sourceRoot":"","sources":["../../src/RcsbRequest/RcsbRequestTools.ts"],"names":[],"mappings":";AAKA,MAAM,KAAW,gBAAgB,CAyChC;AAzCD,WAAiB,gBAAgB;IAE7B,SAAsB,mBAAmB,CAAI,EAAS,EAAE,GAA2B,EAAE,SAAwB;;YACzG,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAG,OAAO;gBACN,OAAO,OAAO,CAAC;YACnB,MAAM,CAAC,GAAe,SAAS,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAC,CAAC,CAAC,CAAA;YACb,OAAO,CAAC,CAAC;QACb,CAAC;KAAA;IAPqB,oCAAmB,sBAOxC,CAAA;IAED,SAAsB,2BAA2B,CAC7C,GAAyB,EACzB,GAA2B,EAC3B,SAAyD,EACzD,YAAe,EACf,WAAyB;;YAEzB,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;gBAClB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA,EAAE,CAAA,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7C,IAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAC,CAAC;gBACnB,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,EAAC,CAAC,YAAY,CAAC,EAAC,OAAO,EAA6B,CAAC,CAAC;gBACjG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAA,EAAE;oBAChB,GAAG,CAAC,GAAG,CACH,EAAE,EACF,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBAC5B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE;4BACrB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,WAAW,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,CAAC;4BACxC,IAAG,CAAC;gCACA,OAAO,CAAC,CAAC,CAAC,CAAC;;gCAEX,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;wBACtC,CAAC,CAAC,CAAA;oBACN,CAAC,CAAC,CACL,CAAA;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;QACtG,CAAC;KAAA;IA5BqB,4CAA2B,8BA4BhD,CAAA;AAEL,CAAC,EAzCgB,gBAAgB,KAAhB,gBAAgB,QAyChC"}
@@ -62,7 +62,11 @@ function collectNextPage(alignmentRequestContext, alignmentCollector, annotation
62
62
  const alignmentResponse = yield RcsbClient_1.rcsbClient.requestGroupAlignment({
63
63
  group: alignmentRequestContext.group,
64
64
  groupId: alignmentRequestContext.groupId,
65
- page: alignmentRequestContext.page
65
+ page: {
66
+ first: alignmentRequestContext.page.first,
67
+ after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
68
+ },
69
+ excludeLogo: true
66
70
  });
67
71
  const targetList = uniqueTargetList(alignmentResponse);
68
72
  if (alignmentRequestContext.groupId) {
@@ -84,7 +88,7 @@ function uniqueTargetList(alignmentResponse) {
84
88
  }
85
89
  function collectFeatures(annotationsContext, annotationCollector) {
86
90
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
87
- return yield annotationCollector.collect(buildGroupAnnotationQuery(annotationsContext));
91
+ return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
88
92
  });
89
93
  }
90
94
  function buildGroupAnnotationQuery(annotationsContext) {
@@ -92,7 +96,6 @@ function buildGroupAnnotationQuery(annotationsContext) {
92
96
  groupId: annotationsContext.groupId,
93
97
  group: GqlTypes_1.GroupReference.SequenceIdentity,
94
98
  sources: [GqlTypes_1.AnnotationReference.PdbInstance],
95
- isSummary: false,
96
99
  filters: [{
97
100
  source: GqlTypes_1.AnnotationReference.PdbInstance,
98
101
  operation: GqlTypes_1.OperationType.Equals,
@@ -103,7 +106,6 @@ function buildGroupAnnotationQuery(annotationsContext) {
103
106
  operation: GqlTypes_1.OperationType.Contains,
104
107
  field: GqlTypes_1.FieldName.TargetId,
105
108
  values: annotationsContext.targetList
106
- }],
107
- externalTrackBuilder: annotationsContext.externalTrackBuilder
109
+ }]
108
110
  };
109
111
  }
@@ -20,18 +20,20 @@ var RcsbRequestTools;
20
20
  if (!Array.isArray(ids))
21
21
  ids = [ids];
22
22
  const missing = ids.filter(id => !map.has(id));
23
- const collectorPromise = collector.collect({ [collectorKey]: missing });
24
- missing.forEach(id => {
25
- map.set(id, new Promise((resolve, reject) => {
26
- collectorPromise.then(t => {
27
- const d = t.find(t => propertyKey(t) == id);
28
- if (d)
29
- resolve(d);
30
- else
31
- reject(`${id} not available`);
32
- });
33
- }));
34
- });
23
+ if (missing.length > 0) {
24
+ const collectorPromise = collector.collect({ [collectorKey]: missing });
25
+ missing.forEach(id => {
26
+ map.set(id, new Promise((resolve, reject) => {
27
+ collectorPromise.then(t => {
28
+ const d = t.find(t => propertyKey(t) == id);
29
+ if (d)
30
+ resolve(d);
31
+ else
32
+ reject(`${id} not available`);
33
+ });
34
+ }));
35
+ });
36
+ }
35
37
  return Promise.all(ids.map(i => map.get(i)).filter((x) => typeof x !== undefined));
36
38
  });
37
39
  }
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.6",
3
+ "version": "6.2.5-dev-js-seqcoord.8",
4
4
  "description": "RCSB 1D Saguaro Web App",
5
5
  "main": "build/app.js",
6
6
  "files": [