openvsx-webui-test 0.18.0-security.5 → 0.19.0-dev.1

package/src/default/menu-content.tsx

@@ -8,10 +8,9 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, PropsWithChildren, useContext } from 'react';
+import { FunctionComponent, PropsWithChildren, useContext, useRef } from 'react';
 import { Typography, MenuItem, Link, Button, IconButton, Accordion, AccordionSummary, Avatar, AccordionDetails } from '@mui/material';
-import { useLocation } from 'react-router-dom';
-import { Link as RouteLink } from 'react-router-dom';
+import { useLocation, Link as RouteLink  } from 'react-router-dom';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import MenuBookIcon from '@mui/icons-material/MenuBook';
@@ -31,21 +30,13 @@ import { LogoutForm } from '../pages/user/logout';
 import { LoginComponent } from './login';
 
 //-------------------- Mobile View --------------------//
-
-export const MobileMenuItem = styled(MenuItem)({
-    cursor: 'auto',
-    '&>a': {
-        textDecoration: 'none'
-    }
-});
-
 export const itemIcon = {
     mr: 1,
     width: '16px',
     height: '16px',
 };
 
-export const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children }) => {
+export const MenuItemText: FunctionComponent<PropsWithChildren> = ({ children }) => {
     return (
         <Typography variant='body2' color='text.primary' sx={{ display: 'flex', alignItems: 'center', textTransform: 'none' }}>
             {children}
@@ -56,6 +47,7 @@ export const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ child
 export const MobileUserAvatar: FunctionComponent = () => {
     const context = useContext(MainContext);
     const user = context.user;
+    const logoutFormRef = useRef<HTMLFormElement>(null);
     if (!user) {
         return null;
     }
@@ -66,52 +58,46 @@ export const MobileUserAvatar: FunctionComponent = () => {
             aria-controls='user-actions'
             id='user-avatar'
         >
-            <MobileMenuItemText>
+            <MenuItemText>
                 <Avatar
                     src={user.avatarUrl}
                     alt={user.loginName}
                     variant='rounded'
                     sx={itemIcon} />
                 {user.loginName}
-            </MobileMenuItemText>
+            </MenuItemText>
         </AccordionSummary>
         <AccordionDetails>
-            <MobileMenuItem>
-                <Link href={user.homepage}>
-                    <MobileMenuItemText>
-                        <GitHubIcon sx={itemIcon} />
-                        {user.loginName}
-                    </MobileMenuItemText>
-                </Link>
-            </MobileMenuItem>
-            <MobileMenuItem>
-                <RouteLink to={UserSettingsRoutes.PROFILE}>
-                    <MobileMenuItemText>
-                        <SettingsIcon sx={itemIcon} />
-                        Settings
-                    </MobileMenuItemText>
-                </RouteLink>
-            </MobileMenuItem>
+            <MenuItem component={Link} href={user.homepage}>
+                <MenuItemText>
+                    <GitHubIcon sx={itemIcon} />
+                    {user.loginName}
+                </MenuItemText>
+            </MenuItem>
+            <MenuItem component={RouteLink} to={UserSettingsRoutes.PROFILE}>
+                <MenuItemText>
+                    <SettingsIcon sx={itemIcon} />
+                    Settings
+                </MenuItemText>
+            </MenuItem>
             {
                 user.role === 'admin'
-                    ? <MobileMenuItem>
-                        <RouteLink to={AdminDashboardRoutes.MAIN}>
-                            <MobileMenuItemText>
-                                <AdminPanelSettingsIcon sx={itemIcon} />
-                                Admin Dashboard
-                            </MobileMenuItemText>
-                        </RouteLink>
-                    </MobileMenuItem>
+                    ? <MenuItem component={RouteLink} to={AdminDashboardRoutes.MAIN}>
+                        <MenuItemText>
+                            <AdminPanelSettingsIcon sx={itemIcon} />
+                            Admin Dashboard
+                        </MenuItemText>
+                    </MenuItem>
                     : null
             }
-            <MobileMenuItem>
-                <LogoutForm>
-                    <MobileMenuItemText>
+            <MenuItem onClick={() => logoutFormRef.current?.submit()}>
+                <LogoutForm ref={logoutFormRef}>
+                    <MenuItemText>
                         <LogoutIcon sx={itemIcon} />
                         Log Out
-                    </MobileMenuItemText>
+                    </MenuItemText>
                 </LogoutForm>
-            </MobileMenuItem>
+            </MenuItem>
         </AccordionDetails>
     </Accordion>;
 };
@@ -125,63 +111,51 @@ export const MobileMenuContent: FunctionComponent = () => {
             user ? (
                 <MobileUserAvatar />
             ) : (
-                <MobileMenuItem>
-                    <LoginComponent
-                        loginProviders={loginProviders}
-                        renderButton={(href, onClick) => {
-                            return (<Link href={href} onClick={onClick}>
-                                <MobileMenuItemText>
-                                    <AccountBoxIcon sx={itemIcon} />
-                                    Log In
-                                </MobileMenuItemText>
-                            </Link>);
-                        }}
-                    />
-                </MobileMenuItem>
+                <LoginComponent
+                    loginProviders={loginProviders}
+                    renderButton={(href, onClick) => (
+                        <MenuItem component={Link} href={href} onClick={onClick}>
+                            <MenuItemText>
+                                <AccountBoxIcon sx={itemIcon} />
+                                Log In
+                            </MenuItemText>
+                        </MenuItem>
+                    )}
+                />
             )
         )}
         {loginProviders && !location.pathname.startsWith(UserSettingsRoutes.ROOT) && (
-            <MobileMenuItem>
-                <RouteLink to='/user-settings/extensions'>
-                    <MobileMenuItemText>
-                        <PublishIcon sx={itemIcon} />
-                        Publish Extension
-                    </MobileMenuItemText>
-                </RouteLink>
-            </MobileMenuItem>
+            <MenuItem component={RouteLink} to='/user-settings/extensions'>
+                <MenuItemText>
+                    <PublishIcon sx={itemIcon} />
+                    Publish Extension
+                </MenuItemText>
+            </MenuItem>
         )}
-        <MobileMenuItem>
-            <Link target='_blank' href='https://github.com/eclipse/openvsx'>
-                <MobileMenuItemText>
-                    <GitHubIcon sx={itemIcon} />
-                    Source Code
-                </MobileMenuItemText>
-            </Link>
-        </MobileMenuItem>
-        <MobileMenuItem>
-            <Link href='https://github.com/eclipse/openvsx/wiki'>
-                <MobileMenuItemText>
-                    <MenuBookIcon sx={itemIcon} />
-                    Documentation
-                </MobileMenuItemText>
-            </Link>
-        </MobileMenuItem>
-        <MobileMenuItem>
-            <Link href='https://join.slack.com/t/openvsxworkinggroup/shared_invite/zt-2y07y1ggy-ct3IfJljjGI6xWUQ9llv6A'>
-                <MobileMenuItemText>
-                    <ForumIcon sx={itemIcon} />
-                    Slack Workspace
-                </MobileMenuItemText>
-            </Link>
-        </MobileMenuItem>
-        <MobileMenuItem>
-            <RouteLink to='/about'>
-                <MobileMenuItemText>
-                    <InfoIcon sx={itemIcon} />
-                    About This Service
-                </MobileMenuItemText>
-            </RouteLink>
-        </MobileMenuItem>
+        <MenuItem component={Link} href='https://github.com/eclipse/openvsx' target='_blank'>
+            <MenuItemText>
+                <GitHubIcon sx={itemIcon} />
+                Source Code
+            </MenuItemText>
+        </MenuItem>
+        <MenuItem component={Link} href='https://github.com/eclipse/openvsx/wiki'>
+            <MenuItemText>
+                <MenuBookIcon sx={itemIcon} />
+                Documentation
+            </MenuItemText>
+        </MenuItem>
+        <MenuItem component={Link} href='https://join.slack.com/t/openvsxworkinggroup/shared_invite/zt-2y07y1ggy-ct3IfJljjGI6xWUQ9llv6A'>
+            <MenuItemText>
+                <ForumIcon sx={itemIcon} />
+                Slack Workspace
+            </MenuItemText>
+        </MenuItem>
+        <MenuItem component={RouteLink} to='/about'>
+            <MenuItemText>
+                <InfoIcon sx={itemIcon} />
+                About This Service
+            </MenuItemText>
+        </MenuItem>
     </>;
 };
 

package/src/default/openvsx-registry-logo.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent } from 'react';
+import { FunctionComponent } from 'react';
 
 const OpenVSXLogo: FunctionComponent<{width: string, height: string, marginTop: string, prefersDarkMode: boolean }> = props => {
     return (

package/src/default/page-settings.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, ReactNode, Suspense, lazy } from 'react';
+import { FunctionComponent, ReactNode, Suspense, lazy } from 'react';
 import { Helmet } from 'react-helmet-async';
 import { styled, Theme } from '@mui/material/styles';
 import { Link, Typography, Box } from '@mui/material';

package/src/default/server.ts

@@ -44,7 +44,7 @@ if (args.indexOf('-ratelimit') != -1) {
 }
 
 // Serve static resources
-const staticPath = path.join(__dirname, '..', '..', 'static');
+const staticPath = path.join(__dirname, '..', '..', 'dist');
 app.use(express.static(staticPath));
 
 // Enable react-router by forwarding the main page to all paths that don't match a resource

package/src/extension-registry-service.ts

@@ -14,7 +14,8 @@ import {
     SortOrder, UrlString, NamespaceMembershipList, PublisherInfo, SearchEntry, RegistryVersion,
     LoginProviders, ScanResultJson, ScanCounts, ScanResultsResponse, ScanFilterOptions,
     FilesResponse, FileDecisionCountsJson, ScanDecisionRequest, ScanDecisionResponse,
-    FileDecisionRequest, FileDecisionResponse, FileDecisionDeleteRequest, FileDecisionDeleteResponse
+    FileDecisionRequest, FileDecisionResponse, FileDecisionDeleteRequest, FileDecisionDeleteResponse,
+    Tier, TierList, Customer, CustomerList, UsageStatsList, LogPageableList,
 } from './extension-registry-types';
 import { createAbsoluteURL, addQuery } from './utils';
 import { sendRequest, ErrorResponse } from './server-request';
@@ -396,7 +397,7 @@ export class ExtensionRegistryService {
             payload: extensionPackage,
             headers: headers,
             endpoint: createAbsoluteURL([this.serverUrl, 'api', 'user', 'publish'])
-        });
+        }, false); // do not retry publishing an extension but show the explicit error received
     }
 
     async createNamespace(abortController: AbortController, name: string): Promise<Readonly<SuccessResult | ErrorResult>> {
@@ -499,6 +500,16 @@ export interface AdminService {
     makeScanDecision(abortController: AbortController, request: ScanDecisionRequest): Promise<Readonly<ScanDecisionResponse>>
     makeFileDecision(abortController: AbortController, request: FileDecisionRequest): Promise<Readonly<FileDecisionResponse>>
     deleteFileDecisions(abortController: AbortController, request: FileDecisionDeleteRequest): Promise<Readonly<FileDecisionDeleteResponse>>
+    getTiers(abortController: AbortController): Promise<Readonly<TierList>>;
+    createTier(abortController: AbortController, tier: Tier): Promise<Readonly<Tier>>;
+    updateTier(abortController: AbortController, name: string, tier: Tier): Promise<Readonly<Tier>>;
+    deleteTier(abortController: AbortController, name: string): Promise<Readonly<SuccessResult | ErrorResult>>;
+    getCustomers(abortController: AbortController): Promise<Readonly<CustomerList>>;
+    createCustomer(abortController: AbortController, customer: Customer): Promise<Readonly<Customer>>;
+    updateCustomer(abortController: AbortController, name: string, customer: Customer): Promise<Readonly<Customer>>;
+    deleteCustomer(abortController: AbortController, name: string): Promise<Readonly<SuccessResult | ErrorResult>>;
+    getUsageStats(abortController: AbortController, customerName: string, date: Date): Promise<Readonly<UsageStatsList>>;
+    getLogs(abortController: AbortController, page?: number, size?: number, period?: string): Promise<Readonly<LogPageableList>>;
 }
 
 export interface AdminServiceConstructor {
@@ -808,6 +819,173 @@ export class AdminServiceImpl implements AdminService {
             payload: request
         });
     }
