openvsx-webui-test 0.19.0-dev.0 → 0.19.0-dev.2

package/src/pages/user/logout.tsx

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  * ****************************************************************************** */
 
-import { FunctionComponent, PropsWithChildren, useContext, useEffect, useRef, useState } from 'react';
+import { PropsWithChildren, useContext, useEffect, useRef, useState, forwardRef } from 'react';
 import { Button } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { isError, CsrfTokenJson } from '../../extension-registry-types';
@@ -22,7 +22,7 @@ const LogoutButton = styled(Button)({
     padding: 0
 });
 
-export const LogoutForm: FunctionComponent<PropsWithChildren> = ({ children }) => {
+export const LogoutForm = forwardRef<HTMLFormElement, PropsWithChildren>(({ children }, ref) => {
     const [csrf, setCsrf] = useState<string>();
     const context = useContext(MainContext);
 
@@ -44,10 +44,12 @@ export const LogoutForm: FunctionComponent<PropsWithChildren> = ({ children }) =
         }
     };
 
-    return <form method='post' action={context.service.getLogoutUrl()}>
+    return <form ref={ref} method='post' action={context.service.getLogoutUrl()}>
         {csrf ? <input name='_csrf' type='hidden' value={csrf} /> : null}
         <LogoutButton type='submit'>
             {children}
         </LogoutButton>
     </form>;
-};
+});
+
+LogoutForm.displayName = 'LogoutForm';

package/src/pages/user/user-settings-extensions.tsx

@@ -84,7 +84,7 @@ export const UserSettingsExtensions: FunctionComponent = () => {
             {
                 extensions && extensions.length > 0
                 ? <UserExtensionList extensions={extensions} loading={loading} canDelete />
-                : <Typography  variant='body1'>No extensions published under this namespace yet.</Typography>
+                : <Typography variant='body1'>You haven&apos;t published any extensions yet.</Typography>
             }
         </Box>
     </>;

package/src/pages/user/user-settings-tokens.tsx

@@ -105,6 +105,7 @@ export const UserSettingsTokens: FunctionComponent = () => {
             <Box alignItems='center' overflow='auto'>
                 <Typography sx={{ fontWeight: 'bold', overflow: 'hidden', textOverflow: 'ellipsis' }}>{token.description}</Typography>
                 <Typography variant='body2'>Created: <Timestamp value={token.createdTimestamp}/></Typography>
+                <Typography variant='body2'>Expires: {token.expiresTimestamp ? <Timestamp value={token.expiresTimestamp} isFutureTime={true} /> : 'never'}</Typography>
                 <Typography variant='body2'>Accessed: {token.accessedTimestamp ? <Timestamp value={token.accessedTimestamp}/> : 'never'}</Typography>
             </Box>
             <Box display='flex' alignItems='center'>

package/src/server-request.ts

@@ -73,7 +73,11 @@ export async function sendRequest<Res>(req: ServerAPIRequest, retry: boolean = t
                 throw new Error(`Unsupported type ${req.headers['Accept']}`);
         }
     } else if (response.status === 429) {
-        const retrySeconds = response.headers.get('X-Rate-Limit-Retry-After-Seconds') ?? '0';
+        // if the server uses the bucket4j starter config
+        const retryAfterSeconds = response.headers.get('X-Rate-Limit-Retry-After-Seconds');
+        // if the server uses the dynamic rate limiting config
+        const retryAfter = response.headers.get('Retry-After');
+        const retrySeconds = retryAfterSeconds ?? retryAfter ?? '0';
         const jitter = Math.floor(Math.random() * 100);
         const timeoutMillis = ((Number(retrySeconds) + 1) * 1000) + jitter;
         return new Promise<ServerAPIRequest>(resolve => setTimeout(resolve, timeoutMillis, req))

package/src/utils.ts

@@ -52,34 +52,61 @@ export function toLocalTime(timestamp?: string): string | undefined {
     return new Intl.DateTimeFormat(undefined, options).format(date);
 }
 
-const msPerMinute = 60 * 1000;
+const msPerSecond = 1000;
+const msPerMinute = msPerSecond * 60;
 const msPerHour = msPerMinute * 60;
 const msPerDay = msPerHour * 24;
 const msPerMonth = msPerDay * 30.4;
 const msPerYear = msPerDay * 365;
-export function toRelativeTime(timestamp?: string): string | undefined {
+export function toRelativeTime(timestamp?: string, isFutureTime: boolean = false): string | undefined {
     if (!timestamp) {
         return undefined;
     }
     const date = new Date(timestamp);
     const elapsed = Date.now() - date.getTime();
-    if (elapsed < msPerMinute) {
-        return 'now';
-    } else if (elapsed < msPerHour) {
-        const value = Math.round(elapsed / msPerMinute);
-        return `${value} minute${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerDay) {
-        const value = Math.round(elapsed / msPerHour);
-        return `${value} hour${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerMonth) {
-        const value = Math.round(elapsed / msPerDay);
-        return `${value} day${value !== 1 ? 's' : ''} ago`;
-    } else if (elapsed < msPerYear) {
-        const value = Math.round(elapsed / msPerMonth);
-        return `${value} month${value !== 1 ? 's' : ''} ago`;
+
+    if (isFutureTime) {
+        const remaining = -elapsed;
+        if (remaining < 0) {
+            return "now";
+        } else if (remaining < msPerMinute) {
+            const value = Math.round(remaining / msPerSecond);
+            return `in ${value} second${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerHour) {
+            const value = Math.round(remaining / msPerMinute);
+            return `in ${value} minute${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerDay) {
+            const value = Math.round(remaining / msPerHour);
+            return `in ${value} hour${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerMonth) {
+            const value = Math.round(remaining / msPerDay);
+            return `in ${value} day${value !== 1 ? 's' : ''}`;
+        } else if (remaining < msPerYear) {
+            const value = Math.round(remaining / msPerMonth);
+            return `in ${value} month${value !== 1 ? 's' : ''}`;
+        } else {
+            const value = Math.round(remaining / msPerYear);
+            return `in ${value} year${value !== 1 ? 's' : ''}`;
+        }
     } else {
-        const value = Math.round(elapsed / msPerYear);
-        return `${value} year${value !== 1 ? 's' : ''} ago`;
+        if (elapsed < msPerMinute) {
+            return 'now';
+        } else if (elapsed < msPerHour) {
+            const value = Math.round(elapsed / msPerMinute);
+            return `${value} minute${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerDay) {
+            const value = Math.round(elapsed / msPerHour);
+            return `${value} hour${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerMonth) {
+            const value = Math.round(elapsed / msPerDay);
+            return `${value} day${value !== 1 ? 's' : ''} ago`;
+        } else if (elapsed < msPerYear) {
+            const value = Math.round(elapsed / msPerMonth);
+            return `${value} month${value !== 1 ? 's' : ''} ago`;
+        } else {
+            const value = Math.round(elapsed / msPerYear);
+            return `${value} year${value !== 1 ? 's' : ''} ago`;
+        }
     }
 }
 
@@ -213,7 +240,8 @@ export function getEngineDisplayName(engine: string): string {
         ['opensumi', 'OpenSumi'],
         ['nadako.vshaxe', 'nadako.vshaxe'],
         ['hbenl.vscode-test-explorer', 'hbenl.vscode-test-explorer'],
+        ['positron', 'Positron']
     ]);
 
     return engineDisplayNames.get(engine) ?? '';
-}
+}