visualizer-on-tabs 1.0.2 → 2.0.1

package/README.md

@@ -16,6 +16,15 @@ Example: https://github.com/cheminfo/cheminfo-server-setup/blob/master/doc/on-ta
 const config = {
   // Title of the single page app
   title: 'My app',
+  // Roc login configuration. Don't set or set to false to disable login
+  rocLogin: {
+    // URL of the rest-on-couch server
+    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: {
     Home: {
@@ -42,15 +51,17 @@ const config = {
   // lead to layout issues. Especially in Firefox.
   // When false, only the selected tab is loaded.
   loadHidden: false,
-  // The visualizer configuration object that will be passed to each visualizer instance
-  visualizerConfig: undefined,
-  // The version of the visualizer to load. By default it 'auto', which uses
-  // the version stored in the loaded view.
-  visualizerVersion: 'auto',
-  // Options passed to `makeVisualizerPage`, see https://github.com/cheminfo/react-visualizer
-  // Respectively `fallbackVersion` and `cdn`.
-  visualizerFallbackVersion: undefined,
-  visualizerCDN: undefined,
+
+  // Options passed to makeVisualizerPage
+  // See https://github.com/cheminfo/react-visualizer
+  visualizer: {
+    loadversion: 'exact',
+    fallbackVersion: 'latest',
+    cdn: 'https://www.lactame.com/visualizer',
+    // 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/bin/build.js

@@ -5,12 +5,17 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
-
-import minimist from 'minimist';
+import { parseArgs } from 'node:util';
 
 import build from '../main/index.js';
 
-const argv = minimist(process.argv.slice(2));
+const { values: argv } = parseArgs({
+  options: {
+    outDir: { type: 'string', short: 'o' },
+    dev: { type: 'boolean', short: 'D' },
+    config: { type: 'string', short: 'c' },
+  },
+});
 
 if (!argv.outDir) {
   console.log(`CLI args:

package/main/index.js

@@ -102,7 +102,7 @@ export default async (options) => {
   await copyBootstrap(options);
   await copyContent(options);
   await Promise.all([
-    fs.writeFile(confPath, JSON.stringify(options.config)),
+    fs.writeFile(confPath, JSON.stringify(options.config ?? {})),
     addIndex(options),
     addVisualizer(options),
   ]);
@@ -156,13 +156,16 @@ async function addIndex(options) {
 }
 
 function addVisualizer(options) {
+  const customScripts = options.config.visualizer?.scripts || [];
   const page = visualizer.makeVisualizerPage({
-    cdn: options.config.visualizerCDN,
-    fallbackVersion: options.config.visualizerFallbackVersion,
+    // By default we choose the safest option
+    loadversion: 'exact',
+    ...options.config.visualizer,
     scripts: [
       {
         url: iframeBridge,
       },
+      ...customScripts,
     ],
   });
   return fs.writeFile(path.join(options.outDir, 'visualizer.html'), page);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "visualizer-on-tabs",
-  "version": "1.0.2",
+  "version": "2.0.1",
   "description": "visualizer-on-tabs webpack builder",
   "type": "module",
   "exports": {
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "npx --no-install visualizer-on-tabs --config=./dev.json --outDir=./out",
-    "build:dev": "npx --no-install visualizer-on-tabs --dev=1 --config=./dev.json --outDir=./out",
+    "build:dev": "npx --no-install visualizer-on-tabs --dev --config=./dev.json --outDir=./out",
     "clean": "rimraf out",
     "eslint": "eslint bin main src",
     "prettier": "prettier --check ./",
@@ -36,18 +36,17 @@
     "iframe-bridge": "^3.0.2",
     "lockr": "^0.8.5",
     "lodash": "^4.17.23",
-    "minimist": "^1.2.8",
     "react": "^18.3.1",
     "react-bootstrap": "^3.0.0-beta.3",
     "react-dom": "^18.3.1",
-    "react-visualizer": "^3.0.1",
-    "webpack": "^5.105.1"
+    "react-visualizer": "^5.3.0",
+    "webpack": "^5.105.2"
   },
   "devDependencies": {
     "eslint": "^9.39.2",
     "eslint-config-zakodium": "^19.1.0",
     "prettier": "^3.8.1",
-    "rimraf": "^6.1.2"
+    "rimraf": "^6.1.3"
   },
   "volta": {
     "node": "24.7.0"

package/src/components/App.js

@@ -323,10 +323,6 @@ class App extends React.Component {
             <Visualizer
               url="visualizer.html"
               viewURL={view.rewrittenUrl || view.url}
-              version={
-                this.visualizerVersion || config.visualizerVersion || 'auto'
-              }
-              config={config.visualizerConfig}
               style={iframeStyle}
             />
           );

package/src/components/Login.js

@@ -14,13 +14,9 @@ class Login extends React.Component {
     this.logout = this.logout.bind(this);
     if (!config.rocLogin) return;
 
-    if (config.rocLogin.urlAbsolute) {
-      this.loginUrl = config.rocLogin.urlAbsolute;
-    } else {
-      this.loginUrl = `${config.rocLogin.url}/auth/login?continue=${encodeURIComponent(
-        config.rocLogin.redirect || window.location.href,
-      )}`;
-    }
+    this.loginUrl = `${config.rocLogin.url}/auth/login?continue=${encodeURIComponent(
+      config.rocLogin.redirect || window.location.href,
+    )}`;
   }
 
   componentDidMount() {
@@ -28,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/config/config.js

@@ -1,7 +1,13 @@
-import defaultConfig from './default.js';
+import defaultVisualizerConfig from './visualizer.js';
 
 export function getConfig(customConfig) {
-  const config = { ...defaultConfig, ...customConfig };
+  const config = {
+    ...customConfig,
+    visualizer: {
+      ...defaultVisualizerConfig,
+      ...customConfig?.visualizer,
+    },
+  };
   if (config.rocLogin && config.rocLogin.url) {
     // Remove trailing slash
     config.rocLogin.url = config.rocLogin.url.replace(/\/$/, '');

package/src/config/{default.js → visualizer.js}

@@ -1,5 +1,5 @@
 export default {
-  visualizerConfig: {
+  config: {
     debugLevel: 0,
     filters: [],
     modules: {

package/src/main/visualizerConfig.js

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