Merge pull request #1525 from ssvlabs/pre-stage

Pre-Stage to Stage

Author: IlyaVi

scripts/pr-automation/index.cjs

@@ -123,9 +123,10 @@ async function addReviewers(owner, repo, prNumber) {
       {
         reviewers: [
           "IlyaVi",
+          "sumbat-ssvlabs",
+          "Chris-ssvlabs",
           "axelrod-blox",
           "nir-ssvlabs",
-          "sumbat-ssvlabs",
           "stefan-ssv-labs",
         ],
       },

src/api/cluster.ts

@@ -1,11 +1,15 @@
 import { endpoint } from "@/api";
 import { api } from "@/lib/api-client";
+import {
+  validatorsSearchParamsSerializer,
+  type ValidatorsSearchSchema,
+} from "@/lib/search-parsers/validators-search-parsers";
 import { formatClusterData, getDefaultClusterData } from "@/lib/utils/cluster";
 import { mapBeaconChainStatus } from "@/lib/utils/validator-status-mapping";
 import type {
   GetClusterResponse,
   GetPaginatedClustersResponse,
-  PaginatedValidatorsResponse,
+  PaginatedSearchValidatorsResponse,
 } from "@/types/api";
 import type { Address } from "abitype";
 
@@ -56,27 +60,17 @@ export const getPaginatedAccountClusters = ({
     }));
 };
 
-export type GetPaginatedClusterValidators = {
-  hash: string;
-  page?: number;
-  perPage?: number;
-};
+export type GetPaginatedClusterValidators = Partial<ValidatorsSearchSchema>;
+
+export const getPaginatedClusterValidators = (
+  params: GetPaginatedClusterValidators,
+) => {
+  const searchParams = validatorsSearchParamsSerializer(params);
+  console.log("searchParams:", searchParams);
 
-export const getPaginatedClusterValidators = ({
-  hash,
-  page = 1,
-  perPage = 10,
-}: GetPaginatedClusterValidators) => {
   return api
-    .get<PaginatedValidatorsResponse>(
-      endpoint(
-        "clusters/hash",
-        hash,
-        `?${new URLSearchParams({
-          page: page.toString(),
-          perPage: perPage.toString(),
-        }).toString()}`,
-      ),
+    .get<PaginatedSearchValidatorsResponse>(
+      endpoint("validators", `?${searchParams}`),
     )
     .then((response) => ({
       ...response,
@@ -88,10 +82,6 @@ export const getPaginatedClusterValidators = ({
           isValid: validator.is_valid,
         }),
       })),
-      pagination: {
-        ...response.pagination,
-        page: response.pagination.page || 1,
-        pages: response.pagination.pages || 1,
-      },
+      pagination: response.pagination,
     }));
 };

src/api/validators.ts

@@ -1,5 +1,6 @@
 import { endpoint } from "@/api";
 import { api } from "@/lib/api-client";
+import type { ValidatorStatusFilterKey } from "@/lib/search-parsers/validators-search-parsers";
 import { add0x } from "@/lib/utils/strings";
 import type { Address } from "abitype";
 
@@ -51,6 +52,15 @@ export const getIsRegisteredValidator = async (publicKey: string) => {
   );
 };
 
+export const getValidatorsStatusCounts = async (clusterHash: string) => {
+  return await api
+    .get<{
+      cluster: string;
+      data: Record<ValidatorStatusFilterKey, number>;
+    }>(endpoint(`validators/statusCount?clusterHash=${add0x(clusterHash)}`))
+    .then((response) => response.data);
+};
+
 export const getAllValidators = async (clusterHash: string | Address) => {
   return await api.get<{ type: string; data: string[] }>(
     endpoint("validators/validatorsByClusterHash", add0x(clusterHash)),

src/app/layouts/dashboard/dashboard.tsx

@@ -1,4 +1,3 @@
-import { Navbar } from "@/app/layouts/dashboard/navbar";
 import { NavbarDVT } from "@/app/layouts/dashboard/navbar-dvt";
 import { AssetWithdrawalModal } from "@/components/modals/bapp/asset-withdrawal-modal";
 import { AssetsDepositModal } from "@/components/modals/bapp/assets-deposit-modal";
@@ -9,7 +8,6 @@ import { TransactionModal } from "@/components/ui/transaction-modal";
 import { useAccount } from "@/hooks/account/use-account";
 import { useAccountState } from "@/hooks/account/use-account-state.ts";
 import { useMaintenance } from "@/hooks/app/use-maintenance";
-import { useAppVersion } from "@/hooks/temp-delete-after-merge/use-app-version";
 import { useBlockNavigationOnPendingTx } from "@/hooks/use-block-navigation-on-pending-tx";
 import { useIdentify } from "@/lib/analytics/mixpanel/useIdentify";
 import { useTrackPageViews } from "@/lib/analytics/mixpanel/useTrackPageViews";
@@ -33,7 +31,6 @@ export const DashboardLayout: FC<ComponentPropsWithRef<"div">> = ({
 
   const { isMaintenancePage } = useMaintenance();
   const { isLoadingClusters, isLoadingOperators } = useAccountState();
-  const app = useAppVersion();
   if (isMaintenancePage) {
     return <Navigate to="/maintenance" replace />;
   }
@@ -66,11 +63,7 @@ export const DashboardLayout: FC<ComponentPropsWithRef<"div">> = ({
               exit={{ opacity: 0 }}
               key="content"
             >
-              {app.isDvtOnly ? (
-                <NavbarDVT className="px-5" />
-              ) : (
-                <Navbar className="px-5" />
-              )}
+              <NavbarDVT className="px-5" />
               <main className={cn(className, "flex-1 overflow-auto")}>
                 {children}
               </main>

src/app/routes/dashboard/clusters/cluster/bulk.tsx

@@ -22,6 +22,7 @@ import { useBulkActionContext } from "@/guard/bulk-action-guard";
 import { Link } from "react-router-dom";
 import { NavigateBackBtn } from "@/components/ui/navigate-back-btn";
 import { ValidatorStatusBadge } from "@/components/cluster/validator-status-badge.tsx";
+import { ValidatorsSearchAndFilters } from "@/components/cluster/validators-search-and-filters";
 import { useParams } from "react-router";
 import type { Validator } from "@/types/api.ts";
 
@@ -55,8 +56,8 @@ export const Bulk: FC<{ type: "remove" | "exit" }> = ({ type }) => {
   // TODO: fetch validators to get status
   return (
     <Container variant="vertical" size="lg" className="py-6 h-full">
-      <NavigateBackBtn to={`/clusters/${clusterHash}`} />
-      <Card className="w-full flex-1">
+      <NavigateBackBtn to={`/clusters/${clusterHash}`} persistSearch />
+      <Card className="w-full flex-1 flex flex-col gap-4">
         <div className="flex justify-between">
           <Text variant="headline4">
             {type === "remove"
@@ -67,6 +68,7 @@ export const Bulk: FC<{ type: "remove" | "exit" }> = ({ type }) => {
             {selectedPublicKeys.length} of {totalValidators} selected
           </Badge>
         </div>
+        <ValidatorsSearchAndFilters />
         <VirtualizedInfinityTable
           gridTemplateColumns="40px 220px minmax(200px, auto) 120px"
           query={infiniteQuery}

src/app/routes/dashboard/clusters/cluster/cluster.tsx

@@ -150,6 +150,7 @@ export const Cluster: FC = () => {
               </Button>
             </Tooltip>
           </div>
+
           <ClusterValidatorsList className="min-h-96" />
         </Card>
       </div>

src/app/routes/root-redirection.tsx

@@ -4,9 +4,7 @@ import { Navigate } from "react-router";
 import { cn } from "@/lib/utils/tw.ts";
 import { SsvLoader } from "@/components/ui/ssv-loader.tsx";
 import { motion } from "framer-motion";
-import { useAppVersion } from "@/hooks/temp-delete-after-merge/use-app-version";
 
-const REDIRECT_EXCLUSIONS = ["/", "/connect", "/compliance"];
 export const Redirector = () => {
   const { isLoadingClusters, isLoadingOperators, hasClusters, hasOperators } =
     useAccountState();
@@ -17,8 +15,6 @@ export const Redirector = () => {
   const landedOnClusterPage = landingPage.startsWith("/clusters");
   const landedOnOperatorsPage = landingPage.startsWith("/operators");
 
-  const app = useAppVersion();
-
   if (isLoadingClusters)
     return (
       <motion.div
@@ -54,12 +50,5 @@ export const Redirector = () => {
   if (landedOnOperatorsPage && hasOperators)
     return <Navigate to={landingPage} replace />;
 
-  if (app.isDvtOnly) {
-    return <Navigate to="/join" replace />;
-  }
-
-  if (!REDIRECT_EXCLUSIONS.includes(landingPage))
-    return <Navigate to={landingPage} replace />;
-
-  return <Navigate to="/account/my-delegations" />;
+  return <Navigate to="/join" replace />;
 };

src/app/routes/router.tsx

@@ -7,7 +7,6 @@ import { proxy, useSnapshot } from "valtio";
 
 import { Compliance } from "@/app/routes/compliance";
 import { Maintenance } from "@/app/routes/maintenance";
-import { accountRoutes } from "@/app/routes/router/route-definitions/account-routes.tsx";
 import type { RouteObject } from "react-router-dom";
 import { createBrowserRouter, Outlet } from "react-router-dom";
 import { NotFound } from "./not-found";
@@ -36,7 +35,6 @@ const routes = [
         element: <FeeRecipientAddress />,
       },
       joinRoutes,
-      accountRoutes,
       clustersRoutes,
       operatorsRoutes,
     ],