@rcsb/rcsb-saguaro-app 6.3.0 → 6.3.2-dev-js-seqcoord.13

package/lib/RcsbFvWeb/RcsbFvGroup/GroupTabs/GroupPfvApp.js

@@ -3,7 +3,7 @@ import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnu
 import { RcsbFvUniprotBuilder } from "../../RcsbFvBuilder/RcsbFvUniprotBuilder";
 import { groupExternalTrackBuilder } from "../../../RcsbUtils/TrackGenerators/GroupExternalTrackBuilder";
 import { RcsbFvGroupBuilder } from "../../RcsbFvBuilder/RcsbFvGroupBuilder";
-import { FieldName, GroupReference, OperationType, SequenceReference, Source, Type } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, GroupReference, OperationType, SequenceReference, AnnotationReference, FeaturesType } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { alignmentGlobalLigandBindingSite } from "../../../RcsbUtils/TrackGenerators/AlignmentGlobalBindingSite";
 import { RcsbTabs } from "../../RcsbFvComponents/RcsbTabs";
 import { GroupPfvUI } from "../../../RcsbFvUI/GroupPfvUI";
@@ -32,12 +32,12 @@ export var GroupPfvApp;
                         component: PaginationItemComponent,
                         props: {
                             count: entityCount,
-                            after: (_b = (_a = additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.page) === null || _a === void 0 ? void 0 : _a.after) !== null && _b !== void 0 ? _b : "0",
+                            after: (_b = (_a = additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.page) === null || _a === void 0 ? void 0 : _a.after) !== null && _b !== void 0 ? _b : 0,
                             first: (_d = (_c = additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.page) === null || _c === void 0 ? void 0 : _c.first) !== null && _d !== void 0 ? _d : 50,
                             stateChange: (state, prevState) => {
                                 paginationCallback(elementId, pfv, RcsbFvGroupBuilder.buildGroupAlignmentFv, pfvArgs, Object.assign(Object.assign({}, additionalConfig), { page: {
                                         first: state.first,
-                                        after: state.after.toString()
+                                        after: state.after
                                     }, excludeLogo: true }));
                             }
                         }
@@ -53,15 +53,15 @@ export var GroupPfvApp;
             var _a;
             additionalConfig = Object.assign(Object.assign({}, additionalConfig), { filters: [...((_a = additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.filters) !== null && _a !== void 0 ? _a : []), {
                         field: FieldName.Type,
-                        values: [Type.HelixP, Type.Sheet, Type.Cath, Type.Scop],
+                        values: [FeaturesType.HelixP, FeaturesType.Sheet, FeaturesType.Cath, FeaturesType.Scop],
                         operation: OperationType.Equals,
-                        source: Source.PdbInstance
+                        source: AnnotationReference.PdbInstance
                     }, {
                         field: FieldName.Type,
-                        values: [Type.Pfam],
+                        values: [FeaturesType.Pfam],
                         operation: OperationType.Equals,
-                        source: Source.PdbEntity
-                    }], sources: [Source.PdbInstance, Source.PdbEntity], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: groupExternalTrackBuilder() });
+                        source: AnnotationReference.PdbEntity
+                    }], sources: [AnnotationReference.PdbInstance, AnnotationReference.PdbEntity], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: groupExternalTrackBuilder() });
             // SequenceReference.PdbEntity && SequenceReference.Uniprot are needed to add row prefixes
             const pfvArgs = [
                 getReferenceFromGroupProvenance(groupProvenanceId),
@@ -78,10 +78,10 @@ export var GroupPfvApp;
             var _a;
             additionalConfig = Object.assign(Object.assign({}, additionalConfig), { filters: [...((_a = additionalConfig === null || additionalConfig === void 0 ? void 0 : additionalConfig.filters) !== null && _a !== void 0 ? _a : []), {
                         field: FieldName.Type,
-                        values: [Type.BindingSite],
+                        values: [FeaturesType.BindingSite],
                         operation: OperationType.Equals,
-                        source: Source.PdbInstance
-                    }], sources: [Source.PdbInstance], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: alignmentGlobalLigandBindingSite() });
+                        source: AnnotationReference.PdbInstance
+                    }], sources: [AnnotationReference.PdbInstance], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: alignmentGlobalLigandBindingSite(), isAnnotationsGroupSummary: false });
             // SequenceReference.PdbEntity && SequenceReference.Uniprot are needed to add row prefixes
             const pfvArgs = [
                 getReferenceFromGroupProvenance(groupProvenanceId),
@@ -95,25 +95,31 @@ export var GroupPfvApp;
     GroupPfvApp.bindingSites = bindingSites;
 })(GroupPfvApp || (GroupPfvApp = {}));
 function annotationPositionFrequencyProcessing(nTargets) {
-    const targets = new Map();
+    const targetValues = new Map();
+    const targetSet = new Map();
     return {
         getAnnotationValue: (feature) => {
             var _a, _b, _c, _d;
-            if (!targets.has(feature.type)) {
-                if (feature.d.value)
-                    targets.set(feature.type, feature.d.value);
-                return (_b = (_a = feature.p.values) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 0;
-            }
-            else {
-                return (_d = (_c = feature.p.values) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 0;
-            }
+            if (!targetValues.has(feature.type))
+                targetValues.set(feature.type, 0);
+            if (!targetSet.has(feature.type))
+                targetSet.set(feature.type, new Set());
+            if (feature.type === "SCOP:Prokaryotic (50S subunit)")
+                console.log(feature);
+            if (typeof feature.d.value === "number")
+                targetValues.set(feature.type, (_a = feature.d.value) !== null && _a !== void 0 ? _a : 0);
+            else
+                (_b = targetSet.get(feature.type)) === null || _b === void 0 ? void 0 : _b.add(feature.targetId);
+            return (_d = (_c = feature.p.values) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 1;
         },
         computeAnnotationValue: (annotationTracks) => {
             annotationTracks.forEach((at, type) => {
-                const N = (type.includes(Type.Cath) || type.includes(Type.Scop) || type.includes(Type.BindingSite) || type.includes(Type.Pfam)) ? targets.get(type) : nTargets;
+                var _a;
+                const isType = (type.includes(FeaturesType.Cath) || type.includes(FeaturesType.Scop) || type.includes(FeaturesType.BindingSite) || type.includes(FeaturesType.Pfam));
+                const N = isType ? (targetValues.get(type) != 0 ? targetValues.get(type) : (_a = targetSet.get(type)) === null || _a === void 0 ? void 0 : _a.size) : nTargets;
                 at.forEach((ann, positionKey) => {
-                    if (ann.source != Source.PdbInterface)
-                        ann.value = Math.ceil(1000 * ann.value / (N !== null && N !== void 0 ? N : 1)) / 1000;
+                    if (ann.source != AnnotationReference.PdbInterface)
+                        ann.value = Math.round(100 * ann.value / (N !== null && N !== void 0 ? N : 1)) / 100;
                 });
             });
         }
@@ -129,3 +135,4 @@ export function getReferenceFromGroupProvenance(groupProvenanceId) {
             return GroupReference.MatchingUniprotAccession;
     }
 }
+//# sourceMappingURL=GroupPfvApp.js.map

package/lib/RcsbFvWeb/RcsbFvGroup/GroupTabs/GroupPfvApp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GroupPfvApp.js","sourceRoot":"","sources":["../../../../src/RcsbFvWeb/RcsbFvGroup/GroupTabs/GroupPfvApp.ts"],"names":[],"mappings":";AAIA,OAAO,EAAC,iBAAiB,EAAC,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAC,oBAAoB,EAAC,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAC,yBAAyB,EAAC,MAAM,8DAA8D,CAAC;AACvG,OAAO,EAAC,kBAAkB,EAAC,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAEH,SAAS,EACT,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,EACf,MAAM,+DAA+D,CAAC;AAKvE,OAAO,EAAC,gCAAgC,EAAC,MAAM,+DAA+D,CAAC;AAC/G,OAAO,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAC,UAAU,EAAkB,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAC,aAAa,EAAC,MAAM,wCAAwC,CAAC;AACrE,OAAO,EACH,uBAAuB,EAG1B,MAAM,sDAAsD,CAAC;AAE9D,MAAM,KAAW,WAAW,CAgH3B;AAhHD,WAAiB,WAAW;IAExB,SAAsB,SAAS,CAAC,SAAiB,EAAE,iBAAoC,EAAE,OAAe,EAAE,WAAkB,EAAE,gBAAgF;;;YAC1M,QAAQ,iBAAiB,EAAC,CAAC;gBACvB,KAAK,iBAAiB,CAAC,kCAAkC;oBACrD,OAAO,oBAAoB,CAAC,oCAAoC,CAAC,SAAS,EAAC,SAAS,GAAC,QAAQ,CAAC,aAAa,EAAC,OAAO,EAAC,EAAE,EAAC,gBAAgB,CAAC,CAAA;gBAC5I;oBACI,gBAAgB,mCACT,gBAAgB,KACnB,oBAAoB,EAAE,yBAAyB,EAAE,GACpD,CAAA;oBACD,0FAA0F;oBAC1F,MAAM,OAAO,GAAgE;wBACzE,+BAA+B,CAAC,iBAAiB,CAAC;wBAClD,OAAO;wBACP,iBAAiB,CAAC,SAAS;wBAC3B,iBAAiB,CAAC,OAAO;qBAC5B,CAAC;oBACF,MAAM,GAAG,GAAgC,MAAM,kBAAkB,CAAC,qBAAqB,CACnF,SAAS,EACT,GAAG,OAAO,EACV,gBAAgB,CACnB,CAAC;oBACF,MAAM,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,EAAkB,CAAC;oBAC9E,MAAM,MAAM,GAAwC;wBAChD,SAAS,EAAE,uBAAuB;wBAClC,KAAK,EAAC;4BACF,KAAK,EAAC,WAAW;4BACjB,KAAK,EAAE,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,0CAAE,KAAK,mCAAI,CAAC;4BACzC,KAAK,EAAE,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,0CAAE,KAAK,mCAAI,EAAE;4BAC1C,WAAW,EAAC,CAAC,KAAyB,EAAC,SAA6B,EAAC,EAAE;gCACnE,kBAAkB,CACd,SAAS,EACT,GAAG,EACH,kBAAkB,CAAC,qBAAqB,EACxC,OAAO,kCAEA,gBAAgB,KACnB,IAAI,EAAC;wCACD,KAAK,EAAC,KAAK,CAAC,KAAK;wCACjB,KAAK,EAAC,KAAK,CAAC,KAAK;qCACpB,EACD,WAAW,EAAE,IAAI,IAExB,CAAA;4BACL,CAAC;yBACJ;qBACJ,CAAC;oBACF,UAAU,CAAC,IAAI,CACX,UAAU,CAAC,mBAAmB,CAAC,SAAS,CAAC,EACzC,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,oBAAoB,0CAAE,OAAO,mCAAI,CAAC,WAAW,GAAG,CAAC,MAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,0CAAE,KAAK,mCAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,oBAAoB,0CAAE,GAAG,EAAC,CAAC,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/N,CAAC;oBACF,OAAO,GAAG,CAAC;YACnB,CAAC;QACL,CAAC;KAAA;IApDqB,qBAAS,YAoD9B,CAAA;IAED,SAAsB,SAAS,CAAC,SAAiB,EAAE,iBAAoC,EAAE,OAAe,EAAE,QAAgB,EAAE,gBAAwC;;;YAChK,gBAAgB,mCACT,gBAAgB,KACnB,OAAO,EAAE,CAAC,GAAG,CAAC,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,mCAAI,EAAE,CAAC,EAAE;wBAC5C,KAAK,EAAE,SAAS,CAAC,IAAI;wBACrB,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC;wBACvF,SAAS,EAAE,aAAa,CAAC,MAAM;wBAC/B,MAAM,EAAE,mBAAmB,CAAC,WAAW;qBAC1C,EAAC;wBACE,KAAK,EAAE,SAAS,CAAC,IAAI;wBACrB,MAAM,EAAC,CAAC,YAAY,CAAC,IAAI,CAAC;wBAC1B,SAAS,EAAE,aAAa,CAAC,MAAM;wBAC/B,MAAM,EAAE,mBAAmB,CAAC,SAAS;qBACxC,CAAC,EACF,OAAO,EAAE,CAAC,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,CAAC,SAAS,CAAC,EACzE,oBAAoB,EAAE,qCAAqC,CAAC,QAAQ,CAAC,EACrE,oBAAoB,EAAE,yBAAyB,EAAE,GACpD,CAAC;YACF,0FAA0F;YAC1F,MAAM,OAAO,GAAgE;gBACzE,+BAA+B,CAAC,iBAAiB,CAAC;gBAClD,OAAO;gBACP,iBAAiB,CAAC,SAAS;gBAC3B,iBAAiB,CAAC,OAAO;aAC5B,CAAC;YACF,OAAO,MAAM,kBAAkB,CAAC,sBAAsB,CAClD,SAAS,EACT,GAAG,OAAO,EACV,gBAAgB,CACnB,CAAC;QACN,CAAC;KAAA;IA9BqB,qBAAS,YA8B9B,CAAA;IAED,SAAsB,YAAY,CAAC,SAAiB,EAAE,iBAAoC,EAAE,OAAe,EAAE,QAAgB,EAAE,gBAAwC;;;YACnK,gBAAgB,mCACT,gBAAgB,KACnB,OAAO,EAAE,CAAC,GAAG,CAAC,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,mCAAI,EAAE,CAAC,EAAE;wBAC5C,KAAK,EAAE,SAAS,CAAC,IAAI;wBACrB,MAAM,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;wBAClC,SAAS,EAAE,aAAa,CAAC,MAAM;wBAC/B,MAAM,EAAE,mBAAmB,CAAC,WAAW;qBAC1C,CAAC,EACF,OAAO,EAAE,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAC1C,oBAAoB,EAAE,qCAAqC,CAAC,QAAQ,CAAC,EACrE,oBAAoB,EAAG,gCAAgC,EAAE,EACzD,yBAAyB,EAAE,KAAK,GACnC,CAAA;YACD,0FAA0F;YAC1F,MAAM,OAAO,GAAgE;gBACzE,+BAA+B,CAAC,iBAAiB,CAAC;gBAClD,OAAO;gBACP,iBAAiB,CAAC,SAAS;gBAC3B,iBAAiB,CAAC,OAAO;aAC5B,CAAC;YACF,OAAO,MAAM,kBAAkB,CAAC,sBAAsB,CAAC,SAAS,EAAE,GAAG,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACpG,CAAC;KAAA;IAtBqB,wBAAY,eAsBjC,CAAA;AAEL,CAAC,EAhHgB,WAAW,KAAX,WAAW,QAgH3B;AAED,SAAS,qCAAqC,CAAC,QAAgB;IAC3D,MAAM,YAAY,GAAuB,IAAI,GAAG,EAAkB,CAAC;IACnE,MAAM,SAAS,GAA4B,IAAI,GAAG,EAAuB,CAAC;IAC1E,OAAO;QACH,kBAAkB,EAAE,CAAC,OAAoG,EAAE,EAAE;;YACzH,IAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC9B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACtC,IAAG,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3B,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YAC3C,IAAG,OAAO,CAAC,IAAI,KAAK,gCAAgC;gBAChD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACxB,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ;gBACnC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAA,OAAO,CAAC,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAC;;gBAErD,MAAA,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,0CAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvD,OAAO,MAAA,MAAA,OAAO,CAAC,CAAC,CAAC,MAAM,0CAAG,CAAC,CAAC,mCAAI,CAAC,CAAC;QACtC,CAAC;QACD,sBAAsB,EAAE,CAAC,gBAAoD,EAAE,EAAE;YAC7E,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAC,IAAI,EAAC,EAAE;;gBAChC,MAAM,MAAM,GAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtK,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACjH,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAC,WAAW,EAAC,EAAE;oBAC1B,IAAG,GAAG,CAAC,MAAM,IAAI,mBAAmB,CAAC,YAAY;wBAC7C,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAE,GAAG,CAAC,KAAgB,GAAG,CAAC,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,CAAC,CAAC,CAAC,GAAC,GAAG,CAAC;gBACzE,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAA;AACL,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,iBAAoC;IAChF,QAAQ,iBAAiB,EAAC,CAAC;QACvB,KAAK,iBAAiB,CAAC,gCAAgC;YACnD,MAAM,sCAAsC,iBAAiB,EAAE,CAAC;QACpE,KAAK,iBAAiB,CAAC,0BAA0B;YAC7C,OAAO,cAAc,CAAC,gBAAgB,CAAC;QAC3C,KAAK,iBAAiB,CAAC,kCAAkC;YACrD,OAAO,cAAc,CAAC,wBAAwB,CAAC;IACvD,CAAC;AACL,CAAC"}

package/lib/RcsbFvWeb/RcsbFvGroup/RcsbFvGroupTabsBuilder.js

@@ -10,3 +10,4 @@ export class RcsbFvGroupTabsBuilder {
         createRoot(element).render(_jsx(GroupPfvTabs, { groupProvenanceId: groupProvenanceId, groupId: groupId, searchQuery: query, additionalConfig: additionalConfig }));
     }
 }
+//# sourceMappingURL=RcsbFvGroupTabsBuilder.js.map

package/lib/RcsbFvWeb/RcsbFvGroup/RcsbFvGroupTabsBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvGroupTabsBuilder.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvGroup/RcsbFvGroupTabsBuilder.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,IAAO,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;AAGhD,MAAM,OAAO,sBAAsB;IAC/B,MAAM,CAAC,cAAc,CAAC,SAAiB,EAAE,iBAAoC,EAAE,OAAe,EAAE,KAAkB,EAAE,gBAAwC;QACxJ,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACnD,aAAa,CAAC,OAAO,CAAC,CAAC;QACvB,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,CACtB,KAAC,YAAY,IAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,CAClI,CAAA;IACL,CAAC;CACJ"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvAbstractModule.d.ts

@@ -4,7 +4,7 @@ import { PolymerEntityInstanceTranslate } from "../../RcsbUtils/Translators/Poly
 import { AlignmentCollectorInterface } from "../../RcsbCollectTools/AlignmentCollector/AlignmentCollectorInterface";
 import { AnnotationRequestContext, AnnotationCollectorInterface } from "../../RcsbCollectTools/AnnotationCollector/AnnotationCollectorInterface";
 import { RcsbFvModuleBuildInterface, RcsbFvModuleInterface } from "./RcsbFvModuleInterface";
-import { AlignmentResponse, AnnotationFeatures, Feature, TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAlignments, SequenceAnnotations, Features, TargetAlignments } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { TrackFactoryInterface } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryInterface";
 import { AlignmentRequestContextType } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/AlignmentTrackFactory";
 import { AnnotationConfigInterface } from "../../RcsbAnnotationConfig/AnnotationConfigInterface";
@@ -29,18 +29,18 @@ export declare abstract class RcsbFvAbstractModule implements RcsbFvModuleInterf
     activeDisplay(): boolean;
     getFv(): RcsbFv;
     getTargets(): Promise<Array<string>>;
-    getAlignmentResponse(): Promise<AlignmentResponse>;
-    getFeatures(): Promise<Array<Feature>>;
+    getAlignmentResponse(): Promise<SequenceAlignments>;
+    getFeatures(): Promise<Array<Features>>;
     getAnnotationConfigData(): Promise<Array<RcsbFvRowConfigInterface>>;
     build(buildConfig: RcsbFvModuleBuildInterface): Promise<void>;
     wait(): Promise<void>;
     protected abstract protectedBuild(): Promise<void>;
     protected abstract concatAlignmentAndAnnotationTracks(): void;
-    protected buildAlignmentTracks(alignmentRequestContext: AlignmentRequestContextType, alignmentResponse: AlignmentResponse, trackFactories?: {
-        alignmentTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignment]>;
+    protected buildAlignmentTracks(alignmentRequestContext: AlignmentRequestContextType, alignmentResponse: SequenceAlignments, trackFactories?: {
+        alignmentTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignments]>;
         sequenceTrackFactory?: TrackFactoryInterface<[AlignmentRequestContextType, string]>;
     }): Promise<void>;
-    protected buildAnnotationsTrack(annotationsRequestContext: AnnotationRequestContext, annotationsFeatures: AnnotationFeatures[], annotationConfigMap?: AnnotationConfigInterface): Promise<void>;
+    protected buildAnnotationsTrack(annotationsRequestContext: AnnotationRequestContext, annotationsFeatures: SequenceAnnotations[], annotationConfigMap?: AnnotationConfigInterface): Promise<void>;
     protected getBoardConfig(): Promise<RcsbFvBoardConfigInterface>;
     protected getRowsConfig(): Promise<Array<RcsbFvRowConfigInterface>>;
     private buildExternalTracks;

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvAbstractModule.js

@@ -141,3 +141,4 @@ export class RcsbFvAbstractModule {
         });
     }
 }
