Various small updates

Author: thknieling

src/adabas/admin.ts

@@ -48,6 +48,7 @@ const AdminCommands = [
     { command: "gcb", path: [] },
     { command: "cluster", path: [] },
     { command: "tcp", path: [] },
+    { command: "plog", path: ["PLOG"] },
 ]
 
 
@@ -167,6 +168,25 @@ export class AdabasAdmin {
     commandStats(): Promise<any> {
         return triggerCallCommandArray(this.status.Dbid, 6);
     }
+    commandStatsReset(): Promise<any> {
+        const getConfig = {
+            headers: authHeader("application/json"),
+            useCredentails: true,
+        };
+        try {
+            return axios
+                .delete(config.Url() + "/adabas/database/" + this.status.Dbid+"/commandstats", getConfig);
+        }
+        catch (error: any) {
+            if (error.response) {
+                if (error.response.status == 401 || error.response.status == 403) {
+                    userService.logout();
+                    location.reload();
+                }
+            }
+            throw error;
+        }
+    }
     // Provide the current monitor I/O statistics and the number of call per second
     monitor(): Promise<any> {
         return triggerCallCommand(this.status.Dbid, 7);
@@ -221,7 +241,23 @@ export class AdabasAdmin {
     async adatcp(): Promise<any> {
         return triggerCallCommand(this.status.Dbid, 15);
     }
-    // Delete the given Adabas file number (all data is removed as well)!!
+    // Get the PLOG stats of the Adabas database
+    plogstats(): Promise<any> {
+        return triggerCallCommand(this.status.Dbid, 16);
+    }
+    feofplog(): Promise<any> {
+        const getConfig = {
+            headers: authHeader("application/json"),
+            useCredentails: true,
+        };
+        return axios
+            .post(config.Url() + "/adabas/database/"
+                + this.status.Dbid + ":feofplog", {}, getConfig)
+            .catch((error: any) => {
+                console.log("Error "+JSON.stringify(error));
+            });
+    }
+   // Delete the given Adabas file number (all data is removed as well)!!
     async deleteFile(file: number): Promise<any> {
         const getConfig = {
             headers: authHeader("application/json"),
@@ -401,6 +437,26 @@ export class AdabasAdmin {
             });
         return highwater;
     }
+    // Retrieve current Adabas Highwater mark information
+    async highWaterMarkReset(): Promise<any> {
+        const getConfig = {
+            headers: authHeader("application/json"),
+            useCredentails: true,
+        };
+        try {
+            return axios
+                .delete(config.Url() + "/adabas/database/" + this.status.Dbid+"/hwm", getConfig);
+        }
+        catch (error: any) {
+            if (error.response) {
+                if (error.response.status == 401 || error.response.status == 403) {
+                    userService.logout();
+                    location.reload();
+                }
+            }
+            throw error;
+        }
+    }
     // Retrieve a list of checkpoints in the database in an given time frame
     checkpoints(from: string, to: string): Promise<any> {
         return triggerCallOnArray("/adabas/database/" + this.status.Dbid + "/checkpoints?end_time=" + to + "&start_time=" + from, ["Checkpoints"]);

src/admin_views/DatabasePlog.vue

@@ -0,0 +1,37 @@
+<!--
+ * 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="databaseplog">
+    <MyHeader></MyHeader>
+    <DatabasePlogStat :url="url" />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import MyHeader from '@/components/Header.vue';
+import DatabasePlogStat from '@/components/DatabasePlogStat.vue';
+
+@Component({
+  components: {
+    MyHeader,
+    DatabasePlogStat,
+  },
+})
+export default class DatabasePlog extends Vue {
+    @Prop(String) readonly url: string | undefined;
+}
+</script>

src/components/CommandstatsData.vue

@@ -18,6 +18,9 @@
             <b-col>
               <Url :url="'/adabas/database/' + url + '/cmdstats'" />
             </b-col>
+            <b-col class="text-right">
+              <b-button v-on:click="resetCommands()">Reset</b-button>
+            </b-col>
           </b-row>
           <b-row>
             <b-col sm="4" class="h-100 p-1">
@@ -202,6 +205,13 @@ export default defineComponent({
       clearInterval(timer);
       timer = null;
     });
+    function resetCommands() {
+     if (!db || db==null) {
+        db = SearchDatabases(props.url);
+        return;
+      }
+      db.commandStatsReset();
+    };
     function loadCommandStat() {
       if (!db || db==null) {
         db = SearchDatabases(props.url);
@@ -230,6 +240,7 @@ export default defineComponent({
       doughnutChartRef,
       barChartProps,
       barChartRef,
+      resetCommands,
       imgData,
     };
   },

src/components/DatabaseInfos.vue

@@ -69,7 +69,7 @@ import { SearchDatabases } from '@/adabas/admin';
     ErrorModal,
   },
 })
-export default class ParameterList extends Vue {
+export default class DatabaseInfos extends Vue {
   @Prop(String) readonly url: string | undefined;
   @Provide() type = 'static';
   data() {

src/components/DatabaseList.vue

@@ -35,15 +35,19 @@
             <b-col> <CreateDatabase /> </b-col>
           </b-row>
           <b-row
-            ><b-col sm="4">
+            ><b-col sm="10">
               <b-pagination
                 v-model="currentPage"
                 :total-rows="databases.length"
                 :per-page="perPage"
                 aria-controls="my-table"
               ></b-pagination>
             </b-col>
-            <b-col sm="8">
+         <b-col sm="2">
+              <b-form-select v-model="perPage" :options="perPageOptions" size="sm" class="mt-3"></b-form-select>
+          </b-col></b-row>
+          <b-row>
+            <b-col>
               <b-form-group
                 label="Filter"
                 label-cols-sm="3"
@@ -236,6 +240,13 @@
                       >
                         Activity
                       </b-dropdown-item>
+                      <b-dropdown-item
+                        size="sm"
+                        :to="'/plogstat/' + row.item.status.Dbid"
+                        class="mr-2"
+                      >
+                        PLOG
+                      </b-dropdown-item>
                       <b-dropdown-item
                         size="sm"
                         :to="'/threadtable/' + row.item.status.Dbid"
@@ -341,6 +352,7 @@ export default class DatabaseList extends Vue {
     return {
       perPage: 10,
       currentPage: 1,
+      perPageOptions: [10,20,50,100],
       filter: '',
       filterOn: [],
       fields: [
@@ -425,6 +437,7 @@ export default class DatabaseList extends Vue {
           'SET_STATUS',
           'Error calling' + operation + ':' + JSON.stringify(error),
         );
+        router.push('/nuclog/' + dbid.dbid());
       });
   }
   /*

src/components/DatabasePlogStat.vue

@@ -0,0 +1,122 @@
+<!--
+ * 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="databaseplogstats p-2">
+    <Sidebar :url="url" />
+    <b-card
+      :header="'Adabas Database PLOG information for database ' + url"
+      border-variant="secondary"
+      header-border-variant="secondary"
+    >
+      <b-card-body>
+        <b-row>
+          <b-col>
+        <Url url="/adabas/database" />
+          </b-col>
+            <b-col class="text-right">
+              <b-button v-on:click="forceFEOF()">Force EOF</b-button>
+            </b-col>
+        </b-row>
+        <b-row>
+        <b-table
+          class="w-100 p-3"
+          striped
+          bordered
+          hover
+          small
+          :items="infos"
+          :fields="fields"
+        ></b-table>
+        </b-row>
+      </b-card-body>
+    </b-card>
+    <StatusBar />
+    <ErrorModal />
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Provide, Vue } from 'vue-property-decorator';
+import Sidebar from './Sidebar.vue';
+import StatusBar from './StatusBar.vue';
+import store from '../store/index';
+import Url from './Url.vue';
+import ErrorModal from '@/components/ErrorModal.vue';
+import { SearchDatabases } from '@/adabas/admin';
+
+@Component({
+  components: {
+    Sidebar,
+    StatusBar,
+    Url,
+    ErrorModal,
+  },
+})
+export default class DatabasePlogStat extends Vue {
+  @Prop(String) readonly url: string | undefined;
+  @Provide() type = 'static';
+  data() {
+    return {
+      db: null,
+      infos: [],
+      fields: ['Name', 'Value'],
+    };
+  }
+  created() {
+    this.$data.db = SearchDatabases(this.url);
+    this.queryInformation();
+  }
+  queryInformation(): void {
+    this.$data.db.plogstats().then((response: any) => {
+      console.log(JSON.stringify(response));
+      this.$data.information = response.PLOG;
+      this.$data.DatabaseInfos = [];
+      Object.entries(response["PLOG"]).forEach((key: any) => {
+        this.$data.infos.push({ Name: key[0], Value: key[1] });
+      });
+    });
+  }
+  getTypeItem(newtype: any): void {
+    console.log('Get type item ' + newtype);
+    this.queryInformation();
+  }
+  forceFEOF(newtype: any): void {
+    this.$data.db.feofplog();
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+h3 {
+  margin: 40px 0 0;
+}
+.card-header {
+  font-weight: bold;
+  font-size: 18px;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: #42b983;
+}
+</style>

src/components/FilesList.vue

@@ -40,15 +40,17 @@
             </b-col>
           </b-row>
           <b-row
-            ><b-col sm="4">
+            ><b-col sm="10">
               <b-pagination
                 v-model="currentPage"
                 :total-rows="files.length"
                 :per-page="perPage"
                 aria-controls="my-table"
               ></b-pagination>
-            </b-col>
-            <b-col sm="8">
+            </b-col><b-col sm="2">
+              <b-form-select v-model="perPage" :options="perPageOptions" size="sm" class="mt-3"></b-form-select>
+          </b-col></b-row><b-row>
+            <b-col sm="12">
               <b-form-group
                 label="Filter"
                 label-cols-sm="3"
@@ -90,6 +92,9 @@
                 :items="files"
                 :fields="fields"
               >
+                 <template v-slot:cell(RecordCount)="row">
+                  {{new Intl.NumberFormat().format(row.item.RecordCount)}}
+                </template>
                 <template v-slot:cell(action)="row">
                   <b-dropdown
                     size="sm"
@@ -261,8 +266,9 @@ export default class FilesList extends Vue {
       newNr: 500,
       currentFile: 0,
       perPage: 10,
+      perPageOptions: [10,20,50,100],
       currentPage: 1,
-      fields: ["FileNr", "Name", "RecordCount", "IsLob", "IsLobRoot", "action"],
+      fields: ["FileNr", "Name","Type", "RecordCount", "IsLob", "IsLobRoot", "action"],
       files: [],
       filter: "",
       filterOn: ["FileNr", "Name"],