Fix StandardJS complaints

parcelLab · Aug 5, 2020 · d04478c · d04478c
1 parent b10fa83
commit d04478c
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 40 deletions.
diff --git a/spec/app.integration.spec.js b/spec/app.integration.spec.js
@@ -19,7 +19,8 @@ describe('ParcelLab App Module Integration', () => {
         return Promise.resolve({
           currentUser: {
             locale: 'en'
-          }})
+          }
+        })
       } else {
         return Promise.resolve({
           'ticket.customField:custom_field_sampleOrderNumberTicketFieldId': 'sampleOrderNumber'
@@ -46,7 +47,7 @@ describe('ParcelLab App Module Integration', () => {
         }
       }],
       body: {
-        'tracking1': [{
+        tracking1: [{
           timestamp: '2018-04-01T00:00:00.000Z'
         }, {
           timestamp: '2018-04-04T18:14:59.000Z'
@@ -73,8 +74,8 @@ describe('ParcelLab App Module Integration', () => {
     global.InitializedZAFClient.get = jest.fn().mockReturnValue(Promise.resolve({
       currentUser: {
         locale: 'en'
-      }}
-    ))
+      }
+    }))
 
     global.InitializedZAFClient.metadata = jest.fn().mockReturnValue(Promise.resolve({
       settings: {
@@ -95,7 +96,7 @@ describe('ParcelLab App Module Integration', () => {
         }
       }],
       body: {
-        'tracking1': [{
+        tracking1: [{
           timestamp: '2018-04-01T00:00:00.000Z'
         }, {
           timestamp: '2018-04-04T18:14:59.000Z'
@@ -113,7 +114,7 @@ describe('ParcelLab App Module Integration', () => {
       expect(container.querySelector('button')).toBeInTheDocument()
     })
 
-    fireEvent.change(getByLabelText(container, /order/i), {target: {value: '123456'}})
+    fireEvent.change(getByLabelText(container, /order/i), { target: { value: '123456' } })
     fireEvent.click(container.querySelector('Button[type=submit]'))
 
     await waitFor(() => {

diff --git a/spec/trackingstatus.spec.js b/spec/trackingstatus.spec.js
@@ -32,12 +32,12 @@ describe('TrackingStatus Component', () => {
           }
         }],
         body: {
-          'tracking1': [{
+          tracking1: [{
             timestamp: '2018-04-01T00:00:00.000Z'
           }, {
             timestamp: '2018-04-04T18:14:59.000Z'
           }],
-          'tracking2': [{
+          tracking2: [{
             timestamp: '2018-04-12T00:00:00.000Z'
           }, {
             timestamp: '2018-06-006T18:14:59.000Z'
@@ -55,7 +55,7 @@ describe('TrackingStatus Component', () => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -71,7 +71,7 @@ describe('TrackingStatus Component', () => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -89,7 +89,7 @@ describe('TrackingStatus Component', () => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -104,7 +104,7 @@ describe('TrackingStatus Component', () => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: ''}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -113,14 +113,14 @@ describe('TrackingStatus Component', () => {
     })
 
     it('should show bad request error message if checkpoints could not be found due to a 4xx response code', async () => {
-      ZendeskClient.fetchCheckpoints = jest.fn().mockRejectedValue({status: 400})
+      ZendeskClient.fetchCheckpoints = jest.fn().mockRejectedValue({ status: 400 })
       const { getByLabelText, getByText, container } = render(<TrackingStatus />)
 
       await waitFor(() => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -129,14 +129,14 @@ describe('TrackingStatus Component', () => {
     })
 
     it('should show server error message if checkpoints could not be fetched due to a 5xx response code', async () => {
-      ZendeskClient.fetchCheckpoints = jest.fn().mockRejectedValue({status: 500})
+      ZendeskClient.fetchCheckpoints = jest.fn().mockRejectedValue({ status: 500 })
       const { getByLabelText, getByText, container } = render(<TrackingStatus />)
 
       await waitFor(() => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {
@@ -152,7 +152,7 @@ describe('TrackingStatus Component', () => {
         expect(container.querySelector('Button[type=submit]')).toBeInTheDocument()
       })
 
-      fireEvent.change(getByLabelText(/order/i), {target: {value: '123456'}})
+      fireEvent.change(getByLabelText(/order/i), { target: { value: '123456' } })
       fireEvent.click(container.querySelector('Button[type=submit]'))
 
       await waitFor(() => {

diff --git a/src/javascripts/modules/app.js b/src/javascripts/modules/app.js
@@ -8,8 +8,8 @@ import I18n from '../../javascripts/lib/i18n'
 import ZendeskClient from '../lib/zendeskclient'
 
 const App = async appData => {
-  const {locale} = await ZendeskClient.getCurrentUserDetails()
-  const {userId, orderNumberTicketFieldId, stripLeadingZerosFromOrderNumber} = await ZendeskClient.getAppSettings()
+  const { locale } = await ZendeskClient.getCurrentUserDetails()
+  const { userId, orderNumberTicketFieldId, stripLeadingZerosFromOrderNumber } = await ZendeskClient.getAppSettings()
   ZendeskClient.setStripLeadingZerosFromOrderNumber(stripLeadingZerosFromOrderNumber)
 
   I18n.loadTranslations(locale)

diff --git a/src/javascripts/modules/trackingstatus.js b/src/javascripts/modules/trackingstatus.js
@@ -63,7 +63,7 @@ class TrackingStatus extends React.Component {
   }
 
   updateOrderNumber (event) {
-    this.setState({orderNumber: event.target.value})
+    this.setState({ orderNumber: event.target.value })
   }
 
   async fetchOrderStatus (orderNumber) {
@@ -80,7 +80,7 @@ class TrackingStatus extends React.Component {
     } catch (error) {
       this.resetFetchedOrderStatus({
         type: 'error',
-        message: error.status >= 500 ? I18n.t('trackingStatus.error.fetch.serverError', {statusCode: error.status}) : I18n.t('trackingStatus.error.fetch.badRequest')
+        message: error.status >= 500 ? I18n.t('trackingStatus.error.fetch.serverError', { statusCode: error.status }) : I18n.t('trackingStatus.error.fetch.badRequest')
       })
     }
   }
@@ -112,28 +112,32 @@ class TrackingStatus extends React.Component {
   }
 
   render () {
-    return <React.Fragment>
-      <Grid>
-        <Row>
-          <Col>
-            {this.state.showOrderNumberInput && <OrderNumberInputForm disabled={this.state.loading} orderNumber={this.state.orderNumber} onOrderNumberChange={this.updateOrderNumber} onSubmit={this.submitForm} />}
-          </Col>
-        </Row>
-        { !this.state.loading && !this.state.exception && this.state.orderStatus &&
+    return (
+      <>
+        <Grid>
           <Row>
             <Col>
-              <OrderStatus orderStatus={this.state.orderStatus} />
+              {this.state.showOrderNumberInput && <OrderNumberInputForm disabled={this.state.loading} orderNumber={this.state.orderNumber} onOrderNumberChange={this.updateOrderNumber} onSubmit={this.submitForm} />}
             </Col>
-          </Row>}
-        {!this.state.loading && this.state.exception &&
-          <Row>
-            <Col style={{marginTop: '50px'}}>
-              <ExceptionNotification exception={this.state.exception} onClose={() => this.setState({exception: undefined})} />
-            </Col>
-          </Row>}
-      </Grid>
-      {!this.state.showOrderNumberInput && this.state.loading && <img className='loader centered' src='spinner.gif' />}
-    </React.Fragment>
+          </Row>
+          {!this.state.loading && !this.state.exception && this.state.orderStatus && (
+            <Row>
+              <Col>
+                <OrderStatus orderStatus={this.state.orderStatus} />
+              </Col>
+            </Row>
+          )}
+          {!this.state.loading && this.state.exception && (
+            <Row>
+              <Col style={{ marginTop: '50px' }}>
+                <ExceptionNotification exception={this.state.exception} onClose={() => this.setState({ exception: undefined })} />
+              </Col>
+            </Row>
+          )}
+        </Grid>
+        {!this.state.showOrderNumberInput && this.state.loading && <img className='loader centered' src='spinner.gif' />}
+      </>
+    )
   }
 }