bioinsilico 2 rokov pred
rodič
commit
208f02b355

+ 52 - 18
package-lock.json

@@ -1,24 +1,26 @@
 {
   "name": "@rcsb/rcsb-saguaro-3d",
-  "version": "1.5.0-models.7",
+  "version": "2.0.0-models.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@rcsb/rcsb-saguaro-3d",
-      "version": "1.5.0-models.7",
+      "version": "2.0.0-models.7",
       "license": "MIT",
       "dependencies": {
-        "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
+        "@rcsb/rcsb-api-tools": "^4.1.0-models.3",
         "@rcsb/rcsb-molstar": "^2.5.5",
         "@rcsb/rcsb-saguaro": "^2.2.6",
-        "@rcsb/rcsb-saguaro-app": "^4.4.0-models.42",
+        "@rcsb/rcsb-saguaro-app": "^4.4.0-models.43",
         "molstar": "^3.13.0"
       },
       "devDependencies": {
         "@babel/core": "^7.18.10",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
         "@babel/preset-env": "^7.18.10",
+        "@types/d3-selection": "^3.0.3",
+        "@types/d3-zoom": "^3.0.1",
         "@types/react": "^18.0.15",
         "@types/react-dom": "^18.0.6",
         "@types/uniqid": "^5.3.2",
@@ -2464,9 +2466,9 @@
       }
     },
     "node_modules/@rcsb/rcsb-api-tools": {
-      "version": "4.1.0-models.1",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-api-tools/-/rcsb-api-tools-4.1.0-models.1.tgz",
-      "integrity": "sha512-pC4ytlB6wzOCbjAiryM4KL7UqFFFye3jSO886TdIIg2215aZhLq+lpAjGHcduYt9ahkKCrqvXkK9oosRCkbJNw==",
+      "version": "4.1.0-models.3",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-api-tools/-/rcsb-api-tools-4.1.0-models.3.tgz",
+      "integrity": "sha512-a424VV47Nh9CNH/xMy0sZJQMmanvR1jxQgGFoIn5W5dpZh3QSoAnhdiwvn5icqWehH12mrFwrmdFjxHMTAIHQw==",
       "dependencies": {
         "@graphql-codegen/cli": "^2.6.2",
         "graphql": "^15.8.0",
@@ -2504,11 +2506,11 @@
       }
     },
     "node_modules/@rcsb/rcsb-saguaro-app": {
-      "version": "4.4.0-models.42",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.42.tgz",
-      "integrity": "sha512-t4UWULBX5kS0ptzulnp9AmZO7hxTfbJdRXhJ+ct99TYWLmNr9xAl6ehCLRoqqChUSR+cyn476ST9E8cjh6nsSA==",
+      "version": "4.4.0-models.43",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.43.tgz",
+      "integrity": "sha512-GKzXa6XbRPOliQj4ldNvvo5ojRyItVvbnRGSnDWjDtqP0gTNmmSmFDMFCLYwfW8WkmFt/S3bHWUVartfQMh2KA==",
       "dependencies": {
-        "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
+        "@rcsb/rcsb-api-tools": "^4.1.0-models.3",
         "@rcsb/rcsb-saguaro": "^2.2.6",
         "react-select": "^5.4.0",
         "rxjs": "^7.5.5",
@@ -2633,6 +2635,12 @@
         "@types/d3-time": "*"
       }
     },
+    "node_modules/@types/d3-selection": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.3.tgz",
+      "integrity": "sha512-Mw5cf6nlW1MlefpD9zrshZ+DAWL4IQ5LnWfRheW6xwsdaWOb6IRRu2H7XPAQcyXEx1D7XQWgdoKR83ui1/HlEA==",
+      "dev": true
+    },
     "node_modules/@types/d3-shape": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.0.tgz",
@@ -2651,6 +2659,16 @@
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
       "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
     },
