[PROD RELEASE] - May #1 release

src/apps/admin/src/platform/skill-management/lib/components/skill-modals/SkillModal.tsx

@@ -91,7 +91,7 @@ const SkillModal: FC<SkillModalProps> = props => {
         setIsLoading(true)
 
         // eslint-disable-next-line unicorn/no-null
-        return restoreArchivedStandardizedSkill({ ...props.skill, deleted_at: null })
+        return restoreArchivedStandardizedSkill({ ...props.skill, deletedAt: null })
             .then(() => {
                 refetchSkills()
                 setEditSkill()

src/apps/admin/src/platform/skill-management/lib/context/skills-manager.context.tsx

@@ -48,7 +48,7 @@ export const SkillsManagerContext: FC<SkillsManagerContextProps> = props => {
     }: SWRResponse<StandardizedSkillCategory[]> = useFetchCategories()
 
     const filteredSkills = useMemo(() => (
-        showArchivedSkills ? allSkills : allSkills.filter(s => !s.deleted_at)
+        showArchivedSkills ? allSkills : allSkills.filter(s => !s.deletedAt)
     ), [allSkills, showArchivedSkills])
 
     const skills = useMemo(() => findSkillsMatches(filteredSkills, skillsFilter), [filteredSkills, skillsFilter])

src/apps/admin/src/platform/skill-management/lib/lib/skills.utils.ts

@@ -9,7 +9,7 @@ export interface GroupedSkills {
 }
 
 export const isSkillArchived = (skill: StandardizedSkill): boolean => (
-    !!skill.deleted_at
+    !!skill.deletedAt
 )
 
 export const groupSkillsByCategory = (skills: StandardizedSkill[]): GroupedSkills => {

src/apps/admin/src/platform/skill-management/lib/services/skills.service.ts

@@ -8,7 +8,7 @@ import { UserSkill, xhrDeleteAsync, xhrGetAsync, xhrPostAsync, xhrPutAsync } fro
 const baseUrl = `${EnvironmentConfig.STANDARDIZED_SKILLS_API}/skills`
 
 export interface StandardizedSkill extends UserSkill {
-    deleted_at: string | null
+    deletedAt: string | null
     categoryId?: string
 }
 

src/apps/customer-portal/src/pages/talent-search/TalentSearchPage/TalentSearchPage.tsx

@@ -46,6 +46,7 @@ export const TalentSearchPage: FC = () => {
     const [totalResults, setTotalResults] = useState<number>(0)
     const [currentPage, setCurrentPage] = useState<number>(1)
     const [lastAppliedSearchSignature, setLastAppliedSearchSignature] = useState<string>('')
+    const [showSkillMatchOnCards, setShowSkillMatchOnCards] = useState<boolean>(false)
     const countryNameByCode = useMemo((): Map<string, string> => new Map(
         (countryLookup || [])
             .filter(country => country.countryCode && country.country)
@@ -71,7 +72,6 @@ export const TalentSearchPage: FC = () => {
         [selectedCountries],
     )
 
-    const hasSkillSearch = selectedSkills.length > 0
     const shouldShowIntroState = !hasSearched
     const currentSearchSignature = useMemo(
         (): string => JSON.stringify({
@@ -312,6 +312,7 @@ export const TalentSearchPage: FC = () => {
         }
 
         setHasSearched(true)
+        const hadSkills = selectedSkills.length > 0
         const searchSucceeded = await runMemberSearch(selectedSkills, {
             countries: selectedCountryCodesList,
             openToWork: onlyOpenToWork,
@@ -321,6 +322,7 @@ export const TalentSearchPage: FC = () => {
         })
         if (searchSucceeded) {
             setLastAppliedSearchSignature(currentSearchSignature)
+            setShowSkillMatchOnCards(hadSkills)
         }
     }, [
         currentSearchSignature,
@@ -547,7 +549,7 @@ export const TalentSearchPage: FC = () => {
                                                 <TalentResultCard
                                                     key={talent.id}
                                                     talent={talent}
-                                                    showSkillMatch={hasSkillSearch}
+                                                    showSkillMatch={showSkillMatchOnCards}
                                                 />
                                             ))}
                                         </div>

src/apps/customer-portal/src/pages/talent-search/components/TalentResultCard/TalentResultCard.tsx

@@ -46,6 +46,19 @@ function getUniqueMatchedSkills(talent: TalentResultCardTalent): TalentResultCar
     })
 }
 
+function matchedSkillStatsLabel(skill: MatchedSkill): string {
+    const parts: string[] = []
+    if (skill.wins > 0) {
+        parts.push(`${skill.wins} wins`)
+    }
+
+    if (skill.submitted > 0) {
+        parts.push(`${skill.submitted} submissions`)
+    }
+
+    return parts.length > 0 ? `: ${parts.join(', ')}` : ''
+}
+
 function buildMatchedSkillsTooltipContent(
     count: number,
     skills: MatchedSkill[],
@@ -59,7 +72,7 @@ function buildMatchedSkillsTooltipContent(
                 {skills.map((skill: MatchedSkill) => (
                     <li key={`${skill.id}-${skill.name}`} className={styles.tooltipSkillLine}>
                         <span className={styles.tooltipSkillName}>{skill.name}</span>
-                        {`: ${skill.wins} wins, ${skill.submitted} submissions`}
+                        {matchedSkillStatsLabel(skill)}
                     </li>
                 ))}
             </ul>

src/apps/reports/src/config/routes.config.ts

@@ -10,3 +10,4 @@ export const rootRoute: string
 
 export const reportsPageRouteId = 'reports'
 export const bulkMemberLookupRouteId = 'bulk-member-lookup'
+export const billingAccountsPageRouteId = 'billing-accounts'

src/apps/reports/src/lib/components/NavTabs/NavTabs.tsx

@@ -15,7 +15,11 @@ import classNames from 'classnames'
 import { useClickOutside } from '~/libs/shared/lib/hooks'
 import { TabsNavItem } from '~/libs/ui'
 
-import { bulkMemberLookupRouteId, reportsPageRouteId } from '../../../config/routes.config'
+import {
+    billingAccountsPageRouteId,
+    bulkMemberLookupRouteId,
+    reportsPageRouteId,
+} from '../../../config/routes.config'
 
 import styles from './NavTabs.module.scss'
 
@@ -34,6 +38,10 @@ const NavTabs: FC = () => {
             id: bulkMemberLookupRouteId,
             title: 'Bulk Member Lookup',
         },
+        {
+            id: billingAccountsPageRouteId,
+            title: 'Billing Accounts',
+        },
     ], [])
 
     const activeTabPathName: string = useMemo<string>(() => {

src/apps/reports/src/lib/services/index.ts

@@ -2,6 +2,7 @@ export {
     downloadBlobFile,
     downloadReportAsCsv,
     downloadReportAsJson,
+    fetchReportJson,
     fetchReportsIndex,
     postReportAsCsv,
     postReportAsJson,
@@ -10,8 +11,12 @@ export {
 } from './reports.service'
 
 export type {
+    BillingAccountDetail,
+    BillingAccountProfileResponse,
+    BillingAccountsViewData,
     ReportDefinition,
     ReportGroup,
     ReportParameter,
     ReportsIndexResponse,
+    SfdcBillingAccountPaymentRow,
 } from './reports.service'

src/apps/reports/src/lib/services/reports.service.ts

@@ -28,6 +28,46 @@ export type ReportGroup = {
 
 export type ReportsIndexResponse = Record<string, ReportGroup>
 
+export type BillingAccountDetail = {
+    name: string
+    description: string | null
+    subcontractingEndCustomer: string | null
+    status: string
+    startDate: string | null
+    endDate: string | null
+    budget: string | number
+    markup: string | number
+}
+
+export type SfdcBillingAccountPaymentRow = {
+    paymentId: string
+    paymentDate: string
+    billingAccountId: string
+    paymentStatus: string
+    challengeFee: string | number
+    paymentAmount: string | number
+    challengeId: string
+    category: string
+    isTask: boolean
+    challengeName: string | null
+    challengeStatus: string | null
+    winnerHandle: string
+    winnerId: string
+    winnerFirstName: string
+    winnerLastName: string
+}
+
+/** Response from GET /sfdc/billing-accounts */
+export type BillingAccountProfileResponse = {
+    billingAccount?: BillingAccountDetail
+}
+
+/** Billing Accounts in-app view: profile + rows from GET /sfdc/payments */
+export type BillingAccountsViewData = {
+    billingAccount?: BillingAccountDetail
+    payments: SfdcBillingAccountPaymentRow[]
+}
+
 const reportsDownloadClient: AxiosInstance = xhrCreateInstance()
 
 const buildReportUrl = (path: string): string => {
@@ -137,6 +177,16 @@ export const downloadReportAsJson = (path: string): Promise<Blob> => (
     downloadReportBlob(path, 'application/json')
 )
 
+export const fetchReportJson = async <T>(path: string): Promise<T> => {
+    if (!path) {
+        throw new Error('Report path is required')
+    }
+
+    const normalizedPath = path.startsWith('/') ? path : `/${path}`
+    const url = `${EnvironmentConfig.API.V6}/reports${normalizedPath}`
+    return xhrGetAsync<T>(url, reportsDownloadClient)
+}
+
 export const downloadReportAsCsv = (path: string): Promise<Blob> => (
     downloadReportBlob(path, 'text/csv')
 )

src/apps/reports/src/pages/reports/BillingAccountsPage.tsx

@@ -0,0 +1,3 @@
+import { BillingAccountsPage } from './ReportsPage'
+
+export default BillingAccountsPage