From e509fc1462d49c45baaace9c074856fdbea47929 Mon Sep 17 00:00:00 2001
From: undefined <nghiapn@reapit.com>
Date: Wed, 20 May 2020 22:55:03 +0700
Subject: [PATCH] feat #1210: fix review comments

---
 .../__test__/aside.test.tsx                   | 23 ++++++-------------
 .../app-detail/__test__/app-content.test.tsx  |  3 ++-
 .../app-detail/app-content/app-content.tsx    |  6 +++--
 .../pages/developer-app-detail/aside.tsx      |  6 ++---
 .../boolean-to-yes-no-string.test.ts          |  9 ++++++++
 .../utils/__tests__/boolean-to-yes-no.test.ts |  9 --------
 .../src/utils/boolean-to-yes-no-string.tsx    |  7 ++++++
 .../src/utils/boolean-to-yes-no.tsx           |  7 ------
 .../marketplace/src/utils/route-dispatcher.ts |  4 ++--
 9 files changed, 34 insertions(+), 40 deletions(-)
 create mode 100644 packages/marketplace/src/utils/__tests__/boolean-to-yes-no-string.test.ts
 delete mode 100644 packages/marketplace/src/utils/__tests__/boolean-to-yes-no.test.ts
 create mode 100644 packages/marketplace/src/utils/boolean-to-yes-no-string.tsx
 delete mode 100644 packages/marketplace/src/utils/boolean-to-yes-no.tsx

diff --git a/packages/marketplace/src/components/pages/developer-app-detail/__test__/aside.test.tsx b/packages/marketplace/src/components/pages/developer-app-detail/__test__/aside.test.tsx
index 8e24244ba9..db263e7de6 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/__test__/aside.test.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/__test__/aside.test.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { DeveloperAppDetailState } from '@/reducers/developer'
 import { Aside, ManageApp, renderListedStatus } from '../aside'
 import { shallow } from 'enzyme'
-import toJson from 'enzyme-to-json'
 import { integrationTypesStub } from '@/sagas/__stubs__/integration-types'
 import { appDetailDataStub } from '@/sagas/__stubs__/app-detail'
 import { DesktopIntegrationTypeModel } from '@reapit/foundations-ts-definitions'
