From a965ac85917f9d6bfe14b84269c3f5d069b693de Mon Sep 17 00:00:00 2001
From: Kalila L <kasenvr@gmail.com>
Date: Thu, 24 Sep 2020 17:30:15 -0400
Subject: [PATCH] Fix some weird context.

---
 domain-server/resources/web/js/shared.js         |  4 ++--
 .../resources/web/settings/js/settings.js        | 16 ++++++++--------
 domain-server/resources/web/wizard/js/wizard.js  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 5081b5aa6a..5469125162 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -228,7 +228,7 @@ function getDomainFromAPI(callback) {
   return pendingDomainRequest;
 }
 
-function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded) {
+function chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded) {
   if (accessToken) {
     getMetaverseUrl(function(metaverse_url) {
 
@@ -429,7 +429,7 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
             loadingDialog.modal('hide');
             bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) {
               if (response) {
-                chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded);
+                chooseFromMetaversePlaces(accessToken, forcePathTo, onSuccessfullyAdded);
               }
             });
           }
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index b1e975bc6c..18574c6187 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -387,7 +387,7 @@ $(document).ready(function(){
 
     $.post("/api/domains", domainJSON, function(data){
       // we successfully created a domain ID, set it on that field
-      var domainID = data.domain.id;
+      var domainID = data.domain.domainId;
       console.log("Setting domain id to ", data, domainID);
       $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
@@ -853,7 +853,7 @@ $(document).ready(function(){
         }
         // Update label
         if (showOrHideLabel()) {
-          var label = data.domain.label;
+          var label = data.domain.name;
           label = label === null ? '' : label;
           $('#network-label').val(label);
         }
@@ -959,7 +959,7 @@ $(document).ready(function(){
       var addRow = $("<tr> <td></td> <td></td> <td class='buttons'><a href='#' class='place-add glyphicon glyphicon-plus'></a></td> </tr>");
       addRow.find(".place-add").click(function(ev) {
         ev.preventDefault();
-        chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
+        chooseFromMetaversePlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
           if (newDomainID) {
             Settings.data.values.metaverse.id = newDomainID;
             var domainIDEl = $("[data-keypath='metaverse.id']");
@@ -1002,13 +1002,13 @@ $(document).ready(function(){
             _.each(data.data.domains, function(domain){
               var domainString = "";
 
-              if (domain.label) {
-                domainString += '"' + domain.label+ '" - ';
+              if (domain.name) {
+                domainString += '"' + domain.name+ '" - ';
               }
 
-              domainString += domain.id;
+              domainString += domain.domainId;
 
-              domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
+              domain_select.append("<option value='" + domain.domainId + "'>" + domainString + "</option>");
             })
             modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
             modal_buttons["success"] = {
@@ -1076,7 +1076,7 @@ $(document).ready(function(){
             var domain = data.data.domain;
 
             // we should have a new domain ID - set it on the domain ID value
-            $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change();
+            $(Settings.DOMAIN_ID_SELECTOR).val(domain.domainId).change();
 
             // we also need to make sure auto networking is set to full
             $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change();
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index 9e1d622287..800bc1cb33 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -70,7 +70,7 @@ $(document).ready(function(){
     });
 
     $('body').on('click', '#change-place-name', function() {
-      chooseFromHighFidelityPlaces(Settings.data.values.metaverse.access_token, "/0,-10,0", function(placeName) {
+      chooseFromMetaversePlaces(Settings.data.values.metaverse.access_token, "/0,-10,0", function(placeName) {
         updatePlaceNameLink(placeName);
       });
     });