updated molstar and data-service urls

package-lock.json

@@ -3397,9 +3397,9 @@
             "dev": true
         },
         "graphql": {
-            "version": "14.5.7",
-            "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz",
-            "integrity": "sha512-as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A==",
+            "version": "14.5.8",
+            "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz",
+            "integrity": "sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==",
             "dev": true,
             "requires": {
                 "iterall": "^1.2.2"
@@ -4441,9 +4441,9 @@
             }
         },
         "molstar": {
-            "version": "0.2.12",
-            "resolved": "https://registry.npmjs.org/molstar/-/molstar-0.2.12.tgz",
-            "integrity": "sha512-MProo9gKAPqK1wM+lwn0mGA/n88jS/UJoGnqNg+NNpmQ5qRfdwcKdia6fAjErTtRaWcUYQaZl6UMdWrGOzCqXA==",
+            "version": "0.2.13",
+            "resolved": "https://registry.npmjs.org/molstar/-/molstar-0.2.13.tgz",
+            "integrity": "sha512-8jIr+9zgEXbaej62FRNg9q/q6jEXboUH27aXOOcCugK50VSWcPX4JYFKPv1vWg8H1qIMnyZTp29coRAu+AxT9A==",
             "dev": true,
             "requires": {
                 "@types/argparse": "^1.0.36",
@@ -4471,31 +4471,6 @@
                 "xhr2": "^0.2.0"
             },
             "dependencies": {
-                "@types/node": {
-                    "version": "12.7.7",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.7.tgz",
-                    "integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w==",
-                    "dev": true
-                },
-                "@types/node-fetch": {
-                    "version": "2.5.2",
-                    "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.2.tgz",
-                    "integrity": "sha512-djYYKmdNRSBtL1x4CiE9UJb9yZhwtI1VC+UxZD0psNznrUj80ywsxKlEGAE+QL1qvLjPbfb24VosjkYM6W4RSQ==",
-                    "dev": true,
-                    "requires": {
-                        "@types/node": "*"
-                    }
-                },
-                "@types/react": {
-                    "version": "16.9.3",
-                    "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.3.tgz",
-                    "integrity": "sha512-Ogb2nSn+2qQv5opoCv7Ls5yFxtyrdUYxp5G+SWTrlGk7dmFKw331GiezCgEZj9U7QeXJi1CDtws9pdXU1zUL4g==",
-                    "dev": true,
-                    "requires": {
-                        "@types/prop-types": "*",
-                        "csstype": "^2.2.0"
-                    }
-                },
                 "rxjs": {
                     "version": "6.5.3",
                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",

package.json

@@ -40,7 +40,7 @@
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^4.2.0",
         "mini-css-extract-plugin": "^0.8.0",
-        "molstar": "^0.2.12",
+        "molstar": "^0.2.13",
         "node-fetch": "^2.6.0",
         "node-sass": "^4.12.0",
         "raw-loader": "^3.1.0",

src/structure-viewer/index.ts

@@ -26,16 +26,16 @@ import { StructureControlsHelper } from './ui/structure';
 require('./skin/rcsb.scss')
 
 export const DefaultStructureViewerProps = {
-    // volumeServerUrl: '//128.6.244.39/',
-    volumeServerUrl: 'https://ds.litemol.org/',
+    // volumeServerUrl: 'https://ds.litemol.org/',
+    volumeServerUrl: '//alpha-maps.rcsb.org/',
     modelUrlProvider: (pdbId: string) => {
         const id = pdbId.toLowerCase()
         return {
-            url: `https://files.rcsb.org/download/${id}.cif`,
-            format: 'cif' as SupportedFormats
-            // url: `https://alpha-models.rcsb.org/${id}.bcif`,
+            // url: `https://files.rcsb.org/download/${id}.cif`,
+            // format: 'cif' as SupportedFormats
+            url: `//alpha-models.rcsb.org/${id}.bcif`,
             // url: `https://alpha-models.rcsb.org/models/${id.substr(1, 2)}/${id}.bcif`,
-            // format: 'bcif' as SupportedFormats
+            format: 'bcif' as SupportedFormats
         }
     },
 }

src/structure-viewer/ui/general.tsx

@@ -17,9 +17,6 @@ const GeneralSettingsParams = {
     renderStyle: PD.Select('glossy', [['toon', 'Toon'], ['matte', 'Matte'], ['glossy', 'Glossy'], ['metallic', 'Metallic']], { description: 'Style in which the 3D scene is rendered' }),
     occlusion: PD.Boolean(false, { description: 'Darken occluded crevices with the ambient occlusion effect' }),
 }
-// TODO remove when updating molstar
-GeneralSettingsParams.spin.description = 'Spin the 3D scene around the x-axis in view space'
-GeneralSettingsParams.background.description = 'Background color of the 3D canvas'
 
 export class GeneralSettings<P> extends CollapsableControls<P> {
     setSettings = (p: { param: PD.Base<any>, name: string, value: any }) => {