@@ -15,13 +14,11 @@ jest.mock('react-router', () => ({
 describe('Aside', () => {
   test('Aside - should match snapshot', () => {
     expect(
-      toJson(
-        shallow(
-          <Aside
-            appDetailState={appDetailDataStub as DeveloperAppDetailState}
-            desktopIntegrationTypes={integrationTypesStub.data as DesktopIntegrationTypeModel[]}
-          />,
-        ),
+      shallow(
+        <Aside
+          appDetailState={appDetailDataStub as DeveloperAppDetailState}
+          desktopIntegrationTypes={integrationTypesStub.data as DesktopIntegrationTypeModel[]}
+        />,
       ),
     ).toMatchSnapshot()
   })
@@ -43,14 +40,8 @@ describe('Aside', () => {
 
   test('ManageApp - should match snapshot', () => {
     expect(
-      toJson(
-        shallow(
-          <ManageApp
-            id="test"
-            pendingRevisions={false}
-            appDetailState={appDetailDataStub as DeveloperAppDetailState}
-          />,
-        ),
+      shallow(
+        <ManageApp id="test" pendingRevisions={false} appDetailState={appDetailDataStub as DeveloperAppDetailState} />,
       ),
     ).toMatchSnapshot()
   })
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
index ed7268448b..15878c4fb1 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/__test__/app-content.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import { GET_ALL_PAGE_SIZE } from '@/constants/paginator'
 import { InstallationModel } from '@reapit/foundations-ts-definitions'
 import { installationsStub } from '@/sagas/__stubs__/installations'
 import { shallow, mount } from 'enzyme'
@@ -65,7 +66,7 @@ describe('AppContent', () => {
       appInstallationsRequestData({
         appId: [appId],
         pageNumber: 1,
-        pageSize: 15,
+        pageSize: GET_ALL_PAGE_SIZE,
         isInstalled: true,
         developerId: [developerId],
       }),
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
index cbf65c2c05..6b67c078e3 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/app-detail/app-content/app-content.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { GET_ALL_PAGE_SIZE } from '@/constants/paginator'
 import { appInstallationsRequestData } from '@/actions/app-installations'
 import { selectDeveloperId } from '@/selector'
 import developerAppDetailStyles from '@/styles/pages/developer-app-detail.scss?mod'
@@ -67,7 +68,7 @@ export const handleUninstallSuccess = ({ handleAfterClose, setUninstallApp, deve
     appInstallationsRequestData({
       appId: [appId],
       pageNumber: 1,
-      pageSize: 15,
+      pageSize: GET_ALL_PAGE_SIZE,
       isInstalled: true,
       developerId: [developerId],
     }),
@@ -83,6 +84,7 @@ const AppContent: React.FC<AppContentProps> = ({ appDetailData }) => {
 
   const [uninstallApp, setUninstallApp] = React.useState<InstallationModel>()
   const columns = generateColumns(handleUninstall(setUninstallApp))()
+  const isVisibleUninstallModal = Boolean(uninstallApp)
 
   /**
    * 0 = icon
@@ -92,7 +94,7 @@ const AppContent: React.FC<AppContentProps> = ({ appDetailData }) => {
 
   return (
     <div className={clientAppDetailStyles.appContentContainer}>
-      <Modal visible={Boolean(uninstallApp)}>
+      <Modal visible={isVisibleUninstallModal}>
         <ConfirmUninstall
           isSetAppDetailStaleAfterUninstallSuccess={false}
           appName={name}
diff --git a/packages/marketplace/src/components/pages/developer-app-detail/aside.tsx b/packages/marketplace/src/components/pages/developer-app-detail/aside.tsx
index f0c43e65c5..490598e648 100644
--- a/packages/marketplace/src/components/pages/developer-app-detail/aside.tsx
+++ b/packages/marketplace/src/components/pages/developer-app-detail/aside.tsx
@@ -6,7 +6,7 @@ import appDetailStyles from '@/styles/blocks/app-detail.scss?mod'
 import developerAppDetailStyles from '@/styles/pages/developer-app-detail.scss?mod'
 import { RenderWithHeader } from './app-detail/render-with-header'
 import { Button } from '@reapit/elements'
-import { BooleanToYesNo } from '@/utils/boolean-to-yes-no'
+import { convertBooleanToYesNoString } from '@/utils/boolean-to-yes-no-string'
 import { renderCategory, renderDesktopIntegrationTypes } from '../client-app-detail/app-content'
 import { DesktopIntegrationTypeModel } from '@reapit/foundations-ts-definitions'
 /* eslint-disable max-len */
@@ -105,8 +105,8 @@ export const Aside: React.FC<AsideProps> = ({ desktopIntegrationTypes, appDetail
       <div className={developerAppDetailStyles.headerWithoutMargin}>
         {renderDesktopIntegrationTypes(desktopIntegrationTypes)}
       </div>
-      <RenderWithHeader header="Private App">{BooleanToYesNo(Boolean(limitToClientIds))}</RenderWithHeader>
-      <RenderWithHeader header="Direct API">{BooleanToYesNo(Boolean(isDirectApi))}</RenderWithHeader>
+      <RenderWithHeader header="Private App">{convertBooleanToYesNoString(Boolean(limitToClientIds))}</RenderWithHeader>
+      <RenderWithHeader header="Direct API">{convertBooleanToYesNoString(Boolean(isDirectApi))}</RenderWithHeader>
       <RenderWithHeader header="Status">{renderListedStatus(Boolean(isListed))}</RenderWithHeader>
       <ManageApp appDetailState={appDetailState} id={id} pendingRevisions={Boolean(pendingRevisions)} />
     </div>
diff --git a/packages/marketplace/src/utils/__tests__/boolean-to-yes-no-string.test.ts b/packages/marketplace/src/utils/__tests__/boolean-to-yes-no-string.test.ts
new file mode 100644
index 0000000000..0a4090c548
--- /dev/null
+++ b/packages/marketplace/src/utils/__tests__/boolean-to-yes-no-string.test.ts
@@ -0,0 +1,9 @@
+import { convertBooleanToYesNoString } from '../boolean-to-yes-no-string'
+describe('convertBooleanToYesNoString', () => {
+  it('should return Yes when input true', () => {
+    expect(convertBooleanToYesNoString(true)).toBe('Yes')
+  })
+  it('should return No when input fasle', () => {
+    expect(convertBooleanToYesNoString(false)).toBe('No')
+  })
+})
diff --git a/packages/marketplace/src/utils/__tests__/boolean-to-yes-no.test.ts b/packages/marketplace/src/utils/__tests__/boolean-to-yes-no.test.ts
deleted file mode 100644
index ae6e6e0007..0000000000
--- a/packages/marketplace/src/utils/__tests__/boolean-to-yes-no.test.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BooleanToYesNo } from '../boolean-to-yes-no'
-describe('BooleanToYesNo', () => {
-  it('should return Yes when input true', () => {
-    expect(BooleanToYesNo(true)).toBe('Yes')
-  })
-  it('should return No when input fasle', () => {
-    expect(BooleanToYesNo(false)).toBe('No')
-  })
-})
diff --git a/packages/marketplace/src/utils/boolean-to-yes-no-string.tsx b/packages/marketplace/src/utils/boolean-to-yes-no-string.tsx
new file mode 100644
index 0000000000..76dc9c9d9c
--- /dev/null
+++ b/packages/marketplace/src/utils/boolean-to-yes-no-string.tsx
@@ -0,0 +1,7 @@
+export const convertBooleanToYesNoString: (value: boolean) => string = value => {
+  if (value) {
+    return 'Yes'
+  }
+
+  return 'No'
+}
diff --git a/packages/marketplace/src/utils/boolean-to-yes-no.tsx b/packages/marketplace/src/utils/boolean-to-yes-no.tsx
deleted file mode 100644
index 3ad2cd5b6b..0000000000
--- a/packages/marketplace/src/utils/boolean-to-yes-no.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export const BooleanToYesNo: (value: boolean) => string = value => {
-  if (value) {
-    return 'Yes'
-  }
-
-  return 'No'
-}
diff --git a/packages/marketplace/src/utils/route-dispatcher.ts b/packages/marketplace/src/utils/route-dispatcher.ts
index 0dc280a836..7eb3ce7722 100644
--- a/packages/marketplace/src/utils/route-dispatcher.ts
+++ b/packages/marketplace/src/utils/route-dispatcher.ts
@@ -1,9 +1,9 @@
 import { AdminDevManagementRequestDataValues } from './../actions/admin-dev-management'
+import { GET_ALL_PAGE_SIZE } from '@/constants/paginator'
 import { selectDeveloperId } from '@/selector'
 import { appDetailRequestData } from './../actions/app-detail'
 import { RouteValue, StringMap } from '../types/core'
 import Routes from '../constants/routes'
-import { GET_ALL_PAGE_SIZE } from '../constants/paginator'
 import store from '../core/store'
 import { clientFetchAppSummary, clientFetchAppDetail } from '../actions/client'
 import { myAppsRequestData } from '../actions/my-apps'
@@ -78,7 +78,7 @@ const routeDispatcher = async (route: RouteValue, params?: StringMap, search?: s
           appInstallationsRequestData({
             appId: [id],
             pageNumber: 1,
-            pageSize: 15,
+            pageSize: GET_ALL_PAGE_SIZE,
             isInstalled: true,
             developerId: [developerId],
           }),