Merge pull request #1234 from phead198708/feat/system-admin

Feat/system admin

Author: jmgasper

src/apps/accounts/src/lib/assets/security/dicelogo.png

@@ -1,17 +1,9 @@
-import { ReactComponent as MFAImage } from './mfa.svg'
 import { ReactComponent as AppleStore } from './apple-store.svg'
 import credentialImage from './credential.png'
-import diceIdLogo from './dicelogo.png'
-import diceIdLogoBig from './dicelogobig.png'
-import diceIdLogoSmall from './dicelogosmall.png'
 import googlePlay from './google-play.png'
 
 export {
     AppleStore,
     credentialImage,
-    diceIdLogo,
-    diceIdLogoBig,
-    diceIdLogoSmall,
     googlePlay,
-    MFAImage,
 }

src/apps/accounts/src/lib/assets/security/dicelogobig.png

@@ -218,6 +218,15 @@ const Actions: FC<{
                 classNames={{ menu: 'challenge-list-actions-dropdown-menu' }}
             >
                 <ul>
+                    <li>
+                        <a
+                            href={`${EnvironmentConfig.ADMIN.CHALLENGE_URL}/${props.challenge.id}`}
+                            target='_blank'
+                            rel='noreferrer'
+                        >
+                            Challenge Details
+                        </a>
+                    </li>
                     <li className={cn({ disabled: !hasProjectId })}>
                         {hasProjectId && (
                             <a
@@ -268,11 +277,10 @@ const ChallengeList: FC<ChallengeListProps> = props => {
                 renderer: (challenge: Challenge) => (
                     // eslint-disable-next-line jsx-a11y/anchor-is-valid
                     <a
-                        href={`${EnvironmentConfig.ADMIN.CHALLENGE_URL}/${challenge.id}`}
+                        href={`${EnvironmentConfig.API.V5}/challenges/${challenge.id}`}
                         className={styles.challengeTitle}
-                        onClick={function onClick() {
-                            window.location.href = `${EnvironmentConfig.ADMIN.CHALLENGE_URL}/${challenge.id}`
-                        }}
+                        target='_blank'
+                        rel='noreferrer'
                     >
                         {challenge.name}
                     </a>
@@ -334,6 +342,7 @@ const ChallengeList: FC<ChallengeListProps> = props => {
                     disableSorting
                     onToggleSort={_.noop}
                     className={styles.desktopTable}
+                    preventDefault
                 />
             )}
             {screenWidth <= 1279 && (

src/apps/accounts/src/lib/assets/security/dicelogosmall.png

@@ -86,12 +86,8 @@ const CopilotOpportunityDetails: FC<{}> = () => {
     const [activeTab, setActiveTab]: [string, Dispatch<SetStateAction<string>>] = useState<string>(activeTabHash)
 
     useEffect(() => {
-        if (isAdminOrPM) {
-            setActiveTab(activeTabHash)
-        } else {
-            setActiveTab('0')
-        }
-    }, [activeTabHash, isAdminOrPM])
+        setActiveTab(activeTabHash)
+    }, [activeTabHash])
 
     const handleTabChange = useCallback((tabId: string): void => {
         setActiveTab(tabId)
@@ -286,7 +282,7 @@ const CopilotOpportunityDetails: FC<{}> = () => {
                         <TabsNavbar
                             defaultActive={activeTab}
                             onChange={handleTabChange}
-                            tabs={getCopilotDetailsTabsConfig(isAdminOrPM, copilotApplications?.length || 0)}
+                            tabs={getCopilotDetailsTabsConfig(copilotApplications?.length || 0)}
                         />
                     )
                 }
@@ -297,7 +293,7 @@ const CopilotOpportunityDetails: FC<{}> = () => {
                         opportunity={opportunity}
                         members={members}
                         onApplied={onApplied}
-                        isAdminOrPM
+                        isAdminOrPM={isAdminOrPM}
                     />
                 )}
 

src/apps/accounts/src/lib/assets/security/index.ts

@@ -5,7 +5,7 @@ export enum CopilotDetailsTabViews {
     applications = '1',
 }
 
-export const getCopilotDetailsTabsConfig = (isAdminOrPM: boolean, count: number): TabsNavItem[] => (isAdminOrPM ? [
+export const getCopilotDetailsTabsConfig = (count: number): TabsNavItem[] => ([
     {
         id: CopilotDetailsTabViews.details,
         title: 'Details',
@@ -18,11 +18,6 @@ export const getCopilotDetailsTabsConfig = (isAdminOrPM: boolean, count: number)
         id: CopilotDetailsTabViews.applications,
         title: 'Applications',
     },
-] : [
-    {
-        id: CopilotDetailsTabViews.details,
-        title: 'Details',
-    },
 ])
 
 export const CopilotDetailsTabsConfig: TabsNavItem[] = [

src/apps/accounts/src/lib/assets/security/mfa.svg

@@ -23,7 +23,7 @@ function copilotOpportunityFactory(data: any): CopilotOpportunity {
     return {
         ...data,
         ...data.data,
-        projectName: data.project.name,
+        projectName: data.project?.name,
     }
 }
 

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

@@ -1,12 +1,10 @@
-import { Dispatch, FC, SetStateAction, useCallback, useContext, useState } from 'react'
+import { FC, useCallback, useContext } from 'react'
 import { NavigateFunction, useNavigate } from 'react-router-dom'
 
 import { Button } from '~/libs/ui'
 import { profileContext, ProfileContextData } from '~/libs/core'
 
 import { getAuthenticateAndEnrollRoute, getTCACertificationEnrollPath } from '../../learn.routes'
-import { LearnConfig } from '../../config'
-import { DiceModal } from '../../course-details/course-curriculum/dice-modal'
 
 interface EnrollCtaBtnProps {
     certification: string
@@ -15,15 +13,9 @@ interface EnrollCtaBtnProps {
 const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
     const navigate: NavigateFunction = useNavigate()
     const { initialized: profileReady, profile }: ProfileContextData = useContext(profileContext)
-    const [isDiceModalOpen, setIsDiceModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>]
-        = useState<boolean>(false)
 
     const isLoggedIn: boolean = profileReady && !!profile
 
-    function onDiceModalClose(): void {
-        setIsDiceModalOpen(false)
-    }
-
     /**
      * Handle user click on start course/resume/login button
      */
@@ -37,15 +29,8 @@ const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
             return
         }
 
-        // if the user is wipro and s/he hasn't set up DICE,
-        // let the user know
-        if (LearnConfig.REQUIRE_DICE_ID && profile?.isWipro && !profile.diceEnabled) {
-            setIsDiceModalOpen(true)
-            return
-        }
-
         navigate(getTCACertificationEnrollPath(props.certification))
-    }, [isLoggedIn, profile?.isWipro, profile?.diceEnabled, props, navigate])
+    }, [isLoggedIn, props, navigate])
 
     return (
         <>
@@ -55,11 +40,6 @@ const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
                 label={isLoggedIn ? 'Enroll Now' : 'Log in to enroll'}
                 onClick={handleEnrollClick}
             />
-
-            <DiceModal
-                isOpen={isDiceModalOpen}
-                onClose={onDiceModalClose}
-            />
         </>
     )
 }