Completed plot integration

Author: enicolasgomez

webapp/constants.js

@@ -404,6 +404,7 @@ export const PLOT_WIDGETS = {
     config: {
       id: 'plotDipole',
       name: 'Dipole plot',
+      uri: 'downloads?uri=workspace/model_output_dipole.png',
       method: {
         plotKey: 'plotDipole',
         plotMethod: 'plotDipole',
@@ -431,6 +432,7 @@ export const PLOT_WIDGETS = {
     config: {
       id: 'plotEEG',
       name: 'EEG plot',
+      uri: 'downloads?uri=workspace/model_output_EEG.png',
       method: {
         plotKey: 'plotEEG',
         plotMethod: 'plotEEG',

webapp/redux/middleware/plotMiddleware.js

@@ -11,6 +11,7 @@ import {
   SET_THEME,
   CREATE_NETWORK,
 } from '../actions/general';
+import { hideSpinner, showSpinner } from '@metacell/geppetto-meta-client/common/actions/actions';
 
 // A simple cache for plots coming from the backend.
 // This is a temporary solution until we have a proper strategy to store the plot data in redux
@@ -27,7 +28,7 @@ const setPlotToWindow = (plotId, data) => {
   window.plotCache[plotId] = data;
 };
 
-const plotFigure = async (plotId, plotMethod, plotType = false, theme) => {
+const plotFigure = async (plotId, plotMethod, plotType = false, uri = null, theme) => {
   try {
     let response = await Promise.race([
       Utils.evalPythonMessage(NETPYNE_COMMANDS.plotFigure, [plotMethod, plotType, theme], false),
@@ -38,7 +39,7 @@ const plotFigure = async (plotId, plotMethod, plotType = false, theme) => {
       })]);
 
     console.log('Plot response received for', plotId);
-    if (!response) {
+    if (!response && !uri) { //png plots return null response but they provide a uri so they can be grabbed from the workspace
       return null;
     }
 
@@ -63,6 +64,9 @@ const plotFigure = async (plotId, plotMethod, plotType = false, theme) => {
       }
       return htmlText;
     }
+    if ((plotMethod == 'plotDipole' || plotMethod == 'plotEEG' )) { //uri is available here
+      return (`<img src="${uri}"></img>`) ;
+    }
     if (response?.length !== undefined) {
       return response[0];
     }
@@ -93,13 +97,15 @@ const updatePlots = (next) => {
 export default (store) => (next) => (action) => {
   async function setWidget (widget) {
     const {
-      plotMethod,
-      plotType,
-    } = widget.config.method;
-    return plotFigure(widget.id, plotMethod, plotType, store.getState().general.theme)
+      method,
+      uri,
+    } = widget.config;
+    showSpinner("Loading plot...");
+    return plotFigure(widget.id, method.plotMethod, method.plotType, uri, store.getState().general.theme)
       .then((data) => {
         setPlotToWindow(widget.id, data);
         widget.initialized = true;
+        hideSpinner();
         if (data) {
           console.debug('Plot retrieved:', widget.id);
           return widget;

webapp/yarn.lock

@@ -1941,9 +1941,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.7.0:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
-  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2282,12 +2282,12 @@ babel-eslint@^10.0.1:
     resolve "^1.12.0"
 
 babel-loader@^8.0.6:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.4.tgz#95f5023c791b2e9e2ca6f67b0984f39c82ff384b"
+  integrity sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==
   dependencies:
     find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
+    loader-utils "^2.0.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
@@ -7093,6 +7093,15 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2
     emojis-list "^3.0.0"
     json5 "^1.0.1"
 
+loader-utils@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 localforage@^1.8.1:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
@@ -7522,7 +7531,7 @@ minimatch@^3.0.0, minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -7568,11 +7577,11 @@ mixin-deep@^1.2.0:
     is-extendable "^1.0.1"
 
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "^1.2.5"
+    minimist "^1.2.6"
 
 monotone-convex-hull-2d@^1.0.1:
   version "1.0.1"
@@ -10738,13 +10747,13 @@ triangulate-polyline@^1.0.0:
     cdt2d "^1.0.0"
 
 tsconfig-paths@^3.12.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976"
-  integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tslib@^1.10.0, tslib@^1.9.3: