Merge branch 'dev' of github.com:topcoder-platform/platform-ui into feat/ai-workflows

Author: vas3a

.circleci/config.yml

@@ -139,15 +139,15 @@ jobs:
         environment:
             DEPLOY_ENV: "QA"
             LOGICAL_ENV: "qa"
-            APPNAME: "platform-ui-mvp-v6"
+            APPNAME: "platform-ui-mvp"
         steps: *build_steps
 
     build-prod:
         <<: *defaults
         environment:
             DEPLOY_ENV: "PROD"
             LOGICAL_ENV: "prod"
-            APPNAME: "platform-ui-mvp-v6"
+            APPNAME: "platform-ui-mvp"
         steps: *build_steps
 
     # Just tests commited code.
@@ -157,7 +157,7 @@ jobs:
             DEPLOY_ENV: "DEV"
             LOGICAL_ENV: "dev"
             ENABLE_CACHE: true
-            APPNAME: "platform-ui-mvp-v6"
+            APPNAME: "platform-ui-mvp"
         steps: *deploy_steps
 
     deployQa:
@@ -166,7 +166,7 @@ jobs:
             DEPLOY_ENV: "QA"
             LOGICAL_ENV: "qa"
             ENABLE_CACHE: true
-            APPNAME: "platform-ui-mvp-v6"
+            APPNAME: "platform-ui-mvp"
         steps: *deploy_steps
 
     deployProd:
@@ -175,7 +175,7 @@ jobs:
             DEPLOY_ENV: "PROD"
             LOGICAL_ENV: "prod"
             ENABLE_CACHE: true
-            APPNAME: "platform-ui-mvp-v6"
+            APPNAME: "platform-ui-mvp"
         steps: *deploy_steps
 
 workflows:

.github/workflows/trivy.yaml

@@ -0,0 +1,34 @@
+name: Trivy Scanner
+
+permissions:
+  contents: read
+  security-events: write
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+jobs:
+  trivy-scan:
+    name: Use Trivy
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Trivy scanner in repo mode
+        uses: aquasecurity/trivy-action@0.33.1
+        with:
+          scan-type: "fs"
+          ignore-unfixed: true
+          format: "sarif"
+          output: "trivy-results.sarif"
+          severity: "CRITICAL,HIGH,UNKNOWN"
+          scanners: vuln,secret,misconfig,license
+          github-pat: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: "trivy-results.sarif"

CODEOWNERS

@@ -0,0 +1 @@
+* @jmgasper @kkartunov

package.json

@@ -33,7 +33,7 @@
     "@types/codemirror": "5.60.15",
     "amazon-s3-uri": "^0.1.1",
     "apexcharts": "^3.36.0",
-    "axios": "^1.7.9",
+    "axios": "^1.12.0",
     "browser-cookies": "^1.2.0",
     "city-timezones": "^1.2.1",
     "classnames": "^2.3.2",

src/.eslintrc.js

@@ -1,3 +1,8 @@
+const path = require('path');
+
+const tsconfigPath = path.resolve(__dirname, '../tsconfig.json');
+const tsconfigRoot = path.resolve(__dirname, '..');
+
 module.exports = {
   root: true,
   overrides: [
@@ -25,8 +30,8 @@ module.exports = {
       parser: '@typescript-eslint/parser',
       parserOptions: {
         useJSXTextNode: true,
-        project: './tsconfig.json',
-        tsconfigRootDir: '.',
+        project: tsconfigPath,
+        tsconfigRootDir: tsconfigRoot,
         tsx: true,
         jsx: true,
         sourceType: 'module',
@@ -40,7 +45,19 @@ module.exports = {
       ],
       settings: {
         'import/resolver': {
-          typescript: {},
+          typescript: {
+            project: tsconfigPath,
+          },
+          node: {
+            extensions: [
+              '.js',
+              '.jsx',
+              '.ts',
+              '.tsx',
+              '.d.ts',
+              '.json',
+            ],
+          },
         },
       },
       rules: {

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

@@ -39,6 +39,10 @@ const ManageSubmissionPage: LazyLoadedComponent = lazyLoad(
     () => import('./challenge-management/ManageSubmissionPage'),
     'ManageSubmissionPage',
 )
+const ManageMarathonMatchPage: LazyLoadedComponent = lazyLoad(
+    () => import('./challenge-management/ManageMarathonMatchPage'),
+    'ManageMarathonMatchPage',
+)
 const UserManagementPage: LazyLoadedComponent = lazyLoad(
     () => import('./user-management/UserManagementPage'),
     'UserManagementPage',
@@ -181,6 +185,11 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                         id: 'manage-resource',
                         route: ':challengeId/manage-submission',
                     },
+                    {
+                        element: <ManageMarathonMatchPage />,
+                        id: 'manage-marathon-match',
+                        route: ':challengeId/manage-marathon-match',
+                    },
                 ],
                 element: <ChallengeManagement />,
                 id: manageChallengeRouteId,

src/apps/admin/src/challenge-management/ManageMarathonMatchPage/ManageMarathonMatchPage.module.scss

@@ -0,0 +1,31 @@
+@import '@libs/ui/styles/includes';
+
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: $sp-6;
+}
+
+.headerButtons {
+    display: flex;
+    flex-wrap: wrap;
+    gap: $sp-3;
+    justify-content: flex-end;
+}
+
+.tableSection {
+    display: flex;
+    flex-direction: column;
+    gap: $sp-3;
+}
+
+.sectionHeading {
+    font-size: 1.25rem;
+    font-weight: 600;
+    margin: 0;
+}
+
+.errorMessage {
+    color: $red-110;
+    font-weight: 500;
+}