@rcsb/rcsb-saguaro-app 6.0.2 → 6.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/build/app.js +1 -1
  2. package/build/constants.js +1 -1
  3. package/build/plot.js +1 -1
  4. package/lib/RcsbSeacrh/FacetStore/SingleFacets.js +19 -4
  5. package/lib/RcsbSeacrh/SearchQueryTools.js +1 -1
  6. package/lib/commonjs/RcsbSeacrh/FacetStore/SingleFacets.js +19 -4
  7. package/lib/commonjs/RcsbSeacrh/SearchQueryTools.js +1 -1
  8. package/package.json +2 -2
package/lib/RcsbSeacrh/FacetStore/SingleFacets.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { RcsbSearchMetadata } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata";
2
2
  import { AggregationType, Operator, Service, Type } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums";
3
3
  import { ChartType } from "@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface";
4
- import { SearchQueryTools as SQT } from "../SearchQueryTools";
4
+ import { buildAttributeQuery } from "@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools";
5
5
  export const EXPERIMENTAL_METHOD_FACET = {
6
6
  id: "method",
7
7
  title: "Experimental Method",
@@ -113,11 +113,26 @@ export const CHIMERIC_FACET = {
113
113
  },
114
114
  bucketClickSearchQuery: (datum, data, e) => {
115
115
  if (datum.x == "Wild Type")
116
- return SQT.searchAttributeQuery(CHIMERIC_FACET.attribute, 1, Operator.Equals, Service.Text);
116
+ return buildAttributeQuery({
117
+ attribute: CHIMERIC_FACET.attribute,
118
+ value: 1,
119
+ operator: Operator.Equals,
120
+ service: Service.Text
121
+ });
117
122
  else if (datum.x == "Synthetic")
118
- return SQT.searchAttributeQuery(CHIMERIC_FACET.attribute, 0, Operator.Equals, Service.Text);
123
+ return buildAttributeQuery({
124
+ attribute: CHIMERIC_FACET.attribute,
125
+ value: 0,
126
+ operator: Operator.Equals,
127
+ service: Service.Text
128
+ });
119
129
  else
120
- return SQT.searchAttributeQuery(CHIMERIC_FACET.attribute, 1, Operator.Greater, Service.Text);
130
+ return buildAttributeQuery({
131
+ attribute: CHIMERIC_FACET.attribute,
132
+ value: 1,
133
+ operator: Operator.Greater,
134
+ service: Service.Text
135
+ });
121
136
  }
122
137
  },
