visualizer-on-tabs 2.0.0 → 2.0.2

package/README.md

@@ -22,6 +22,8 @@ const config = {
     url: 'https://demo.scipeaks.com/roc',
     // Redirect after login
     redirect: 'https://demo.scipeaks.com/',
+    // If true, automatically redirects to the login page if not logged in
+    auto: true,
   },
   // List of default views to load
   possibleViews: {
@@ -50,20 +52,16 @@ const config = {
   // When false, only the selected tab is loaded.
   loadHidden: false,
 
-  // Options related to https://github.com/cheminfo/react-visualizer
+  // Options passed to makeVisualizerPage
+  // See https://github.com/cheminfo/react-visualizer
   visualizer: {
-    /**
-     * Options to generate the visualizer html page
-     */
     loadversion: 'exact',
+    queryType: 'query', // 'fragment' or 'query'
     fallbackVersion: 'latest',
     cdn: 'https://www.lactame.com/visualizer',
-
-    /*
-     * Props passed to the visualizer component
-     */
-    // Visualizer config.json
-    config: undefined,
+    // Can be a URL string or an object
+    // Example of config object: https://github.com/NPellet/visualizer/blob/master/src/usr/config/default.json
+    config: '',
   },
 };
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "visualizer-on-tabs",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "visualizer-on-tabs webpack builder",
   "type": "module",
   "exports": {
@@ -39,7 +39,7 @@
     "react": "^18.3.1",
     "react-bootstrap": "^3.0.0-beta.3",
     "react-dom": "^18.3.1",
-    "react-visualizer": "^5.0.0",
+    "react-visualizer": "^5.4.0",
     "webpack": "^5.105.2"
   },
   "devDependencies": {

package/src/components/App.js

@@ -323,7 +323,8 @@ class App extends React.Component {
             <Visualizer
               url="visualizer.html"
               viewURL={view.rewrittenUrl || view.url}
-              config={config.visualizer.config}
+              // The query type passed here should be the same as the one passed to makeVisualizerPage
+              queryType={config.visualizer?.queryType}
               style={iframeStyle}
             />
           );

package/src/components/Login.js

@@ -24,16 +24,17 @@ class Login extends React.Component {
   }
 
   async session() {
-    if (!this.props.config.rocLogin) return;
-    const login = this.props.config.rocLogin;
-    const response = await fetch(`${login.url}/auth/session`, {
+    const rocLogin = this.props.config.rocLogin;
+    if (!rocLogin) return;
+    const response = await fetch(`${rocLogin.url}/auth/session`, {
       credentials: 'include',
     });
     if (response.ok) {
       const body = await response.json();
       if (
-        login.auto &&
-        (!body.authenticated || (login.user && body.username !== login.user))
+        rocLogin.auto &&
+        (!body.authenticated ||
+          (rocLogin.user && body.username !== rocLogin.user))
       ) {
         window.location.href = this.loginUrl;
       }

package/src/main/visualizerConfig.js

@@ -1,7 +0,0 @@
-const config = '../config.json';
-
-const defaultConfig = {};
-
-export function getConfig() {
-  return config.visualizerConfig || defaultConfig;
-}