Merge pull request #1206 from topcoder-platform/feat/system-admin

Feat/system admin release for terms, moving gamification admin, and additional features for submissions

Author: jmgasper

package.json

@@ -28,6 +28,9 @@
     "@storybook/react": "7.6.10",
     "@stripe/react-stripe-js": "1.13.0",
     "@stripe/stripe-js": "1.41.0",
+    "@tinymce/tinymce-react": "^6.2.1",
+    "@types/codemirror": "5.60.15",
+    "amazon-s3-uri": "^0.1.1",
     "apexcharts": "^3.36.0",
     "axios": "^1.7.9",
     "browser-cookies": "^1.2.0",
@@ -43,6 +46,7 @@
     "draft-js-export-html": "^1.2.0",
     "draft-js-markdown-shortcuts-plugin": "^0.3.0",
     "draft-js-plugins-editor": "^2.0.3",
+    "easymde": "2.20.0",
     "express": "^4.21.2",
     "express-fileupload": "^1.4.0",
     "express-interceptor": "^1.2.0",
@@ -101,6 +105,7 @@
     "styled-components": "^5.3.6",
     "swr": "^1.3.0",
     "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.27",
+    "tinymce": "^7.9.1",
     "typescript": "^4.8.4",
     "universal-navigation": "https://github.com/topcoder-platform/universal-navigation#9fc50d938be7182",
     "uuid": "^11.1.0",

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

@@ -16,6 +16,7 @@ import {
     permissionManagementRouteId,
     platformRouteId,
     rootRoute,
+    termsRouteId,
     userManagementRouteId,
 } from './config/routes.config'
 import { platformSkillRouteId } from './platform/routes.config'
@@ -128,6 +129,22 @@ const BadgeListingPage: LazyLoadedComponent = lazyLoad(
 const CreateBadgePage: LazyLoadedComponent = lazyLoad(
     () => import('./platform/gamification-admin/src/pages/create-badge/CreateBadgePage'),
 )
+const TermsListPage: LazyLoadedComponent = lazyLoad(
+    () => import('./platform/terms/TermsListPage'),
+    'TermsListPage',
+)
+const TermsAddPage: LazyLoadedComponent = lazyLoad(
+    () => import('./platform/terms/TermsAddPage'),
+    'TermsAddPage',
+)
+const TermsEditPage: LazyLoadedComponent = lazyLoad(
+    () => import('./platform/terms/TermsEditPage'),
+    'TermsEditPage',
+)
+const TermsUsersPage: LazyLoadedComponent = lazyLoad(
+    () => import('./platform/terms/TermsUsersPage'),
+    'TermsUsersPage',
+)
 
 export const toolTitle: string = ToolTitle.admin
 
@@ -310,6 +327,22 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                         element: <BadgeDetailPage />,
                         route: `${gamificationAdminRouteId}${baseDetailPath}/:id`,
                     },
+                    {
+                        element: <TermsListPage />,
+                        route: termsRouteId,
+                    },
+                    {
+                        element: <TermsAddPage />,
+                        route: `${termsRouteId}/add`,
+                    },
+                    {
+                        element: <TermsUsersPage />,
+                        route: `${termsRouteId}/:id/users`,
+                    },
+                    {
+                        element: <TermsEditPage />,
+                        route: `${termsRouteId}/:id/edit`,
+                    },
                 ],
                 element: <Platform />,
                 id: platformRouteId,

src/apps/admin/src/challenge-management/ManageSubmissionPage/ManageSubmissionPage.tsx

@@ -1,13 +1,19 @@
 /**
  * Manage Submission Page.
  */
