Typescript conversion (#1805)

6 files changed, 123 insertions, 61 deletions

diff --git a/src/models/News.js b/src/models/News.ts
index acacb97dd..3db812937 100644
--- a/src/models/News.js
+++ b/src/models/News.ts
@@ -1,15 +1,22 @@
 // @flow
 
+interface INews {
+  id: string;
+  message: string;
+  type: string;
+  sticky: boolean | undefined;
+}
+
 export default class News {
-  id = '';
+  id: string = '';
 
-  message = '';
+  message: string = '';
 
-  type = 'primary';
+  type: string = 'primary';
 
-  sticky = false;
+  sticky: boolean = false;
 
-  constructor(data) {
+  constructor(data: INews) {
     if (!data.id) {
       throw Error('News requires Id');
     }
diff --git a/src/models/Order.js b/src/models/Order.js
deleted file mode 100644
index f7624c627..000000000
--- a/src/models/Order.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export default class Order {
-  id = '';
-
-  subscriptionId = '';
-
-  name = '';
-
-  invoiceUrl = '';
-
-  price = '';
-
-  date = '';
-
-  constructor(data) {
-    this.id = data.id;
-    this.subscriptionId = data.subscriptionId;
-    this.name = data.name || this.name;
-    this.invoiceUrl = data.invoiceUrl || this.invoiceUrl;
-    this.price = data.price || this.price;
-    this.date = data.date || this.date;
-  }
-}
diff --git a/src/models/Order.ts b/src/models/Order.ts
new file mode 100644
index 000000000..546b813a0
--- /dev/null
+++ b/src/models/Order.ts
@@ -0,0 +1,33 @@
+// TODO: Can this file be deleted?
+
+interface IOrder {
+  id: string;
+  subscriptionId: string;
+  name: string;
+  invoiceUrl: string;
+  price: string;
+  date: string;
+}
+
+export default class Order {
+  id: string = '';
+
+  subscriptionId: string = '';
+
+  name: string = '';
+
+  invoiceUrl: string = '';
+
+  price: string = '';
+
+  date: string = '';
+
+  constructor(data: IOrder) {
+    this.id = data.id;
+    this.subscriptionId = data.subscriptionId;
+    this.name = data.name || this.name;
+    this.invoiceUrl = data.invoiceUrl || this.invoiceUrl;
+    this.price = data.price || this.price;
+    this.date = data.date || this.date;
+  }
+}
diff --git a/src/models/Recipe.js b/src/models/Recipe.ts
index 0d97d4472..33d383983 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.ts
@@ -2,47 +2,71 @@ import semver from 'semver';
 import { pathExistsSync } from 'fs-extra';
 import { join } from 'path';
 
+interface IRecipe {
+  id: string;
+  name: string;
+  version: string;
+  aliases?: string[];
+  path: string;
+  config: {
+    serviceURL?: string;
+    hasDirectMessages?: boolean;
+    hasIndirectMessages?: boolean;
+    hasNotificationSound?: boolean;
+    hasTeamId?: boolean;
+    hasCustomUrl?: boolean;
+    hasHostedOption?: boolean;
+    urlInputPrefix?: string;
+    urlInputSuffix?: string;
+    disablewebsecurity?: boolean;
+    autoHibernate?: boolean;
+    partition?: string;
+    message?: string;
+  };
+}
+
 export default class Recipe {
   // Note: Do NOT change these default values. If they change, then the corresponding changes in the recipes needs to be done
-  id = '';
+  id: string = '';
 
-  name = '';
+  name: string = '';
 
   description = '';
 
-  version = '';
+  version: string = '';
 
-  aliases = [];
+  aliases: string[] = [];
 
-  path = '';
+  path: string = '';
 
-  serviceURL = '';
+  serviceURL: string = '';
 
-  hasDirectMessages = true;
+  hasDirectMessages: boolean = true;
 
-  hasIndirectMessages = false;
+  hasIndirectMessages: boolean = false;
 
-  hasNotificationSound = false;
+  hasNotificationSound: boolean = false;
 
-  hasTeamId = false;
+  hasTeamId: boolean = false;
 
-  hasCustomUrl = false;
+  hasCustomUrl: boolean = false;
 
-  hasHostedOption = false;
+  hasHostedOption: boolean = false;
 
-  urlInputPrefix = '';
+  urlInputPrefix: string = '';
 
-  urlInputSuffix = '';
+  urlInputSuffix: string = '';
 
-  message = '';
+  message: string = '';
 
-  disablewebsecurity = false;
+  disablewebsecurity: boolean = false;
 
-  autoHibernate = false;
+  autoHibernate: boolean = false;
 
-  partition = '';
+  partition: string = '';
 
-  constructor(data) {
+  // TODO: Need to reconcile which of these are optional/mandatory
+  constructor(data: IRecipe) {
     if (!data) {
       throw Error('Recipe config not valid');
     }
@@ -88,11 +112,11 @@ export default class Recipe {
   }
 
   // TODO: Need to remove this if its not used anywhere
-  get author() {
+  get author(): string[] {
     return [];
   }
 
-  get hasDarkMode() {
+  get hasDarkMode(): boolean {
     return pathExistsSync(join(this.path, 'darkmode.css'));
   }
 }
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.ts
index 6a9ce3080..351ecf765 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.ts
@@ -1,17 +1,17 @@
 // @flow
 
 export default class RecipePreview {
-  id = '';
+  id: string = '';
 
-  name = '';
+  name: string = '';
 
-  icon = '';
+  icon: string = '';
 
-  featured = false;
+  featured: boolean = false;
 
-  aliases = [];
+  aliases: string[] = [];
 
-  constructor(data) {
+  constructor(data: { id: any; }) {
     if (!data.id) {
       throw Error('RecipePreview requires Id');
     }
diff --git a/src/models/User.js b/src/models/User.ts
index d864dde0c..8c6c2b1c9 100644
--- a/src/models/User.js
+++ b/src/models/User.ts
@@ -1,20 +1,40 @@
 import { observable } from 'mobx';
 
+interface IUser {
+  id: string | null;
+  email: string | null;
+  firstname: string | null;
+  lastname: string | null;
+  organization: string | null;
+  accountType: string | null;
+  beta: boolean;
+  donor: object;
+  isDonor: boolean;
+  isMiner: boolean;
+  locale: boolean;
+  isSubscriptionOwner: boolean;
+  hasSubscription: boolean;
+  hadSubscription: boolean;
+  team: object;
+}
+
+// TODO: Need to cleanup these fields since we have removed the tiers of the paid plans from Ferdi
 export default class User {
-  id = null;
+  id: string | null = null;
 
-  @observable email = null;
+  @observable email: string | null = null;
 
-  @observable firstname = null;
+  @observable firstname: string | null = null;
 
-  @observable lastname = null;
+  @observable lastname: string | null = null;
 
-  @observable organization = null;
+  @observable organization: string | null = null;
 
-  @observable accountType = null;
+  @observable accountType: string | null = null;
 
   @observable emailIsConfirmed = true;
 
+  // TODO: Need to delete references to 'subscription' and 'donor'
   // better assume it's confirmed to avoid noise
   @observable subscription = {};
 
@@ -36,7 +56,7 @@ export default class User {
 
   @observable team = {};
 
-  constructor(data) {
+  constructor(data: IUser) {
     if (!data.id) {
       throw Error('User requires Id');
     }