Feat: add organization filter (#352)

Signed-off-by: laixingyou <[email protected]>
oss-compass · May 9, 2024 · ea412a7 · ea412a7
1 parent b6da736
commit ea412a7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/apps/web/i18n b/apps/web/i18n
diff --git a/.../analyze/DataView/MetricDetail/MetricContributor/ContributorTable/ContributorDropdown.tsx b/.../analyze/DataView/MetricDetail/MetricContributor/ContributorTable/ContributorDropdown.tsx
@@ -3,7 +3,12 @@ import React, { useState } from 'react';
 import { Button, Input } from 'antd';
 import { useTranslation } from 'next-i18next';
 
-const ContributorDropdown = ({ selectedKeys, setSelectedKeys, confirm }) => {
+const ContributorDropdown = ({
+  selectedKeys,
+  setSelectedKeys,
+  confirm,
+  placeholder,
+}) => {
   const { t } = useTranslation();
   const [contributor, setContributor] = useState(selectedKeys);
 
@@ -17,7 +22,7 @@ const ContributorDropdown = ({ selectedKeys, setSelectedKeys, confirm }) => {
   return (
     <div style={{ padding: 8 }} onKeyDown={(e) => e.stopPropagation()}>
       <Input
-        placeholder={t('analyze:metric_detail:search_contributor')}
+        placeholder={placeholder}
         value={contributor[0]}
         onChange={(e) => setContributor([e.target.value])}
         onPressEnter={() => handleSearch()}

diff --git a/...eb/src/modules/analyze/DataView/MetricDetail/MetricContributor/ContributorTable/index.tsx b/...eb/src/modules/analyze/DataView/MetricDetail/MetricContributor/ContributorTable/index.tsx
@@ -204,6 +204,7 @@ const MetricTable: React.FC<{
             selectedKeys={selectedKeys}
             setSelectedKeys={setSelectedKeys}
             confirm={confirm}
+            placeholder={t('analyze:metric_detail:search_contributor')}
           />
         );
       },
@@ -299,6 +300,25 @@ const MetricTable: React.FC<{
           </div>
         );
       },
+      filterIcon: (filtered: boolean) => (
+        <AiFillFilter
+          className="text-sm"
+          style={{ color: filtered ? '#1677ff' : undefined }}
+        />
+      ),
+      defaultFilteredValue:
+        defaultFilterOpts.find((i) => i.type === 'organization')?.values ||
+        null,
+      filterDropdown: ({ selectedKeys, setSelectedKeys, confirm }) => {
+        return (
+          <ContributorDropdown
+            selectedKeys={selectedKeys}
+            setSelectedKeys={setSelectedKeys}
+            confirm={confirm}
+            placeholder={t('analyze:metric_detail:search_organization')}
+          />
+        );
+      },
     },
     {
       title: t('analyze:metric_detail:contribution'),