From ac1d0a0b7f5b765c62beb4e87c5963726d2bdcc4 Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Tue, 24 Apr 2018 09:13:58 -0500 Subject: [PATCH] Updated webgme-easydag dependency and Icons/ path. Fixes #1105 --- config/config.webgme.js | 27 ++++++++++++++++--- src/common/viz/Buttons.js | 2 +- .../OperationInterfaceEditor/Buttons.js | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/config/config.webgme.js b/config/config.webgme.js index 340a3ffb2..63155ee3c 100644 --- a/config/config.webgme.js +++ b/config/config.webgme.js @@ -32,9 +32,21 @@ config.visualization.panelPaths.push(__dirname + '/../node_modules/webgme-easyda config.visualization.panelPaths.push(__dirname + '/../src/visualizers/panels'); -config.rest.components['execution/logs'] = __dirname + '/../src/routers/JobLogsAPI/JobLogsAPI.js'; -config.rest.components['job/origins'] = __dirname + '/../src/routers/JobOriginAPI/JobOriginAPI.js'; -config.rest.components['execution/pulse'] = __dirname + '/../src/routers/ExecPulse/ExecPulse.js'; +config.rest.components['JobLogsAPI'] = { + src: __dirname + '/../src/routers/JobLogsAPI/JobLogsAPI.js', + mount: 'execution/logs', + options: {} +}; +config.rest.components['JobOriginAPI'] = { + src: __dirname + '/../src/routers/JobOriginAPI/JobOriginAPI.js', + mount: 'job/origins', + options: {} +}; +config.rest.components['ExecPulse'] = { + src: __dirname + '/../src/routers/ExecPulse/ExecPulse.js', + mount: 'execution/pulse', + options: {} +}; // Visualizer descriptors config.visualization.visualizerDescriptors.push(__dirname + '/../src/visualizers/Visualizers.json'); @@ -56,7 +68,14 @@ config.requirejsPaths = { 'panels/BreadcrumbHeader': './node_modules/webgme-breadcrumbheader/src/visualizers/panels/BreadcrumbHeader', 'widgets/BreadcrumbHeader': './node_modules/webgme-breadcrumbheader/', 'panels/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/panels/FloatingActionButton', - 'widgets/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/widgets/FloatingActionButton' + 'widgets/FloatingActionButton': './node_modules/webgme-fab/src/visualizers/widgets/FloatingActionButton', + 'webgme-simple-nodes': './node_modules/webgme-simple-nodes/src/common', + 'webgme-chflayout': './node_modules/webgme-chflayout/src/common', + 'webgme-fab': './node_modules/webgme-fab/src/common', + 'webgme-breadcrumbheader': './node_modules/webgme-breadcrumbheader/src/common', + 'webgme-autoviz': './node_modules/webgme-autoviz/src/common', + 'webgme-easydag': './node_modules/webgme-easydag/src/common', + 'deepforge': './src/common' }; config.visualization.layout.default = 'SidebarLayout'; diff --git a/src/common/viz/Buttons.js b/src/common/viz/Buttons.js index 96550743d..87853dec0 100644 --- a/src/common/viz/Buttons.js +++ b/src/common/viz/Buttons.js @@ -2,7 +2,7 @@ define([ 'deepforge/globals', 'widgets/EasyDAG/Buttons', - 'widgets/EasyDAG/Icons' + 'webgme-easydag/Icons' ], function( DeepForge, EasyDAGButtons, diff --git a/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js b/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js index 8a9d842c1..3077960b5 100644 --- a/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js +++ b/src/visualizers/widgets/OperationInterfaceEditor/Buttons.js @@ -3,7 +3,7 @@ define([ 'deepforge/viz/Buttons', 'deepforge/Constants', 'widgets/EasyDAG/Buttons', - 'widgets/EasyDAG/Icons', + 'webgme-easydag/Icons', 'underscore', './lib/spectrum.min' ], function(