@rcsb/rcsb-saguaro-app 6.3.7-react-downgrade.1 → 6.3.8

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/PlainObservedAlignmentTrackFactory.js

@@ -9,7 +9,7 @@ const TrackUtils_1 = require("./Helper/TrackUtils");
 const RcsbRequestContextManager_1 = require("../../../../RcsbRequest/RcsbRequestContextManager");
 const Assertions_1 = require("../../../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class PlainObservedAlignmentTrackFactory {
     constructor(entityInstanceTranslator) {
         this.unObservedResidues = new Map();

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/PositionalScoreAlignmentTrackFactory.d.ts

@@ -1,16 +1,16 @@
 import { RcsbFvTrackDataElementInterface } from "@rcsb/rcsb-saguaro/lib/RcsbDataManager/RcsbDataManager";
 import { RcsbFvRowConfigInterface } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFvConfig/RcsbFvConfigInterface";
-import { AlignedRegion, AnnotationFeatures, TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { AlignedRegions, SequenceAnnotations, TargetAlignments } from "@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { AlignmentContextInterface, PolymerEntityInstanceTranslate } from "../../../../RcsbUtils/Translators/PolymerEntityInstanceTranslate";
 import { TrackFactoryInterface } from "../TrackFactoryInterface";
 import { AlignmentRequestContextType } from "./AlignmentTrackFactory";
-export declare class PositionalScoreAlignmentTrackFactory implements TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignment]> {
+export declare class PositionalScoreAlignmentTrackFactory implements TrackFactoryInterface<[AlignmentRequestContextType, TargetAlignments]> {
     private alignmentTrackFactory;
     private positionalScores;
     private readonly instanceEntityMap;
     constructor(entityInstanceTranslator?: PolymerEntityInstanceTranslate);
-    getTrack(alignmentRequestContext: AlignmentRequestContextType, targetAlignment: TargetAlignment, alignedRegionToTrackElementList?: (region: AlignedRegion, alignmentContext: AlignmentContextInterface) => Array<RcsbFvTrackDataElementInterface>): Promise<RcsbFvRowConfigInterface>;
-    prepareFeatures(positionalScores: Array<AnnotationFeatures>): Promise<void>;
+    getTrack(alignmentRequestContext: AlignmentRequestContextType, targetAlignment: TargetAlignments, alignedRegionToTrackElementList?: (region: AlignedRegions, alignmentContext: AlignmentContextInterface) => Array<RcsbFvTrackDataElementInterface>): Promise<RcsbFvRowConfigInterface>;
+    prepareFeatures(positionalScores: Array<SequenceAnnotations>): Promise<void>;
     private collectFeatureEntryProperties;
     private prepareFeaturesAlignmentMap;
     private alignedRegionToTrackElementList;

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/PositionalScoreAlignmentTrackFactory.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionalScoreAlignmentTrackFactory = void 0;
 const tslib_1 = require("tslib");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const Operator_1 = require("../../../../RcsbUtils/Helpers/Operator");
 const lodash_1 = require("lodash");
 const PlainAlignmentTrackFactory_1 = require("./PlainAlignmentTrackFactory");
@@ -10,7 +10,7 @@ const TrackUtils_1 = require("./Helper/TrackUtils");
 const RcsbRequestContextManager_1 = require("../../../../RcsbRequest/RcsbRequestContextManager");
 const Assertions_1 = require("../../../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class PositionalScoreAlignmentTrackFactory {
     constructor(entityInstanceTranslator) {
         this.positionalScores = new Map();
@@ -108,7 +108,7 @@ class PositionalScoreAlignmentTrackFactory {
                     source: TrackUtils_1.TrackUtils.transformSourceFromTarget(alignmentContext.targetId, alignmentContext.to),
                     provenanceName: TrackUtils_1.TrackUtils.getProvenanceConfigFormTarget(alignmentContext.targetId, alignmentContext.to).name,
                     provenanceColor: TrackUtils_1.TrackUtils.getProvenanceConfigFormTarget(alignmentContext.targetId, alignmentContext.to).color,
-                    type: GqlTypes_1.Type.MaQaMetricLocalTypeOther,
+                    type: GqlTypes_1.FeaturesType.MaQaMetricLocalTypeOther,
                 }, alignmentContext));
             });
         }

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackFactoryImpl/SequenceTrackFactory.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequenceTrackFactory = void 0;
 const tslib_1 = require("tslib");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const SequenceTrackTitleFactory_1 = require("../TrackTitleFactoryImpl/SequenceTrackTitleFactory");
 const TrackUtils_1 = require("./Helper/TrackUtils");
 const Assertions_1 = require("../../../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class SequenceTrackFactory {
     constructor(entityInstanceTranslator, trackTitleFactory) {
         this.entityInstanceTranslator = undefined;
@@ -20,7 +20,7 @@ class SequenceTrackFactory {
             const queryId = (_a = alignmentQueryContext.queryId) !== null && _a !== void 0 ? _a : alignmentQueryContext.groupId;
             assertDefined(queryId);
             return {
-                trackId: (_b = "mainSequenceTrack_" + alignmentQueryContext.queryId) !== null && _b !== void 0 ? _b : alignmentQueryContext.groupId,
+                trackId: "mainSequenceTrack_" + ((_b = alignmentQueryContext.queryId) !== null && _b !== void 0 ? _b : alignmentQueryContext.groupId),
                 displayType: "sequence" /* RcsbFvDisplayTypes.SEQUENCE */,
                 trackColor: "#F9F9F9",
                 displayColor: "#000000",

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/AlignmentTrackTitleFactory.d.ts

@@ -1,13 +1,13 @@
 import { RcsbFvLink } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFvConfig/RcsbFvConfigInterface";
 import { TrackTitleFactoryInterface } from "../TrackTitleFactoryInterface";
-import { TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { TargetAlignments } from "@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { AlignmentRequestContextType } from "../TrackFactoryImpl/AlignmentTrackFactory";
 import { PolymerEntityInstanceTranslate } from "../../../../RcsbUtils/Translators/PolymerEntityInstanceTranslate";
-export declare class AlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignment]> {
+export declare class AlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignments]> {
     private readonly experimentalTrackTitleFactory;
     private readonly modelTrackTitleFactory;
     constructor(entityInstanceTranslator?: PolymerEntityInstanceTranslate);
-    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string | RcsbFvLink>;
-    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
-    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
+    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string | RcsbFvLink>;
+    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
+    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
 }

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/AlignmentTrackTitleFactory.js

@@ -4,7 +4,7 @@ exports.AlignmentTrackTitleFactory = void 0;
 const tslib_1 = require("tslib");
 const ExperimentalAlignmentTrackTitleFactory_1 = require("./ExperimentalAlignmentTrackTitleFactory");
 const ModelAlignmentTrackTitleFactory_1 = require("./ModelAlignmentTrackTitleFactory");
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class AlignmentTrackTitleFactory {
     constructor(entityInstanceTranslator) {
         this.experimentalTrackTitleFactory = new ExperimentalAlignmentTrackTitleFactory_1.ExperimentalAlignmentTrackTitleFactory(entityInstanceTranslator);

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/ExperimentalAlignmentTrackTitleFactory.d.ts

@@ -1,13 +1,13 @@
 import { RcsbFvLink } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFvConfig/RcsbFvConfigInterface";
 import { TrackTitleFactoryInterface } from "../TrackTitleFactoryInterface";
-import { TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { TargetAlignments } from "@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { AlignmentRequestContextType } from "../TrackFactoryImpl/AlignmentTrackFactory";
 import { PolymerEntityInstanceTranslate } from "../../../../RcsbUtils/Translators/PolymerEntityInstanceTranslate";
-export declare class ExperimentalAlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignment]> {
+export declare class ExperimentalAlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignments]> {
     private readonly entityInstanceTranslator;
     constructor(entityInstanceTranslator?: PolymerEntityInstanceTranslate);
-    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string | RcsbFvLink>;
-    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
-    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
+    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string | RcsbFvLink>;
+    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
+    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
     private buildInstanceId;
 }

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/ExperimentalAlignmentTrackTitleFactory.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExperimentalAlignmentTrackTitleFactory = void 0;
 const tslib_1 = require("tslib");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const web_resources_json_1 = tslib_1.__importDefault(require("../../../../RcsbServerConfig/web.resources.json"));
 const RcsbAnnotationConstants_1 = require("../../../../RcsbAnnotationConfig/RcsbAnnotationConstants");
 const Assertions_1 = require("../../../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class ExperimentalAlignmentTrackTitleFactory {
     constructor(entityInstanceTranslator) {
         this.entityInstanceTranslator = undefined;

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/ModelAlignmentTrackTitleFactory.d.ts

@@ -1,12 +1,12 @@
 import { RcsbFvLink } from "@rcsb/rcsb-saguaro/lib/RcsbFv/RcsbFvConfig/RcsbFvConfigInterface";
 import { TrackTitleFactoryInterface } from "../TrackTitleFactoryInterface";
 import { AlignmentRequestContextType } from "../TrackFactoryImpl/AlignmentTrackFactory";
-import { TargetAlignment } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { TargetAlignments } from "@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { PolymerEntityInstanceTranslate } from "../../../../RcsbUtils/Translators/PolymerEntityInstanceTranslate";
-export declare class ModelAlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignment]> {
+export declare class ModelAlignmentTrackTitleFactory implements TrackTitleFactoryInterface<[AlignmentRequestContextType, TargetAlignments]> {
     private readonly alignmentTrackTitleFactory;
     constructor(entityInstanceTranslator?: PolymerEntityInstanceTranslate);
-    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string | RcsbFvLink>;
-    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
-    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignment): Promise<string>;
+    getTrackTitle(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string | RcsbFvLink>;
+    getTrackTitlePrefix(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
+    getTrackTitleFlagColor(alignmentQueryContext: AlignmentRequestContextType, targetAlignment: TargetAlignments): Promise<string>;
 }

package/lib/commonjs/RcsbFvWeb/RcsbFvFactories/RcsbFvTrackFactory/TrackTitleFactoryImpl/SequenceTrackTitleFactory.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequenceTrackTitleFactory = void 0;
 const tslib_1 = require("tslib");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const web_resources_json_1 = tslib_1.__importDefault(require("../../../../RcsbServerConfig/web.resources.json"));
 const RcsbAnnotationConstants_1 = require("../../../../RcsbAnnotationConfig/RcsbAnnotationConstants");
 const TrackUtils_1 = require("../TrackFactoryImpl/Helper/TrackUtils");
 const Assertions_1 = require("../../../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 class SequenceTrackTitleFactory {
     constructor(entityInstanceTranslator) {
         this.entityInstanceTranslator = undefined;

package/lib/commonjs/RcsbFvWeb/RcsbFvGroup/GroupPfvTabs.d.ts

@@ -1,7 +1,7 @@
-import React from "react";
+import React, { ReactNode } from "react";
 import { RcsbFvAdditionalConfig } from "../RcsbFvModule/RcsbFvModuleInterface";
-import { SearchQuery } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchQueryInterface";
-import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums";
+import { SearchQuery } from "@rcsb/rcsb-api-tools/lib/RcsbSearch/Types/SearchQueryInterface";
+import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/lib/RcsbDw/Types/DwEnums";
 interface SequenceTabInterface {
     groupProvenanceId: GroupProvenanceId;
     groupId: string;
@@ -19,7 +19,7 @@ export declare class GroupPfvTabs extends React.Component<SequenceTabInterface>
         groupId: string;
         searchQuery: SearchQuery;
     });
-    render(): JSX.Element;
+    render(): ReactNode;
     private onMount;
     private syncPositionAndHighlight;
     private onSelect;

package/lib/commonjs/RcsbFvWeb/RcsbFvGroup/GroupPfvTabs.js

@@ -4,11 +4,11 @@ exports.GroupPfvTabs = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = tslib_1.__importDefault(require("react"));
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const SearchRequestProperty_1 = require("../../RcsbSeacrh/SearchRequestProperty");
-const SearchEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums");
+const SearchEnums_1 = require("@rcsb/rcsb-api-tools/lib/RcsbSearch/Types/SearchEnums");
 const RcsbTabs_1 = require("../RcsbFvComponents/RcsbTabs");
-const DwEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums");
+const DwEnums_1 = require("@rcsb/rcsb-api-tools/lib/RcsbDw/Types/DwEnums");
 const SearchQueryTools_1 = require("../../RcsbSeacrh/SearchQueryTools");
 const GroupPfvApp_1 = require("./GroupTabs/GroupPfvApp");
 const rxjs_1 = require("rxjs");
@@ -83,30 +83,30 @@ class GroupPfvTabs extends react_1.default.Component {
     }
     renderPositionalFeatureViewer(tabKey) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             switch (tabKey) {
                 case ALIGNMENT:
-                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.alignment(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_a = this.entityCount) !== null && _a !== void 0 ? _a : 0, Object.assign(Object.assign({ page: { first: 50, after: "0" } }, this.props.additionalConfig), { alignmentFilter: this.filterEntities })));
+                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.alignment(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_a = this.entityCount) !== null && _a !== void 0 ? _a : 0, Object.assign(Object.assign({ page: { first: 50, after: 0 } }, this.props.additionalConfig), { alignmentFilter: this.filterEntities })));
                     break;
                 case BINDING_SITES:
-                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.bindingSites(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_c = (_b = this.filterInstances) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, Object.assign(Object.assign({ page: { first: 0, after: "0" } }, this.props.additionalConfig), { alignmentFilter: this.props.searchQuery ? this.filterEntities : undefined, filters: this.props.searchQuery ? [{
-                                source: GqlTypes_1.Source.PdbInstance,
+                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.bindingSites(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_c = (_b = this.filterInstances) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, Object.assign(Object.assign({ page: { first: 1, after: 0 } }, this.props.additionalConfig), { alignmentFilter: this.props.searchQuery ? this.filterEntities : undefined, filters: this.props.searchQuery ? [{
+                                source: GqlTypes_1.AnnotationReference.PdbInstance,
                                 field: GqlTypes_1.FieldName.TargetId,
                                 operation: GqlTypes_1.OperationType.Equals,
-                                values: this.filterInstances
+                                values: (_d = this.filterInstances) !== null && _d !== void 0 ? _d : []
                             }] : undefined })));
                     break;
                 case STRUCTURAL_FEATURES:
-                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.structure(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_e = (_d = this.filterInstances) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0, Object.assign(Object.assign({ page: { first: 0, after: "0" } }, this.props.additionalConfig), { alignmentFilter: this.props.searchQuery ? this.filterEntities : undefined, filters: this.props.searchQuery ? [{
-                                source: GqlTypes_1.Source.PdbInstance,
+                    this.featureViewers.set(tabKey, yield GroupPfvApp_1.GroupPfvApp.structure(tabKey.toString(), this.props.groupProvenanceId, this.props.groupId, (_f = (_e = this.filterInstances) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0, Object.assign(Object.assign({ page: { first: 1, after: 0 } }, this.props.additionalConfig), { alignmentFilter: this.props.searchQuery ? this.filterEntities : undefined, filters: this.props.searchQuery ? [{
+                                source: GqlTypes_1.AnnotationReference.PdbInstance,
                                 field: GqlTypes_1.FieldName.TargetId,
                                 operation: GqlTypes_1.OperationType.Equals,
-                                values: this.filterInstances
+                                values: (_g = this.filterInstances) !== null && _g !== void 0 ? _g : []
                             }, {
-                                source: GqlTypes_1.Source.PdbEntity,
+                                source: GqlTypes_1.AnnotationReference.PdbEntity,
                                 field: GqlTypes_1.FieldName.TargetId,
                                 operation: GqlTypes_1.OperationType.Equals,
-                                values: this.filterEntities
+                                values: (_h = this.filterEntities) !== null && _h !== void 0 ? _h : []
                             }] : undefined })));
                     break;
             }

package/lib/commonjs/RcsbFvWeb/RcsbFvGroup/GroupTabs/GroupPfvApp.d.ts

@@ -1,10 +1,10 @@
 import { RcsbFvAdditionalConfig, RcsbFvModulePublicInterface } from "../../RcsbFvModule/RcsbFvModuleInterface";
-import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums";
-import { GroupReference } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/lib/RcsbDw/Types/DwEnums";
+import { GroupReference } from "@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { ActionMethods } from "../../../RcsbFvUI/Helper/ActionMethods";
 export declare namespace GroupPfvApp {
     function alignment(elementId: string, groupProvenanceId: GroupProvenanceId, groupId: string, entityCount: number, additionalConfig?: RcsbFvAdditionalConfig & ActionMethods.FvChangeConfigInterface): Promise<RcsbFvModulePublicInterface>;
     function structure(elementId: string, groupProvenanceId: GroupProvenanceId, groupId: string, nTargets: number, additionalConfig?: RcsbFvAdditionalConfig): Promise<RcsbFvModulePublicInterface>;
     function bindingSites(elementId: string, groupProvenanceId: GroupProvenanceId, groupId: string, nTargets: number, additionalConfig?: RcsbFvAdditionalConfig): Promise<RcsbFvModulePublicInterface>;
 }
-export declare function getReferenceFromGroupProvenance(groupProvenanceId: GroupProvenanceId): GroupReference;
+export declare function getReferenceFromGroupProvenance(groupProvenanceId: GroupProvenanceId): GroupReference | undefined;

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

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupPfvApp = void 0;
 exports.getReferenceFromGroupProvenance = getReferenceFromGroupProvenance;
 const tslib_1 = require("tslib");
-const DwEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums");
+const DwEnums_1 = require("@rcsb/rcsb-api-tools/lib/RcsbDw/Types/DwEnums");
 const RcsbFvUniprotBuilder_1 = require("../../RcsbFvBuilder/RcsbFvUniprotBuilder");
 const GroupExternalTrackBuilder_1 = require("../../../RcsbUtils/TrackGenerators/GroupExternalTrackBuilder");
 const RcsbFvGroupBuilder_1 = require("../../RcsbFvBuilder/RcsbFvGroupBuilder");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const AlignmentGlobalBindingSite_1 = require("../../../RcsbUtils/TrackGenerators/AlignmentGlobalBindingSite");
 const RcsbTabs_1 = require("../../RcsbFvComponents/RcsbTabs");
 const GroupPfvUI_1 = require("../../../RcsbFvUI/GroupPfvUI");
@@ -36,12 +36,12 @@ var GroupPfvApp;
                         component: PaginationItemComponent_1.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_1.RcsbFvGroupBuilder.buildGroupAlignmentFv, pfvArgs, Object.assign(Object.assign({}, additionalConfig), { page: {
                                         first: state.first,
-                                        after: state.after.toString()
+                                        after: state.after
                                     }, excludeLogo: true }));
                             }
                         }
@@ -57,15 +57,15 @@ 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: GqlTypes_1.FieldName.Type,
-                        values: [GqlTypes_1.Type.HelixP, GqlTypes_1.Type.Sheet, GqlTypes_1.Type.Cath, GqlTypes_1.Type.Scop],
+                        values: [GqlTypes_1.FeaturesType.HelixP, GqlTypes_1.FeaturesType.Sheet, GqlTypes_1.FeaturesType.Cath, GqlTypes_1.FeaturesType.Scop],
                         operation: GqlTypes_1.OperationType.Equals,
-                        source: GqlTypes_1.Source.PdbInstance
+                        source: GqlTypes_1.AnnotationReference.PdbInstance
                     }, {
                         field: GqlTypes_1.FieldName.Type,
-                        values: [GqlTypes_1.Type.Pfam],
+                        values: [GqlTypes_1.FeaturesType.Pfam],
                         operation: GqlTypes_1.OperationType.Equals,
-                        source: GqlTypes_1.Source.PdbEntity
-                    }], sources: [GqlTypes_1.Source.PdbInstance, GqlTypes_1.Source.PdbEntity], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: (0, GroupExternalTrackBuilder_1.groupExternalTrackBuilder)() });
+                        source: GqlTypes_1.AnnotationReference.PdbEntity
+                    }], sources: [GqlTypes_1.AnnotationReference.PdbInstance, GqlTypes_1.AnnotationReference.PdbEntity], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: (0, GroupExternalTrackBuilder_1.groupExternalTrackBuilder)() });
             // SequenceReference.PdbEntity && SequenceReference.Uniprot are needed to add row prefixes
             const pfvArgs = [
                 getReferenceFromGroupProvenance(groupProvenanceId),
@@ -82,10 +82,10 @@ 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: GqlTypes_1.FieldName.Type,
-                        values: [GqlTypes_1.Type.BindingSite],
+                        values: [GqlTypes_1.FeaturesType.BindingSite],
                         operation: GqlTypes_1.OperationType.Equals,
-                        source: GqlTypes_1.Source.PdbInstance
-                    }], sources: [GqlTypes_1.Source.PdbInstance], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: (0, AlignmentGlobalBindingSite_1.alignmentGlobalLigandBindingSite)() });
+                        source: GqlTypes_1.AnnotationReference.PdbInstance
+                    }], sources: [GqlTypes_1.AnnotationReference.PdbInstance], annotationProcessing: annotationPositionFrequencyProcessing(nTargets), externalTrackBuilder: (0, AlignmentGlobalBindingSite_1.alignmentGlobalLigandBindingSite)(), isAnnotationsGroupSummary: false });
             // SequenceReference.PdbEntity && SequenceReference.Uniprot are needed to add row prefixes
             const pfvArgs = [
                 getReferenceFromGroupProvenance(groupProvenanceId),
@@ -99,25 +99,31 @@ var GroupPfvApp;
     GroupPfvApp.bindingSites = bindingSites;
 })(GroupPfvApp || (exports.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(GqlTypes_1.Type.Cath) || type.includes(GqlTypes_1.Type.Scop) || type.includes(GqlTypes_1.Type.BindingSite) || type.includes(GqlTypes_1.Type.Pfam)) ? targets.get(type) : nTargets;
+                var _a;
+                const isType = (type.includes(GqlTypes_1.FeaturesType.Cath) || type.includes(GqlTypes_1.FeaturesType.Scop) || type.includes(GqlTypes_1.FeaturesType.BindingSite) || type.includes(GqlTypes_1.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 != GqlTypes_1.Source.PdbInterface)
-                        ann.value = Math.ceil(1000 * ann.value / (N !== null && N !== void 0 ? N : 1)) / 1000;
+                    if (ann.source != GqlTypes_1.AnnotationReference.PdbInterface)
+                        ann.value = Math.round(100 * ann.value / (N !== null && N !== void 0 ? N : 1)) / 100;
                 });
             });
         }

