Remove log, fix parameter view

Author: thknieling

src/adabas/admin.ts

@@ -85,7 +85,7 @@ export class AdabasAdmin {
                 .get(config.Url() + "/adabas/database/" + this.status.Dbid + "/nuclog", getConfig);
             return response.data.Log.Log;
         }
-        catch (error:any) {
+        catch (error: any) {
             if (error.response.status == 401 || error.response.status == 403) {
                 userService.logout();
                 location.reload();
@@ -175,7 +175,7 @@ export class AdabasAdmin {
         };
         try {
             return axios
-                .delete(config.Url() + "/adabas/database/" + this.status.Dbid+"/commandstats", getConfig);
+                .delete(config.Url() + "/adabas/database/" + this.status.Dbid + "/commandstats", getConfig);
         }
         catch (error: any) {
             if (error.response) {
@@ -233,8 +233,8 @@ export class AdabasAdmin {
     information(): Promise<any> {
         return triggerCallCommand(this.status.Dbid, 13);
     }
-     // Retrieve current Adabas cluster information
-     cluster(): Promise<any> {
+    // Retrieve current Adabas cluster information
+    cluster(): Promise<any> {
         return triggerCallCommand(this.status.Dbid, 14);
     }
     // Retrieve current Adabas TCP connections
@@ -274,10 +274,16 @@ export class AdabasAdmin {
             .post(config.Url() + "/adabas/database/"
                 + this.status.Dbid + ":feofplog", {}, getConfig)
             .catch((error: any) => {
-                console.log("Error "+JSON.stringify(error));
+                console.log("Error " + JSON.stringify(error));
+                if (error.response) {
+                    if (error.response.status == 401 || error.response.status == 403) {
+                        userService.logout();
+                        location.reload();
+                    }
+                }
             });
     }
-   // Delete the given Adabas file number (all data is removed as well)!!
+    // Delete the given Adabas file number (all data is removed as well)!!
     async deleteFile(file: number): Promise<any> {
         const getConfig = {
             headers: authHeader("application/json"),
@@ -452,7 +458,7 @@ export class AdabasAdmin {
                     }
                 }
                 else {
-                    console.log("Unknown " + element);
+                    console.log("Unknown HWM parameter: " + element);
                 }
             });
         return highwater;
@@ -465,7 +471,7 @@ export class AdabasAdmin {
         };
         try {
             return axios
-                .delete(config.Url() + "/adabas/database/" + this.status.Dbid+"/hwm", getConfig);
+                .delete(config.Url() + "/adabas/database/" + this.status.Dbid + "/hwm", getConfig);
         }
         catch (error: any) {
             if (error.response) {

src/adabas/file.ts

@@ -21,6 +21,7 @@ import { triggerCall } from "./admin";
 import { authHeader } from "../user/auth-header";
 import axios, { AxiosResponse } from "axios";
 import { config } from "../store/config";
+import { userService } from "../user/service";
 
 export class FilePathBrowser {
     private current = "";
@@ -91,6 +92,12 @@ export class FilePathBrowser {
                 console.log(
                     error.response.statusText + ":" + JSON.stringify(error.response)
                 );
+                if (error.response) {
+                    if (error.response.status == 401 || error.response.status == 403) {
+                        userService.logout();
+                        location.reload();
+                    }
+                }
             });
     }
     async deleteFile(fileName: string): Promise<any> {
@@ -110,6 +117,12 @@ export class FilePathBrowser {
                 console.log(
                     error.response.statusText + ":" + JSON.stringify(error.response)
                 );
+                if (error.response) {
+                    if (error.response.status == 401 || error.response.status == 403) {
+                        userService.logout();
+                        location.reload();
+                    }
+                }
             });
     }
 }

src/components/BufferFlushData.vue

@@ -223,7 +223,6 @@ export default defineComponent({
         if (!response) {
           return;
         }
-        // console.log("RESPONSE: "+JSON.stringify(response));
         bufferflush.value = response.Statistics;
         data.value = [];
         response.Statistics.LStat.forEach((l)=>{

src/components/CommandstatsData.vue

@@ -248,14 +248,6 @@ export default defineComponent({
 </script>
 
 <style>
-.commandstatsdata {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-}
 h3 {
   margin: 40px 0 0;
 }

src/components/Configuration.vue

@@ -584,7 +584,6 @@ export default class Configuration extends Vue {
   del_installation(location: string): void {
     console.log('Delete installation : ' + location);
     this.$data.config.Module.Installation.forEach((element: any) => {
-      console.log('Installation -> ' + JSON.stringify(element));
       if (element.Location === location) {
         console.log('Remove -> ' + location);
         element.Deleted = true;

src/components/MonitorData.vue

@@ -1,3 +1,18 @@
+<!--
+ * Copyright (c) 2020 Software AG (http://www.softwareag.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.-->
+
 <template>
   <div class="monitordata p-2">
     <Sidebar :url="url" />
@@ -279,14 +294,6 @@ export default defineComponent({
 </script>
 
 <style>
-.monitordata {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 60px;
-}
 h3 {
   margin: 40px 0 0;
 }

src/components/ParameterList.vue

@@ -291,7 +291,27 @@ export default class ParameterList extends Vue {
   getParameterInfo() {
     this.$data.db.parameterInfo().then((response: any) => {
       this.$data.parameters.forEach((element: any) => {
-        let v = response.filter((f: any) => f.Acronym === element.Name);
+        let name = element.Name;
+        switch (element.Name) {
+          case 'ADATCPATB':
+            name = 'TCPATB';
+            break;
+          case 'ADATCPCONNECTIONS':
+            name = 'TCPCONNECTIONS';
+            break;
+          case 'ADATCPPORT':
+            name = 'PORTNUMBER';
+            break;
+          case 'ADATCPRECEIVER':
+            name = 'TCPRECEIVER';
+            break;
+          case 'SSLPORT':
+            name = 'SSLPORTNUMBER';
+            break;
+          default:
+            break;
+        }
+        let v = response.filter((f: any) => f.Acronym === name);
         if (v.length > 0) {
           element.Description = v[0].Description;
           element.OnlineValue = v[0].OnlineValue;