+    "node_modules/@types/d3-zoom": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.1.tgz",
+      "integrity": "sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
     "node_modules/@types/eslint": {
       "version": "8.4.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
@@ -14011,9 +14029,9 @@
       }
     },
     "@rcsb/rcsb-api-tools": {
-      "version": "4.1.0-models.1",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-api-tools/-/rcsb-api-tools-4.1.0-models.1.tgz",
-      "integrity": "sha512-pC4ytlB6wzOCbjAiryM4KL7UqFFFye3jSO886TdIIg2215aZhLq+lpAjGHcduYt9ahkKCrqvXkK9oosRCkbJNw==",
+      "version": "4.1.0-models.3",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-api-tools/-/rcsb-api-tools-4.1.0-models.3.tgz",
+      "integrity": "sha512-a424VV47Nh9CNH/xMy0sZJQMmanvR1jxQgGFoIn5W5dpZh3QSoAnhdiwvn5icqWehH12mrFwrmdFjxHMTAIHQw==",
       "requires": {
         "@graphql-codegen/cli": "^2.6.2",
         "graphql": "^15.8.0",
@@ -14051,11 +14069,11 @@
       }
     },
     "@rcsb/rcsb-saguaro-app": {
-      "version": "4.4.0-models.42",
-      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.42.tgz",
-      "integrity": "sha512-t4UWULBX5kS0ptzulnp9AmZO7hxTfbJdRXhJ+ct99TYWLmNr9xAl6ehCLRoqqChUSR+cyn476ST9E8cjh6nsSA==",
+      "version": "4.4.0-models.43",
+      "resolved": "https://registry.npmjs.org/@rcsb/rcsb-saguaro-app/-/rcsb-saguaro-app-4.4.0-models.43.tgz",
+      "integrity": "sha512-GKzXa6XbRPOliQj4ldNvvo5ojRyItVvbnRGSnDWjDtqP0gTNmmSmFDMFCLYwfW8WkmFt/S3bHWUVartfQMh2KA==",
       "requires": {
-        "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
+        "@rcsb/rcsb-api-tools": "^4.1.0-models.3",
         "@rcsb/rcsb-saguaro": "^2.2.6",
         "react-select": "^5.4.0",
         "rxjs": "^7.5.5",
@@ -14177,6 +14195,12 @@
         "@types/d3-time": "*"
       }
     },
+    "@types/d3-selection": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.3.tgz",
+      "integrity": "sha512-Mw5cf6nlW1MlefpD9zrshZ+DAWL4IQ5LnWfRheW6xwsdaWOb6IRRu2H7XPAQcyXEx1D7XQWgdoKR83ui1/HlEA==",
+      "dev": true
+    },
     "@types/d3-shape": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.0.tgz",
@@ -14195,6 +14219,16 @@
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
       "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
     },
+    "@types/d3-zoom": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.1.tgz",
+      "integrity": "sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==",
+      "dev": true,
+      "requires": {
+        "@types/d3-interpolate": "*",
+        "@types/d3-selection": "*"
+      }
+    },
     "@types/eslint": {
       "version": "8.4.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",

+ 5 - 3
package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rcsb/rcsb-saguaro-3d",
-  "version": "2.0.0-models.7",
+  "version": "2.0.0-models.8",
   "description": "RCSB Molstar/Saguaro Web App",
   "main": "build/dist/app.js",
   "files": [
@@ -45,6 +45,8 @@
     "@babel/core": "^7.18.10",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.18.10",
+    "@types/d3-selection": "^3.0.3",
+    "@types/d3-zoom": "^3.0.1",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "@types/uniqid": "^5.3.2",
@@ -78,10 +80,10 @@
     "webpack-dev-server": "^4.9.3"
   },
   "dependencies": {
-    "@rcsb/rcsb-api-tools": "^4.1.0-models.1",
+    "@rcsb/rcsb-api-tools": "^4.1.0-models.3",
     "@rcsb/rcsb-molstar": "^2.5.5",
     "@rcsb/rcsb-saguaro": "^2.2.6",
-    "@rcsb/rcsb-saguaro-app": "^4.4.0-models.42",
+    "@rcsb/rcsb-saguaro-app": "^4.4.0-models.43",
     "molstar": "^3.13.0"
   },
   "bugs": {

+ 4 - 3
src/RcsbFvSequence/SequenceViews/RcsbView/PfvManagerFactoryImplementation/UniprotPfvManagerFactory/UniprotRowMarkComponent.tsx

@@ -4,7 +4,7 @@
 */
 
 import React from "react";
-import classes from './scss/UniprotPfvStyle.module.scss';
+//import classes from './scss/UniprotPfvStyle.module.scss';
 import {Property} from "csstype";
 import {asyncScheduler} from "rxjs";
 
@@ -30,13 +30,14 @@ export class UniprotRowMarkComponent extends React.Component <UniprotRowMarkInte
     }
 
     public render(): JSX.Element {
-        return (
+        return (<></>);
+        /*return (
             <>
                 <div onClick={this.click.bind(this)} onMouseOver={this.hover.bind(this)} style={{visibility: this.state.visibility, cursor:"pointer", display:"inline-block", width:6, height:6, marginBottom: 4, marginRight:5}} >
                     <div className={classes.uniprotRowMark} style={{borderLeftColor: this.props.isGlowing ? this.HOVER_COLOR : (this.state.borderLeftColor)}}/>
                 </div>
             </>
-        );
+        );*/
     }
 
     private click(): void {