Remove typescript warnings

Author: thknieling

src/adabas/admin.ts

@@ -24,12 +24,13 @@ import axios, { AxiosResponse } from "axios";
 import store from "../store/index";
 
 interface AdabasAdminType {
-  Active: boolean;
-  Dbid: number;
-  Name: string;
-  StructureLevel: number;
-  Version:string;
+    Active: boolean;
+    Dbid: number;
+    Name: string;
+    StructureLevel: number;
+    Version: string;
 }
+
 /* 
  * This typescript class AdabasAdmin handles all database administration
  * and monitor tasks provided by Adabas REST server.

src/adabas/jobs.ts

@@ -20,97 +20,133 @@
 import { authHeader } from "../user/auth-header";
 import { config } from "../store/config";
 import { userService } from "../user/service";
-import axios from "axios";
+import axios, { AxiosResponse } from "axios";
 import { triggerCall } from "./admin";
 
+interface JobJobType {
+    Name: string;
+    User: string;
+    Utility: string;
+    Environments: {
+        Parameter: string
+    }
+    Parameters: {
+        Parameter: string
+    }
+}
+
+interface JobExecutionType {
+    Ended: string;
+    ExitCode: number;
+    Log: string;
+    Id: string;
+    Scheduled: string;
+}
+
+interface JobAdminType {
+    Executions: JobExecutionType[];
+    Job: JobJobType;
+    Status: string;
+}
+
 export class JobAdmin {
-    private status: any;
-    constructor(dbInput: any) {
+    private status: JobAdminType;
+    constructor(dbInput: JobAdminType) {
         this.status = dbInput;
-        console.log("JOBS struct: "+JSON.stringify(dbInput));
     }
-    start() {
-        console.log("Starting ...");
+    // Schedule the job
+    async start(): Promise<AxiosResponse<any>> {
         const getConfig = {
             headers: authHeader("application/json"),
             useCredentails: true,
         };
-        return axios
-            .put(config.Url() + "/scheduler/job/" + this.status.Job.Name, {}, getConfig)
-            .catch((error: any) => {
-                if (error.response) {
-                    if (error.response.status == 401 || error.response.status == 403) {
-                        userService.logout();
-                        location.reload(true);
-                    }
+        try {
+            return axios
+                .put(config.Url() + "/scheduler/job/" + this.status.Job.Name, {}, getConfig);
+        }
+        catch (error) {
+            if (error.response) {
+                if (error.response.status == 401 || error.response.status == 403) {
+                    userService.logout();
+                    location.reload(true);
                 }
-                throw error;
-            });
+            }
+            throw error;
+        }
     }
     name(): string {
         return this.status.Job.Name;
     }
-    delete() {
+    async delete(): Promise<AxiosResponse<any>> {
         const getConfig = {
             headers: authHeader("application/json"),
             useCredentails: true,
         };
-        return axios
-            .delete(config.Url() + "/scheduler/job/" + this.status.Job.Name, getConfig)
-            .catch((error: any) => {
-                if (error.response) {
-                    if (error.response.status == 401 || error.response.status == 403) {
-                        userService.logout();
-                        location.reload(true);
-                    }
+        try {
+            return axios
+                .delete(config.Url() + "/scheduler/job/" + this.status.Job.Name, getConfig);
+        }
+        catch (error) {
+            if (error.response) {
+                if (error.response.status == 401 || error.response.status == 403) {
+                    userService.logout();
+                    location.reload(true);
                 }
-                throw error;
-            });
+            }
+            throw error;
+        }
     }
-    delete_execution(id: string) {
+    async delete_execution(id: string): Promise<AxiosResponse<any>> {
         console.log("Starting ...");
         const getConfig = {
             headers: authHeader("application/json"),
             useCredentails: true,
         };
-        return axios
-            .delete(config.Url() + "/scheduler/job/" + this.status.Job.Name + "/result/" + id, getConfig)
-            .catch((error: any) => {
-                if (error.response) {
-                    if (error.response.status == 401 || error.response.status == 403) {
-                        userService.logout();
-                        location.reload(true);
-                    }
+        try {
+            return axios
+                .delete(config.Url() + "/scheduler/job/" + this.status.Job.Name + "/result/" + id, getConfig);
+        }
+        catch (error) {
+            if (error.response) {
+                if (error.response.status == 401 || error.response.status == 403) {
+                    userService.logout();
+                    location.reload(true);
                 }
-                throw error;
-            });
+            }
+            throw error;
+        }
 
     }
 }
 
-export function insertJob(job: any): Promise<any> {
+// Insert job in REST server configuration.
+export async function insertJob(job: any): Promise<any> {
     const getConfig = {
         headers: authHeader("application/json"),
         useCredentails: true,
     };
-    return axios
-        .post(config.Url() + "/scheduler/job/", job, getConfig)
-        .catch((error: any) => {
-            if (error.response) {
-                if (error.response.status == 401 || error.response.status == 403) {
-                    userService.logout();
-                    location.reload(true);
-                }
+    try {
+        return axios
+            .post(config.Url() + "/scheduler/job/", job, getConfig);
+    }
+    catch (error) {
+        if (error.response) {
+            if (error.response.status == 401 || error.response.status == 403) {
+                userService.logout();
+                location.reload(true);
             }
-            throw error;
-        });
+        }
+        throw error;
+    }
 }
-export function loadJobs(): Promise<any> {
-    return triggerCall("/scheduler/job").then((response: any) => {
-        const jobs = [] as any[];
-        response.JobDefinition.forEach((element: any) => {
-            jobs.push(new JobAdmin(element));
-        });
-        return jobs;
+
+// Load all jobs available in REST server. Return array
+// of all jobs.
+export async function loadJobs(): Promise<any> {
+    const response = await triggerCall("/scheduler/job");
+    const jobs = ([] as JobAdmin[]);
+    response.JobDefinition.forEach((element: any) => {
+        jobs.push(new JobAdmin(element));
     });
+    return jobs;
 }