Merge branch 'master' of github.com:ottomatica/docable-notebooks into…

… master
ottomatica · Sep 18, 2020 · cae2ad6 · cae2ad6
2 parents 5f62584 + 2939deb
commit cae2ad6
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,7 @@ Your Docable Notebooks can be interacted with at http://localhost:3000.
 #### Install help
 
 * If you have problems with `gyp` on MacOs, [see this simple guide](https://medium.com/flawless-app-stories/gyp-no-xcode-or-clt-version-detected-macos-catalina-anansewaa-38b536389e8d) for setting up/reinstalling CommandLineTools.
+* If updating existing repository, make sure to run `npm update && npm install` to get updates from modules.
 
 ## Advanced Features
 

diff --git a/docs/examples/advanced/runbooks/deploy-hosted-notebooks.md b/docs/examples/advanced/runbooks/deploy-hosted-notebooks.md
@@ -1,9 +1,4 @@
-<!--
-setup:
-    ssh: 
-        host: user@ip
-        privateKey: ~/.ssh/id_rsa
--->
+
 
 
 # Deploy Docable Notebooks (Ubuntu)

diff --git a/docs/examples/advanced/runbooks/install-letsencrypt-ssl.md b/docs/examples/advanced/runbooks/install-letsencrypt-ssl.md
@@ -1,9 +1,3 @@
-<!--
-setup:
-    ssh: 
-        host: user@ip
-        privateKey: ~/.ssh/id_rsa
--->
 
 # Install Let's encrypt SSL for a nginx webserver
 

diff --git a/docs/examples/advanced/runbooks/ottomatica/www.md b/docs/examples/advanced/runbooks/ottomatica/www.md
@@ -144,7 +144,7 @@ server {
       proxy_pass          http://127.0.0.1:3333;
       proxy_read_timeout  90;
 
-      proxy_redirect      http://127.0.0.1:3333 https://services.ottomatica.com;
+      proxy_redirect      http://127.0.0.1:3333 https://services.ottomatica.io;
     }
 }
 ```

diff --git a/index.js b/index.js
@@ -1,3 +1,4 @@
+#! /usr/bin/env node
 const path = require("path");
 
 const yargs = require('yargs');
@@ -42,6 +43,8 @@ const notebookSlug = require('./lib/notebook/slug');
 
 const app = express();
 
+const isHosted = process.env.prod ? true: false;
+
 app.use(session({
     secret: "Shh, its a secret!",
     resave: true,
@@ -94,7 +97,7 @@ if (process.env.NODE_ENV == 'dev') {
             user.gravatar = `https://www.gravatar.com/avatar/${hash}`;
         }
 
-        res.render("home", { github_imports, notebook_tree, user });
+        res.render("home", { github_imports, notebook_tree, user, isHosted });
     });
 
     app.get('/variables', workspace_routes.variables);

diff --git a/lib/notebook/render.js b/lib/notebook/render.js
@@ -9,6 +9,8 @@ const policy = require('./policy');
 
 var uuid = require('uuid');
 
