From 7e2d47541752bcc8ff9963ce64dd85baa70db3ff Mon Sep 17 00:00:00 2001
From: ZitRos <zitros.lab@gmail.com>
Date: Mon, 17 Apr 2017 14:04:17 +0300
Subject: [PATCH] Default initial port fix, installation docs edit

---
 README.md                        | 16 ++++++++++++----
 package.json                     |  2 +-
 src/static/index.html            |  2 +-
 src/static/js/settings/values.js |  2 +-
 src/static/js/source/index.js    | 10 +++++-----
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index a5f4cb6..2583d14 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,20 @@ Preview
 Installation
 ------------
 
-Download the latest release and import XML file to Caché (iKnow-enabled namespace). Then, open your
-browser at `http://localhost:57772/EntityBrowser/` web page (change the host/port respectively to 
-your server's addresses and always add the trailing slash `/` at the end of the URL).
+Download the latest release XML and import it into iKnow-enabled namespace (for example, SAMPLES). 
+Then, open your browser at `http://127.0.0.1:57772/EntityBrowser/` web page (change the host/port 
+respectively to your server's addresses and always append the trailing slash `/` at the end of the 
+URL).
 
 To delete the application, simply delete the `EntityBrowser` package, the web application will be 
-deleted automatically as well as it gets created during installation.
+deleted automatically if it wasn't modified since installation as well as it gets created during the 
+installation.
+
+Currently, to use iKnowEntityBrowser in different namespaces, you need to import the project to each
+iKnow-enabled namespace, and manually set up web application (for example, you can clone
+`/EntityBrowser` application and name it `/EntityBrowserUser`). Change the settings inside 
+application as well in this case. Currently we are working under possibility to change the namespace
+from the UI interface.
 
 Usage
 -----
diff --git a/package.json b/package.json
index f663963..d6950bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iknow-entity-browser",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Visualizer for iKnow entities",
   "main": "gulpfile.babel.js",
   "scripts": {
diff --git a/src/static/index.html b/src/static/index.html
index 0bd22bf..c3f4af3 100644
--- a/src/static/index.html
+++ b/src/static/index.html
@@ -158,7 +158,7 @@ <h1>General Settings</h1>
                 <b>Data source:</b>
                 <input type="text" value="http://localhost" id="settings.host" autosize
                 placeholder="http://host.name"/>:<input id="settings.port" autosize
-                type="number" placeholder="port" value="57772"/>/<input id="settings.webAppName"
+                type="number" placeholder="port" value=""/>/<input id="settings.webAppName"
                 autosize type="text" placeholder="app name" value="EntityBrowser"/>/api/domain/
                 <input id="settings.domain" autosize type="text" placeholder="domain" value="1"
                 />/<span id="querySetting"><select id="settings.queryType" title="Query Type">
diff --git a/src/static/js/settings/values.js b/src/static/js/settings/values.js
index 6925367..8ebf86b 100644
--- a/src/static/js/settings/values.js
+++ b/src/static/js/settings/values.js
@@ -25,7 +25,7 @@ const unsaveableSettings = new Set([]);
 const settings = {
     compact: false,
     host: "",
-    port: 57772,
+    port: +location.port || 57772,
     webAppName: "EntityBrowser",
     domain: "1",
     queryType: "related",
diff --git a/src/static/js/source/index.js b/src/static/js/source/index.js
index 77c5f44..09a3480 100644
--- a/src/static/js/source/index.js
+++ b/src/static/js/source/index.js
@@ -2,12 +2,12 @@ import { httpGet } from "../utils";
 import { getOption } from "../settings/values";
 
 export function getData (callback) {
-    let https = (getOption("host") || "").indexOf("https://") === 0;
+    let https = (getOption("host") || location.href).indexOf("https:") === 0,
+        port = getOption("port") || +location.port || 57772;
     httpGet(`${ getOption("host") || `http://${ location.hostname }` }${
-        getOption("port") === (https ? 443 : 80) ? "" : ":" + getOption("port") 
-    }/${ getOption("webAppName") }/api/domain/${ encodeURIComponent(getOption("domain")) }/${
-        encodeURIComponent(getOption("queryType"))
-    }/${
+        port === (https ? 443 : 80) ? "" : ":" + port 
+    }/${ getOption("webAppName") || "EntityBrowser" }/api/domain/${ 
+        encodeURIComponent(getOption("domain")) }/${ encodeURIComponent(getOption("queryType")) }/${
         encodeURIComponent(getOption("seed")) 
     }`, callback);
 }
\ No newline at end of file