From 2055c66630ce32452d276bbb420662c967120fe2 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 2 Sep 2022 00:37:25 +0200
Subject: [PATCH] Fixed app documentation loading

---
 frontend/README.md                     | 13 ++++++++++++-
 frontend/src/views/AngularWorkflow.jsx | 10 +++++++---
 functions/onprem/orborus/build.sh      |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/frontend/README.md b/frontend/README.md
index 2257fc4e..fe883a45 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,4 +1,4 @@
-# Certificate:
+## Localhost Certificate info:
 
 Creating a localhost certificate:
 
@@ -7,3 +7,14 @@ openssl genrsa -out privkey.pem 2048
 openssl req -new -key privkey.pem -out certreq.csr
 openssl x509 -req -days 3650 -in certreq.csr -signkey privkey.pem -out fullchain.pem
 ```
+
+## Using your own certificate
+If you have your own .crt and .key file, you can do it like this:
+```
+openssl x509 -in mycert.crt -out fullchain.cert.pem -outform PEM
+```
+
+The KEY file has to be named privkey.pem 
+```
+mv cert.key privkey.pem
+```
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index edacd411..2c92e7b5 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -398,8 +398,8 @@ const AngularWorkflow = (defaultprops) => {
     },
   });
 
-  const getAppDocs = (appname) => {
-    fetch(`${globalUrl}/api/v1/docs/${appname}?location=openapi`, {
+  const getAppDocs = (appname, location, version) => {
+    fetch(`${globalUrl}/api/v1/docs/${appname}?location=${location}&version=${version}`, {
       headers: {
         Accept: "application/json",
       },
@@ -436,10 +436,14 @@ const AngularWorkflow = (defaultprops) => {
   useEffect(() => {
 		if (authenticationModalOpen === true && selectedAction.app_name !== undefined) {
 			console.log(`Should get app docs for: ${selectedAction.app_name}`)
+			//console.log(selectedAction)
+			//console.log("APP: ", selectedApp)
 
 			if (selectedAction.documentation === undefined || selectedAction.documentation === null || selectedAction.documentation.length === 0) {
 				// SelectedApp.documentation = Markdown? If so, it works
-				getAppDocs(selectedAction.app_name) 
+				//
+				const apptype = selectedApp.generated === false ? "python" : "openapi"
+				getAppDocs(selectedAction.app_name, apptype, selectedAction.app_version)
 			}
 		}
 	}, [authenticationModalOpen])
diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index 64a17f91..062b8d15 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=1.0.6
+VERSION=1.0.7
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force