+//# sourceMappingURL=RcsbFvAbstractModule.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvAbstractModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvAbstractModule.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvAbstractModule.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvChromosome.js

@@ -28,14 +28,14 @@ function sequenceDisplayDynamicUpdate(reference, ranges, trackWidth) {
                     from: reference,
                     to: SequenceReference.NcbiGenome
                 });
-            })).then(alignments => {
+            })).then((alignments) => {
                 const out = new RcsbFvTrackData();
                 alignments.forEach((a, n) => {
                     var _c;
                     if (a.query_sequence == null)
                         return;
                     const sequence = a.query_sequence.split("");
-                    (_c = a.target_alignment) === null || _c === void 0 ? void 0 : _c.forEach(ta => {
+                    (_c = a.target_alignments) === null || _c === void 0 ? void 0 : _c.forEach(ta => {
                         var _c;
                         if (!ta)
                             return;
@@ -110,12 +110,12 @@ export class RcsbFvChromosome extends RcsbFvAbstractModule {
                 from: SequenceReference.PdbEntity,
                 to: to
             });
-        })).then(result => {
+        })).then((result) => {
             result.forEach(a => {
                 var _c;
                 if (!a)
                     return;
-                (_c = a.target_alignment) === null || _c === void 0 ? void 0 : _c.forEach(ta => {
+                (_c = a.target_alignments) === null || _c === void 0 ? void 0 : _c.forEach(ta => {
                     if ((ta === null || ta === void 0 ? void 0 : ta.target_id) && (ta === null || ta === void 0 ? void 0 : ta.coverage))
                         this.targetCoverages.set(ta.target_id, ta.coverage);
                 });
@@ -141,8 +141,8 @@ export class RcsbFvChromosome extends RcsbFvAbstractModule {
     collectPdbWorkerResults(ar, pdbEntityId, chrId) {
         return __awaiter(this, void 0, void 0, function* () {
             var _c, _d;
-            assertElementListDefined(ar.target_alignment);
-            const exonTracks = this.collectExons(ar.target_alignment, "target", RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, SequenceReference.PdbEntity, chrId);
+            assertElementListDefined(ar.target_alignments);
+            const exonTracks = this.collectExons(ar.target_alignments, "target", RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, SequenceReference.PdbEntity, chrId);
             this.pdbEntityTrack = this.mergeExonTracks(exonTracks, SequenceReference.PdbEntity)[0];
             (_d = (_c = this.pdbEntityTrack.displayConfig) === null || _c === void 0 ? void 0 : _c[0].displayData) === null || _d === void 0 ? void 0 : _d.forEach(d => {
                 d.description = [pdbEntityId];
@@ -316,8 +316,8 @@ export class RcsbFvChromosome extends RcsbFvAbstractModule {
             this.completeTasks++;
             const e = this.targetAlignmentList.get(reference);
             assertDefined(e);
-            assertElementListDefined(alignment.target_alignment);
-            e[index] = alignment.target_alignment;
+            assertElementListDefined(alignment.target_alignments);
+            e[index] = alignment.target_alignments;
             console.log("Completed " + Math.floor(this.completeTasks / this.nTasks * 100) + "%");
             if (forcePlot) {
                 yield this.plot();
@@ -736,3 +736,4 @@ export class RcsbFvChromosome extends RcsbFvAbstractModule {
     concatAlignmentAndAnnotationTracks() {
     }
 }
+//# sourceMappingURL=RcsbFvChromosome.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvChromosome.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvChromosome.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvChromosome.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvDataProvider.js

@@ -23,3 +23,4 @@ export class RcsbFvDataProvider extends RcsbFvAbstractModule {
         this.rowConfigData = this.referenceTrack ? [this.referenceTrack].concat(this.alignmentTracks) : this.alignmentTracks;
     }
 }
+//# sourceMappingURL=RcsbFvDataProvider.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvDataProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvDataProvider.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvDataProvider.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAK5D,OAAO,EACH,0BAA0B,EAC7B,MAAM,mFAAmF,CAAC;AAE3F,MAAM,OAAO,kBAAmB,SAAQ,oBAAoB;IAExC,cAAc;;;YAC1B,IAAG,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,UAAU,EAAE,CAAC;gBAC7D,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC;gBAE9F,MAAM,iBAAiB,GAAuB,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,mBAC5E,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,UAAU,CAAC,OAAO,GACvE,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,eAAe,CAAC,CAAC;gBAEvD,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,UAAU,CAAC,OAAO,EAAE,iBAAiB,kBAE9G,qBAAqB,EAAE,IAAI,0BAA0B,CAAC,IAAI,CAAC,kCAAkC,EAAE,CAAC,IAC7F,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,UAAU,CAAC,cAAc,EAC/E,CAAC;gBAEP,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,UAAU,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAA,CAAC;YACnI,CAAC;YACD,IAAG,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,gBAAgB,0CAAE,YAAY,0CAAE,WAAW,EAAC,CAAC;gBAC7D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;gBAE/F,MAAM,mBAAmB,GAA0B,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,mBAClF,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,EACvE,CAAC;gBAEH,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;YAC9H,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,WAAW,GAAG,IAAI,CAAC;QAC5C,CAAC;KAAA;IAES,kCAAkC;QACxC,IAAI,CAAC,aAAa,GAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;IAC1H,CAAC;CAEJ"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvEntity.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
 var assertDefined = Assertions.assertDefined;
@@ -26,7 +26,7 @@ export class RcsbFvEntity extends RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 queryId: buildConfig.entityId,
                 reference: SequenceReference.PdbEntity,
-                sources: (_d = (_c = buildConfig.additionalConfig) === null || _c === void 0 ? void 0 : _c.sources) !== null && _d !== void 0 ? _d : [Source.PdbEntity, Source.Uniprot],
+                sources: (_d = (_c = buildConfig.additionalConfig) === null || _c === void 0 ? void 0 : _c.sources) !== null && _d !== void 0 ? _d : [AnnotationReference.PdbEntity, AnnotationReference.Uniprot],
                 titleSuffix: this.titleSuffix.bind(this),
                 filters: (_e = buildConfig.additionalConfig) === null || _e === void 0 ? void 0 : _e.filters,
                 annotationProcessing: (_f = buildConfig.additionalConfig) === null || _f === void 0 ? void 0 : _f.annotationProcessing,
@@ -59,7 +59,7 @@ export class RcsbFvEntity extends RcsbFvAbstractModule {
         return __awaiter(this, void 0, void 0, function* () {
             if (!ann.target_id)
                 return;
-            if (this.polymerEntityInstance != null && ann.source === Source.PdbInstance) {
+            if (this.polymerEntityInstance != null && ann.source === AnnotationReference.PdbInstance) {
                 const labelAsymId = ann.target_id.split(TagDelimiter.instance)[1];
                 const authAsymId = this.polymerEntityInstance.translateAsymToAuth(labelAsymId);
                 return labelAsymId === authAsymId ? labelAsymId : labelAsymId + "[auth " + authAsymId + "]";
@@ -67,3 +67,4 @@ export class RcsbFvEntity extends RcsbFvAbstractModule {
         });
     }
 }
+//# sourceMappingURL=RcsbFvEntity.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvEntity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvEntity.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvEntity.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js

@@ -1,12 +1,13 @@
 import { __awaiter } from "tslib";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
-import { FieldName, GroupReference, OperationType, Source, Type } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { FieldName, GroupReference, OperationType, AnnotationReference, FeaturesType } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { MsaAlignmentTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/MsaAlignmentTrackFactory";
 import { Assertions } from "../../RcsbUtils/Helpers/Assertions";
 var assertDefined = Assertions.assertDefined;
 import { TagDelimiter } from "@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter";
 import { Operator } from "../../RcsbUtils/Helpers/Operator";
 import { rcsbRequestCtxManager } from "../../RcsbRequest/RcsbRequestContextManager";
+import { rcsbClient } from "../../RcsbGraphQL/RcsbClient";
 export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
     protectedBuild() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -27,7 +28,6 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
                 sequencePrefix: (_f = (_e = buildConfig.additionalConfig) === null || _e === void 0 ? void 0 : _e.sequencePrefix) !== null && _f !== void 0 ? _f : "",
                 externalTrackBuilder: (_g = buildConfig.additionalConfig) === null || _g === void 0 ? void 0 : _g.externalTrackBuilder
             };
-            collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
             const alignmentResponse = yield this.alignmentCollector.collect(alignmentRequestContext, (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.alignmentFilter);
             const trackFactory = new MsaAlignmentTrackFactory(this.getPolymerEntityInstanceTranslator());
             const targetList = uniqueTargetList(alignmentResponse);
@@ -36,10 +36,11 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
                 externalTrackBuilder: (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.externalTrackBuilder,
                 targetList
             }, this.annotationCollector);
-            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == Type.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == Type.MaQaMetricLocalTypePlddt) })); }));
+            yield trackFactory.prepareFeatures(alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == FeaturesType.UnobservedResidueXyz) })); }), alignmentFeatures.map(af => { var _a; return (Object.assign(Object.assign({}, af), { feature: (_a = af.features) === null || _a === void 0 ? void 0 : _a.filter(f => (f === null || f === void 0 ? void 0 : f.type) == FeaturesType.MaQaMetricLocalTypePlddt) })); }));
             yield this.buildAlignmentTracks(alignmentRequestContext, alignmentResponse, {
                 alignmentTrackFactory: trackFactory
             });
+            collectNextPage(alignmentRequestContext, this.alignmentCollector, this.annotationCollector).then(() => console.log("Next page ready"));
             return void 0;
         });
     }
@@ -54,16 +55,21 @@ export class RcsbFvGroupAlignment extends RcsbFvAbstractModule {
 }
 function collectNextPage(alignmentRequestContext, alignmentCollector, annotationCollector) {
     return __awaiter(this, void 0, void 0, function* () {
-        const alignmentResponse = yield alignmentCollector.collect(Object.assign(Object.assign({}, alignmentRequestContext), { excludeLogo: true, page: {
+        const alignmentResponse = yield rcsbClient.requestGroupAlignment({
+            group: alignmentRequestContext.group,
+            groupId: alignmentRequestContext.groupId,
+            page: {
                 first: alignmentRequestContext.page.first,
-                after: (parseInt(alignmentRequestContext.page.after) + alignmentRequestContext.page.first).toString()
-            } }));
+                after: alignmentRequestContext.page.after + alignmentRequestContext.page.first
+            },
+            excludeLogo: true
+        });
         const targetList = uniqueTargetList(alignmentResponse);
         if (alignmentRequestContext.groupId) {
-            const alignmentFeatures = yield collectFeatures({
+            const alignmentFeatures = yield rcsbClient.requestRcsbPdbGroupAnnotations(buildGroupAnnotationQuery({
                 groupId: alignmentRequestContext.groupId,
                 targetList
-            }, annotationCollector);
+            }));
             const featureTargetList = Operator.uniqueValues(alignmentFeatures.map(af => { var _a; return TagDelimiter.parseInstance((_a = af.target_id) !== null && _a !== void 0 ? _a : "").entryId; }));
             Operator.arrayChunk(featureTargetList, 100).forEach(ids => rcsbRequestCtxManager.getEntryProperties(ids));
         }
@@ -71,31 +77,32 @@ function collectNextPage(alignmentRequestContext, alignmentCollector, annotation
 }
 function uniqueTargetList(alignmentResponse) {
     var _a, _b;
-    return Operator.uniqueValues((_b = (_a = alignmentResponse.target_alignment) === null || _a === void 0 ? void 0 : _a.map(ta => {
+    return Operator.uniqueValues((_b = (_a = alignmentResponse.target_alignments) === null || _a === void 0 ? void 0 : _a.map(ta => {
         assertDefined(ta === null || ta === void 0 ? void 0 : ta.target_id);
         return TagDelimiter.parseEntity(ta.target_id).entryId;
     })) !== null && _b !== void 0 ? _b : []);
 }
 function collectFeatures(annotationsContext, annotationCollector) {
     return __awaiter(this, void 0, void 0, function* () {
-        const annotationsRequestContext = {
-            histogram: false,
-            groupId: annotationsContext.groupId,
-            group: GroupReference.SequenceIdentity,
-            sources: [Source.PdbInstance],
-            filters: [{
-                    source: Source.PdbInstance,
-                    operation: OperationType.Equals,
-                    field: FieldName.Type,
-                    values: [Type.UnobservedResidueXyz, Type.MaQaMetricLocalTypePlddt]
-                }, {
-                    source: Source.PdbInstance,
-                    operation: OperationType.Contains,
-                    field: FieldName.TargetId,
-                    values: annotationsContext.targetList
-                }],
-            externalTrackBuilder: annotationsContext.externalTrackBuilder
-        };
-        return yield annotationCollector.collect(annotationsRequestContext);
+        return yield annotationCollector.collect(Object.assign(Object.assign({}, buildGroupAnnotationQuery(annotationsContext)), { isSummary: false, externalTrackBuilder: annotationsContext.externalTrackBuilder }));
     });
 }
+function buildGroupAnnotationQuery(annotationsContext) {
+    return {
+        group: GroupReference.SequenceIdentity,
+        groupId: annotationsContext.groupId,
+        sources: [AnnotationReference.PdbInstance],
+        filters: [{
+                source: AnnotationReference.PdbInstance,
+                operation: OperationType.Equals,
+                field: FieldName.Type,
+                values: [FeaturesType.UnobservedResidueXyz, FeaturesType.MaQaMetricLocalTypePlddt]
+            }, {
+                source: AnnotationReference.PdbInstance,
+                operation: OperationType.Contains,
+                field: FieldName.TargetId,
+                values: annotationsContext.targetList
+            }]
+    };
+}
+//# sourceMappingURL=RcsbFvGroupAlignment.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvGroupAlignment.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAlignment.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.js

@@ -8,7 +8,7 @@ const annotationConfigMap = acm;
 export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
     protectedBuild() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const buildConfig = this.buildConfig;
             assertDefined(buildConfig.group), assertDefined(buildConfig.groupId), assertDefined((_a = buildConfig.additionalConfig) === null || _a === void 0 ? void 0 : _a.page);
             const alignmentRequestContext = {
@@ -31,10 +31,11 @@ export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 group: buildConfig.group,
                 groupId: buildConfig.groupId,
-                sources: (_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.sources,
-                filters: (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.filters,
-                annotationProcessing: (_k = buildConfig.additionalConfig) === null || _k === void 0 ? void 0 : _k.annotationProcessing,
-                externalTrackBuilder: (_l = buildConfig.additionalConfig) === null || _l === void 0 ? void 0 : _l.externalTrackBuilder
+                isSummary: typeof ((_h = buildConfig.additionalConfig) === null || _h === void 0 ? void 0 : _h.isAnnotationsGroupSummary) === "boolean" ? buildConfig.additionalConfig.isAnnotationsGroupSummary : true,
+                sources: (_k = (_j = buildConfig.additionalConfig) === null || _j === void 0 ? void 0 : _j.sources) !== null && _k !== void 0 ? _k : [],
+                filters: (_l = buildConfig.additionalConfig) === null || _l === void 0 ? void 0 : _l.filters,
+                annotationProcessing: (_m = buildConfig.additionalConfig) === null || _m === void 0 ? void 0 : _m.annotationProcessing,
+                externalTrackBuilder: (_o = buildConfig.additionalConfig) === null || _o === void 0 ? void 0 : _o.externalTrackBuilder
             };
             const annotationsFeatures = yield this.annotationCollector.collect(annotationsRequestContext);
             yield this.buildAnnotationsTrack(annotationsRequestContext, annotationsFeatures, annotationConfigMap);
@@ -50,3 +51,4 @@ export class RcsbFvGroupAnnotation extends RcsbFvAbstractModule {
         this.rowConfigData = this.referenceTrack ? [this.referenceTrack].concat(this.alignmentTracks).concat(this.annotationTracks) : this.alignmentTracks.concat(this.annotationTracks);
     }
 }
+//# sourceMappingURL=RcsbFvGroupAnnotation.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvGroupAnnotation.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvGroupAnnotation.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { SequenceReference, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceReference, AnnotationReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 import { buriedResidues, buriedResiduesFilter } from "../../RcsbUtils/TrackGenerators/BuriedResidues";
 import { SequenceTrackFactory } from "../RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/SequenceTrackFactory";
@@ -13,7 +13,7 @@ export class RcsbFvInstance extends RcsbFvAbstractModule {
             const buildConfig = this.buildConfig;
             const instanceId = buildConfig.instanceId;
             assertDefined(instanceId);
-            const source = [Source.PdbEntity, Source.PdbInstance, Source.Uniprot];
+            const source = [AnnotationReference.PdbEntity, AnnotationReference.PdbInstance, AnnotationReference.Uniprot];
             const alignmentRequestContext = {
                 queryId: instanceId,
                 from: SequenceReference.PdbInstance,
@@ -50,3 +50,4 @@ export class RcsbFvInstance extends RcsbFvAbstractModule {
                     this.alignmentTracks.concat(this.annotationTracks);
     }
 }
+//# sourceMappingURL=RcsbFvInstance.js.map

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RcsbFvInstance.js","sourceRoot":"","sources":["../../../src/RcsbFvWeb/RcsbFvModule/RcsbFvInstance.ts"],"names":[],"mappings":"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"}

package/lib/RcsbFvWeb/RcsbFvModule/RcsbFvInterface.d.ts

@@ -1,4 +1,4 @@
-import { AnnotationFeatures } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { SequenceAnnotations } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { RcsbFvAbstractModule } from "./RcsbFvAbstractModule";
 export declare class RcsbFvInterface extends RcsbFvAbstractModule {
     private instanceId;
@@ -8,5 +8,5 @@ export declare class RcsbFvInterface extends RcsbFvAbstractModule {
     private titleSuffix;
     private trackTitle;
 }
-export declare function interfaceAnnotations(annotations: Array<AnnotationFeatures>): Promise<Array<AnnotationFeatures>>;
-export declare function filter(ann: Array<AnnotationFeatures>): Promise<Array<AnnotationFeatures>>;
+export declare function interfaceAnnotations(annotations: Array<SequenceAnnotations>): Promise<Array<SequenceAnnotations>>;
+export declare function filter(ann: Array<SequenceAnnotations>): Promise<Array<SequenceAnnotations>>;