Connection Choice (#25)

To offer a list of connection choices they can be specified in a JSON file.

* Add ConnectionItem

* LoginPage: Connection Choice

* LoginPage: Tab Order

* ConnectionItem: .txt and Shell

* Cache Connection Choices

* Optimize reading from Shell Command

* Update README.md

* Version 1.1.0

Author: jo-tools

README.md

@@ -1,64 +1,78 @@
-# cubeSQL Web Admin
-A web based administration for [cubeSQL Server](https://sqlabs.com/cubesql) (© [sqlabs](https://sqlabs.com/))
+# cubeSQL Web Admin
+A web based administration for [cubeSQL Server](https://sqlabs.com/cubesql) (© [sqlabs](https://sqlabs.com/))
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
 
 ## Description
 
-*[cubeSQL Server](https://sqlabs.com/cubesql) is a fully featured and high performance relational database management system built on top of the sqlite database engine.*
+*[cubeSQL Server](https://sqlabs.com/cubesql) is a fully featured and high performance relational database management system built on top of the sqlite database engine.*
 
-cubeSQL Web Admin is a web based administration tool for [cubeSQL Server](https://sqlabs.com/cubesql).
+cubeSQL Web Admin is a web based administration tool for [cubeSQL Server](https://sqlabs.com/cubesql).
 
-![ScreenShot: Login](screenshots/login.png?raw=true)
+![ScreenShot: Login](screenshots/login.png?raw=true)
 
-![ScreenShot: Databases](screenshots/databases.png?raw=true)
+![ScreenShot: Databases](screenshots/databases.png?raw=true)
 
 ## Build from Source Code
 
-In order to build cubeSQL Web Admin application, [Xojo](https://xojo.com/) and the latest [cubeSQL Xojo Plugin](https://github.com/cubesql/cubeSQLAdmin) are required.
+In order to build cubeSQL Web Admin application, [Xojo](https://xojo.com/) and the latest [cubeSQL Xojo Plugin](https://github.com/marcobambini/cubesqlplugin) are required.
 
-- Xojo can be obtained from: https://xojo.com/
-- Latest [cubeSQL Xojo Plugin](https://github.com/cubesql/cubeSQLAdmin) can be found inside the Plugins folder
+- Xojo can be obtained from: [https://xojo.com/](https://xojo.com/)
+- Latest [cubeSQL Xojo Plugin](https://github.com/marcobambini/cubesqlplugin) can be downloaded from the [Releases](https://github.com/marcobambini/cubesqlplugin/releases)
 
 ## Ready to use executables and Docker Images
 
 1. Executables are provided with the [Releases](https://github.com/cubesql/webadmin/releases).
    - A Shell Script is provided to choose a Port and launch the Web Application
    - It is up to you to install the Web Application as a service.  
-     See [Xojo Documentation: Deployment Overview](https://documentation.xojo.com/topics/application_deployment/web/deployment_overview.html)
+     See [Xojo Documentation: Deployment Overview](https://documentation.xojo.com/topics/application_deployment/web/deployment_overview.html)
 
 2. Docker Images provided by jo-tools can be found here:  
-   [Docker Hub: jotools/cubesql-webadmin](https://hub.docker.com/r/jotools/cubesql-webadmin)
+   [Docker Hub: jotools/cubesql-webadmin](https://hub.docker.com/r/jotools/cubesql-webadmin)
 
 3. Docker Compose setups provided by jo-tools can be found here:  
    [GitHub: jo-tools/docker](https://github.com/jo-tools/docker)
    - These setups contain both cubeSQL Server and cubeSQL Web Admin
 
 ## Configuration
 
-cubeSQL Web Admin supports the following launch arguments and corresponding environment variables:
+cubeSQL Web Admin supports the following launch arguments and corresponding environment variables.
 
-#### Web Application
+*Example:*  
+*Launch cubeSQLWebAdmin on Port 8080 and prefill login data to connect to a cubeSQL Server running on localhost Port 4440:*  
+ `/path/to/launch/cubeSQLWebAdmin --Port=8080 --CubeSQLHostname=localhost --CubeSQLPort=4440 --CubeSQLUsername=admin --CubeSQLPassword=admin`
+
+### Web Application
 - `--Port` | `CUBESQL_WEBADMIN_PORT`
 
-#### Prefill Login data:
+### Default New Connection
 
 - `--CubeSQLHostname` | `CUBESQL_HOSTNAME`
 - `--CubeSQLPort` | `CUBESQL_PORT`
 - `--CubeSQLEncryption` | `CUBESQL_ENCRYPTION` with values: `NONE`, `AES128`, `AES128`, `SSL`  
   For Encryption type `SSL`:
   - `--CubeSQLSSLCertificate` | `CUBESQL_SSL_CERTIFICATE`  
-    with value: `/path/to/file`
+    *with value:* `/path/to/file`
   - `--CubeSQLSSLCertificatePassword` | `CUBESQL_SSL_CERTIFICATEPASSWORD`  
-    with value: `/path/to/file.txt` | plain text
+    *with value:* plain text | `/path/to/file.txt` | `` `/output/of/a/shell/cmd` ``
   - `--CubeSQLSSLRootCertificate` | `CUBESQL_SSL_ROOTCERTIFICATE`  
-    with value: `/path/to/file`
+    *with value:* `/path/to/file`
   - `--CubeSQLSSLCipherList` | `CUBESQL_SSL_CIPHERLIST`  
-    with value: `/path/to/file.txt` | plain text
+    *with value:* plain text | `/path/to/file.txt`
 - `--CubeSQLUsername` | `CUBESQL_USERNAME`  
   Only if Username is prefilled:
-  - `--CubeSQLPassword` | `CUBESQL_PASSWORD`
+  - `--CubeSQLPassword` | `CUBESQL_PASSWORD`  
+    *with value:* plain text | `/path/to/file.txt` | `` `/output/of/a/shell/cmd` ``
+
+### Connection Choice
+
+To offer a list of connection choices they can be specified in a JSON file which contains an array of [`ConnectionItems`](./webapp/ConnectionItem.xojo_code).
+
+*Example:* [`connection-choice.json`](./resources/connection-choice.json)
+
+- `--CubeSQLConnectionChoice` | `CUBESQL_CONNECTIONCHOICE`  
+  *with value:* `/path/to/connection-choice.json`
 
 
 ## About
-cubeSQL Web Admin has been written by Jürg Otter, who is a long term user of Xojo and working for [CM Informatik AG](https://cmiag.ch/). Their Application [CMI LehrerOffice](https://cmi-bildung.ch/) is a Xojo Design Award Winner 2018. In his leisure time Jürg provides some [bits and pieces for Xojo Developers](https://www.jo-tools.ch/).
+cubeSQL Web Admin has been written by Jürg Otter, who is a long term user of Xojo and working for [CM Informatik AG](https://cmiag.ch/). Their Application [CMI LehrerOffice](https://cmi-bildung.ch/) is a Xojo Design Award Winner 2018. In his leisure time Jürg provides some [bits and pieces for Xojo Developers](https://www.jo-tools.ch/).

cubesql-webadmin.xojo_project

@@ -50,6 +50,7 @@ Class=DatasourceColumn;webapp/containers/base/DatasourceColumn.xojo_code;&h00000
 Class=App;webapp/App.xojo_code;&h0000000055A03FFF;&h0000000018D38FFF;false
 WebSession=Session;webapp/Session.xojo_code;&h0000000046C87FFF;&h0000000018D38FFF;false
 Module=modCubeSQLAdmin;webapp/modCubeSQLAdmin.xojo_code;&h00000000097C9FFF;&h0000000018D38FFF;false
+Class=ConnectionItem;webapp/ConnectionItem.xojo_code;&h0000000046AE4FFF;&h0000000018D38FFF;false
 MultiImage=icon_128;resources/icon_128.xojo_image;&h000000007294E7FF;&h0000000035B107FF;false
 BuildSteps=Build Automation;Build Automation.xojo_code;&h000000001394FFFF;&h0000000000000000;false
 ColorAsset=colTextKey;styles/colTextKey.xojo_color;&h000000005870AFFF;&h00000000139DBFFF;false
@@ -66,15 +67,16 @@ Folder=information;webapp/containers/information;&h000000005EFC7FFF;&h0000000058
 WebContainer=cntCommands;webapp/containers/information/cntCommands.xojo_code;&h000000002752C7FF;&h000000005EFC7FFF;false
 WebContainer=cntClients;webapp/containers/information/cntClients.xojo_code;&h000000002140EFFF;&h000000005EFC7FFF;false
 WebContainer=cntLog;webapp/containers/information/cntLog.xojo_code;&h000000002B1057FF;&h000000005EFC7FFF;false
+Class=thrConnectionChoices;webapp/thrConnectionChoices.xojo_code;&h00000000733557FF;&h0000000018D38FFF;false
 DefaultWindow=LoginPage
 MajorVersion=1
-MinorVersion=0
-SubVersion=1
+MinorVersion=1
+SubVersion=0
 NonRelease=0
 Release=0
 InfoVersion=cubeSQL Web Admin
 LongVersion=SQLabs and jo-tools
-ShortVersion=1.0.1
+ShortVersion=1.1.0
 WinCompanyName=sqlabs.com
 WinInternalName=cubesqlwebadmin
 WinProductName=cubeSQL Web Admin
@@ -93,7 +95,7 @@ MDICaption=
 DefaultEncoding=&h0
 AppIcon=cubesql-webadmin.xojo_resources;&h0
 OSXBundleID=com.sqlabs.cubesqlwebadmin
-DebuggerCommandLine=--CubeSQLHostname=localhost --CubeSQLPort=4430 --CubeSQLUsername=admin --CubeSQLPassword=admin
+DebuggerCommandLine=--CubeSQLHostname=localhost --CubeSQLPort=4430 --CubeSQLUsername=admin --CubeSQLPassword=admin --CubeSQLConnectionChoice=./resources/connection-choice.json
 UseGDIPlus=False
 UseBuildsFolder=True
 HiDPI=True

resources/connection-choice.json

@@ -0,0 +1,58 @@
+[
+	{
+		"caption": "localhost (4430, AES256)",
+		"selected": false,
+		"hostname": "localhost",
+		"username": "admin",
+		"password": "admin",
+		"port": 4430,
+		"encryption": "AES256",
+		"sslcertificate": "",
+		"sslcertificatepassword": "",
+		"sslrootcertificate": "",
+		"sslcipherlist": ""
+	},
+	{
+		"caption": "localhost (4430, AES128)",
+		"selected": false,
+		"hostname": "localhost",
+		"username": "admin",
+		"password": "admin",
+		"port": 4430,
+		"encryption": "AES128",
+		"sslcertificate": "",
+		"sslcertificatepassword": "",
+		"sslrootcertificate": "",
+		"sslcipherlist": ""
+	},
+	{
+		"caption": "localhost (4430, NONE)",
+		"selected": false,
+		"hostname": "localhost",
+		"username": "admin",
+		"password": "admin",
+		"port": 4430,
+		"encryption": "NONE",
+		"sslcertificate": "",
+		"sslcertificatepassword": "",
+		"sslrootcertificate": "",
+		"sslcipherlist": ""
+	},
+	{
+		"caption": "-",
+		"hostname": "-"
+	},
+	{
+		"caption": "localhost (4440, AES256)",
+		"selected": false,
+		"hostname": "localhost",
+		"username": "admin",
+		"password": "admin",
+		"port": 4440,
+		"encryption": "AES256",
+		"sslcertificate": "",
+		"sslcertificatepassword": "",
+		"sslrootcertificate": "",
+		"sslcipherlist": ""
+	}
+]

webapp/App.xojo_code

@@ -3,9 +3,11 @@ Protected Class App
 Inherits WebApplication
 	#tag Event
 		Sub Opening(args() As String)
-		  ' Store Launch Arguments for later
 		  modCubeSQLAdmin.StoreLaunchArguments(args)
 
+		  ethrConnectionChoices = New thrConnectionChoices
+		  ethrConnectionChoices.Start
+		  
 		End Sub
 	#tag EndEvent
 
@@ -22,6 +24,11 @@ Inherits WebApplication
 	#tag EndEvent
 
 
+	#tag Property, Flags = &h21
+		Private ethrConnectionChoices As thrConnectionChoices
+	#tag EndProperty
+
+
 	#tag Constant, Name = constDockerTag, Type = String, Dynamic = False, Default = \"jotools/cubesql-webadmin", Scope = Private
 	#tag EndConstant