Merge pull request #159 from Weflo-A/develop

Develop
Weflo-A · Mar 10, 2024 · e637553 · e637553
2 parents a99fb74 + ddf47de
commit e637553
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/src/components/common/MenuTab.tsx b/src/components/common/MenuTab.tsx
@@ -5,6 +5,8 @@ import ItemContainer from 'src/components/common/ItemContainer';
 import Button from 'src/components/common/Button';
 import { Plus } from 'src/assets';
 import { useLocation, useNavigate } from 'react-router-dom';
+import GroupPopup from '../onboarding/GroupPopup';
+import React from 'react';
 
 //
 //
@@ -63,6 +65,7 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => {
   const location = useLocation();
   const isTestDetailPage = location.pathname.includes('/test');
   const isEstimatePage = location.pathname.includes('/estimate');
+  const [isPopupOpen, setIsPopupOpen] = React.useState(false);
 
   const handleTabMenu = (url: string, id?: string) => {
     navigate(url, { state: id });
@@ -268,28 +271,31 @@ const MenuTab = ({ groups, drones, type }: MenuTabProps) => {
   };
 
   return (
-    <ItemContainer
-      style={{ minWidth: '12.5rem', position: 'fixed', marginTop: '3.25rem' }}
-    >
-      <TabContainer>
-        {type === 'monitoring' ? renderDroneSearchTab() : null}
-        {type === 'monitoring' ? renderDroneGroupTab() : null}
-        {type === 'dashboard' ? renderDroneListTab() : null}
-        {type === 'parts' ? renderPartsTab() : null}
-        {type === 'trade' ? renderTradeTab() : null}
-        {type === 'monitoring' ? (
-          <Button
-            text={
-              <>
-                <Plus /> 그룹 생성하기
-              </>
-            }
-            buttonType='accentLight'
-            onClick={() => alert('클릭')}
-          />
-        ) : null}
-      </TabContainer>
-    </ItemContainer>
+    <>
+      <ItemContainer
+        style={{ minWidth: '12.5rem', position: 'fixed', marginTop: '3.25rem' }}
+      >
+        <TabContainer>
+          {type === 'monitoring' ? renderDroneSearchTab() : null}
+          {type === 'monitoring' ? renderDroneGroupTab() : null}
+          {type === 'dashboard' ? renderDroneListTab() : null}
+          {type === 'parts' ? renderPartsTab() : null}
+          {type === 'trade' ? renderTradeTab() : null}
+          {type === 'monitoring' ? (
+            <Button
+              text={
+                <>
+                  <Plus /> 그룹 생성하기
+                </>
+              }
+              buttonType='accentLight'
+              onClick={() => setIsPopupOpen(true)}
+            />
+          ) : null}
+        </TabContainer>
+      </ItemContainer>
+      {isPopupOpen && <GroupPopup onClose={() => setIsPopupOpen(false)} />}
+    </>
   );
 };
 

diff --git a/src/pages/EstimatePage.tsx b/src/pages/EstimatePage.tsx
@@ -193,7 +193,8 @@ const EstimatePage = () => {
     const sortedRepairCompanies = [...repairCompanies];
     if (repairFilter === 'recommend') {
       sortedRepairCompanies.sort(
-        (a, b) => b.features.length - a.features.length
+        (a, b) =>
+          [...new Set(b.features)].length - [...new Set(a.features)].length
       );
     } else if (repairFilter === 'price') {
       sortedRepairCompanies.sort((a, b) => a.minPrice - b.minPrice);