Merge pull request #57 from oslabs-beta/cedar/types

Migrated interfaces/types to root folder.

Author: tiffanynchau

src/components/Authentication.tsx

@@ -1,16 +1,12 @@
 import React from 'react';
 import { Navigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
+import { RootState } from '../../types'
 
-interface RootState {
-  session: {
-    isLoggedIn: boolean
-  }
-}
 
 const Authentication = () => {
   // grab session information from state
-  const session: boolean = useSelector((state: RootState) => state.session.isLoggedIn);
+  const session: any = useSelector((state: RootState) => state.session.isLoggedIn);
   // if session is false navigate to login, if session is true navigate to outlet
   return (
     session ? <Navigate to='/app' /> : <Navigate to='/login' />

src/components/Login.tsx

@@ -16,20 +16,10 @@
 
  // @ts-ignore
  import Docketeer from '../../assets/docketeer-title.png';
+
+ // import interface
+ import { UserInfo } from '../../types';
 
- interface UserInfo {
-   _id: number,
-   username: string,
-   email: string,
-   phone: string,
-   role: string,
-   role_id: number,
-   contact_pref: string | null,
-   mem_threshold: number,
-   cpu_threshold: number,
-   container_stops: boolean,
-   token: string
- }
 
  const Login = () => {
    const navigate = useNavigate();

src/components/RenderViews.tsx

@@ -4,12 +4,7 @@ import { useSelector } from 'react-redux';
 import AdminView from './views/Admin';
 import UserView from './views/UserView';
 import SysAdminView from './views/SysAdmin';
-
-interface RootState {
-  session: {
-    role: string
-  }
-}
+import { RootState } from '../../types';
 
 const RenderViews = ():any => {
   // grab current user's role

src/components/debug/debugRouter.js

@@ -8,7 +8,7 @@ class DebugRouter extends Router {
     this.history.listen((location, action)=>{
       console.log(
         `The current URL is ${location.pathname}${location.search}${location.hash}`
-      )
+      );
       console.log(`The last navigation action was ${action}`, JSON.stringify(this.history, null,2));
     });
   }

src/components/display/AccountDisplay.tsx

@@ -2,8 +2,8 @@
  * @module AccountDisplay
  * @description Account Display for Settings tab, this will host any forms to update account details such as email, passwords, etc.
  */
-import React, { useEffect, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
+import React from "react";
+import { useSelector } from "react-redux";
 
 // Material UI Imports
 import Button from "@mui/material/Button";

src/components/display/LineChartDisplay.tsx

@@ -7,7 +7,7 @@ import * as helper from "../helper/commands";
 import { DataGrid } from "@mui/x-data-grid";
 import { FormControlLabel, Checkbox } from "@mui/material";
 import { RootState } from "../../renderer/store";
-import { AnyAction } from "redux";
+import { auxObjType, obType } from '../../../types';
 
 /**
  * Displays linegraph and github metrics
@@ -26,10 +26,10 @@ const LineChartDisplay = () => {
   const readIO = useSelector((state: RootState) => state.graphs["graphReadIO"]);
   const axis = useSelector((state: RootState) => state.graphs["graphAxis"]);
   const runningList = useSelector(
-    (state: RootState) => state.containersList.runningList
+    (state: RootState) => state.containersList['runningList']
   );
   const stoppedList = useSelector(
-    (state: RootState) => state.containersList.stoppedList
+    (state: RootState) => state.containersList['stoppedList']
   );
 
   const dispatch = useDispatch();
@@ -64,7 +64,7 @@ const LineChartDisplay = () => {
     labels: axis,
     datasets: cpu,
   };
-  const writtenIOObj = {
+const writtenIOObj = {
     labels: axis,
     datasets: writtenIO,
   };
@@ -145,27 +145,7 @@ const LineChartDisplay = () => {
 
     const containerMetrics = await getContainerMetrics();
 
-    interface auxObjType {
-      container?: ContainerInterface;
-      currentContainer?: any;
-      containerName?: string;
-    }
-
-    interface ContainerInterface {
-      memory?: any;
-      cpu?: any;
-      writtenIO?: any;
-      readIO?: any;
-    }
-
-    // interface ContainerNameInterface{
-
-    // }
-
-    //const container: keyof auxObjType = 'container'
-
     const auxObj: auxObjType = {};
-    //const container: keyof typeof auxObj;
     Object.keys(activeContainers).forEach((container) => {
       auxObj[container as keyof typeof auxObj] = {
         memory: buildLineGraphObj(container),
@@ -207,7 +187,7 @@ const LineChartDisplay = () => {
       buildAxis(timeStamp);
     });
 
-    let longest = 0; // 32
+    let longest = 0; 
 
     Object.keys(auxObj).forEach((containerName: string) => {
       if (
@@ -248,9 +228,6 @@ const LineChartDisplay = () => {
     });
   };
 
-  interface obType {
-    containerName?: any;
-  }
 
   //Fetching the data from github API and turning it into an object with keys of objects that contain the data of each container
   const fetchGitData = async (containerName: string) => {
@@ -273,7 +250,7 @@ const LineChartDisplay = () => {
         new URLSearchParams({
           since: `${date}`,
         });
-      //need an actual url to test this, right now it can't connect
+      //need a url to test this, right now it can't connect
       const data = await fetch(url);
       const jsonData = await data.json();
 
@@ -322,10 +299,6 @@ const LineChartDisplay = () => {
     { field: "message", headerName: "Message", width: 525, align: "left" },
   ];
 
-  // interface elType {
-  //   name: {};
-  // }
-
   gitData = gitUrls.map((el, index: any) => {
     const name = Object.keys(el);
     type rowsType = any[];
@@ -399,9 +372,9 @@ const LineChartDisplay = () => {
     const result: any[] = [];
     const completeContainerList = [...runningList, ...stoppedList];
     completeContainerList.forEach((container, index) => {
-      const containerNameKey = container.Name
-        ? container.Name
-        : container.Names;
+      const containerNameKey = container['Name']
+        ? container['Name']
+        : container['Names'];
       result.push(
         <FormControlLabel
           key={`formControl-${index}`}