@rcsb/rcsb-saguaro-app 6.0.0 → 6.0.2

package/lib/commonjs/RcsbSeacrh/FacetStore/SingleFacets.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SearchFacets = exports.GO_COMPONENT_FACET = exports.GO_PROCESS_FACET = exports.GO_FUNCTION_FACET = exports.ENZYME_CLASS_FACET = exports.CHEM_COMP_FACET = exports.ENTITY_NAME_FACET = exports.PFAM_FACET = exports.TAXONOMY_FACET = exports.ORGANISM_FACET = exports.LIGAND_OF_INTEREST_FACET = exports.LIGAND_FACET = exports.ECOD_FACET = exports.CATH_FACET = exports.SCOP_FACET = exports.RELEASE_DATE_FACET = exports.METHODOLOGY_FACET = exports.RESOLUTION_FACET = exports.EXPERIMENTAL_METHOD_FACET = void 0;
+exports.SearchFacets = exports.GO_COMPONENT_FACET = exports.GO_PROCESS_FACET = exports.GO_FUNCTION_FACET = exports.ENZYME_CLASS_FACET = exports.CHEM_COMP_FACET = exports.ENTITY_NAME_FACET = exports.PFAM_FACET = exports.TAXONOMY_FACET = exports.ORGANISM_FACET = exports.LIGAND_OF_INTEREST_FACET = exports.LIGAND_FACET = exports.ECOD_FACET = exports.CATH_FACET = exports.SCOP_FACET = exports.RELEASE_DATE_FACET = exports.CHIMERIC_FACET = exports.METHODOLOGY_FACET = exports.RESOLUTION_FACET = exports.EXPERIMENTAL_METHOD_FACET = void 0;
 const SearchMetadata_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata");
 const SearchEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums");
 const ChartConfigInterface_1 = require("@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface");
+const SearchQueryTools_1 = require("../SearchQueryTools");
 exports.EXPERIMENTAL_METHOD_FACET = {
     id: "method",
     title: "Experimental Method",
@@ -46,7 +47,6 @@ exports.RESOLUTION_FACET = {
             constHeight: 225
         },
         histogramBinIncrement: 0.5,
-        mergeDomainMaxValue: 5,
         domainMinValue: 0,
         domainMaxValue: 6,
         axisLabel: "Angstroms",
@@ -56,6 +56,9 @@ exports.RESOLUTION_FACET = {
             return `Resolution ${d.x - 0.25} - ${d.x + 0.25}`;
         }
     },
+    facetConfig: {
+        mergeDomainMaxValue: 5
+    },
     facet: {
         name: "RESOLUTION_FACET",
         aggregation_type: SearchEnums_1.AggregationType.Histogram,
@@ -81,6 +84,52 @@ exports.METHODOLOGY_FACET = {
         min_interval_population: 1
     }
 };
