Feat/system admin

.circleci/config.yml

@@ -221,6 +221,7 @@ workflows:
                               - dev
                               - LVT-256
                               - CORE-635
+                              - feat/system-admin
 
             - deployQa:
                   context: org-global

package.json

@@ -103,7 +103,7 @@
     "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.27",
     "typescript": "^4.8.4",
     "universal-navigation": "https://github.com/topcoder-platform/universal-navigation#9fc50d938be7182",
-    "uuid": "^9.0.0",
+    "uuid": "^11.1.0",
     "yup": "^1.6.1"
   },
   "devDependencies": {

src/apps/admin/src/admin-app.routes.tsx

@@ -29,13 +29,9 @@ const ManageUserPage: LazyLoadedComponent = lazyLoad(
     () => import('./challenge-management/ManageUserPage'),
     'ManageUserPage',
 )
-const ManageResourcePage: LazyLoadedComponent = lazyLoad(
-    () => import('./challenge-management/ManageResourcePage'),
-    'ManageResourcePage',
-)
-const AddResourcePage: LazyLoadedComponent = lazyLoad(
-    () => import('./challenge-management/AddResourcePage'),
-    'AddResourcePage',
+const ManageSubmissionPage: LazyLoadedComponent = lazyLoad(
+    () => import('./challenge-management/ManageSubmissionPage'),
+    'ManageSubmissionPage',
 )
 const UserManagementPage: LazyLoadedComponent = lazyLoad(
     () => import('./user-management/UserManagementPage'),
@@ -136,14 +132,9 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                         route: ':challengeId/manage-user',
                     },
                     {
-                        element: <ManageResourcePage />,
+                        element: <ManageSubmissionPage />,
                         id: 'manage-resource',
-                        route: ':challengeId/manage-resource',
-                    },
-                    {
-                        element: <AddResourcePage />,
-                        id: 'add-resource',
-                        route: ':challengeId/manage-resource/add',
+                        route: ':challengeId/manage-submission',
                     },
                 ],
                 element: <ChallengeManagement />,

src/apps/admin/src/billing-account/BillingAccountNewPage/BillingAccountNewPage.tsx

@@ -14,6 +14,7 @@ import _ from 'lodash'
 import classNames from 'classnames'
 import moment from 'moment'
 
+import { EnvironmentConfig } from '~/config'
 import {
     Button,
     InputDatePicker,
@@ -30,7 +31,7 @@ import { useManageAddBillingAccount, useManageAddBillingAccountProps } from '../
 import { BILLING_ACCOUNT_STATUS_EDIT_OPTIONS } from '../../config/index.config'
 import { PageContent, PageHeader } from '../../lib'
 import { FormEditBillingAccount, SelectOption } from '../../lib/models'
-import { formEditBillingAccountSchema } from '../../lib/utils'
+import { formAddBillingAccountSchema, formEditBillingAccountSchema } from '../../lib/utils'
 
 import styles from './BillingAccountNewPage.module.scss'
 
@@ -46,6 +47,7 @@ export const BillingAccountNewPage: FC<Props> = (props: Props) => {
     const { accountId = '' }: { accountId?: string } = useParams<{
         accountId: string
     }>()
+    const isEdit = useMemo(() => !!accountId, [accountId])
     const {
         isLoading,
         isAdding,
@@ -55,8 +57,8 @@ export const BillingAccountNewPage: FC<Props> = (props: Props) => {
         billingAccount,
     }: useManageAddBillingAccountProps = useManageAddBillingAccount(accountId)
     const pageTitle = useMemo(
-        () => (accountId ? 'Edit Billing Account' : 'New Billing Account'),
-        [accountId],
+        () => (isEdit ? 'Edit Billing Account' : 'New Billing Account'),
+        [isEdit],
     )
     const {
         register,
@@ -81,7 +83,9 @@ export const BillingAccountNewPage: FC<Props> = (props: Props) => {
             subscriptionNumber: '' as any,
         },
         mode: 'all',
-        resolver: yupResolver(formEditBillingAccountSchema),
+        resolver: yupResolver(
+            isEdit ? formEditBillingAccountSchema : formAddBillingAccountSchema,
+        ),
     })
 
     const endDate = watch('endDate')
@@ -130,7 +134,7 @@ export const BillingAccountNewPage: FC<Props> = (props: Props) => {
                 name: billingAccount.name,
                 paymentTerms: billingAccount.paymentTerms
                     ? parseInt(billingAccount.paymentTerms, 10) ?? 0
-                    : undefined,
+                    : EnvironmentConfig.ADMIN.DEFAULT_PAYMENT_TERMS,
                 poNumber: billingAccount.poNumber,
                 salesTax: billingAccount.salesTax,
                 startDate: billingAccount.startDate,
@@ -354,7 +358,9 @@ export const BillingAccountNewPage: FC<Props> = (props: Props) => {
                                 onChange={_.noop}
                                 classNameWrapper={styles.field}
                                 inputControl={register('paymentTerms')}
-                                disabled={isAdding || isUpdating}
+                                disabled={
+                                    isEdit ? true : isAdding || isUpdating
+                                }
                                 error={_.get(errors, 'paymentTerms.message')}
                                 dirty
                             />

src/apps/admin/src/billing-account/BillingAccountsPage/BillingAccountsPage.tsx

@@ -1,11 +1,11 @@
 /**
  * Billing accounts page.
  */
-import { FC } from 'react'
+import { FC, useState } from 'react'
 import classNames from 'classnames'
 
 import { PlusIcon } from '@heroicons/react/solid'
-import { LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui'
+import { colWidthType, LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui'
 
 import { BillingAccountsFilter } from '../../lib/components/BillingAccountsFilter'
 import { BillingAccountsTable } from '../../lib/components/BillingAccountsTable'
@@ -22,6 +22,7 @@ interface Props {
 const pageTitle = 'Billing Accounts'
 
 export const BillingAccountsPage: FC<Props> = (props: Props) => {
+    const [colWidth, setColWidth] = useState<colWidthType>({})
     const {
         isLoading,
         datas,
@@ -76,6 +77,8 @@ export const BillingAccountsPage: FC<Props> = (props: Props) => {
                                 setPage={setPage}
                                 setSort={setSort}
                                 sort={sort}
+                                colWidth={colWidth}
+                                setColWidth={setColWidth}
                             />
                         )}
                     </>

src/apps/admin/src/billing-account/ClientsPage/ClientsPage.tsx

@@ -1,10 +1,10 @@
 /**
  * Billing account clients page.
  */
-import { FC } from 'react'
+import { FC, useState } from 'react'
 import classNames from 'classnames'
 
-import { LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui'
+import { colWidthType, LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui'
 import { PlusIcon } from '@heroicons/react/solid'
 
 import { MSG_NO_RECORD_FOUND } from '../../config/index.config'
@@ -22,6 +22,7 @@ interface Props {
 const pageTitle = 'Clients'
 
 export const ClientsPage: FC<Props> = (props: Props) => {
+    const [colWidth, setColWidth] = useState<colWidthType>({})
     const {
         isLoading,
         datas,
@@ -77,6 +78,8 @@ export const ClientsPage: FC<Props> = (props: Props) => {
                                 setPage={setPage}
                                 setSort={setSort}
                                 sort={sort}
+                                colWidth={colWidth}
+                                setColWidth={setColWidth}
                             />
                         )}
                     </>