@rcsb/rcsb-saguaro-app 3.2.1 → 3.3.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 [Semantic Versioning](https://semver.org/)
 
+## [3.3.0] - 2021-11-30
+### Annotations configuration improvements
+- Removed interface `CollectAnnotationsInterface` attribute `addTargetInTitle`
+- Added `titleSuffix` and `trackTitle` attributes to `CollectAnnotationsInterface`
+     - These new attributes are defined as async functions (ann: AnnotationFeatures, d: Feature) => Promise<string|undefined> to provide or modify track titles based on the features content
+
 ## [3.2.1] - 2021-11-10
 ### Minor configuration
 - Dropdown title configuration is exposed in `InstanceSequenceConfig` attribute `dropdownTitle` 

package/build/dist/RcsbAnnotationConfig/RcsbAnnotationConfig.d.ts

@@ -21,10 +21,11 @@ export declare class RcsbAnnotationConfig {
     uniprotOrder(): Array<string>;
     instanceOrder(): Array<string>;
     entityOrder(): Array<string>;
-    buildAndAddType(d: Feature, targetId?: string): string;
+    buildAndAddType(d: Feature, mainTitle?: string, titleSuffix?: string): string;
     private addNewType;
     sortAndIncludeNewTypes(): void;
     private checkAndIncludeNewType;
+    private cleanAddedTypes;
     isMergedType(type: string): boolean;
     getMergedType(type: string): string;
     annotationMergedPreference(type: string, a: RcsbFvTrackDataElementInterface, b: RcsbFvTrackDataElementInterface): boolean;

package/build/dist/RcsbCollectTools/AnnotationCollector/AnnotationCollector.d.ts

@@ -20,7 +20,6 @@ export declare class AnnotationCollector implements AnnotationCollectorInterface
     private externalTrackBuilder;
     constructor(acm?: AnnotationConfigInterface);
     collect(requestConfig: AnnotationCollectConfig): Promise<Array<RcsbFvRowConfigInterface>>;
-    getPolymerEntityInstanceTranslator(): PolymerEntityInstanceTranslate;
     setPolymerEntityInstanceTranslator(p: PolymerEntityInstanceTranslate): void;
     setExternalTrackBuilder(externalTrackBuilder: ExternalTrackBuilderInterface): void;
     getFeatures(): Promise<Array<Feature>>;

package/build/dist/RcsbCollectTools/AnnotationCollector/AnnotationCollectorInterface.d.ts

@@ -1,6 +1,6 @@
 import { CoreCollectorInterface } from "../CoreCollectorInterface";
 import { RcsbFvRowConfigInterface } from "@rcsb/rcsb-saguaro";
-import { AnnotationFeatures, Feature, QueryAnnotationsArgs, Source } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
+import { AnnotationFeatures, Feature, QueryAnnotationsArgs } from "@rcsb/rcsb-api-tools/build/RcsbGraphQL/Types/Borrego/GqlTypes";
 import { AnnotationTrack, FeaturePositionGaps } from "./AnnotationTrack";
 import { ExternalTrackBuilderInterface } from "../FeatureTools/ExternalTrackBuilderInterface";
 export declare type IncreaseAnnotationValueType = (feature: {
@@ -20,8 +20,9 @@ interface CommonAnnotationInterface {
     externalAnnotationTrackBuilder?: ExternalTrackBuilderInterface;
 }
 export interface CollectAnnotationsInterface extends QueryAnnotationsArgs, CommonAnnotationInterface {
-    addTargetInTitle?: Set<Source>;
     collectSwissModel?: boolean;
+    titleSuffix?(ann: AnnotationFeatures, d: Feature): Promise<string | undefined>;
+    trackTitle?(ann: AnnotationFeatures, d: Feature): Promise<string | undefined>;
 }
 export declare type AnnotationCollectConfig = Partial<CollectAnnotationsInterface>;
 export interface AnnotationCollectorInterface extends CoreCollectorInterface {

package/build/dist/RcsbCollectTools/AnnotationCollector/AnnotationTrackManager.d.ts

@@ -8,11 +8,12 @@ export declare class AnnotationTrackManager {
     private readonly annotationTracks;
     private polymerEntityInstanceTranslator;
     constructor(rcsbAnnotationConfig: RcsbAnnotationConfig);
-    processRcsbPdbAnnotations(data: Array<AnnotationFeatures>, requestConfig: AnnotationCollectConfig): void;
+    processRcsbPdbAnnotations(data: Array<AnnotationFeatures>, requestConfig: AnnotationCollectConfig): Promise<void>;
     getAnnotationTracks(): Map<string, AnnotationTrack>;
     private getPolymerEntityInstanceTranslator;
     setPolymerEntityInstanceTranslator(p: PolymerEntityInstanceTranslate): void;
     private mergeTracks;
     private buildType;
     private addAnnotationToTracks;
+    private addFeature;
 }

package/build/dist/RcsbCollectTools/CoreCollectorInterface.d.ts

@@ -5,5 +5,4 @@ export interface CoreCollectorInterface {
     readonly rcsbFvQuery: RcsbClient;
     setPolymerEntityInstanceTranslator(p: PolymerEntityInstanceTranslate): void;
     setExternalTrackBuilder(externalTrackBuilder: ExternalTrackBuilderInterface): void;
-    getPolymerEntityInstanceTranslator(): PolymerEntityInstanceTranslate;
 }

package/build/dist/RcsbCollectTools/SequenceCollector/SequenceCollector.d.ts

@@ -30,7 +30,6 @@ export declare class SequenceCollector implements SequenceCollectorInterface {
     getTargets(): Promise<Array<string>>;
     getAlignmentResponse(): Promise<AlignmentResponse>;
     getSequenceLength(): number;
-    getPolymerEntityInstanceTranslator(): PolymerEntityInstanceTranslate;
     setPolymerEntityInstanceTranslator(p: PolymerEntityInstanceTranslate): void;
     setExternalTrackBuilder(externalTrackBuilder: ExternalTrackBuilderInterface): void;
     private complete;

package/build/dist/RcsbFvWeb/RcsbFvModule/RcsbFvAbstractModule.d.ts

@@ -10,6 +10,7 @@ export declare abstract class RcsbFvAbstractModule implements RcsbFvModuleInterf
     protected readonly elementId: string;
     protected boardConfigData: RcsbFvBoardConfigInterface;
     protected rowConfigData: Array<RcsbFvRowConfigInterface>;
+    protected polymerEntityInstance: PolymerEntityInstanceTranslate;
     protected readonly sequenceCollector: SequenceCollectorInterface;
     protected readonly annotationCollector: AnnotationCollectorInterface;
     protected alignmentTracks: SequenceCollectorDataInterface;

package/build/dist/RcsbFvWeb/RcsbFvModule/RcsbFvEntity.d.ts

@@ -3,4 +3,5 @@ import { RcsbFvModuleBuildInterface } from "./RcsbFvModuleInterface";
 export declare class RcsbFvEntity extends RcsbFvAbstractModule {
     protected protectedBuild(buildConfig: RcsbFvModuleBuildInterface): Promise<void>;
     protected concatAlignmentAndAnnotationTracks(buildConfig: RcsbFvModuleBuildInterface): void;
+    private titleSuffix;
 }

package/build/dist/RcsbFvWeb/RcsbFvModule/RcsbFvUniprotEntity.d.ts

@@ -3,4 +3,5 @@ import { RcsbFvModuleBuildInterface } from "./RcsbFvModuleInterface";
 export declare class RcsbFvUniprotEntity extends RcsbFvAbstractModule {
     protected protectedBuild(buildConfig: RcsbFvModuleBuildInterface): Promise<void>;
     protected concatAlignmentAndAnnotationTracks(buildConfig: RcsbFvModuleBuildInterface): void;
+    private titleSuffix;
 }