package/lib/commonjs/RcsbFvWeb/RcsbFvGroup/RcsbFvGroupTabsBuilder.d.ts

@@ -1,5 +1,5 @@
-import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums";
-import { SearchQuery } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchQueryInterface";
+import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/lib/RcsbDw/Types/DwEnums";
+import { SearchQuery } from "@rcsb/rcsb-api-tools/lib/RcsbSearch/Types/SearchQueryInterface";
 import { RcsbFvAdditionalConfig } from "../RcsbFvModule/RcsbFvModuleInterface";
 export declare class RcsbFvGroupTabsBuilder {
     static buildGroupTabs(elementId: string, groupProvenanceId: GroupProvenanceId, groupId: string, query?: SearchQuery, additionalConfig?: RcsbFvAdditionalConfig): void;

package/lib/commonjs/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/lib/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/commonjs/RcsbFvWeb/RcsbFvModule/RcsbFvChromosome.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const RcsbDataManager_1 = require("@rcsb/rcsb-saguaro/lib/RcsbDataManager/RcsbDataManager");
 const RcsbFvAbstractModule_1 = require("./RcsbFvAbstractModule");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const RcsbAnnotationConstants_1 = require("../../RcsbAnnotationConfig/RcsbAnnotationConstants");
 const RcsbFvAlignmentCollectorQueue_1 = require("../RcsbFvWorkers/RcsbFvAlignmentCollectorQueue");
 const NcbiGenomeSequenceData_1 = require("../../ExternalResources/NcbiData/NcbiGenomeSequenceData");
@@ -31,14 +31,14 @@ function sequenceDisplayDynamicUpdate(reference, ranges, trackWidth) {
                     from: reference,
                     to: GqlTypes_1.SequenceReference.NcbiGenome
                 });
