feat: #1125: Update codes based on reviews

reapit · May 13, 2020 · 9b6b4d7 · 9b6b4d7
1 parent e2e5db9
commit 9b6b4d7
Show file tree

Hide file tree

Showing 11 changed files with 155 additions and 191 deletions.
diff --git a/...es/client-app-detail-manage/__test__/__snapshots__/client-app-detail-manage.test.tsx.snap b/...es/client-app-detail-manage/__test__/__snapshots__/client-app-detail-manage.test.tsx.snap
@@ -36,7 +36,7 @@ exports[`ClientAppDetailManage should match a snapshot 1`] = `
         "entries": Array [
           Object {
             "hash": "",
-            "key": "3glyf9",
+            "key": "w0nkbv",
             "pathname": "/",
             "search": "",
             "state": undefined,
@@ -50,7 +50,7 @@ exports[`ClientAppDetailManage should match a snapshot 1`] = `
         "listen": [Function],
         "location": Object {
           "hash": "",
-          "key": "3glyf9",
+          "key": "w0nkbv",
           "pathname": "/",
           "search": "",
           "state": undefined,

diff --git a/...components/pages/client-app-detail/__test__/__snapshots__/client-app-detail.test.tsx.snap b/...components/pages/client-app-detail/__test__/__snapshots__/client-app-detail.test.tsx.snap
@@ -38,7 +38,7 @@ exports[`ClientAppDetail should match a snapshot 1`] = `
         "entries": Array [
           Object {
             "hash": "",
-            "key": "to3pvn",
+            "key": "x8a4cq",
             "pathname": "/",
             "search": "",
             "state": undefined,
@@ -52,7 +52,7 @@ exports[`ClientAppDetail should match a snapshot 1`] = `
         "listen": [Function],
         "location": Object {
           "hash": "",
-          "key": "to3pvn",
+          "key": "x8a4cq",
           "pathname": "/",
           "search": "",
           "state": undefined,
@@ -848,10 +848,6 @@ exports[`ClientAppDetail should match a snapshot 1`] = `
             title="Confirm Peter's Properties installation"
             visible={false}
           />
-          <Component
-            afterClose={[Function]}
-            visible={false}
-          />
         </ClientAppInstallConfirmation>
       </div>
     </ClientAppDetail>

diff --git a/...ents/pages/developer-app-detail/__test__/__snapshots__/developer-app-detail.test.tsx.snap b/...ents/pages/developer-app-detail/__test__/__snapshots__/developer-app-detail.test.tsx.snap
@@ -80,7 +80,7 @@ exports[`DeveloperAppDetail should match a snapshot 1`] = `
         "entries": Array [
           Object {
             "hash": "",
-            "key": "1dzv0n",
+            "key": "4x6531",
             "pathname": "/",
             "search": "",
             "state": undefined,
@@ -94,7 +94,7 @@ exports[`DeveloperAppDetail should match a snapshot 1`] = `
         "listen": [Function],
         "location": Object {
           "hash": "",
-          "key": "1dzv0n",
+          "key": "4x6531",
           "pathname": "/",
           "search": "",
           "state": undefined,
@@ -959,110 +959,6 @@ exports[`DeveloperAppDetail should match a snapshot 1`] = `
             </div>
           </Component>
         </AppContent>
-        <AppDeleteModalWithRedux
-          afterClose={[Function]}
-          appId="9b6fd5f7-2c15-483d-b925-01b650538e52"
-          appName="Peter's Properties"
-          onDeleteSuccess={[Function]}
-          visible={false}
-        >
-          <Component
-            afterClose={[Function]}
-            appDeleteRequest={[Function]}
-            appId="9b6fd5f7-2c15-483d-b925-01b650538e52"
-            appName="Peter's Properties"
-            onDeleteSuccess={[Function]}
-            visible={false}
-          >
-            <Component
-              afterClose={[Function]}
-              renderChildren={true}
-              visible={false}
-            />
-          </Component>
-        </AppDeleteModalWithRedux>
-        <Component
-          afterClose={[Function]}
-          appId="9b6fd5f7-2c15-483d-b925-01b650538e52"
-          appName="Peter's Properties"
-          onUninstallSuccess={[Function]}
-          visible={false}
-        >
-          <Component
-            afterClose={[Function]}
-            renderChildren={true}
-            visible={false}
-          />
-        </Component>
-        <AppRevisionModal
-          afterClose={[Function]}
-          appDetailState={
-            Object {
-              "data": Object {
-                "description": "enim facilisis gravida neque convallis a cras semper auctor neque vitae tempus quam 
-    pellentesque nec nam aliquam sem et tortor consequat id porta nibh venenatis cras 
-    sed felis eget velit aliquet sagittis id consectetur purus ut faucibus pulvinar 
-    elementum integer enim neque volutpat ac tincidunt vitae semper quis lectus nulla 
-    at volutpat diam ut venenatis tellus in metus vulputate eu scelerisque felis imperdiet 
-    proin fermentum leo vel orci porta non pulvinar neque laoreet suspendisse interdum co",
-                "developer": "Pete's Proptech World Ltd",
-                "homePage": "http://myawesomeproptechproduct.io",
-                "id": "9b6fd5f7-2c15-483d-b925-01b650538e52",
-                "media": Array [
-                  Object {
-                    "description": "Application Icon",
-                    "type": "icon",
-                    "uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/7d88729f-2366-4561-9d5c-282615f3946b.jpeg",
-                  },
-                  Object {
-                    "description": "Application Image",
-                    "type": "image",
-                    "uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/c4a36706-aa44-47f9-9fb6-9053eef4e581.png",
-                  },
-                  Object {
-                    "description": "Application Image",
-                    "type": "image",
-                    "uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/65bd3b97-e78c-41cd-b75f-e06e1d2f00df.png",
-                  },
-                ],
-                "name": "Peter's Properties",
-                "scopes": Array [
-                  Object {
-                    "description": "Read data about developers",
-                    "name": "Marketplace/developers.read",
-                  },
-                  Object {
-                    "description": "Write data about developers",
-                    "name": "Marketplace/developers.write",
-                  },
-                ],
-                "summary": "vitae elementum curabitur vitae nunc sed velit eget gravida cum sociis natoque!!",
-                "supportEmail": "[email protected]",
-                "telephone": "0113 288 2900",
-              },
-              "isAppDetailLoading": false,
-            }
-          }
-          appId="9b6fd5f7-2c15-483d-b925-01b650538e52"
-          visible={false}
-        >
-          <Component
-            afterClose={[Function]}
-            footerItems={
-              <Unknown
-                dataTest="revision-approve-button"
-                disabled={false}
-                onClick={[Function]}
-                type="button"
-                variant="primary"
-              >
-                CANCEL PENDING REVISIONS
-              </Unknown>
-            }
-            title="Pending Revisions"
-            visible={false}
-          />
-        </AppRevisionModal>
       </div>
     </DeveloperAppDetail>
   </Router>

diff --git a/packages/marketplace/src/components/pages/developer-app-detail/developer-app-detail.tsx b/packages/marketplace/src/components/pages/developer-app-detail/developer-app-detail.tsx
@@ -88,28 +88,36 @@ const DeveloperAppDetail: React.FC<DeveloperAppDetailProps> = () => {
         )}
       />
       <AppContent appDetailData={appDetailData} loginType={loginType} />
-      <AppDelete
-        appId={id}
-        appName={name}
-        afterClose={closeDeleteAppModal(setIsDeleteModalOpen)}
-        visible={isDeleteModalOpen}
-        onDeleteSuccess={handleOnDeleteAppSuccess(history)}
-      />
 
-      <AppInstallations
-        appId={id}
-        appName={name}
-        visible={isInstallationsModalOpen}
-        afterClose={closeInstallationsModal(setIsInstallationsModalOpen)}
-        onUninstallSuccess={closeInstallationsModal(setIsInstallationsModalOpen)}
-      />
+      {isDeleteModalOpen && (
+        <AppDelete
+          appId={id}
+          appName={name}
+          afterClose={closeDeleteAppModal(setIsDeleteModalOpen)}
+          visible={isDeleteModalOpen}
+          onDeleteSuccess={handleOnDeleteAppSuccess(history)}
+        />
+      )}
+
+      {isInstallationsModalOpen && (
+        <AppInstallations
+          appId={id}
+          appName={name}
+          visible={isInstallationsModalOpen}
+          afterClose={closeInstallationsModal(setIsInstallationsModalOpen)}
+          onUninstallSuccess={closeInstallationsModal(setIsInstallationsModalOpen)}
+        />
+      )}
+
+      {isAppRevisionComparisionModalOpen && (
+        <AppRevisionModal
+          visible={isAppRevisionComparisionModalOpen}
+          appId={id}
+          appDetailState={appDetailState}
+          afterClose={closeAppRevisionComparisionModal(setIsAppRevisionComparisionModalOpen)}
+        />
+      )}
 
-      <AppRevisionModal
-        visible={isAppRevisionComparisionModalOpen}
-        appId={id}
-        appDetailState={appDetailState}
-        afterClose={closeAppRevisionComparisionModal(setIsAppRevisionComparisionModalOpen)}
-      />
       {isLoadingAppDetail && <Loader />}
     </div>
   )

diff --git a/packages/marketplace/src/components/pages/developer-home.tsx b/packages/marketplace/src/components/pages/developer-home.tsx
@@ -73,8 +73,11 @@ export const DeveloperHome: React.FunctionComponent<DeveloperProps> = ({
 
   if (location && location.search) {
     const pageQueryString = getParamValueFromPath(location.search, 'page')
-    pageNumber = Number(pageQueryString) > 0 ? Number(pageQueryString) : 1
+    if (pageQueryString) {
+      pageNumber = Number(pageQueryString)
+    }
   }
+
   const unfetched = !developerState.developerData
   const loading = developerState.loading
   const list = developerState?.developerData?.data?.data || []

diff --git a/packages/marketplace/src/components/ui/app-detail/app-content/app-content.tsx b/packages/marketplace/src/components/ui/app-detail/app-content/app-content.tsx
@@ -97,13 +97,11 @@ const AppContent: React.FC<AppContentProps> = ({ appDetailData, loginType }) =>
     speed: 500,
     variableWidth: true,
     prevArrow: (
-      // @ts-ignore
       <SlickButtonNav>
         <ChevronLeftIcon />
       </SlickButtonNav>
     ),
     nextArrow: (
-      // @ts-ignore
       <SlickButtonNav>
         <ChevronLeftIcon />
       </SlickButtonNav>

diff --git a/...ui/client-app-detail/__test__/__snapshots__/client-app-install-confirmation.test.tsx.snap b/...ui/client-app-detail/__test__/__snapshots__/client-app-install-confirmation.test.tsx.snap
@@ -23,7 +23,7 @@ exports[`ClientAppInstallConfirmation should match a snapshot 1`] = `
         "entries": Array [
           Object {
             "hash": "",
-            "key": "49wyie",
+            "key": "9ujcw5",
             "pathname": "/",
             "search": "",
             "state": undefined,
@@ -37,7 +37,7 @@ exports[`ClientAppInstallConfirmation should match a snapshot 1`] = `
         "listen": [Function],
         "location": Object {
           "hash": "",
-          "key": "49wyie",
+          "key": "9ujcw5",
           "pathname": "/",
           "search": "",
           "state": undefined,
@@ -122,10 +122,6 @@ exports[`ClientAppInstallConfirmation should match a snapshot 1`] = `
         title="Confirm Peter's Properties installation"
         visible={true}
       />
-      <Component
-        afterClose={[Function]}
-        visible={false}
-      />
     </ClientAppInstallConfirmation>
   </Router>
 </Provider>

diff --git a/.../client-app-detail/__test__/__snapshots__/client-app-uninstall-confirmation.test.tsx.snap b/.../client-app-detail/__test__/__snapshots__/client-app-uninstall-confirmation.test.tsx.snap
@@ -1,5 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`ClientAppUninstallConfirmation renderUninstallConfirmationModalFooter should match snapshot 1`] = `
+<div>
+  <Component
+    dataTest="agree-btn"
+    loading={false}
+    onClick={[Function]}
+    type="button"
+    variant="primary"
+  >
+    Confirm
+  </Component>
+  <Component
+    dataTest="disagree-btn"
+    disabled={false}
+    onClick={[MockFunction]}
+    type="button"
+    variant="danger"
+  >
+    Cancel
+  </Component>
+</div>
+`;
+
 exports[`ClientAppUninstallConfirmation should match a snapshot 1`] = `
 <Provider
   store={
@@ -23,7 +46,7 @@ exports[`ClientAppUninstallConfirmation should match a snapshot 1`] = `
         "entries": Array [
           Object {
             "hash": "",
-            "key": "vclqtp",
+            "key": "ua2k3p",
             "pathname": "/",
             "search": "",
             "state": undefined,
@@ -37,7 +60,7 @@ exports[`ClientAppUninstallConfirmation should match a snapshot 1`] = `
         "listen": [Function],
         "location": Object {
           "hash": "",
-          "key": "vclqtp",
+          "key": "ua2k3p",
           "pathname": "/",
           "search": "",
           "state": undefined,

diff --git a/...e/src/components/ui/client-app-detail/__test__/client-app-uninstall-confirmation.test.tsx b/...e/src/components/ui/client-app-detail/__test__/client-app-uninstall-confirmation.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import * as ReactRedux from 'react-redux'
 import { ReduxState } from '@/types/core'
-import { mount } from 'enzyme'
+import { mount, shallow } from 'enzyme'
 import configureStore from 'redux-mock-store'
 import { Router } from 'react-router'
 import { createMemoryHistory } from 'history'
@@ -15,6 +15,7 @@ import ClientAppUninstallConfirmation, {
   handleUninstallAppSuccessCallback,
   handleSuccessAlertButtonClick,
   handleSuccessAlertMessageAfterClose,
+  renderUninstallConfirmationModalFooter,
 } from '../client-app-uninstall-confirmation'
 
 const mockState = {
@@ -126,4 +127,22 @@ describe('ClientAppUninstallConfirmation', () => {
     fn()
     expect(mockFunction).toBeCalledWith(false)
   })
+  describe('renderUninstallConfirmationModalFooter', () => {
+    it('should match snapshot', () => {
+      const wrapper = shallow(
+        <div>
+          {renderUninstallConfirmationModalFooter(
+            false,
+            appId,
+            clientId,
+            installationId,
+            spyDispatch,
+            jest.fn(),
+            jest.fn(),
+          )}
+        </div>,
+      )
+      expect(wrapper).toMatchSnapshot()
+    })
+  })
 })