Browser download clone

cli.ts

@@ -3,7 +3,7 @@ import { Command } from "commander";
 import { Git } from "./src/models/Git";
 import dataSource from "./src/utils/DB";
 
-const pkg: {version: string} = require("../package.json");  // eslint-disable-line
+const pkg: { version: string } = require("../package.json");  // eslint-disable-line
 const cmd = new Command();
 
 interface CommandOptions {
@@ -27,93 +27,93 @@ cmd
   .option("-s, --sha <sha>", "[operation=add/update] git repository's sha hash")
   .action(async (operation: string, cmd: CommandOptions) => {
     switch (operation) {
-    case "add": {
-      const git = new Git();
+      case "add": {
+        const git = new Git();
 
-      if (cmd.address && cmd.id) {
-        git.address = cmd.address;
-        git.id = cmd.id;
-      } else {
-        console.error(
-          "-a, --address <address> and -i, --id <id> flags is required"
-        );
-        return;
-      }
+        if (cmd.address && cmd.id) {
+          git.address = cmd.address;
+          git.id = cmd.id;
+        } else {
+          console.error(
+            "-a, --address <address> and -i, --id <id> flags is required"
+          );
+          return;
+        }
 
-      git.isApproved = true;
-      if (cmd.sha) git.sha = cmd.sha;
+        git.isApproved = true;
+        if (cmd.sha) git.sha = cmd.sha;
 
-      const gitRepo = dataSource.getRepository(Git);
-      await gitRepo.save(git);
+        const gitRepo = dataSource.getRepository(Git);
+        await gitRepo.save(git);
 
-      console.log("git successfully added:");
-      console.log(git);
+        console.log("git successfully added:");
+        console.log(git);
 
-      break;
-    }
-    case "update": {
-      if (!cmd.id) {
-        console.error("-i, --id <id> flag is required");
-        return;
+        break;
       }
+      case "update": {
+        if (!cmd.id) {
+          console.error("-i, --id <id> flag is required");
+          return;
+        }
 
-      const i: { address?: string, sha?: string } = {};
+        const i: { address?: string, sha?: string } = {};
 
-      if (cmd.address) i.address = cmd.address;
-      if (cmd.sha) i.sha = cmd.sha;
+        if (cmd.address) i.address = cmd.address;
+        if (cmd.sha) i.sha = cmd.sha;
 
-      await dataSource
-        .createQueryBuilder()
-        .update(Git)
-        .where("id = :id", { id: cmd.id })
-        .set(i)
-        .execute();
+        await dataSource
+          .createQueryBuilder()
+          .update(Git)
+          .where("id = :id", { id: cmd.id })
+          .set(i)
+          .execute();
 
-      console.log("git successfully updated:");
-      const gitRepo = dataSource.getRepository(Git);
-      console.log(await gitRepo.findOneBy({ id: cmd.id }));
+        console.log("git successfully updated:");
+        const gitRepo = dataSource.getRepository(Git);
+        console.log(await gitRepo.findOneBy({ id: cmd.id }));
 
-      break;
-    }
-    case "approve": {
-      if (!cmd.id) {
-        console.error("-i, --id <id> flag is required");
-        return;
+        break;
       }
-
-      await dataSource
-        .createQueryBuilder()
-        .update(Git)
-        .where("id = :id", { id: cmd.id })
-        .set({ isApproved: true })
-        .execute();
-
-      console.log("git approved");
-
-      break;
-    }
-    case "delete": {
-      if (!cmd.id) {
-        console.error("-i, --id <id> flag is required");
-        return;
+      case "approve": {
+        if (!cmd.id) {
+          console.error("-i, --id <id> flag is required");
+          return;
+        }
+
+        await dataSource
+          .createQueryBuilder()
+          .update(Git)
+          .where("id = :id", { id: cmd.id })
+          .set({ isApproved: true })
+          .execute();
+
+        console.log("git approved");
+
+        break;
       }
+      case "delete": {
+        if (!cmd.id) {
+          console.error("-i, --id <id> flag is required");
+          return;
+        }
 
-      const gitRepo = dataSource.getRepository(Git);
-      await gitRepo.delete(cmd.id);
+        const gitRepo = dataSource.getRepository(Git);
+        await gitRepo.delete(cmd.id);
 
-      console.log("git successfully deleted");
+        console.log("git successfully deleted");
 
-      break;
-    }
-    default: {
-      console.error(
-        "<operation> invalid operation, only support [add/update/delete/approve]"
-      );
+        break;
+      }
+      default: {
+        console.error(
+          "<operation> invalid operation, only support [add/update/delete/approve]"
+        );
 
-      break;
-    }
+        break;
+      }
     }
-    
+
     await dataSource.destroy();
   });
 

configs/config.ts

@@ -5,7 +5,7 @@ import {
   containerConfig,
   jupyterGlobusMapConfig,
   kernelConfig,
-} from "../src/utils/types";
+} from "../src/definitions";
 // eslint-disable-next-line import/order
 import rawConfig from "../config.json"; // base config
 import rawContainerConfig from "./container.json";  // docker container config
@@ -14,62 +14,57 @@ import rawJupyterGlobusMapConfig from "./jupyter-globus-map.json";  // globus co
 import rawKernelConfig from "./kernel.json";  // python kernel configs
 import rawMaintainer from "./maintainer.json";  // maintainer config
 
+type ConfigMap = Record<string, unknown>;
+
+function createConfigMap<T>(
+  rawConfig: ConfigMap,
+  defaultValues: Partial<T> = {}
+): Record<string, T> {
+  const configMap: Record<string, T> = {};
+
+  for (const key in rawConfig) {
+    configMap[key] = Object.assign(
+      {},
+      defaultValues,
+      JSON.parse(JSON.stringify(rawConfig[key]))
+    ) as T;
+  }
+
+  return configMap;
+}
+
 const config: baseConfig = JSON.parse(JSON.stringify(rawConfig)) as baseConfig;
 
 // create and populate configs
+const hpcDefaults: Partial<hpcConfig> = {
+  ip: undefined,
+  port: undefined,
+  is_community_account: undefined,
+  community_login: undefined,
+  root_path: undefined,
+  job_pool_capacity: undefined,
+  init_sbatch_script: [],
+  init_sbatch_options: [],
+  description: "none",
+  globus: undefined,
+  mount: {},
+  slurm_input_rules: {},
+  allocation: undefined,
+  partition: undefined
+};
 
-const hpcConfigMap: Record<string, hpcConfig> = {};
-for (const hpc in rawHpc) {
-  hpcConfigMap[hpc] = Object.assign(
-    {
-      ip: undefined,
-      port: undefined,
-      is_community_account: undefined,
-      community_login: undefined,
-      root_path: undefined,
-      job_pool_capacity: undefined,
-      init_sbatch_script: [],
-      init_sbatch_options: [],
-      description: "none",
-      globus: undefined,
-      mount: {},
-      slurm_input_rules: {},
-      allocation: undefined,
-      partition: undefined
-    },
-    JSON.parse(JSON.stringify((rawHpc as Record<string, unknown>)[hpc]))
-  ) as hpcConfig;
-}
-
-const jupyterGlobusMap: Record<string, jupyterGlobusMapConfig> = {};
-for (const globusMap in rawJupyterGlobusMapConfig) {
-  jupyterGlobusMap[globusMap] = JSON.parse(
-    JSON.stringify(
-      (rawJupyterGlobusMapConfig as Record<string, unknown>)[globusMap]
-    )
-  ) as jupyterGlobusMapConfig;
-}
+const hpcConfigMap: Record<string, hpcConfig> = createConfigMap(rawHpc as ConfigMap, hpcDefaults);
 
-const maintainerConfigMap: Record<string, maintainerConfig> = {};
-for (const maintainer in rawMaintainer) {
-  maintainerConfigMap[maintainer] = JSON.parse(
-    JSON.stringify((rawMaintainer as Record<string, unknown>)[maintainer])
-  ) as maintainerConfig;
-}
+const jupyterGlobusMap: Record<string, jupyterGlobusMapConfig> = 
+  createConfigMap(rawJupyterGlobusMapConfig as ConfigMap);
 
-const containerConfigMap: Record<string, containerConfig> = {};
-for (const container in rawContainerConfig) {
-  containerConfigMap[container] = JSON.parse(
-    JSON.stringify((rawContainerConfig as Record<string, unknown>)[container])
-  ) as containerConfig;
-}
+const maintainerConfigMap: Record<string, maintainerConfig> = 
+  createConfigMap(rawMaintainer as ConfigMap);
 
-const kernelConfigMap: Record<string, kernelConfig> = {};
-for (const i in rawKernelConfig) {
-  kernelConfigMap[i] = JSON.parse(
-    JSON.stringify((rawKernelConfig as Record<string, unknown>)[i])
-  ) as kernelConfig;
-}
+const containerConfigMap: Record<string, containerConfig> = 
+  createConfigMap(rawContainerConfig as ConfigMap);
+
+const kernelConfigMap: Record<string, kernelConfig> = createConfigMap(rawKernelConfig as ConfigMap);
 
 export {
   config,

eslint.config.js

@@ -22,7 +22,7 @@ module.exports = tseslint.config(
         ...globals.node
       }
     },
-    
+
   },
 
   {
@@ -34,7 +34,11 @@ module.exports = tseslint.config(
     rules: {
       indent: [
         "error",
-        2
+        2,
+        {
+          "SwitchCase": 1,
+          "ignoredNodes": ["ConditionalExpression", "flatTernaryExpressions "]
+        },
       ],
       "linebreak-style": 0,
       quotes: [
@@ -45,7 +49,7 @@ module.exports = tseslint.config(
         "error",
         "always"
       ],
-      "no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
+      "no-unused-vars": "off",
       "@typescript-eslint/no-unused-vars": [
         "error", { argsIgnorePattern: "^_" }
       ],
@@ -81,12 +85,12 @@ module.exports = tseslint.config(
         },
       ],
       "stylistic/max-len": [
-        "error", 
-        { 
-          ignoreTemplateLiterals: true, 
-          code: 100, 
-          ignoreComments: true, 
-          ignoreStrings: true 
+        "error",
+        {
+          ignoreTemplateLiterals: true,
+          code: 100,
+          ignoreComments: true,
+          ignoreStrings: true
         }
       ],
       "stylistic/object-curly-spacing": [