+exports.CHIMERIC_FACET = {
+    id: "chimeric",
+    title: "Protein Sequence Composition",
+    attributeName: "CHIMERIC_FACET",
+    attribute: SearchMetadata_1.RcsbSearchMetadata.RcsbPolymerEntity.RcsbSourcePartCount.path,
+    chartType: ChartConfigInterface_1.ChartType.barplot,
+    contentType: "string",
+    facetConfig: {
+        facetTransform: (buckets) => {
+            const out = [];
+            const wt = buckets.find(b => b.label == 1);
+            if (wt)
+                out.push({
+                    label: "Wild Type",
+                    population: wt.population
+                });
+            const synthetic = buckets.find(b => b.label == 0);
+            if (synthetic)
+                out.push({
+                    label: "Synthetic",
+                    population: synthetic.population
+                });
+            const chimeric = buckets.filter(b => parseInt(b.label.toString()) > 1);
+            if ((chimeric === null || chimeric === void 0 ? void 0 : chimeric.length) > 0)
+                out.push({
+                    label: "Chimeric",
+                    population: chimeric.reduce((c, p) => c + p.population, 0)
+                });
+            return out;
+        },
+        bucketClickSearchQuery: (datum, data, e) => {
+            if (datum.x == "Wild Type")
+                return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 1, SearchEnums_1.Operator.Equals, SearchEnums_1.Service.Text);
+            else if (datum.x == "Synthetic")
+                return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 0, SearchEnums_1.Operator.Equals, SearchEnums_1.Service.Text);
+            else
+                return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 1, SearchEnums_1.Operator.Greater, SearchEnums_1.Service.Text);
+        }
+    },
+    facet: {
+        name: "CHIMERIC_FACET",
+        aggregation_type: SearchEnums_1.AggregationType.Terms,
+        attribute: SearchMetadata_1.RcsbSearchMetadata.RcsbPolymerEntity.RcsbSourcePartCount.path,
+        min_interval_population: 1
+    }
+};
 exports.RELEASE_DATE_FACET = {
     id: "release_date",
     title: undefined,
@@ -559,5 +608,6 @@ exports.SearchFacets = {
     GO_PROCESS_FACET: exports.GO_PROCESS_FACET,
     GO_COMPONENT_FACET: exports.GO_COMPONENT_FACET,
     LIGAND_OF_INTEREST_FACET: exports.LIGAND_OF_INTEREST_FACET,
-    METHODOLOGY_FACET: exports.METHODOLOGY_FACET
+    METHODOLOGY_FACET: exports.METHODOLOGY_FACET,
+    CHIMERIC_FACET: exports.CHIMERIC_FACET
 };

package/lib/commonjs/RcsbSeacrh/FacetStore/UniprotGroupFacetStore.js

@@ -27,7 +27,8 @@ class UniprotGroupFacetStore {
             (0, lodash_1.cloneDeep)(SingleFacets_1.ENTITY_NAME_FACET),
             (0, lodash_1.cloneDeep)(SingleFacets_1.GO_FUNCTION_FACET),
             (0, lodash_1.cloneDeep)(SingleFacets_1.GO_PROCESS_FACET),
-            (0, lodash_1.cloneDeep)(SingleFacets_1.GO_COMPONENT_FACET)
+            (0, lodash_1.cloneDeep)(SingleFacets_1.GO_COMPONENT_FACET),
+            (0, lodash_1.cloneDeep)(SingleFacets_1.CHIMERIC_FACET)
         ];
         this.nonPolymerFacet = [
             (0, lodash_1.cloneDeep)(SingleFacets_1.CHEM_COMP_FACET)

package/lib/commonjs/RcsbSeacrh/FacetTools.d.ts

@@ -2,7 +2,7 @@ import { BucketFacet } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchR
 import { FacetMemberInterface } from "./FacetStore/FacetMemberInterface";
 import { AttributeTextQueryParameters } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchQueryInterface";
 import { Service } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums";
-import { ChartDisplayConfigInterface, ChartObjectInterface, ChartType } from "@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface";
+import { ChartDisplayConfigInterface, ChartObjectInterface } from "@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface";
 import { RcsbSearchAttributeType } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata";
 export type SearchFilter = {
     attribute: RcsbSearchAttributeType;
@@ -10,16 +10,10 @@ export type SearchFilter = {
     operator: AttributeTextQueryParameters["operator"];
     service: Service.Text | Service.TextChem;
 };
-export interface RcsbChartInterface<T = any> {
-    chartType: ChartType;
+export interface RcsbChartInterface<T = any> extends Omit<FacetMemberInterface, "id" | "facet"> {
     labelList?: string[];
-    attribute: RcsbSearchAttributeType;
-    attributeName: string;
-    chartConfig?: FacetMemberInterface["chartConfig"];
-    title?: string;
     data: ChartObjectInterface<T>[];
     filters?: SearchFilter[];
-    contentType: FacetMemberInterface['contentType'];
 }
 export declare class FacetTools {
     static getResultDrilldowns(facetMembers: FacetMemberInterface[], searchResultFacets: Array<BucketFacet>): Array<RcsbChartInterface>;
@@ -45,15 +39,15 @@ export declare class FacetTools {
             barClickCallback?: import("@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface").BarClickCallbackType | undefined;
             sort?: ((b: import("@rcsb/rcsb-charts/lib/RcsbChartDataProvider/ChartDataProviderInterface").ChartDataColumnInterface<any>, a: import("@rcsb/rcsb-charts/lib/RcsbChartDataProvider/ChartDataProviderInterface").ChartDataColumnInterface<any>) => number) | undefined;
             tooltipText?: ((a: import("@rcsb/rcsb-charts/lib/RcsbChartDataProvider/ChartDataProviderInterface").ChartDataValueInterface<any>) => string | string[] | undefined) | undefined;
-            mergeDomainMaxValue?: number | undefined;
         };
-        chartType: ChartType;
         labelList?: string[] | undefined;
-        attribute: RcsbSearchAttributeType;
-        attributeName: string;
-        title?: string | undefined;
         data: ChartObjectInterface<any>[];
         filters?: SearchFilter[] | undefined;
+        title?: string | undefined;
+        attribute: RcsbSearchAttributeType;
+        attributeName: string;
+        chartType: import("@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface").ChartType;
+        facetConfig?: import("./FacetStore/FacetMemberInterface").FacetConfigInterface | undefined;
         contentType: "string" | "number" | "date";
     };
     private static includeMissingFacets;

package/lib/commonjs/RcsbSeacrh/FacetTools.js

@@ -12,17 +12,7 @@ class FacetTools {
             if (!facet)
                 return;
             const chart = FacetTools.getFacetChartTypeFromAttribute(facetMembers, bucket.name);
-            out.push({
-                chartType: chart.chartType,
-                chartConfig: chart.chartConfig,
-                labelList: [],
-                attributeName: bucket.name,
-                attribute: facet.attribute,
-                title: chart.title,
-                data: applyChartConfigToData(bucket.data, facet === null || facet === void 0 ? void 0 : facet.chartConfig),
-                filters: FacetTools.getFacetFiltersFromName(facetMembers, bucket.name),
-                contentType: facet.contentType
-            });
+            out.push(Object.assign(Object.assign({}, chart), { labelList: [], attributeName: bucket.name, attribute: facet.attribute, data: applyChartConfigToData(bucket.data, facet === null || facet === void 0 ? void 0 : facet.facetConfig), filters: FacetTools.getFacetFiltersFromName(facetMembers, bucket.name), contentType: facet.contentType }));
         });
         return out;
     }
@@ -66,7 +56,7 @@ class FacetTools {
         const facet = facetMembers.find((facet) => (facet.attributeName === attribute));
         if (!facet)
             throw `Unknown facet attribute ${attribute}`;
-        return { chartType: facet.chartType, chartConfig: facet.chartConfig, title: facet.title };
+        return facet;
     }
     static getFacetFiltersFromName(facetMembers, attribute) {
         const facet = facetMembers.find((facet) => (facet.attributeName === attribute));
@@ -94,9 +84,11 @@ class FacetTools {
     }
 }
 exports.FacetTools = FacetTools;
-function applyChartConfigToData(data, chartConfig) {
-    if (chartConfig === null || chartConfig === void 0 ? void 0 : chartConfig.mergeDomainMaxValue)
-        return mergeDomainMaxValue(data, chartConfig.mergeDomainMaxValue);
+function applyChartConfigToData(data, facetConfig) {
+    if (facetConfig === null || facetConfig === void 0 ? void 0 : facetConfig.mergeDomainMaxValue)
+        return mergeDomainMaxValue(data, facetConfig.mergeDomainMaxValue);
+    if (facetConfig === null || facetConfig === void 0 ? void 0 : facetConfig.facetTransform)
+        return facetConfig.facetTransform(data);
     return data;
 }
 function mergeDomainMaxValue(data, domMaxValue) {

package/lib/commonjs/RcsbUtils/Groups/GroupPropertiesProvider.d.ts

@@ -1,6 +1,6 @@
-import { EntryPropertyIntreface } from "../../RcsbCollectTools/DataCollectors/MultipleEntryPropertyCollector";
+import { EntryPropertyInterface } from "../../RcsbCollectTools/DataCollectors/MultipleEntryPropertyCollector";
 export interface GroupPropertiesProviderInterface {
-    entryProperties: Array<EntryPropertyIntreface>;
+    entryProperties: Array<EntryPropertyInterface>;
 }
 interface ItemPropertyInterface {
     objectId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcsb/rcsb-saguaro-app",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "RCSB 1D Saguaro Web App",
   "main": "build/app.js",
   "files": [