+const isHosted = process.env.prod ? true: false;
+
 class NotebookRender
 {
     async notebookRender(session, rootDir, md, ir) {
@@ -113,15 +115,19 @@ class NotebookRender
         // cell is parent to overlay
         overlay.wrap(cell);
 
-        // add buttons
-        let more_btn = 
-        `<button class="docable-overlay-btn-reveal btn-more">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 560 560" id="more-icon-560" aria-hidden="true" class="option-menu">
-        <path d="M350 280c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70m0-210c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70m0 420c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70"></path>
-        </svg>
-        </button>
-        `;
-        overlay.append(more_btn);
+        if( !isHosted )
+        {
+
+            // add buttons
+            let more_btn = 
+            `<button class="docable-overlay-btn-reveal btn-more">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 560 560" id="more-icon-560" aria-hidden="true" class="option-menu">
+            <path d="M350 280c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70m0-210c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70m0 420c0 38.634-31.366 70-70 70s-70-31.366-70-70 31.366-70 70-70 70 31.366 70 70"></path>
+            </svg>
+            </button>
+            `;
+            overlay.append(more_btn);
+        }
 
         if( executable )
         {

diff --git a/lib/routes/workspace.js b/lib/routes/workspace.js
@@ -13,6 +13,7 @@ const { setNonEnumerableProperties } = require('got/dist/source');
 
 let {logger, notebook_dir, configPath, config, githubImportsDir} = env.vars();
 
+const isHosted = process.env.prod ? true: false;
 
 exports.get_notebook = async function (req, res) {
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "description": "Notebooks for CM and DevOps",
   "main": "index.js",
+  "bin": "index.js",
   "scripts": {
     "dev": "cross-env LOG_LEVEL=debug NODE_ENV=dev nodemon ./index.js --notebook_dir docs/examples/ | pino-pretty",
     "prod": "cross-env LOG_LEVEL=debug NODE_ENV=prod pm2 start ./index.js -- --notebook_dir docs/examples/ ",

diff --git a/public/js/notebook.js b/public/js/notebook.js
@@ -111,7 +111,7 @@ function run(endPoint, body, stepIndex)
                 }
             }
             else {
-                output.append(`<span>${data}</span>\n`);
+                output.append(`<span>${data}</span>`);
             }
 
         });
@@ -268,35 +268,38 @@ const EditForm = ({stepIndex}) =>
 </div>
 `;
 
-// We use the parent, with child selector because if cells are dynamically updated, then they will not be registered.
-$('main').on('click', '.btn-more', function () {
-    let stepIndex = $('pre[data-docable="true"]').index($(this).siblings('pre[data-docable="true"]'));
-    let cell = $('[data-docable="true"]').eq(stepIndex);
+if( !isHosted )
+{
+    // We use the parent, with child selector because if cells are dynamically updated, then they will not be registered.
+    $('main').on('click', '.btn-more', function () {
+        let stepIndex = $('pre[data-docable="true"]').index($(this).siblings('pre[data-docable="true"]'));
+        let cell = $('[data-docable="true"]').eq(stepIndex);
 
-    let cell_overlay = $(this).parent();
-    $(cell_overlay).hide();
+        let cell_overlay = $(this).parent();
+        $(cell_overlay).hide();
 
-    cell_overlay.parent().append( EditForm({stepIndex}) );
+        cell_overlay.parent().append( EditForm({stepIndex}) );
 
-    $('#btn-cancel-cell').on('click', function () {
-        $("#update-cell-form").remove();
-        $(cell_overlay).show();
-    });
+        $('#btn-cancel-cell').on('click', function () {
+            $("#update-cell-form").remove();
+            $(cell_overlay).show();
+        });
 
-    $('#btn-update-cell').on('click', function () {
-        editCell($(`textarea[id="docable-edit-area-${stepIndex}"`).val())
-        .then(data => {
-            let cell = $('[data-docable="true"]').eq(stepIndex);
-            cell.parent().parent().replaceWith( data );
+        $('#btn-update-cell').on('click', function () {
+            editCell($(`textarea[id="docable-edit-area-${stepIndex}"`).val())
+            .then(data => {
+                let cell = $('[data-docable="true"]').eq(stepIndex);
+                cell.parent().parent().replaceWith( data );
+            });
         });
-    });
 
-    viewCell($(cell)[0].outerHTML, stepIndex)
-    .then(data => {
-        console.log(data);
-        $(`#docable-edit-area-${stepIndex}`).val(data.cell);
+        viewCell($(cell)[0].outerHTML, stepIndex)
+        .then(data => {
+            console.log(data);
+            $(`#docable-edit-area-${stepIndex}`).val(data.cell);
+        });
     });
-});
+}
 
 // new ClipboardJS('.copy-btn', {
 //     text: function (trigger) {

diff --git a/views/home.ejs b/views/home.ejs
@@ -144,6 +144,7 @@
         <h2>📓 Your Notebooks</h2>
 
         <div class="tree-actions">
+            <% if (!locals.isHosted) { %>
             <button id="btn-openFolder" type="button" data-toggle="tooltip" data-placement="right" class="btn btn-outline-dark py-0" title="Open Folder in System">
                 <i class="far fa-folder-open"></i>
             </button>
@@ -153,6 +154,7 @@
                     <path class="icon-path" d="m218.62 29.953-105.41 96.92-58.909-44.403l-24.346 14.17 58.068 53.359-58.068 53.359 24.346 14.212 58.909-44.402 105.41 96.878 51.424-24.976v-190.14zm0 63.744v112.6l-74.719-56.302z" fill="#000" stroke-width="17.15"/>
                 </svg>                
             </button>
+            <% } %>
         </div>
 
         <div id="tree"></div>
@@ -216,6 +218,8 @@
                 //     }
                 // });
 
+                <% if (!locals.isHosted) { %>
+
                 $('#btn-openFolder').click(function()
                 {
                     var tree = $.ui.fancytree.getTree("#tree");
@@ -241,6 +245,7 @@
                     openEditor(dir);
                     
                 });
+                <% } %>
 
             });
 

diff --git a/views/notebook.ejs b/views/notebook.ejs
@@ -64,10 +64,14 @@
                 <%- include('templates/environment'); -%>
             <% } %>
 
+            <!-- Turn off whole notebook execution when hosted -->
+            <% if (!locals.isHosted) { %>
             <button type="button" class="ml-auto btn btn-outline-success" id="submit">
                 <span class="" role="status" id="submit-button" aria-hidden="true"></span>
                 Run Notebook
             </button>
+            <% } %>
+
         </nav>
     </header>
 
@@ -88,8 +92,10 @@
             <%- notebookHtml %>
         </div>
 
-        <!--- style customization not supported by css -->
+        <!--- init and style customization not supported by css -->
         <script>
+            var isHosted = locals.isHosted;
+
             $("[data-type='command'][data-spawn='true']")
                 .parents('.docable-cell').children('.sideAnnotation').append('🖥️ ');
             $("[data-type='script'][data-lang='js']")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@ const { setNonEnumerableProperties } = require('got/dist/source');

		let {logger, notebook_dir, configPath, config, githubImportsDir} = env.vars();

		const isHosted = process.env.prod ? true: false;

		exports.get_notebook = async function (req, res) {

Expand Down