fix: #178 fix ui and bug admin portal (#441)

reapit · Feb 26, 2020 · b6bb64a · b6bb64a
1 parent 608bce5
commit b6bb64a
Show file tree

Hide file tree

Showing 18 changed files with 430 additions and 392 deletions.
diff --git a/packages/elements/src/components/Pagination/index.tsx b/packages/elements/src/components/Pagination/index.tsx
@@ -30,7 +30,6 @@ export const generatePagination = (currentPage: number, pageCount: number) => {
 
 export const Pagination = ({ onChange, pageNumber = 1, pageSize = 1, totalCount = 1 }: PaginationProps) => {
   const maxPage = Math.ceil(totalCount / pageSize)
-
   if (maxPage < 2) {
     return null
   }

diff --git a/packages/marketplace/src/actions/__tests__/admin-apps.ts b/packages/marketplace/src/actions/__tests__/admin-apps.ts
@@ -10,7 +10,7 @@ describe('adminApps actions', () => {
 
   it('should create a adminAppsRequestData action', () => {
     expect(adminAppsRequestData.type).toEqual(ActionTypes.ADMIN_APPS_REQUEST_DATA)
-    expect(adminAppsRequestData().data).toEqual(undefined)
+    expect(adminAppsRequestData({ pageNumber: 1 }).data).toEqual({ pageNumber: 1 })
   })
 
   it('should create a adminAppsRequestFailure action', () => {

diff --git a/packages/marketplace/src/actions/admin-apps.ts b/packages/marketplace/src/actions/admin-apps.ts
@@ -8,7 +8,14 @@ export type AdminAppsFeaturedParams = {
   isFeatured: boolean
 }
 
-export const adminAppsRequestData = actionCreator<void>(ActionTypes.ADMIN_APPS_REQUEST_DATA)
+export type AdminAppsParams = {
+  pageNumber?: number
+  appName?: string
+  developerName?: string
+  companyName?: string
+}
+
+export const adminAppsRequestData = actionCreator<AdminAppsParams>(ActionTypes.ADMIN_APPS_REQUEST_DATA)
 export const adminAppsReceiveData = actionCreator<PagedResultAppSummaryModel_>(ActionTypes.ADMIN_APPS_RECEIVE_DATA)
 export const adminAppsRequestFailure = actionCreator<void>(ActionTypes.ADMIN_APPS_REQUEST_FAILURE)
 export const adminAppsRequestFeatured = actionCreator<AdminAppsFeaturedParams>(ActionTypes.ADMIN_APPS_REQUEST_FEATURED)