feat: compare mode open new tabs (#259)

Signed-off-by: laixingyou <[email protected]>
oss-compass · Nov 2, 2023 · 0f1322c · 0f1322c · vercel · Nov 2, 2023
1 parent 20243bd
commit 0f1322c
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 19 deletions.
diff --git a/apps/web/src/modules/analyze/DataView/OverviewSummary/CommunityRepos.tsx b/apps/web/src/modules/analyze/DataView/OverviewSummary/CommunityRepos.tsx
@@ -29,11 +29,7 @@ const RepoItem: React.FC<{
 
   return (
     <div className="rounded border border-gray-300 px-4 py-3">
-      <Link
-        href={getShortAnalyzeLink(shortCode)}
-        target="_blank"
-        className="hover:underline"
-      >
+      <Link href={getShortAnalyzeLink(shortCode)} className="hover:underline">
         <h4 className="line-clamp-2 text-sm font-bold">{name}</h4>
       </Link>
       <p className="text-xs text-gray-400">{getFirstPathSegment(path)}</p>

diff --git a/apps/web/src/modules/analyze/DataView/OverviewSummary/TableList.tsx b/apps/web/src/modules/analyze/DataView/OverviewSummary/TableList.tsx
@@ -147,10 +147,7 @@ const TrendsList: React.FC = () => {
                 return (
                   <tr className="group" key={item!.label}>
                     <td className="flex flex-col px-1 py-2 ">
-                      <Link
-                        href={getShortAnalyzeLink(item!.shortCode)}
-                        target="_blank"
-                      >
+                      <Link href={getShortAnalyzeLink(item!.shortCode)}>
                         <p className="break-words text-sm font-bold md:w-[140px]">
                           {r.name}
                           {item?.level === Level.COMMUNITY ? (

diff --git a/apps/web/src/modules/collection/MainHeader.tsx b/apps/web/src/modules/collection/MainHeader.tsx
@@ -63,7 +63,7 @@ const MainHeader = ({
             <div
               onClick={async () => {
                 if (compareIds.length > 1) {
-                  await router.push(getShortCompareLink(compareIds));
+                  await window.open(getShortCompareLink(compareIds), '_blank');
                 }
                 // setSelect(false);
               }}

diff --git a/apps/web/src/modules/explore/CollectionCard.tsx b/apps/web/src/modules/explore/CollectionCard.tsx
@@ -66,7 +66,6 @@ const CollectionCard = (props: { collection: Collection }) => {
                 <Link
                   key={label}
                   href={getShortAnalyzeLink(shortCode)}
-                  target="_blank"
                   className="flex w-full items-center text-sm hover:underline"
                 >
                   <span className="mr-1 h-1 w-1 flex-shrink-0 bg-black" />

diff --git a/apps/web/src/modules/explore/CollectionFullCard.tsx b/apps/web/src/modules/explore/CollectionFullCard.tsx
@@ -74,7 +74,6 @@ const CollectionFullCard = (props: { collection: Collection }) => {
                     <Link
                       key={label}
                       href={getShortAnalyzeLink(shortCode)}
-                      target="_blank"
                       className="flex w-full items-center text-sm hover:underline"
                     >
                       <span className="mr-1 h-1 w-1 flex-shrink-0 bg-black" />

diff --git a/apps/web/src/modules/explore/RepoCard.tsx b/apps/web/src/modules/explore/RepoCard.tsx
@@ -54,9 +54,7 @@ const RepoCard = (props: {
               {compareMode ? (
                 repo
               ) : (
-                <Link href={getShortAnalyzeLink(shortCode)} target="_blank">
-                  {repo}
-                </Link>
+                <Link href={getShortAnalyzeLink(shortCode)}>{repo}</Link>
               )}
             </p>
             <p className="h-6 truncate text-sm text-gray-400">{nameSpace}</p>

diff --git a/apps/web/src/modules/home/Banner/SearchDropdown.tsx b/apps/web/src/modules/home/Banner/SearchDropdown.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import Link from 'next/link';
 import classnames from 'classnames';
+import { useRouter } from 'next/router';
 import { useTranslation, Trans } from 'next-i18next';
 import { AiOutlineRightCircle } from 'react-icons/ai';
 import useDropDown from '@common/hooks/useDropDown';
@@ -93,7 +94,6 @@ const LinkItem: React.FC<{
     <Link
       key={item.label}
       href={getShortAnalyzeLink(item)}
-      target="_blank"
       className={classnames(
         'flex min-h-[66px] cursor-pointer items-center justify-between px-4 py-3 text-xl hover:bg-gray-100',
         'md:py-2 md:px-2 md:text-base',
@@ -115,11 +115,12 @@ const DropDownList: React.FC<{ result: SearchQuery['fuzzySearch'] }> = ({
   result,
 }) => {
   const { t } = useTranslation();
+  const router = useRouter();
   const { active } = useDropDown({
     totalLength: result.length,
     onPressEnter: () => {
       const activeItem = result[active];
-      window.open(getShortAnalyzeLink(activeItem), '_blank');
+      router.push(getShortAnalyzeLink(activeItem));
     },
   });
 

diff --git a/apps/web/src/modules/home/HotFields/ProjectItem.tsx b/apps/web/src/modules/home/HotFields/ProjectItem.tsx
@@ -17,7 +17,6 @@ const ProjectItem = ({ shortCode, url }) => {
     <Link
       key={name}
       href={getShortAnalyzeLink(shortCode)}
-      target="_blank"
       className="flex cursor-pointer justify-between py-1"
     >
       <div className="text-sm text-black">

diff --git a/apps/web/src/modules/home/Trending/ListPanel.tsx b/apps/web/src/modules/home/Trending/ListPanel.tsx
@@ -30,7 +30,6 @@ const ListPanel = (props: {
             key={item.label}
             href={getShortAnalyzeLink(item.shortCode)}
             className="grid cursor-pointer grid-cols-6 gap-2 border-b py-3 last:border-0"
-            target="_blank"
           >
             <div className="col-span-3 flex">
               <div className="relative h-10 w-10">