+
+    async getTiers(abortController: AbortController): Promise<Readonly<TierList>> {
+        return sendRequest({
+            abortController,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'tiers']),
+            credentials: true
+        }, false);
+    }
+
+    async createTier(abortController: AbortController, tier: Tier): Promise<Readonly<Tier>> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'POST',
+            payload: tier,
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'tiers', 'create']),
+            headers
+        }, false);
+    }
+
+    async updateTier(abortController: AbortController, name: string, tier: Tier): Promise<Readonly<Tier>> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'PUT',
+            payload: tier,
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'tiers', name]),
+            headers
+        }, false);
+    }
+
+    async deleteTier(abortController: AbortController, name: string): Promise<SuccessResult | ErrorResult> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'DELETE',
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'tiers', name]),
+            headers
+        }, false);
+    }
+
+    async getCustomers(abortController: AbortController): Promise<Readonly<CustomerList>> {
+        return sendRequest({
+            abortController,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'customers']),
+            credentials: true
+        }, false);
+    }
+
+    async createCustomer(abortController: AbortController, customer: Customer): Promise<Readonly<Customer>> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'POST',
+            payload: customer,
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'customers', 'create']),
+            headers
+        }, false);
+    }
+
+    async updateCustomer(abortController: AbortController, name: string, customer: Customer): Promise<Readonly<Customer>> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'PUT',
+            payload: customer,
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'customers', name]),
+            headers
+        }, false);
+    }
+
+    async deleteCustomer(abortController: AbortController, name: string): Promise<SuccessResult | ErrorResult> {
+        const csrfResponse = await this.registry.getCsrfToken(abortController);
+        const headers: Record<string, string> = {
+            'Content-Type': 'application/json;charset=UTF-8'
+        };
+        if (!isError(csrfResponse)) {
+            const csrfToken = csrfResponse as CsrfTokenJson;
+            headers[csrfToken.header] = csrfToken.value;
+        }
+        return sendRequest({
+            abortController,
+            method: 'DELETE',
+            credentials: true,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'customers', name]),
+            headers
+        }, false);
+    }
+
+    /**
+     * Get usage stats for a customer within an optional date range.
+     */
+    async getUsageStats(
+        abortController: AbortController,
+        customerName: string,
+        date: Date,
+    ): Promise<Readonly<UsageStatsList>> {
+        const query: { key: string, value: string | number }[] = [];
+        query.push({ key: 'date', value: date.toISOString() });
+
+        return sendRequest({
+            abortController,
+            endpoint: createAbsoluteURL([this.registry.serverUrl, 'admin', 'ratelimit', 'customers', customerName, 'usage'], query),
+            credentials: true
+        }, false);
+    }
+
+    async getLogs(
+        abortController: AbortController,
+        page: number = 0,
+        size: number = 20,
+        period?: string
+    ): Promise<Readonly<LogPageableList>> {
+        const query: { key: string, value: string | number }[] = [
+            { key: 'page', value: page },
+            { key: 'size', value: size }
+        ];
+        if (period) {
+            query.push({ key: 'period', value: period });
+        }
+        const endpoint = addQuery(createAbsoluteURL([this.registry.serverUrl, 'admin', 'logs']), query);
+        return sendRequest({
+            abortController,
+            endpoint,
+            credentials: true
+        }, false);
+    }
 }
 
 export interface ExtensionFilter {

package/src/extension-registry-types.ts

@@ -180,6 +180,8 @@ export interface PersonalAccessToken {
     value?: string;
     createdTimestamp: TimestampString;
     accessedTimestamp?: TimestampString;
+    expiresTimestamp?: TimestampString;
+    notified?: boolean;
     description: string;
     deleteTokenUrl: UrlString;
 }
@@ -415,3 +417,69 @@ export interface FileDecisionDeleteResponse {
     failed: number;
     results: FileDecisionDeleteResult[];
 }
+
+export enum TierType {
+    FREE = 'FREE',
+    SAFETY = 'SAFETY',
+    NON_FREE = 'NON_FREE'
+}
+
+export enum RefillStrategy {
+    GREEDY = 'GREEDY',
+    INTERVAL = 'INTERVAL'
+}
+
+export interface Tier {
+    name: string;
+    description?: string;
+    tierType: TierType;
+    capacity: number;
+    duration: number;
+    refillStrategy: RefillStrategy;
+}
+
+export interface TierList {
+    tiers: Tier[];
+}
+
+export enum EnforcementState {
+    EVALUATION = 'EVALUATION',
+    ENFORCEMENT = 'ENFORCEMENT'
+}
+
+export interface Customer {
+    name: string;
+    tier?: Tier;
+    state: EnforcementState;
+    cidrBlocks: string[];
+}
+
+export interface CustomerList {
+    customers: Customer[];
+}
+
+export interface UsageStats {
+    windowStart: number; // epoch seconds in UTC
+    duration: number; // in seconds
+    count: number;
+}
+
+export interface UsageStatsList {
+    stats: UsageStats[];
+}
+
+export interface Log {
+    timestamp: string;
+    user: string;
+    message: string;
+}
+
+export interface LogPageableList {
+    content: Log[];
+    page: {
+        size: number;
+        number: number;
+        totalElements: number;
+        totalPages: number;
+    };
+}

package/src/header-menu.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { ComponentType, FunctionComponent, useContext, useEffect, useState } from 'react';
+import { ComponentType, FunctionComponent, useContext, useEffect, useState } from 'react';
 import { Menu, IconButton, useTheme } from '@mui/material';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import MenuIcon from '@mui/icons-material/Menu';

package/src/hooks/scan-admin/use-dialogs.ts

@@ -13,7 +13,7 @@
 
 import { useMemo } from 'react';
 import { useScanContext } from '../../context/scan-admin';
-import { ConfirmActionType, FileActionType, ScanResult, FileDecision } from '../../context/scan-admin/scan-types';
+import { ConfirmActionType, FileActionType, ScanResult, FileDecision } from '../../context/scan-admin';
 
 /**
  * Return type for the useDialogs hook

package/src/hooks/scan-admin/use-quarantined-tab.ts

@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import { useMemo, useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useScanContext } from '../../context/scan-admin';
 import { useScanFilters } from './use-scan-filters';
 import { usePagination } from './use-pagination';
@@ -35,8 +35,7 @@ export const useQuarantinedTab = () => {
     const selectableScans = useMemo(() => {
         return quarantinedScans.filter(scan => {
             const hasEnforcedThreat = scan.threats.some(t => t.enforcedFlag);
-            const needsReview = !scan.adminDecision?.decision && hasEnforcedThreat;
-            return needsReview;
+            return !scan.adminDecision?.decision && hasEnforcedThreat;
         });
     }, [quarantinedScans]);
 

package/src/hooks/scan-admin/use-query-params-state.ts

@@ -0,0 +1,55 @@
+/******************************************************************************
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
+
+import { useState } from 'react';
+
+const getQuery = () => {
+    if (typeof window !== 'undefined') {
+        return new URLSearchParams(window.location.search);
+    }
+    return new URLSearchParams();
+};
+
+const getQueryStringVal = (key: string): string | null => {
+    return getQuery().get(key);
+};
+
+const useQueryParam = (
+    key: string,
+    defaultVal: string
+): [string, (val: string) => void] => {
+    const [query, setQuery] = useState(getQueryStringVal(key) || defaultVal);
+
+    const updateUrl = (newVal: string) => {
+        setQuery(newVal);
+
+        const query = getQuery();
+
+        if (newVal.trim() !== '') {
+            query.set(key, newVal);
+        } else {
+            query.delete(key);
+        }
+
+        // This check is necessary if using the hook with Gatsby
+        if (typeof window !== 'undefined') {
+            const { protocol, pathname, host } = window.location;
+            const newUrl = `${protocol}//${host}${pathname}?${query.toString()}`;
+            window.history.pushState({}, '', newUrl);
+        }
+    };
+
+    return [query, updateUrl];
+};
+
+export default useQueryParam;

package/src/hooks/scan-admin/use-scan-card-state.ts

@@ -11,6 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
+import type { RefObject } from "react";
 import { useState, useEffect, useRef, useMemo } from 'react';
 import { ScanResult } from '../../context/scan-admin';
 import { formatDuration } from '../../components/scan-admin/common';
@@ -19,7 +20,7 @@ import {
     shouldShowExpandButton,
     getDetailBadges,
     DetailBadge,
-} from '../../components/scan-admin/scan-card/utils';
+} from '../../components/scan-admin';
 
 interface UseScanCardStateReturn {
     expanded: boolean;
@@ -28,7 +29,7 @@ interface UseScanCardStateReturn {
     badges: DetailBadge[];
     liveDuration: string;
     // Card ref for height tracking
-    cardRef: React.RefObject<HTMLDivElement>;
+    cardRef: RefObject<HTMLDivElement>;
 }
 
 /**