From 1b21287892efc5c242abce5b07e9b0156abf19c9 Mon Sep 17 00:00:00 2001
From: mirkoperillo <mirko.perillo@gmail.com>
Date: Fri, 12 Apr 2019 06:53:58 +0200
Subject: [PATCH] fix #78

---
 src/index.html | 16 +++++++++++++++-
 src/js/app.js  | 21 +++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/index.html b/src/index.html
index 2628f83..401a8b8 100644
--- a/src/index.html
+++ b/src/index.html
@@ -83,9 +83,23 @@
           <div class="btn-group" role="group">
             <button type="button" class="btn btn-primary" data-bind="click: send">Send</button>
           </div>
+<!--
           <div class="btn-group" role="group">
             <button type="button" class="btn btn-primary" data-bind="click: saveBookmarkDialog">Save</button>
           </div>
+-->
+          <div class="btn-group">
+            <button type="button" class="btn btn-primary" aria-haspopup="true" aria-expanded="false" data-bind="click: saveBookmarkDialog">Save</button>
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+              <span class="caret"></span>
+              <span class="sr-only">Toggle Dropdown</span>
+            </button>
+            <ul class="dropdown-menu">
+              <li><a href="#" data-bind="click: saveAsBookmarkDialog">Save as</a></li>
+            </ul>
+          </div>
+          
+          
           <div class="btn-group" role="group">
             <button type="button" class="btn btn-primary" data-bind="click: reset">Reset</button>
           </div>
@@ -171,7 +185,7 @@
     </div>
     <div class="panel-body">
       <div class="form-group">
-        Name <input type="text" class="form-control" data-bind="value: bookmarkSelected.name"></input>
+        Name <input type="text" class="form-control" data-bind="value: bookmarkName"></input>
       </div>
       <div class="form-group">
         Folder <select class="form-control" data-bind="options: folders, optionsText: 'name', optionsValue: 'id', optionsCaption: 'None', value: folderSelected"></select>
diff --git a/src/js/app.js b/src/js/app.js
index c87b4a6..0f9149c 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -60,6 +60,7 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
       bookmarks: ko.observableArray(),
       folders: ko.observableArray(),
       folderSelected: ko.observable(),
+      bookmarkName: ko.observable(),
       methods: ko.observableArray(['GET','POST','PUT','DELETE','HEAD','OPTIONS','CONNECT','TRACE','PATCH']),
 
       // request panel flags
@@ -76,6 +77,8 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
       showContextDialog: ko.observable(false),
       showCreateContextDialog: ko.observable(false),
       showConfirmDialog: ko.observable(false),
+      
+      saveAsNewBookmark: ko.observable(false),
 
       dialogConfirmMessage: ko.observable(),
       contextName: ko.observable(),
@@ -235,7 +238,7 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
     }
 
     const _saveBookmark = (bookmark, internal=false) => {
-       if(Resting.bookmarkCopy && !internal) {
+       if(Resting.bookmarkCopy && !Resting.saveAsNewBookmark() && !internal) {
           // if edit a bookmark
           if(bookmark.folder) {
             const oldFolder = Resting.bookmarkCopy.folder;
@@ -299,8 +302,9 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
         _extractModelFromVM(Resting.request.headers()), _extractModelFromVM(Resting.request.querystring()), Resting.request.bodyType(),
         body(Resting.request.bodyType()),_authentication(), Resting.request.context());
 
-      const bookmarkId = Resting.bookmarkCopy ? Resting.bookmarkCopy.id : new Date().toString();
-      const bookmarkObj = bookmarkProvider.makeBookmark(bookmarkId, req, validateBookmarkName(Resting.bookmarkSelected.name()), Resting.folderSelected());
+      const bookmarkId = Resting.bookmarkCopy && !Resting.saveAsNewBookmark() ? Resting.bookmarkCopy.id : new Date().toString();
+      const bookmarkObj = bookmarkProvider.makeBookmark(bookmarkId, req, validateBookmarkName(Resting.bookmarkName()), Resting.folderSelected());
+      Resting.bookmarkSelected.name(Resting.bookmarkName());
       _saveBookmark(bookmarkObj);
 
       // close the dialog
@@ -310,7 +314,7 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
     const reset = () => {
       Resting.bookmarkCopy = null;
       Resting.folderSelected('');
-
+      Resting.bookmarkName('');
       Resting.bookmarkSelected.name('');
       Resting.bookmarkSelected.id('');
 
@@ -454,6 +458,14 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
 
     const saveBookmarkDialog = () => {
       Resting.showBookmarkDialog(true);
+      Resting.saveAsNewBookmark(false);
+      Resting.bookmarkName(Resting.bookmarkSelected.name());
+    };
+    
+    const saveAsBookmarkDialog = () => {
+      Resting.showBookmarkDialog(true);
+      Resting.saveAsNewBookmark(true);
+      Resting.bookmarkName('');
     };
 
     const dismissSaveBookmarkDialog = () => {
@@ -586,6 +598,7 @@ requirejs(['jquery','app/storage','knockout','knockout-secure-binding','hjls','a
     Resting.creditsDialog = creditsDialog;
     Resting.contextDialog = contextDialog;
     Resting.saveBookmarkDialog = saveBookmarkDialog;
+    Resting.saveAsBookmarkDialog = saveAsBookmarkDialog;
 
     Resting.dismissSaveBookmarkDialog = dismissSaveBookmarkDialog;
     Resting.dismissCreditsDialog = dismissCreditsDialog;