fix types

Author: AnthonyGress

backend/src/routes/layout.route.ts

@@ -4,6 +4,7 @@ import fs from 'fs/promises';
 import StatusCodes from 'http-status-codes';
 import path from 'path';
 
+import { Config } from '../types';
 export const layoutRoute = Router();
 
 const CONFIG_FILE = path.join(__dirname, '../config/config.json');
@@ -36,7 +37,7 @@ layoutRoute.post('/', async (req: Request, res: Response): Promise<void> => {
         console.log('saving layout body', req.body);
 
         const { desktop, mobile } = req.body;
-        const config = loadConfig();
+        const config: Config = loadConfig();
 
         console.log('config', config);
         config.layout.desktop = desktop && desktop.length > 0 ? desktop : config.layout.desktop;

shared/types/config.ts backend/src/types/index.tsshared/types/config.ts renamed to backend/src/types/index.ts

@@ -1,5 +1,3 @@
-import { DashboardItem } from './dashboard-item'
-
 export type Config = {
     layout: {
         desktop: DashboardItem[];
@@ -11,3 +9,13 @@ export type DashboardLayout = {
     desktop: DashboardItem[];
     mobile: DashboardItem[];
 }
+
+export type DashboardItem = {
+    id: string;
+    label: string;
+    type: string;
+    url?: string;
+    icon?: { path: string; name: string; source?: string; };
+    showName?: boolean;
+};
+

backend/tsconfig.json

@@ -12,7 +12,6 @@
   },
   "include": [
     "index.ts",
-    "./src/config/config.json",
-    "../shared"
+    "./src/config/config.json"
   ]
 }

frontend/src/api/dash-api.ts

@@ -1,10 +1,8 @@
 import axios from 'axios';
 import { StatusCodes } from 'http-status-codes';
 
-import { DashboardLayout } from '../../../shared/types/config';
-import { DashboardItem } from '../../../shared/types/dashboard-item';
 import { BACKEND_URL } from '../constants/constants';
-import { Icon } from '../types';
+import { DashboardItem, DashboardLayout, Icon } from '../types';
 
 
 export class DashApi {

frontend/src/components/dnd/DashboardGrid.tsx

@@ -19,9 +19,8 @@ import { SortableAppShortcut } from './SortableAppShortcut';
 import { SortableDateTimeWidget } from './SortableDateTime';
 import { SortableSystemMonitorWidget } from './SortableSystemMonitor';
 import { SortableWeatherWidget } from './SortableWeather';
-import { DashboardItem } from '../../../../shared/types/dashboard-item';
 import { useAppContext } from '../../context/useAppContext';
-import { ITEM_TYPE } from '../../types';
+import { DashboardItem, ITEM_TYPE } from '../../types';
 import { AddEditForm } from '../forms/AddEditForm';
 import { CenteredModal } from '../modals/CenteredModal';
 import { ConfirmationOptions, PopupManager } from '../modals/PopupManager';

frontend/src/components/forms/AddEditForm.tsx

@@ -3,13 +3,13 @@ import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import {  CheckboxElement, FormContainer, SelectElement, TextFieldElement } from 'react-hook-form-mui';
 
-import { DashboardItem } from '../../../../shared/types/dashboard-item';
+
 import { DashApi } from '../../api/dash-api';
 import { useAppContext } from '../../context/useAppContext';
 import { useIsMobile } from '../../hooks/useIsMobile';
 import { COLORS, styles } from '../../theme/styles';
 import { theme } from '../../theme/theme';
-import { Icon, ITEM_TYPE, NewItem } from '../../types';
+import { DashboardItem, Icon, ITEM_TYPE, NewItem } from '../../types';
 import { IconSearch } from '../IconSearch';
 
 type Props = {

frontend/src/context/AppContext.tsx

@@ -1,7 +1,6 @@
 import { createContext, Dispatch, SetStateAction } from 'react';
 
-import { DashboardItem } from '../../../shared/types/dashboard-item';
-import { NewItem } from '../types';
+import { DashboardItem, NewItem } from '../types';
 
 export interface IAppContext {
     dashboardLayout: DashboardItem[];

frontend/src/context/AppContextProvider.tsx

@@ -3,12 +3,10 @@ import { ReactNode, useState } from 'react';
 import shortid from 'shortid';
 
 import { AppContext } from './AppContext';
-import { DashboardLayout } from '../../../shared/types/config';
-import { DashboardItem } from '../../../shared/types/dashboard-item';
 import { DashApi } from '../api/dash-api';
 import { initialItems } from '../constants/constants';
 import { theme } from '../theme/theme';
-import { NewItem } from '../types';
+import { DashboardItem, DashboardLayout, NewItem } from '../types';
 
 type Props = {
     children: ReactNode
@@ -25,7 +23,9 @@ export const AppContextProvider = ({ children }: Props) => {
 
         if (res) {
             const selectedLayout = isMobile ? res.mobile : res.desktop;
-            setDashboardLayout(selectedLayout);
+            if (selectedLayout.length > 0) {
+                setDashboardLayout(selectedLayout);
+            }
             return selectedLayout;
         }
         return [];

frontend/src/types/index.ts

@@ -22,3 +22,25 @@ export type Icon = {
     source?: string;
     guidelines?: string;
 }
+
+export type Config = {
+    layout: {
+        desktop: DashboardItem[];
+        mobile: DashboardItem[];
+    }
+}
+
+export type DashboardLayout = {
+    desktop: DashboardItem[];
+    mobile: DashboardItem[];
+}
+
+export type DashboardItem = {
+    id: string;
+    label: string;
+    type: string;
+    url?: string;
+    icon?: { path: string; name: string; source?: string; };
+    showName?: boolean;
+};
+

frontend/tsconfig.app.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "tsBuildInfoFile": "./frontend/node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
     "target": "ES2020",
     "useDefineForClassFields": true,
     "lib": [
@@ -26,6 +26,5 @@
   },
   "include": [
     "./src",
-    "../shared"
   ]
 }