chore: #228 feedbacks fix

reapit · Sep 3, 2020 · d36f78f · d36f78f
1 parent d4dc8a9
commit d36f78f
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 16 deletions.
diff --git a/packages/react-app-scaffolder/app/templates/_config.json b/packages/react-app-scaffolder/app/templates/_config.json
@@ -2,9 +2,10 @@
   "appEnv": "local",
   "sentryDns": "",
   "connectClientId": "<%= clientId %>",
-  "connectUserPoolId": "eu-west-2_hbt0B7yys",
+  "connectUserPoolId": "",
   "googleAnalyticsKey": "",
-  "connectOAuthUrl": "https://dev.connect.reapit.cloud",
-  "platformApiUrl": "https://dev.platform.reapit.cloud",
-  "graphqlUri": "https://b97ovghsoa.execute-api.eu-west-2.amazonaws.com/dev/graphql"
+  "connectOAuthUrl": "",
+  "platformApiUrl": "",
+  "graphqlUri": "",
+  "marketplaceUrl": ""
 }
diff --git a/packages/react-app-scaffolder/app/templates/graphql/config.example.json b/packages/react-app-scaffolder/app/templates/graphql/config.example.json
@@ -3,8 +3,9 @@
   "sentryDns": "",
   "googleAnalyticsKey": "",
   "connectClientId": "",
-  "connectUserPoolId": "eu-west-2_hbt0B7yys",
-  "connectOAuthUrl": "https://dev.connect.reapit.cloud",
-  "platformApiUrl": "https://dev.platform.reapit.cloud",
-  "graphqlUri": "https://b97ovghsoa.execute-api.eu-west-2.amazonaws.com/dev/graphql"
+  "connectUserPoolId": "",
+  "connectOAuthUrl": "",
+  "platformApiUrl": "",
+  "graphqlUri": "",
+  "marketplaceUrl": ""
 }
diff --git a/...pp-scaffolder/app/templates/graphql/src/components/hocs/__tests__/error-boundary.test.tsx b/...pp-scaffolder/app/templates/graphql/src/components/hocs/__tests__/error-boundary.test.tsx
@@ -9,6 +9,12 @@ const props = {
   children: Component,
 }
 
+jest.mock('@reapit/elements', () => ({
+  notification: {
+    error: jest.fn(),
+  },
+}))
+
 describe('ErrorBoundary', () => {
   it('should match a snapshot when no error', () => {
     expect(shallow(<ErrorBoundary {...props} />)).toMatchSnapshot()

diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/components/hocs/error-boundary.tsx b/packages/react-app-scaffolder/app/templates/graphql/src/components/hocs/error-boundary.tsx
@@ -1,4 +1,6 @@
 import * as React from 'react'
+import errorMessages from '@/constants/error-messages'
+import { notification } from '@reapit/elements'
 
 export interface ErrorState {
   hasFailed: boolean
@@ -23,7 +25,7 @@ export class ErrorBoundary extends React.Component<ErrorProps, ErrorState> {
   }
 
   componentDidCatch(error: Error, info: React.ErrorInfo) {
-    console.error('ERROR BOUNDARY CAUGHT', error.message, info)
+    notification.error({ message: errorMessages.DEFAULT_COMPONENT_ERROR, placement: 'bottomRight' })
   }
 
   render() {

diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/components/ui/menu.tsx b/packages/react-app-scaffolder/app/templates/graphql/src/components/ui/menu.tsx
@@ -39,11 +39,9 @@ export const generateMenuConfig = (
   }
 }
 
-export const callbackAppClick = () =>
-  (window.location.href =
-    window.location.href.includes('dev') || window.location.href.includes('localhost')
-      ? 'https://dev.marketplace.reapit.cloud/installed'
-      : 'https://marketplace.reapit.cloud/installed')
+export const callbackAppClick = () => {
+  window.location.href = window.reapit.config.marketplaceUrl
+}
 
 export type MenuProps = RouteComponentProps
 

diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/constants/error-messages.ts b/packages/react-app-scaffolder/app/templates/graphql/src/constants/error-messages.ts
@@ -0,0 +1,5 @@
+const errorMessages = {
+  DEFAULT_COMPONENT_ERROR: 'Something went wrong with this component',
+}
+
+export default errorMessages
diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/core/index.tsx b/packages/react-app-scaffolder/app/templates/graphql/src/core/index.tsx
@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 import * as Sentry from '@sentry/browser'
 import React from 'react'
 import { render } from 'react-dom'
@@ -17,6 +18,7 @@ window.reapit = {
     connectOAuthUrl: '',
     platformApiUrl: '',
     graphqlUri: '',
+    marketplaceUrl: '',
   },
 }
 

diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/core/router.tsx b/packages/react-app-scaffolder/app/templates/graphql/src/core/router.tsx
@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 import * as React from 'react'
 import { Route, Router as BrowserRouter, Switch, Redirect } from 'react-router-dom'
 import { createBrowserHistory } from 'history'

diff --git a/packages/react-app-scaffolder/app/templates/graphql/src/types/global.d.ts b/packages/react-app-scaffolder/app/templates/graphql/src/types/global.d.ts
@@ -7,6 +7,7 @@ export type Config = {
   connectOAuthUrl: string
   platformApiUrl: string
   graphqlUri: string
+  marketplaceUrl: string
 }
 
 declare global {

diff --git a/packages/react-app-scaffolder/app/templates/hooks/src/core/index.tsx b/packages/react-app-scaffolder/app/templates/hooks/src/core/index.tsx
@@ -15,8 +15,9 @@ window.reapit = {
     connectUserPoolId: '',
     googleAnalyticsKey: '',
     connectOAuthUrl: '',
-    connectUserPoolId: '',
     platformApiUrl: '',
+    graphqlUri: '',
+    marketplaceUrl: '',
   },
 }
 

diff --git a/packages/react-app-scaffolder/app/templates/hooks/src/types/global.d.ts b/packages/react-app-scaffolder/app/templates/hooks/src/types/global.d.ts
@@ -6,6 +6,8 @@ export type Config = {
   googleAnalyticsKey: string
   connectOAuthUrl: string
   platformApiUrl: string
+  graphqlUri: string
+  marketplaceUrl: string
 }
 
 declare global {

diff --git a/packages/react-app-scaffolder/app/templates/redux/src/core/index.tsx b/packages/react-app-scaffolder/app/templates/redux/src/core/index.tsx
@@ -15,8 +15,9 @@ window.reapit = {
     connectUserPoolId: '',
     googleAnalyticsKey: '',
     connectOAuthUrl: '',
-    connectUserPoolId: '',
     platformApiUrl: '',
+    graphqlUri: '',
+    marketplaceUrl: '',
   },
 }
 

diff --git a/packages/react-app-scaffolder/app/templates/redux/src/types/global.d.ts b/packages/react-app-scaffolder/app/templates/redux/src/types/global.d.ts
@@ -6,6 +6,8 @@ export type Config = {
   googleAnalyticsKey: string
   connectOAuthUrl: string
   platformApiUrl: string
+  graphqlUri: string
+  marketplaceUrl: string
 }
 
 declare global {