-            })).then(alignments => {
+            })).then((alignments) => {
                 const out = new RcsbDataManager_1.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;
@@ -113,12 +113,12 @@ class RcsbFvChromosome extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
                 from: GqlTypes_1.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);
                 });
@@ -144,8 +144,8 @@ class RcsbFvChromosome extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     collectPdbWorkerResults(ar, pdbEntityId, chrId) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _c, _d;
-            assertElementListDefined(ar.target_alignment);
-            const exonTracks = this.collectExons(ar.target_alignment, "target", RcsbAnnotationConstants_1.RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, RcsbAnnotationConstants_1.RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, GqlTypes_1.SequenceReference.PdbEntity, chrId);
+            assertElementListDefined(ar.target_alignments);
+            const exonTracks = this.collectExons(ar.target_alignments, "target", RcsbAnnotationConstants_1.RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, RcsbAnnotationConstants_1.RcsbAnnotationConstants.provenanceColorCode.rcsbPdb, GqlTypes_1.SequenceReference.PdbEntity, chrId);
             this.pdbEntityTrack = this.mergeExonTracks(exonTracks, GqlTypes_1.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];
@@ -319,8 +319,8 @@ class RcsbFvChromosome extends RcsbFvAbstractModule_1.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();

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RcsbFvEntity = void 0;
 const tslib_1 = require("tslib");
