Feat: add bot filter (#350)

Signed-off-by: laixingyou <[email protected]>
oss-compass · May 8, 2024 · ff69469 · ff69469
1 parent 5c21ff1
commit ff69469
Show file tree

Hide file tree

Showing 18 changed files with 411 additions and 116 deletions.
diff --git a/apps/web/i18n b/apps/web/i18n
diff --git a/apps/web/src/common/components/Table/Download.tsx b/apps/web/src/common/components/Table/Download.tsx
@@ -7,6 +7,7 @@ import {
   apiDownloadFiles,
   Status,
 } from '@modules/analyze/DataView/MetricDetail/tableDownload';
+import { useTranslation } from 'react-i18next';
 
 // 对象驼峰转下划线
 const objectHumpToLine = (obj) => {
@@ -27,6 +28,7 @@ const Download = ({
   query: any;
   fileName: string;
 }) => {
+  const { t } = useTranslation();
   const newQuery = objectHumpToLine(query);
   newQuery['sort_opts'] && (newQuery['sort_opts'] = [newQuery['sort_opts']]);
 
@@ -66,9 +68,12 @@ const Download = ({
   };
   return (
     <>
-      <div className="flex h-7 w-10 cursor-pointer items-center justify-center rounded-sm border border-[#3f60ef] text-xs text-[#3f60ef]">
+      <div className="flex h-7 cursor-pointer items-center justify-center rounded-sm border py-2 px-3 text-sm hover:text-[#3f60ef]">
         {loadingDownLoad ? (
-          <AiOutlineLoading className="t animate-spin" />
+          <>
+            <AiOutlineLoading className="t mr-1 animate-spin" />
+            {t('analyze:metric_detail.download_data')}
+          </>
         ) : (
           <Tooltip arrow title={fileName} placement="top">
             <div
@@ -78,7 +83,8 @@ const Download = ({
                 await downloadFun();
               }}
             >
-              <BsDownload />
+              <BsDownload className="mr-1" />
+              {t('analyze:metric_detail.download_data')}
             </div>
           </Tooltip>
         )}

diff --git a/apps/web/src/modules/academe/DataUsageProcess/DataTerms.tsx b/apps/web/src/modules/academe/DataUsageProcess/DataTerms.tsx
@@ -68,9 +68,9 @@ const DataTerms = () => {
         4. 如果该学术研究成果可进行工程化部署，在不侵犯知识产权的情况下，请同意
         OSS Compass 享有此成果的使用权。
         <br />
-        5. 具体细节请查看底部协议附件。
+        {/* 5. 具体细节请查看底部协议附件。 */}
       </p>
-      <h3 className="my-4 text-lg font-semibold">
+      {/* <h3 className="my-4 text-lg font-semibold">
         附：
         <a
           className="underline"
@@ -80,7 +80,7 @@ const DataTerms = () => {
         >
           OSS Compass 项目合作框架协议书.pdf
         </a>
-      </h3>
+      </h3> */}
     </div>
   );
   const enTerms = (
@@ -178,9 +178,9 @@ const DataTerms = () => {
         engineering without infringing intellectual property rights, please
         agree to OSS Compass having the right to use these results.
         <br />
-        5. For specific details, please see the agreement below.
+        {/* 5. For specific details, please see the agreement below. */}
       </p>
-      <h3 className="my-4 text-lg font-semibold">
+      {/* <h3 className="my-4 text-lg font-semibold">
         <a
           className="underline"
           download
@@ -189,7 +189,7 @@ const DataTerms = () => {
         >
           OSS Compass Project Cooperation Framework Agreement.pdf
         </a>
-      </h3>
+      </h3> */}
     </div>
   );
   if (i18n.language === 'en') {

diff --git a/...icContributor/ContributorContribution.tsx → ...ributionCount/ContributorContribution.tsx b/...icContributor/ContributorContribution.tsx → ...ributionCount/ContributorContribution.tsx
@@ -6,18 +6,18 @@ import {
 import client from '@common/gqlClient';
 import { useTranslation } from 'next-i18next';
 import MetricChart from '@modules/analyze/DataView/MetricDetail/MetricChart';
-import { useGetEcologicalText } from './contribution';
+import { useGetEcologicalText } from '../contribution';
 import { gradientRamp } from '@common/options';
-import PieDropDownMenu from '../PieDropDownMenu';
+import PieDropDownMenu from '../../PieDropDownMenu';
 import type { EChartsOption } from 'echarts';
 
 const ContributorContribution: React.FC<{
   label: string;
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   const [orgModel, setOrgModel] = useState<boolean>(true);
   const [onlyIdentity, setOnlyIdentity] = useState<boolean>(false);
   const [onlyOrg, setOnlyOrg] = useState<boolean>(false);
@@ -59,15 +59,15 @@ const ContributorContribution: React.FC<{
           level={level}
           beginDate={beginDate}
           endDate={endDate}
-          mileage={mileage}
+          commonFilterOpts={commonFilterOpts}
         />
       ) : (
         <EcoContributorContribution
           label={label}
           level={level}
           beginDate={beginDate}
           endDate={endDate}
-          mileage={mileage}
+          commonFilterOpts={commonFilterOpts}
           orgModel={orgModel}
           onlyIdentity={onlyIdentity}
           onlyOrg={onlyOrg}
@@ -195,7 +195,7 @@ const EcoContributorContribution: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
+  commonFilterOpts: any[];
   orgModel: boolean;
   onlyIdentity: boolean;
   onlyOrg: boolean;
@@ -204,7 +204,7 @@ const EcoContributorContribution: React.FC<{
   level,
   beginDate,
   endDate,
-  mileage,
+  commonFilterOpts,
   orgModel,
   onlyIdentity,
   onlyOrg,
@@ -216,7 +216,7 @@ const EcoContributorContribution: React.FC<{
     level: level,
     beginDate: beginDate,
     endDate: endDate,
-    filterOpts: [{ type: 'mileage_type', values: mileage }],
+    filterOpts: commonFilterOpts,
   });
   const getEcologicalText = useGetEcologicalText();
   const getSeries = useMemo(() => {
@@ -301,16 +301,16 @@ const OrgContributorContribution: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   const { t } = useTranslation();
   const chartRef = useRef<HTMLDivElement>(null);
   const { data, isLoading } = useOrgContributionDistributionQuery(client, {
     label: label,
     level: level,
     beginDate: beginDate,
     endDate: endDate,
-    filterOpts: [{ type: 'mileage_type', values: mileage }],
+    filterOpts: commonFilterOpts,
   });
   const getEcologicalText = useGetEcologicalText();
   const getSeries = useMemo(() => {

diff --git a/...cContributor/ContributorOrganizations.tsx → ...ibutionCount/ContributorOrganizations.tsx b/...cContributor/ContributorOrganizations.tsx → ...ibutionCount/ContributorOrganizations.tsx
@@ -11,16 +11,16 @@ const ContributorContribution: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   const { t } = useTranslation();
   const chartRef = useRef<HTMLDivElement>(null);
   const { data, isLoading } = useOrgContributorsOverviewQuery(client, {
     label: label,
     level: level,
     beginDate: beginDate,
     endDate: endDate,
-    filterOpts: [{ type: 'mileage_type', values: mileage }],
+    filterOpts: commonFilterOpts,
   });
   const getSeries = useMemo(() => {
     const legend = [];

diff --git a/...l/MetricContributor/ContributionCount.tsx → ...icContributor/ContributionCount/index.tsx b/...l/MetricContributor/ContributionCount.tsx → ...icContributor/ContributionCount/index.tsx
@@ -7,23 +7,23 @@ const ContributionCount: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   return (
     <div className="flex h-full lg:flex-col">
       <ContributorContribution
         label={label}
         level={level}
         beginDate={beginDate}
         endDate={endDate}
-        mileage={mileage}
+        commonFilterOpts={commonFilterOpts}
       />
       <ContributorOrganizations
         label={label}
         level={level}
         beginDate={beginDate}
         endDate={endDate}
-        mileage={mileage}
+        commonFilterOpts={commonFilterOpts}
       />
     </div>
   );

diff --git a/...eb/src/modules/analyze/DataView/MetricDetail/MetricContributor/ContributorTable/index.tsx b/...eb/src/modules/analyze/DataView/MetricDetail/MetricContributor/ContributorTable/index.tsx
@@ -49,8 +49,8 @@ const MetricTable: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   const { t } = useTranslation();
   const [openConfirm, setOpenConfirm] = useState(false);
   const [currentName, setCurrentName] = useState('');
@@ -68,14 +68,6 @@ const MetricTable: React.FC<{
   const router = useRouter();
   const { handleQueryParams } = useHandleQueryParams();
 
-  const mileageFilter = useMemo(() => {
-    if (mileage.length > 0) {
-      return { type: 'mileage_type', values: mileage };
-    } else {
-      return null;
-    }
-  }, [mileage]);
-
   const queryFilterOpts = router.query?.filterOpts as string;
   const defaultFilterOpts = queryFilterOpts ? JSON.parse(queryFilterOpts) : [];
   const defaultSortOpts = router.query?.sortOpts
@@ -101,7 +93,7 @@ const MetricTable: React.FC<{
   const query = {
     page: tableParams.pagination.current,
     per: tableParams.pagination.pageSize,
-    filterOpts: [...filterOpts, mileageFilter],
+    filterOpts: [...filterOpts, ...commonFilterOpts],
     sortOpts: tableParams.sortOpts,
     label,
     level,
@@ -330,7 +322,7 @@ const MetricTable: React.FC<{
   ];
   return (
     <>
-      <div className="absolute right-0 top-2">
+      <div className="absolute right-4 top-16">
         <Download
           beginFun={getContributorExport}
           pollingFun={getContributorPolling}

diff --git a/apps/web/src/modules/analyze/DataView/MetricDetail/MetricContributor/Contributors.tsx b/apps/web/src/modules/analyze/DataView/MetricDetail/MetricContributor/Contributors.tsx
@@ -125,8 +125,8 @@ const ContributorContributors: React.FC<{
   level: string;
   beginDate: Date;
   endDate: Date;
-  mileage: string[];
-}> = ({ label, level, beginDate, endDate, mileage }) => {
+  commonFilterOpts: any[];
+}> = ({ label, level, beginDate, endDate, commonFilterOpts }) => {
   const { t } = useTranslation();
   const getEcologicalText = useGetEcologicalText();
   const chartRef = useRef<HTMLDivElement>(null);
@@ -137,7 +137,7 @@ const ContributorContributors: React.FC<{
     level: level,
     beginDate: beginDate,
     endDate: endDate,
-    filterOpts: [{ type: 'mileage_type', values: mileage }],
+    filterOpts: commonFilterOpts,
   });
 
   const getSeries = useMemo(() => {