From c0f26819dc05e4a828fbb79e47dbe80c131c5586 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 25 Aug 2022 08:10:11 +0100
Subject: [PATCH] Update types

---
 .../server/src/api/controllers/application.ts    | 16 ++++++----------
 packages/types/src/documents/app/app.ts          |  6 ++++++
 packages/types/src/documents/app/layout.ts       |  4 +++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 0636eded84..926fe0ec52 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -252,7 +252,6 @@ const performAppCreate = async (ctx: any) => {
   const appId = instance._id
   const db = context.getAppDB()
 
-  // Create new app doc
   let newApplication: App = {
     _id: DocumentType.APP_METADATA,
     _rev: undefined,
@@ -263,7 +262,7 @@ const performAppCreate = async (ctx: any) => {
     name: name,
     url: url,
     template: templateKey,
-    instance: instance,
+    instance,
     tenantId: getTenantId(),
     updatedAt: new Date().toISOString(),
     createdAt: new Date().toISOString(),
@@ -290,15 +289,14 @@ const performAppCreate = async (ctx: any) => {
   // Fetch and migrate some metadata from the existing app.
   try {
     const existing: App = await db.get(DocumentType.APP_METADATA)
-    const keys: string[] = [
+    const keys: (keyof App)[] = [
       "_rev",
       "navigation",
       "theme",
       "customTheme",
       "icon",
     ]
-    keys.forEach((key: string) => {
-      // @ts-ignore
+    keys.forEach(key => {
       if (existing[key]) {
         // @ts-ignore
         newApplication[key] = existing[key]
@@ -602,17 +600,15 @@ const updateAppPackage = async (appPackage: any, appId: any) => {
 const migrateAppNavigation = async () => {
   const db = context.getAppDB()
   const existing: App = await db.get(DocumentType.APP_METADATA)
-  const layouts = await getLayouts()
-  const screens = await getScreens()
+  const layouts: Layout[] = await getLayouts()
+  const screens: Screen[] = await getScreens()
 
   // Migrate all screens, removing custom layouts
   for (let screen of screens) {
     if (!screen.layoutId) {
       return
     }
-    const layout = layouts.find(
-      (layout: Layout) => layout._id === screen.layoutId
-    )
+    const layout = layouts.find(layout => layout._id === screen.layoutId)
     screen.layoutId = undefined
     screen.showNavigation = layout?.props.navigation !== "None"
     screen.width = layout?.props.width || "Large"
diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts
index 55eebe389d..a03875aa50 100644
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@@ -18,6 +18,7 @@ export interface App extends Document {
   revertableVersion?: string
   navigation?: AppNavigation
   automationErrors?: AppMetadataErrors
+  icon?: AppIcon
 }
 
 export interface AppInstance {
@@ -53,3 +54,8 @@ export interface AppCustomTheme {
   navTextColor?: string
   navBackground?: string
 }
+
+export interface AppIcon {
+  name: string
+  color: string
+}
diff --git a/packages/types/src/documents/app/layout.ts b/packages/types/src/documents/app/layout.ts
index 85ca4b7e94..db046e3d92 100644
--- a/packages/types/src/documents/app/layout.ts
+++ b/packages/types/src/documents/app/layout.ts
@@ -1,3 +1,5 @@
 import { Document } from "../document"
 
-export interface Layout extends Document {}
+export interface Layout extends Document {
+  props: any
+}