From 2e75166e0de4c08c8b30a6463a3e62fa8c2c4365 Mon Sep 17 00:00:00 2001
From: Kalila L <kasenvr@gmail.com>
Date: Sun, 11 Oct 2020 21:10:24 -0400
Subject: [PATCH 1/9] Hide temp place name button, hide places table, hide
 places wizard step.

---
 domain-server/resources/web/settings/js/settings.js | 13 ++++++++-----
 domain-server/resources/web/wizard/index.shtml      |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 8a9971d520..18d07fa6ef 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -40,6 +40,8 @@ $(document).ready(function(){
 
       // call our method to setup the place names table
       setupPlacesTable();
+      // hide the places table for now because we do not want that interacted with from the domain-server
+      $('#' + Settings.PLACES_TABLE_ID).hide();
 
       setupDomainNetworkingSettings();
       // setupDomainLabelSetting();
@@ -711,8 +713,8 @@ $(document).ready(function(){
       name: 'places',
       label: 'Places',
       html_id: Settings.PLACES_TABLE_ID,
-      help: "The following places currently point to this domain.</br>To point places to this domain, "
-        + " go to the <a href='" + METAVERSE_URL + "/user/places'>My Places</a> "
+      help: "To point places to this domain, "
+        + " go to the <a href='" + METAVERSE_URL + "/user/places'>Places</a> "
         + "page in your Metaverse account.",
       read_only: true,
       can_add_new_rows: false,
@@ -745,9 +747,10 @@ $(document).ready(function(){
     var errorEl = createDomainLoadingError("There was an error retrieving your places.");
     $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
 
-    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
-    temporaryPlaceButton.hide();
-    $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
+    // DISABLE TEMP PLACE NAME BUTTON...
+    // var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
+    // temporaryPlaceButton.hide();
+    // $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
     if (accessTokenIsSet()) {
       appendAddButtonToPlacesTable();
     }
diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml
index 4093eda39a..c15b4169ed 100644
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@@ -19,7 +19,7 @@
   </dl>
 </div>
 
-<div class="wizard-step col-md-8 col-centered" style="display: none;">
+<!-- <div class="wizard-step col-md-8 col-centered" style="display: none;">
   <h4 class="step-title"></h4>
   <div class="row">
     <div class="col-md-12">
@@ -51,7 +51,7 @@
       <button type="button" class="btn btn-md btn-block btn-primary next-button">Next</button>
     </dd>
   </dl>
-</div>
+</div> -->
 
 <div class="wizard-step col-md-9 col-centered" style="display: none;">
   <h4 class="step-title"></h4>

From 2546639171a78e4c999433ce028c17e38d7395ee Mon Sep 17 00:00:00 2001
From: Kalila L <kasenvr@gmail.com>
Date: Mon, 12 Oct 2020 01:17:00 -0400
Subject: [PATCH 2/9] Add domain label creation step 1 of wizard.

---
 domain-server/resources/web/js/shared.js      | 27 ++++++++++++++++
 .../resources/web/wizard/js/wizard.js         | 31 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 5469125162..b52928914a 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -500,6 +500,33 @@ function prepareAccessTokenPrompt(callback) {
   });
 }
 
+function createDomainIDPrompt(callback) {
+    swal({
+      title: 'Finish Registering Domain',
+      type: 'input',
+      text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
+      showCancelButton: true,
+      confirmButtonText: "Create",
+      closeOnConfirm: false,
+      html: true
+    }, function(inputValue){
+      if (inputValue === false) {
+      return false;
+    }
+
+    if (inputValue === "") {
+      swal.showInputError("Please enter a valid label for your machine.")
+      return false
+    }
+
+    if (callback) {
+      callback(inputValue);
+    }
+
+    swal.close();
+  });
+}
+
 function getMetaverseUrl(callback) {
     $.ajax('/api/metaverse_info', {
       success: function(data) {
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 2603eca5c6..995c34d9ec 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -50,6 +50,7 @@ $(document).ready(function(){
       prepareAccessTokenPrompt(function(accessToken) {
         Metaverse.accessToken = accessToken;
         saveAccessToken();
+        promptToCreateDomainID();
       });
     });
   
@@ -171,6 +172,34 @@ function setupWizardSteps() {
   $(currentStep).show();
 }
 
+function promptToCreateDomainID() {
+    setTimeout(function(){ 
+        createDomainIDPrompt(function(label) {
+            var domainJSON = {
+              "label": label
+            }
+        
+            $.post("/api/domains", domainJSON, function(data){
+              // we successfully created a domain ID, set it on that field
+              var domainID = data.domain.domainId;
+              console.log("Setting domain ID to ", data, domainID);
+            
+              var formJSON = {
+                "metaverse": {
+                  "id": domainID
+                }
+              }
+            
+              // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+              postSettings(formJSON, goToNextStep);
+            }, 'json').fail(function(){
+              console.log("Failed to create domain ID...");
+              goToNextStep();
+            });
+        });
+    }, 500); // Apparently swal needs time before opening another prompt.
+}
+
 function updatePlaceNameLink(address) {
   if (address) {
     var url = URLs.PLACE_URL + '/' + address;
@@ -341,7 +370,7 @@ function saveAccessToken() {
   $(this).blur();
 
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-  postSettings(formJSON, goToNextStep);
+  postSettings(formJSON);
 }
 
 function getSettingDescriptionForKey(groupKey, settingKey) {

From 5725a32200ef70d3c642834cdbbd693f3177aa5e Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Tue, 13 Oct 2020 05:03:32 -0400
Subject: [PATCH 3/9] Apply suggestions from code review

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 domain-server/resources/web/js/shared.js        | 9 +++++----
 domain-server/resources/web/wizard/js/wizard.js | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index b52928914a..02243fe53d 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -501,7 +501,8 @@ function prepareAccessTokenPrompt(callback) {
 }
 
 function createDomainIDPrompt(callback) {
-    swal({
+  swal(
+    {
       title: 'Finish Registering Domain',
       type: 'input',
       text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
@@ -509,14 +510,14 @@ function createDomainIDPrompt(callback) {
       confirmButtonText: "Create",
       closeOnConfirm: false,
       html: true
-    }, function(inputValue){
+    }, function(inputValue) {
       if (inputValue === false) {
       return false;
     }
 
     if (inputValue === "") {
-      swal.showInputError("Please enter a valid label for your machine.")
-      return false
+      swal.showInputError("Please enter a valid label for your machine.");
+      return false;
     }
 
     if (callback) {
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 995c34d9ec..377a3f755c 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -179,7 +179,7 @@ function promptToCreateDomainID() {
               "label": label
             }
         
-            $.post("/api/domains", domainJSON, function(data){
+            $.post("/api/domains", domainJSON, function(data) {
               // we successfully created a domain ID, set it on that field
               var domainID = data.domain.domainId;
               console.log("Setting domain ID to ", data, domainID);

From 9624d3bb0cf35ece920c207b3fb7f72fa16bdb26 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Tue, 13 Oct 2020 18:54:15 -0400
Subject: [PATCH 4/9] Update shared.js

---
 domain-server/resources/web/js/shared.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 02243fe53d..8d69d16c98 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -501,17 +501,16 @@ function prepareAccessTokenPrompt(callback) {
 }
 
 function createDomainIDPrompt(callback) {
-  swal(
-    {
-      title: 'Finish Registering Domain',
-      type: 'input',
-      text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
-      showCancelButton: true,
-      confirmButtonText: "Create",
-      closeOnConfirm: false,
-      html: true
-    }, function(inputValue) {
-      if (inputValue === false) {
+  swal({
+    title: 'Finish Registering Domain',
+    type: 'input',
+    text: 'Enter a label for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>This is a required step for registration.</br></br>',
+    showCancelButton: true,
+    confirmButtonText: "Create",
+    closeOnConfirm: false,
+    html: true
+  }, function(inputValue) {
+    if (inputValue === false) {
       return false;
     }
 

From 065971381df7161cbaf93ad457ceae2b9645e33d Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Tue, 13 Oct 2020 18:57:30 -0400
Subject: [PATCH 5/9] Update wizard.js

---
 .../resources/web/wizard/js/wizard.js         | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 377a3f755c..ec4ce859e8 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -173,31 +173,31 @@ function setupWizardSteps() {
 }
 
 function promptToCreateDomainID() {
-    setTimeout(function(){ 
-        createDomainIDPrompt(function(label) {
-            var domainJSON = {
-              "label": label
-            }
-        
-            $.post("/api/domains", domainJSON, function(data) {
-              // we successfully created a domain ID, set it on that field
-              var domainID = data.domain.domainId;
-              console.log("Setting domain ID to ", data, domainID);
-            
-              var formJSON = {
-                "metaverse": {
-                  "id": domainID
-                }
-              }
-            
-              // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-              postSettings(formJSON, goToNextStep);
-            }, 'json').fail(function(){
-              console.log("Failed to create domain ID...");
-              goToNextStep();
-            });
-        });
-    }, 500); // Apparently swal needs time before opening another prompt.
+  setTimeout(function() {
+    createDomainIDPrompt(function(label) {
+      var domainJSON = {
+        "label": label
+      }
+
+      $.post("/api/domains", domainJSON, function(data) {
+        // we successfully created a domain ID, set it on that field
+        var domainID = data.domain.domainId;
+        console.log("Setting domain ID to ", data, domainID);
+
+        var formJSON = {
+          "metaverse": {
+            "id": domainID
+          }
+        }
+
+        // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+        postSettings(formJSON, goToNextStep);
+      }, 'json').fail(function() {
+        console.log("Failed to create domain ID...");
+        goToNextStep();
+      });
+    });
+  }, 500); // Apparently swal needs time before opening another prompt.
 }
 
 function updatePlaceNameLink(address) {

From 69fe471374024cbd782d4183bab82f6dd7b1b055 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Wed, 14 Oct 2020 02:58:20 -0400
Subject: [PATCH 6/9] Apply suggestions from code review

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 domain-server/resources/web/js/shared.js        |  2 +-
 domain-server/resources/web/wizard/js/wizard.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 8d69d16c98..0395106297 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -509,7 +509,7 @@ function createDomainIDPrompt(callback) {
     confirmButtonText: "Create",
     closeOnConfirm: false,
     html: true
-  }, function(inputValue) {
+  }, function (inputValue) {
     if (inputValue === false) {
       return false;
     }
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index ec4ce859e8..6c46a3b35c 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -173,13 +173,13 @@ function setupWizardSteps() {
 }
 
 function promptToCreateDomainID() {
-  setTimeout(function() {
-    createDomainIDPrompt(function(label) {
+  setTimeout(function () {
+    createDomainIDPrompt(function (label) {
       var domainJSON = {
         "label": label
-      }
+      };
 
-      $.post("/api/domains", domainJSON, function(data) {
+      $.post("/api/domains", domainJSON, function (data) {
         // we successfully created a domain ID, set it on that field
         var domainID = data.domain.domainId;
         console.log("Setting domain ID to ", data, domainID);
@@ -188,11 +188,11 @@ function promptToCreateDomainID() {
           "metaverse": {
             "id": domainID
           }
-        }
+        };
 
         // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
         postSettings(formJSON, goToNextStep);
-      }, 'json').fail(function() {
+      }, 'json').fail(function () {
         console.log("Failed to create domain ID...");
         goToNextStep();
       });

From 4c1de14cbbda078172e95e9bb9c24362945b1b4f Mon Sep 17 00:00:00 2001
From: Kalila L <kasenvr@gmail.com>
Date: Wed, 21 Oct 2020 00:56:55 -0400
Subject: [PATCH 7/9] Add input error handling and notice.

---
 domain-server/resources/web/js/shared.js        |  2 --
 domain-server/resources/web/wizard/js/wizard.js | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 0395106297..bffd512890 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -522,8 +522,6 @@ function createDomainIDPrompt(callback) {
     if (callback) {
       callback(inputValue);
     }
-
-    swal.close();
   });
 }
 
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 6c46a3b35c..6039c68cfa 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -179,7 +179,14 @@ function promptToCreateDomainID() {
         "label": label
       };
 
-      $.post("/api/domains", domainJSON, function (data) {
+      $.post("/api/domainsss", domainJSON, function (data) {
+        if (data.status === "failure") {
+          swal.showInputError("Error: " + data.error);
+          return;
+        }
+        
+        swal.close();
+
         // we successfully created a domain ID, set it on that field
         var domainID = data.domain.domainId;
         console.log("Setting domain ID to ", data, domainID);
@@ -192,9 +199,13 @@ function promptToCreateDomainID() {
 
         // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
         postSettings(formJSON, goToNextStep);
-      }, 'json').fail(function () {
+    }, 'json').fail(function (data) {
+        if (data && data.status === "failure") {
+          swal.showInputError("Error: " + data.error);
+        } else {
+          swal.showInputError("Error: Failed to post to metaverse.");
+        }
         console.log("Failed to create domain ID...");
-        goToNextStep();
       });
     });
   }, 500); // Apparently swal needs time before opening another prompt.

From c1a47878b935abecd1332518f12582a24fecd3fc Mon Sep 17 00:00:00 2001
From: Kalila L <kasenvr@gmail.com>
Date: Wed, 21 Oct 2020 00:57:30 -0400
Subject: [PATCH 8/9] Fix indent.

---
 domain-server/resources/web/wizard/js/wizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 6039c68cfa..1350de7205 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -199,7 +199,7 @@ function promptToCreateDomainID() {
 
         // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
         postSettings(formJSON, goToNextStep);
-    }, 'json').fail(function (data) {
+      }, 'json').fail(function (data) {
         if (data && data.status === "failure") {
           swal.showInputError("Error: " + data.error);
         } else {

From 70b04b12268fd71ceb3486e047cc4fa2c47c4be6 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Wed, 21 Oct 2020 16:42:10 -0400
Subject: [PATCH 9/9] Update wizard.js

---
 domain-server/resources/web/wizard/js/wizard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 1350de7205..d7eda38055 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -179,7 +179,7 @@ function promptToCreateDomainID() {
         "label": label
       };
 
-      $.post("/api/domainsss", domainJSON, function (data) {
+      $.post("/api/domains", domainJSON, function (data) {
         if (data.status === "failure") {
           swal.showInputError("Error: " + data.error);
           return;