Merge pull request #40 from rwth-acis/release/v.1.0.2

Release/v.1.0.2

Author: Aran30

README.md

@@ -1269,6 +1269,50 @@
                 }
             }
         },
+        "646c1466c4bf34e8267c4f27": {
+            "label": {
+                "id": "646c1466c4bf34e8267c4f27[label]",
+                "name": "Label",
+                "value": {
+                    "id": "646c1466c4bf34e8267c4f27[label]",
+                    "name": "Label",
+                    "value": "crType"
+                }
+            },
+            "left": 3295.999999999998,
+            "top": 6164.666666666664,
+            "width": 150,
+            "height": 100,
+            "zIndex": 16035,
+            "type": "Enumeration",
+            "attributes": {
+                "[attributes]": {
+                    "id": "[attributes]",
+                    "name": "Attributes",
+                    "type": "SingleValueListAttribute",
+                    "list": {
+                        "c596b17505c1ab2465c91d3e[value]": {
+                            "id": "c596b17505c1ab2465c91d3e[value]",
+                            "name": "c596b17505c1ab2465c91d3e[value]",
+                            "value": {
+                                "id": "c596b17505c1ab2465c91d3e[value]",
+                                "name": "c596b17505c1ab2465c91d3e[value]",
+                                "value": "Text Message"
+                            }
+                        },
+                        "4a08265717bc14dec36db08e[value]": {
+                            "id": "4a08265717bc14dec36db08e[value]",
+                            "name": "4a08265717bc14dec36db08e[value]",
+                            "value": {
+                                "id": "4a08265717bc14dec36db08e[value]",
+                                "name": "4a08265717bc14dec36db08e[value]",
+                                "value": "Interactive Message"
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "5529bde8544426cd5580efc1": {
             "label": {
                 "id": "5529bde8544426cd5580efc1[label]",
@@ -4154,6 +4198,21 @@
             "attributes": {},
             "type": "Bi-Dir-Association"
         },
+        "a2fc139715fd3b1f4a3c1584": {
+            "label": {
+                "id": "a2fc139715fd3b1f4a3c1584[label]",
+                "name": "Label",
+                "value": {
+                    "id": "a2fc139715fd3b1f4a3c1584[label]",
+                    "name": "Label",
+                    "value": "Type"
+                }
+            },
+            "source": "dd34599cb11fbaa06554d5ea",
+            "target": "646c1466c4bf34e8267c4f27",
+            "attributes": {},
+            "type": "Bi-Dir-Association"
+        },
         "3eefc7d9ef22d58361826cd2": {
             "label": {
                 "id": "3eefc7d9ef22d58361826cd2[label]",

SyncMeta Models/BotMetaModel.json

@@ -1,5 +1,4 @@
 /node_modules
 /bower_components
-config.json
 /build
 /dist

Utilities Frontend/app/.gitignore

@@ -0,0 +1,7 @@
+{
+    "webhost": "<WEBHOST>",
+    "oidc_client_id": "<OIDC_CLIENT_ID>",
+    "yjs_address": "<YJS_ADDRESS>",
+    "yjs_resource_path": "<YJS_RESOURCE_PATH>",
+    "contact_service_url": "<CONTACT_SERVICE_URL>"
+}

Utilities Frontend/app/config.json

@@ -2,5 +2,6 @@
     "webhost": "<WEBHOST>",
     "oidc_client_id": "<OIDC_CLIENT_ID>",
     "yjs_address": "<YJS_ADDRESS>",
-    "yjs_resource_path": "<YJS_RESOURCE_PATH>"
+    "yjs_resource_path": "<YJS_RESOURCE_PATH>",
+    "contact_service_url": "<CONTACT_SERVICE_URL>"
 }

Utilities Frontend/app/config.json.sample

@@ -18,11 +18,15 @@ gulp.task('copy:modules', () => {
 
 gulp.task('copy:src', () => {
     const config = JSON.parse(fs.readFileSync('./config.json'));
+    // choose the package.json file (edit this later)
+    const packageInfo = JSON.parse(fs.readFileSync('./package.json'));
     const copySrc = gulp.src('src/**')
         .pipe(replace('{WEBHOST}', config.webhost))
         .pipe(replace('{OIDC_CLIENT_ID}', config.oidc_client_id))
         .pipe(replace('{YJS_ADDRESS}', config.yjs_address))
         .pipe(replace('{YJS_RESOURCE_PATH}', config.yjs_resource_path))
+        .pipe(replace('{STATUSBAR_SUBTITLE}', "v" + packageInfo.version))
+        .pipe(replace('{CONTACT_SERVICE_URL}', config.contact_service_url))
         .pipe(gulp.dest('dist/src'));
     const copyIndex = gulp.src('index.html')
         .pipe(gulp.dest('dist'));

Utilities Frontend/app/gulpfile.js

@@ -1,5 +1,6 @@
 {
   "name": "SocialBotFramework",
+  "version": "1.0.2",
   "description": "Frontend of Social Bot Framework",
   "scripts": {
     "start": "polymer serve --port 8082 dist",

Utilities Frontend/app/package.json

@@ -65,6 +65,7 @@ class StaticApp extends PolymerElement {
         oidcpopupsignouturl="/src/callbacks/popup-signout-callback.html"
         oidcsilentsigninturl="/src/callbacks/silent-callback.html"
         oidcclientid="{OIDC_CLIENT_ID}"
+        subtitle="{STATUSBAR_SUBTITLE}"
         autoAppendWidget=true
       ></las2peer-frontend-statusbar>    
 
@@ -159,8 +160,11 @@ class StaticApp extends PolymerElement {
   ready() {
     super.ready();
     const statusBar = this.shadowRoot.querySelector("#statusBar");
-    statusBar.addEventListener('signed-in', this.handleLogin);
-    statusBar.addEventListener('signed-out', this.handleLogout);
+    console.log("{CONTACT_SERVICE_URL}");
+    console.log("{OIDC_CLIENT_ID}");
+    statusBar.setAttribute("baseUrl", {CONTACT_SERVICE_URL});
+    statusBar.addEventListener('signed-in',(event) => this.handleLogin(event));
+    statusBar.addEventListener('signed-out',(event) => this.handleLogout(event));
     this.displayCurrentRoomName();
   }
 
@@ -202,9 +206,12 @@ class StaticApp extends PolymerElement {
   } 
 
   handleLogin(event) {
-    localStorage.setItem("access_token", event.detail.access_token);
-    localStorage.setItem("userinfo_endpoint", "https://api.learning-layers.eu/auth/realms/main/protocol/openid-connect/userinfo");
-    location.reload();
+    if(localStorage.getItem("access_token") == null){
+      localStorage.setItem("access_token", event.detail.access_token);
+      localStorage.setItem("userinfo_endpoint", "https://api.learning-layers.eu/auth/realms/main/protocol/openid-connect/userinfo");
+      location.reload();
+    }
+
   }
 
   handleLogout() {

Utilities Frontend/app/src/static-app.js

@@ -368,6 +368,14 @@
         "dd34599cb11fbaa06554d5ea": {
             "label": "Chat Response",
             "attributes": {
+                "a5844a8bde0637231a942b70": {
+                    "key": "Type",
+                    "value": "crType",
+                    "options": {
+                    "Text":"Text",
+                    "Interactive Message":"Interactive Message"
+                    }
+                },
                 "a5844a8bde0637231a942b69": {
                     "key": "Message",
                     "value": "string"

Utilities Frontend/app/src/vls.js

@@ -22,6 +22,7 @@ fi
 #### RASA_NLU and SBF_MANAGER are optional ####
 check_if_exists "$RASA_NLU" "RASA_NLU"
 check_if_exists "$SBF_MANAGER" "SBF_MANAGER"
+check_if_exists "$CONTACT_SERVICE_URL" "CONTACT_SERVICE_URL"
 
 #### Replace SBF Manager and Rasa-NLU URLs ####
 sed -i "s={RASA_NLU}=$RASA_NLU=g" app/src/model-training.js
@@ -49,6 +50,7 @@ sed -i "s=<WEBHOST>=$WEBHOST=g" config.json
 sed -i "s=<OIDC_CLIENT_ID>=$OIDC_CLIENT_ID=g" config.json
 sed -i "s=<YJS_ADDRESS>=$YJS=g" config.json
 sed -i "s=<YJS_RESOURCE_PATH>=$YJS_RESOURCE_PATH=g" config.json
+sed -i "s=<CONTACT_SERVICE_URL>=$CONTACT_SERVICE_URL=g" config.json
 npm run build
 cd ..