feat: update jacoco

canyon-project · Jun 4, 2024 · 74cdd72 · 74cdd72
1 parent 57372dc
commit 74cdd72
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...d]/commits/[sha]/helper/handleOnSelect.ts → ...nts/JacocoReport/helper/handleOnSelect.ts b/...d]/commits/[sha]/helper/handleOnSelect.ts → ...nts/JacocoReport/helper/handleOnSelect.ts
diff --git a/...oco/projects/[id]/commits/[sha]/index.tsx → ...orm/src/components/JacocoReport/index.tsx b/...oco/projects/[id]/commits/[sha]/index.tsx → ...orm/src/components/JacocoReport/index.tsx
@@ -50,7 +50,7 @@ const ReportPage = () => {
     //   path: path,
     // });
 
-    nav(`/jacoco/projects/${projectID}/commits/${sha}?path=${path}`);
+    nav(`/projects/${projectID}/commits/${sha}?path=${path}`);
     // console.log(path);
 
     console.log(path, 'path');

diff --git a/packages/canyon-platform/src/pages/index/projects/[id]/commits/[sha].tsx b/packages/canyon-platform/src/pages/index/projects/[id]/commits/[sha].tsx
@@ -3,6 +3,7 @@ import { useRequest } from 'ahooks';
 import { useLocation, useNavigate, useParams, useSearchParams } from 'react-router-dom';
 
 import CanyonReport from '../../../../../components/CanyonReport';
+import ReportPage from '../../../../../components/JacocoReport';
 import { GetProjectByIdDocument } from '../../../../../helpers/backend/gen/graphql.ts';
 import { getCoverageSummaryMapService, handleSelectFile } from './helper';
 const { useToken } = theme;
@@ -84,17 +85,23 @@ const Sha = () => {
     >
       {/*{pathWithNamespace}111*/}
       {/*{pathWithNamespace}*/}
-      <CanyonReport
-        theme={localStorage.getItem('theme') || 'light'}
-        mainData={mainData}
-        pathWithNamespace={pathWithNamespace}
-        activatedPath={activatedPath}
-        coverageSummaryMapData={coverageSummaryMapData || []}
-        loading={loading}
-        onSelect={(v) => {
-          setActivatedPath(v.path);
-        }}
-      />
+
+      <>{getProjectByIdDocumentData?.getProjectByID.language === 'Java' && <ReportPage />}</>
+      <>
+        {getProjectByIdDocumentData?.getProjectByID.language === 'JavaScript' && (
+          <CanyonReport
+            theme={localStorage.getItem('theme') || 'light'}
+            mainData={mainData}
+            pathWithNamespace={pathWithNamespace}
+            activatedPath={activatedPath}
+            coverageSummaryMapData={coverageSummaryMapData || []}
+            loading={loading}
+            onSelect={(v) => {
+              setActivatedPath(v.path);
+            }}
+          />
+        )}
+      </>
     </div>
   );
 };