[Cleanup] Address feedback

artsy · Dec 8, 2017 · 5e0b8db · 5e0b8db
1 parent 603c19f
commit 5e0b8db
Show file tree

Hide file tree

Showing 38 changed files with 230 additions and 269 deletions.
diff --git a/src/lib/AppRegistry.tsx b/src/lib/AppRegistry.tsx
@@ -17,16 +17,11 @@ import HomeScene from "./Scenes/Home"
 import renderWithLoadProgress from "./utils/renderWithLoadProgress"
 import { Schema, screenTrack as track } from "./utils/track"
 
-// FIXME: This isnt being used
-// Analytics wrapper for all of our top level React components
-// function AddTrack(_pageName: string) {
-//   return component => component
-// }
-
 interface ArtistProps {
   artistID: string
   isPad: boolean
 }
+
 const Artist: React.SFC<ArtistProps> = track<ArtistProps>(props => {
   return {
     context_screen: Schema.PageNames.ArtistPage,
@@ -35,7 +30,7 @@ const Artist: React.SFC<ArtistProps> = track<ArtistProps>(props => {
   }
 })(props => <ArtistRenderer {...props} render={renderWithLoadProgress(Containers.Artist, props)} />)
 
-const Inbox: React.SFC<{}> = track<{}>(_props => {
+const Inbox: React.SFC<{}> = track<{}>(() => {
   return { context_screen: Schema.PageNames.InboxPage, context_screen_owner_type: null }
 })(() => <InboxRenderer render={renderWithLoadProgress(Containers.Inbox)} />)
 

diff --git a/src/lib/Components/Artist/Articles/Article.tsx b/src/lib/Components/Artist/Articles/Article.tsx
@@ -7,20 +7,7 @@ import fonts from "lib/data/fonts"
 import SwitchBoard from "lib/NativeModules/SwitchBoard"
 import ImageView from "../../OpaqueImageView"
 
-interface Props extends ViewProperties {
-  article: {
-    href: string
-    author: {
-      name
-    }
-    thumbnail_image: {
-      url
-    }
-    thumbnail_title: string
-  }
-}
-
-class Article extends React.Component<Props, {}> {
+class Article extends React.Component<RelayProps & ViewProperties> {
   handleTap() {
     SwitchBoard.presentNavigationViewController(this, this.props.article.href)
   }
@@ -101,16 +88,15 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This is being unused in code
-// interface RelayProps {
-//   article: {
-//     thumbnail_title: string | null
-//     href: string | null
-//     author: {
-//       name: string | null
-//     } | null
-//     thumbnail_image: {
-//       url: string | null
-//     } | null
-//   }
-// }
+interface RelayProps {
+  article: {
+    thumbnail_title: string | null
+    href: string | null
+    author: {
+      name: string | null
+    } | null
+    thumbnail_image: {
+      url: string | null
+    } | null
+  }
+}
diff --git a/src/lib/Components/Artist/Articles/index.tsx b/src/lib/Components/Artist/Articles/index.tsx
@@ -5,11 +5,11 @@ import { createFragmentContainer, graphql } from "react-relay"
 import SerifText from "../../Text/Serif"
 import Article from "./Article"
 
-interface Props extends ViewProperties {
+interface Props extends RelayProps, ViewProperties {
   articles: any[]
 }
 
-class Articles extends React.Component<Props, {}> {
+class Articles extends React.Component<Props> {
   render() {
     const articles = this.props.articles
     return (
@@ -49,9 +49,8 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This is being unused in code
-// interface RelayProps {
-//   articles: Array<{
-//     __id: string
-//   } | null> | null
-// }
+interface RelayProps {
+  articles: Array<{
+    __id: string
+  } | null> | null
+}
diff --git a/src/lib/Components/Artist/Artworks/index.tsx b/src/lib/Components/Artist/Artworks/index.tsx
@@ -19,15 +19,7 @@ interface RenderSectionParams {
   mapPropsToArtworksConnection: (Props) => any
 }
 
-interface Props extends ViewProperties {
-  artist: {
-    counts: {
-      for_sale_artworks: number
-      artworks: number
-    }
-    not_for_sale_artworks: any[]
-    for_sale_artworks: any[]
-  }
+interface Props extends RelayProps, ViewProperties {
   relay: any
 }
 
@@ -138,14 +130,13 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This is unused in code
-// interface RelayProps {
-//   artist: {
-//     counts: {
-//       artworks: boolean | number | string | null
-//       for_sale_artworks: boolean | number | string | null
-//     } | null
-//     for_sale_artworks: Array<boolean | number | string | null> | null
-//     not_for_sale_artworks: Array<boolean | number | string | null> | null
-//   }
-// }
+interface RelayProps {
+  artist: {
+    counts: {
+      artworks: number | null
+      for_sale_artworks: number | null
+    } | null
+    for_sale_artworks: Array<number | null> | null
+    not_for_sale_artworks: Array<boolean | number | string | null> | null
+  }
+}
diff --git a/src/lib/Components/Artist/Biography.tsx b/src/lib/Components/Artist/Biography.tsx
@@ -9,11 +9,7 @@ import SerifText from "../Text/Serif"
 
 const sideMargin = Dimensions.get("window").width > 700 ? 50 : 0
 
-interface Props extends ViewProperties {
-  artist: any
-}
-
-class Biography extends React.Component<Props, any> {
+class Biography extends React.Component<RelayProps & ViewProperties> {
   render() {
     const artist = this.props.artist
     if (!artist.blurb && !artist.bio) {
@@ -70,10 +66,9 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This isn't being used in code
-// interface RelayProps {
-//   artist: {
-//     bio: string | null
-//     blurb: string | null
-//   }
-// }
+interface RelayProps {
+  artist: {
+    bio: string | null
+    blurb: string | null
+  }
+}
diff --git a/src/lib/Components/Artist/Header.tsx b/src/lib/Components/Artist/Header.tsx
@@ -49,7 +49,7 @@ class Header extends React.Component<Props, State> {
     NativeModules.ARTemporaryAPIModule.followStatusForArtist(this.props.artist._id, (error, following) => {
       if (error) {
         // FIXME: Handle error
-        console.error("Artist/Header.tsx |", error)
+        console.error("Artist/Header.tsx", error.message)
       }
       this.setState({ following })
     })

diff --git a/src/lib/Components/Artist/Shows/Metadata.tsx b/src/lib/Components/Artist/Shows/Metadata.tsx
@@ -7,23 +7,7 @@ import SerifText from "lib/Components/Text/Serif"
 import colors from "lib/data/colors"
 import fonts from "lib/data/fonts"
 
-interface Props extends ViewProperties {
-  show: {
-    name: string
-    kind: string
-    exhibition_period: string
-    location?: {
-      city: string
-    }
-    status_update?: string
-    status: string
-    partner?: {
-      name: string
-    }
-  }
-}
-
-class Metadata extends React.Component<Props, any> {
+class Metadata extends React.Component<RelayProps & ViewProperties> {
   render() {
     const partnerName = this.props.show.partner && this.props.show.partner.name
     return (
@@ -120,19 +104,18 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This isn't being used in code
-// interface RelayProps {
-//   show: {
-//     kind: string | null
-//     name: string | null
-//     exhibition_period: string | null
-//     status_update: string | null
-//     status: string | null
-//     partner: {
-//       name: string | null
-//     } | null
-//     location: {
-//       city: string | null
-//     } | null
-//   }
-// }
+interface RelayProps {
+  show: {
+    kind: string | null
+    name: string | null
+    exhibition_period: string | null
+    status_update: string | null
+    status: string | null
+    partner: {
+      name: string | null
+    } | null
+    location: {
+      city: string | null
+    } | null
+  }
+}
diff --git a/src/lib/Components/Artist/Shows/Show.tsx b/src/lib/Components/Artist/Shows/Show.tsx
@@ -6,13 +6,7 @@ import SwitchBoard from "../../../NativeModules/SwitchBoard"
 import OpaqueImageView from "../../OpaqueImageView"
 import Metadata from "./Metadata"
 
-interface Props extends ViewProperties {
-  show: {
-    href: string
-    cover_image: {
-      url: string
-    }
-  }
+interface Props extends RelayProps, ViewProperties {
   styles?: {
     container?: any
     image?: any
@@ -56,12 +50,11 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This isn't being used in code
-// interface RelayProps {
-//   show: {
-//     href: string | null
-//     cover_image: {
-//       url: string | null
-//     } | null
-//   }
-// }
+interface RelayProps {
+  show: {
+    href: string | null
+    cover_image: {
+      url: string | null
+    } | null
+  }
+}
diff --git a/src/lib/Components/Artist/Shows/SmallList.tsx b/src/lib/Components/Artist/Shows/SmallList.tsx
@@ -6,15 +6,11 @@ import Show from "./Show"
 
 import colors from "lib/data/colors"
 
-interface Props extends ViewProperties {
-  shows: any[]
-}
-
 interface State {
   dataSource: ListViewDataSource
 }
 
-class SmallList extends React.Component<Props, State> {
+class SmallList extends React.Component<RelayProps & ViewProperties, State> {
   constructor(props) {
     super(props)
     this.state = {
@@ -72,7 +68,6 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This isn't being used in code
-// interface RelayProps {
-//   shows: Array<{} | null> | null
-// }
+interface RelayProps {
+  shows: Array<{} | null> | null
+}
diff --git a/src/lib/Components/Artist/Shows/VariableSizeShowsList.tsx b/src/lib/Components/Artist/Shows/VariableSizeShowsList.tsx
@@ -5,7 +5,7 @@ import { LayoutChangeEvent, StyleSheet, View, ViewProperties, ViewStyle } from "
 
 import Show from "./Show"
 
-interface Props extends ViewProperties {
+interface Props extends RelayProps, ViewProperties {
   showSize: "medium" | "large"
   shows: any[]
 }
@@ -102,9 +102,8 @@ export default createFragmentContainer(
   `
 )
 
-// FIXME: This isn't being used in code
-// interface RelayProps {
-//   shows: Array<{
-//     __id: string
-//   } | null> | null
-// }
+interface RelayProps {
+  shows: Array<{
+    __id: string
+  } | null> | null
+}
diff --git a/src/lib/Components/Artist/Shows/index.tsx b/src/lib/Components/Artist/Shows/index.tsx
@@ -8,7 +8,7 @@ import SerifText from "../../Text/Serif"
 import SmallList from "./SmallList"
 import VariableSizeShowsList from "./VariableSizeShowsList"
 
-class Shows extends React.Component<RelayProps, any> {
+class Shows extends React.Component<RelayProps> {
   render() {
     return (
       <View style={styles.container}>

diff --git a/src/lib/Components/ArtworkGrids/InfiniteScrollGrid.tsx b/src/lib/Components/ArtworkGrids/InfiniteScrollGrid.tsx
@@ -120,7 +120,7 @@ class InfiniteScrollArtworksGrid extends React.Component<Props, State> {
     this.props.relay.loadMore(PAGE_SIZE, error => {
       if (error) {
         // FIXME: Handle error
-        console.error("InfiniteScrollGrid.tsx |", error)
+        console.error("InfiniteScrollGrid.tsx", error.message)
       }
       this.setState({ fetchingNextPage: false })
       if (!this.artworksConnection().pageInfo.hasNextPage && this.props.onComplete) {

diff --git a/src/lib/Components/Consignments/Screens/Overview.tsx b/src/lib/Components/Consignments/Screens/Overview.tsx
@@ -180,9 +180,6 @@ export default class Info extends React.Component<Props, State> {
 
     const isPad = Dimensions.get("window").width > 700
 
-    // TODO: Reenable when used
-    // const isPadHorizontal = Dimensions.get("window").height > 700
-
     return (
       <ConsignmentBG showCloseButton>
         <ScrollView style={{ flex: 1 }} alwaysBounceVertical={false} centerContent>

diff --git a/src/lib/Components/Consignments/Screens/Welcome.tsx b/src/lib/Components/Consignments/Screens/Welcome.tsx
@@ -35,9 +35,6 @@ export default class Welcome extends React.Component<Props, null> {
   render() {
     const isPad = Dimensions.get("window").width > 700
 
-    // TODO: Reenable when used
-    // const isPadHorizontal = Dimensions.get("window").height > 700
-
     const TOS = () =>
       <Text style={{ textDecorationStyle: "solid", textDecorationLine: "underline" }} onPress={this.TOSTapped}>
         Terms of Sevice

diff --git a/src/lib/Components/Consignments/Submission/geminiUploadToS3.ts b/src/lib/Components/Consignments/Submission/geminiUploadToS3.ts
@@ -96,12 +96,9 @@ export const uploadFileToS3 = async (file: string, req: GeminiCredsInput, res: G
     const bucket = asset.policy_document.conditions.bucket
     const uploadURL = `https://${bucket}.s3.amazonaws.com`
 
-    // FIXME: This is being unused in 103; does this uploader work?
-    // const filename = file.split(/\//g).pop()
-
     const data = {
       "Content-Type": "image/jpg",
-      key: geminiKey + "/${filename}",
+      key: geminiKey + "/${filename}", // NOTE: This form (which _looks_ like ES6 interpolation) is required by AWS
       AWSAccessKeyId: asset.credentials,
       acl: req.acl,
       success_action_status: asset.policy_document.conditions.success_action_status,