-import { FC } from 'react'
+import { FC, useMemo } from 'react'
 import { useParams } from 'react-router-dom'
 import classNames from 'classnames'
 
 import { LinkButton } from '~/libs/ui'
 
 import {
+    useDownloadSubmission,
+    useDownloadSubmissionProps,
+    useFetchChallenge,
+    useFetchChallengeProps,
+    useManageAVScan,
+    useManageAVScanProps,
     useManageBusEvent,
     useManageBusEventProps,
     useManageChallengeSubmissions,
@@ -20,6 +26,7 @@ import {
     TableLoading,
     TableNoRecord,
 } from '../../lib'
+import { checkIsMM } from '../../lib/utils'
 
 import styles from './ManageSubmissionPage.module.scss'
 
@@ -35,7 +42,13 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
         = useManageBusEvent()
 
     const {
-        isLoading,
+        isLoading: isLoadingChallenge,
+        challengeInfo,
+    }: useFetchChallengeProps = useFetchChallenge(challengeId)
+    const isMM = useMemo(() => checkIsMM(challengeInfo), [challengeInfo])
+
+    const {
+        isLoading: isLoadingSubmission,
         submissions,
         isRemovingSubmission,
         isRemovingSubmissionBool,
@@ -48,6 +61,19 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
     }: useManageChallengeSubmissionsProps
         = useManageChallengeSubmissions(challengeId)
 
+    const {
+        isLoading: isDownloadingSubmission,
+        isLoadingBool: isDownloadingSubmissionBool,
+        downloadSubmission,
+    }: useDownloadSubmissionProps = useDownloadSubmission()
+    const {
+        isLoading: isDoingAvScan,
+        isLoadingBool: isDoingAvScanBool,
+        doPostBusEvent: doPostBusEventAvScan,
+    }: useManageAVScanProps = useManageAVScan()
+
+    const isLoading = isLoadingSubmission || isLoadingChallenge
+
     return (
         <PageWrapper
             pageTitle='Submission Management'
@@ -67,6 +93,10 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
                     ) : (
                         <div className={styles.blockTableContainer}>
                             <SubmissionTable
+                                isDoingAvScan={isDoingAvScan}
+                                doPostBusEventAvScan={doPostBusEventAvScan}
+                                isDownloading={isDownloadingSubmission}
+                                downloadSubmission={downloadSubmission}
                                 data={submissions}
                                 isRemovingSubmission={isRemovingSubmission}
                                 doRemoveSubmission={doRemoveSubmission}
@@ -80,9 +110,12 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
                                 doPostBusEvent={doPostBusEvent}
                                 showSubmissionHistory={showSubmissionHistory}
                                 setShowSubmissionHistory={setShowSubmissionHistory}
+                                isMM={isMM}
                             />
 
-                            {(isRemovingSubmissionBool
+                            {(isDoingAvScanBool
+                                || isDownloadingSubmissionBool
+                                || isRemovingSubmissionBool
                                 || isRunningTestBool
                                 || isRemovingReviewSummationsBool) && (
                                 <ActionLoading />

src/apps/admin/src/config/busEvent.config.ts

@@ -3,10 +3,14 @@
  */
 import { v4 as uuidv4 } from 'uuid'
 
-import { RequestBusAPI } from '../lib/models'
+import {
+    RequestBusAPI,
+    RequestBusAPIAVScan,
+    RequestBusAPIAVScanPayload,
+} from '../lib/models'
 
 /**
- * Create data for bus event
+ * Create data for data submission marathon match bus event
  * @param submissionId submission id
  * @param testType test type
  * @returns data for bus event
@@ -27,3 +31,19 @@ export const CREATE_BUS_EVENT_DATA_SUBMISSION_MARATHON_MATCH = (
         .toISOString(),
     topic: 'submission.notification.score',
 })
+
+/**
+ * Create data for av rescan bus event
+ * @param payload av rescan payload
+ * @returns data for bus event
+ */
+export const CREATE_BUS_EVENT_AV_RESCAN = (
+    payload: RequestBusAPIAVScanPayload,
+): RequestBusAPIAVScan => ({
+    'mime-type': 'application/json',
+    originator: 'submission-processor',
+    payload,
+    timestamp: new Date()
+        .toISOString(),
+    topic: 'avscan.action.scan',
+})

src/apps/admin/src/config/routes.config.ts

@@ -14,4 +14,5 @@ export const userManagementRouteId = 'user-management'
 export const billingAccountRouteId = 'billing-account'
 export const permissionManagementRouteId = 'permission-management'
 export const gamificationAdminRouteId = 'gamification-admin'
+export const termsRouteId = 'terms'
 export const platformRouteId = 'platform'

src/apps/admin/src/lib/components/ChallengeList/ChallengeList.tsx

@@ -21,7 +21,6 @@ import {
 import { useEventCallback } from '../../hooks'
 import { Challenge, ChallengeFilterCriteria, ChallengeType } from '../../models'
 import { Paging } from '../../models/challenge-management/Pagination'
-import { checkIsMM } from '../../utils'
 
 import { MobileListView } from './MobileListView'
 import styles from './ChallengeList.module.scss'
@@ -135,7 +134,6 @@ const Actions: FC<{
     challenge: Challenge
     currentFilters: ChallengeFilterCriteria
 }> = props => {
-    const isMM = useMemo(() => checkIsMM(props.challenge), [props.challenge])
     const [openDropdown, setOpenDropdown] = useState(false)
     const navigate = useNavigate()
     const goToManageUser = useEventCallback(() => {
@@ -202,16 +200,14 @@ const Actions: FC<{
                     >
                         Users
                     </li>
-                    {isMM && (
-                        <li
-                            onClick={function onClick() {
-                                navigate(`${props.challenge.id}/manage-submission`)
-                                setOpenDropdown(false)
-                            }}
-                        >
-                            Submissions
-                        </li>
-                    )}
+                    <li
+                        onClick={function onClick() {
+                            navigate(`${props.challenge.id}/manage-submission`)
+                            setOpenDropdown(false)
+                        }}
+                    >
+                        Submissions
+                    </li>
                 </ul>
             </DropdownMenu>
 

src/apps/admin/src/lib/components/DialogAddTermUser/DialogAddTermUser.module.scss

@@ -0,0 +1,34 @@
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    position: relative;
+}
+
+.blockForm {
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    position: relative;
+}
+
+.actionButtons {
+    display: flex;
+    justify-content: flex-end;
+    gap: 6px;
+}
+
+.dialogLoadingSpinnerContainer {
+    position: absolute;
+    width: 64px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    bottom: 0;
+    height: 64px;
+    left: 0;
+
+    .spinner {
+        background: none;
+    }
+}