-const GqlTypes_1 = require("@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes");
+const GqlTypes_1 = require("@rcsb/rcsb-api-tools/lib/RcsbGraphQL/Types/Borrego/GqlTypes");
 const RcsbFvAbstractModule_1 = require("./RcsbFvAbstractModule");
 const Assertions_1 = require("../../RcsbUtils/Helpers/Assertions");
 var assertDefined = Assertions_1.Assertions.assertDefined;
-const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/build/RcsbUtils/TagDelimiter");
+const TagDelimiter_1 = require("@rcsb/rcsb-api-tools/lib/RcsbUtils/TagDelimiter");
 const UnmodeledTrackBuilder_1 = require("../../RcsbUtils/TrackGenerators/UnmodeledTrackBuilder");
 class RcsbFvEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
     constructor() {
@@ -29,7 +29,7 @@ class RcsbFvEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
             const annotationsRequestContext = {
                 queryId: buildConfig.entityId,
                 reference: GqlTypes_1.SequenceReference.PdbEntity,
-                sources: (_d = (_c = buildConfig.additionalConfig) === null || _c === void 0 ? void 0 : _c.sources) !== null && _d !== void 0 ? _d : [GqlTypes_1.Source.PdbEntity, GqlTypes_1.Source.Uniprot],
+                sources: (_d = (_c = buildConfig.additionalConfig) === null || _c === void 0 ? void 0 : _c.sources) !== null && _d !== void 0 ? _d : [GqlTypes_1.AnnotationReference.PdbEntity, GqlTypes_1.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,
@@ -62,7 +62,7 @@ class RcsbFvEntity extends RcsbFvAbstractModule_1.RcsbFvAbstractModule {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!ann.target_id)
                 return;
-            if (this.polymerEntityInstance != null && ann.source === GqlTypes_1.Source.PdbInstance) {
+            if (this.polymerEntityInstance != null && ann.source === GqlTypes_1.AnnotationReference.PdbInstance) {
                 const labelAsymId = ann.target_id.split(TagDelimiter_1.TagDelimiter.instance)[1];
                 const authAsymId = this.polymerEntityInstance.translateAsymToAuth(labelAsymId);
                 return labelAsymId === authAsymId ? labelAsymId : labelAsymId + "[auth " + authAsymId + "]";