123
138
  facet: {
package/lib/RcsbSeacrh/SearchQueryTools.js CHANGED
@@ -2,10 +2,10 @@ import { LogicalOperator, RelevanceScoreRankingOption, ScoringStrategy, Service,
2
2
  import { RcsbSearchMetadata } from "@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata";
3
3
  import { cloneDeep } from 'lodash';
4
4
  import { GroupProvenanceId } from "@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums";
5
+ import { buildAttributeQuery, buildRequestFromCombinedSearchQuery, buildRequestFromSearchQuery } from "@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools";
5
6
  import { depositionGroupFacetStore } from "./FacetStore/DepositionGroupFacetStore";
6
7
  import { sequenceGroupFacetStore } from "./FacetStore/SequenceGroupFacetStore";
7
8
  import { uniprotGroupFacetStore } from "./FacetStore/UniprotGroupFacetStore";
8
- import { buildAttributeQuery, buildRequestFromCombinedSearchQuery, buildRequestFromSearchQuery } from "@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools";
9
9
  export var SearchQueryTools;
10
10
  (function (SearchQueryTools) {
11
11
  function searchGroupQuery(groupProvenance, groupId, service) {
package/lib/commonjs/RcsbSeacrh/FacetStore/SingleFacets.js CHANGED
@@ -4,7 +4,7 @@ exports.SearchFacets = exports.GO_COMPONENT_FACET = exports.GO_PROCESS_FACET = e
4
4
  const SearchMetadata_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata");
5
5
  const SearchEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchEnums");
6
6
  const ChartConfigInterface_1 = require("@rcsb/rcsb-charts/lib/RcsbChartComponent/ChartConfigInterface");
7
- const SearchQueryTools_1 = require("../SearchQueryTools");
7
+ const SearchQueryTools_1 = require("@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools");
8
8
  exports.EXPERIMENTAL_METHOD_FACET = {
9
9
  id: "method",
10
10
  title: "Experimental Method",
@@ -116,11 +116,26 @@ exports.CHIMERIC_FACET = {
116
116
  },
117
117
  bucketClickSearchQuery: (datum, data, e) => {
118
118
  if (datum.x == "Wild Type")
119
- return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 1, SearchEnums_1.Operator.Equals, SearchEnums_1.Service.Text);
119
+ return (0, SearchQueryTools_1.buildAttributeQuery)({
120
+ attribute: exports.CHIMERIC_FACET.attribute,
121
+ value: 1,
122
+ operator: SearchEnums_1.Operator.Equals,
123
+ service: SearchEnums_1.Service.Text
124
+ });
120
125
  else if (datum.x == "Synthetic")
121
- return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 0, SearchEnums_1.Operator.Equals, SearchEnums_1.Service.Text);
126
+ return (0, SearchQueryTools_1.buildAttributeQuery)({
127
+ attribute: exports.CHIMERIC_FACET.attribute,
128
+ value: 0,
129
+ operator: SearchEnums_1.Operator.Equals,
130
+ service: SearchEnums_1.Service.Text
131
+ });
122
132
  else
123
- return SearchQueryTools_1.SearchQueryTools.searchAttributeQuery(exports.CHIMERIC_FACET.attribute, 1, SearchEnums_1.Operator.Greater, SearchEnums_1.Service.Text);
133
+ return (0, SearchQueryTools_1.buildAttributeQuery)({
134
+ attribute: exports.CHIMERIC_FACET.attribute,
135
+ value: 1,
136
+ operator: SearchEnums_1.Operator.Greater,
137
+ service: SearchEnums_1.Service.Text
138
+ });
124
139
  }
125
140
  },
126
141
  facet: {
package/lib/commonjs/RcsbSeacrh/SearchQueryTools.js CHANGED
@@ -5,10 +5,10 @@ const SearchEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/Searc
5
5
  const SearchMetadata_1 = require("@rcsb/rcsb-api-tools/build/RcsbSearch/Types/SearchMetadata");
6
6
  const lodash_1 = require("lodash");
7
7
  const DwEnums_1 = require("@rcsb/rcsb-api-tools/build/RcsbDw/Types/DwEnums");
8
+ const SearchQueryTools_1 = require("@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools");
8
9
  const DepositionGroupFacetStore_1 = require("./FacetStore/DepositionGroupFacetStore");
9
10
  const SequenceGroupFacetStore_1 = require("./FacetStore/SequenceGroupFacetStore");
10
11
  const UniprotGroupFacetStore_1 = require("./FacetStore/UniprotGroupFacetStore");
11
- const SearchQueryTools_1 = require("@rcsb/rcsb-search-tools/lib/SearchQueryTools/SearchQueryTools");
12
12
  var SearchQueryTools;
13
13
  (function (SearchQueryTools) {
14
14
  function searchGroupQuery(groupProvenance, groupId, service) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rcsb/rcsb-saguaro-app",
3
- "version": "6.0.2",
3
+ "version": "6.0.4",
4
4
  "description": "RCSB 1D Saguaro Web App",
5
5
  "main": "build/app.js",
6
6
  "files": [
@@ -102,7 +102,7 @@
102
102
  },
103
103
  "peerDependencies": {
104
104
  "@rcsb/rcsb-api-tools": "^4.1.13",
105
- "@rcsb/rcsb-saguaro": "^3.0.3",
105
+ "@rcsb/rcsb-saguaro": "^3.0.4",
106
106
  "boxicons": "^2.1.0",
107
107
  "react": "^18.1.0",
108
108
  "react-dom": "^18.1.0"