Release v0.20.0

Dockerfile

@@ -1,4 +1,4 @@
-ARG SERVER_VERSION=v0.19.0
+ARG SERVER_VERSION=v0.20.0
 
 # Builder image to compile the website
 FROM ubuntu AS builder
@@ -19,7 +19,7 @@ RUN apt-get update \
   && corepack prepare yarn@stable --activate
 
 # bump to update website
-ENV WEBSITE_VERSION 0.13.0
+ENV WEBSITE_VERSION 0.13.1-next.dee19c0f
 COPY . /workdir
 
 RUN /usr/bin/yarn --cwd website \

configuration/application.yml

@@ -25,9 +25,6 @@ server:
 spring:
   application:
     name: openvsx-server
-  autoconfigure:
-    # don't send traces to Zipkin
-    exclude: org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration
   config:
     import: file:${DEPLOYMENT_CONFIG}
   cache:
@@ -84,7 +81,7 @@ management:
       exposure:
         include:
           - health
-          # - prometheus
+          - prometheus
   tracing:
     sampling:
       probability: 0.1
@@ -179,9 +176,9 @@ ovsx:
     ssl: true
   search:
     relevance:
-      rating: 0.2
-      downloads: 1.0
-      timestamp: 3.0
+      rating: 0.5
+      downloads: 2.0
+      timestamp: 1.2
   migrations:
     delay:
       seconds: 300
@@ -190,4 +187,4 @@ ovsx:
   integrity:
     key-pair: create
   registry:
-    version: <SERVER_VERSION>
+    version: <SERVER_VERSION>

configuration/ehcache.xml

@@ -80,4 +80,40 @@
             <disk unit="MB">8</disk>
         </resources>
     </cache>
+    <cache alias="files.webresource">
+        <expiry>
+            <tti unit="hours">1</tti>
+        </expiry>
+        <listeners>
+            <listener>
+                <class>org.eclipse.openvsx.cache.ExpiredFileListener</class>
+                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
+                <event-ordering-mode>UNORDERED</event-ordering-mode>
+                <events-to-fire-on>EXPIRED</events-to-fire-on>
+                <events-to-fire-on>EVICTED</events-to-fire-on>
+                <events-to-fire-on>REMOVED</events-to-fire-on>
+            </listener>
+        </listeners>
+        <resources>
+            <heap>150</heap>
+        </resources>
+    </cache>
+    <cache alias="files.extension">
+        <expiry>
+            <tti unit="hours">1</tti>
+        </expiry>
+        <listeners>
+            <listener>
+                <class>org.eclipse.openvsx.cache.ExpiredFileListener</class>
+                <event-firing-mode>ASYNCHRONOUS</event-firing-mode>
+                <event-ordering-mode>UNORDERED</event-ordering-mode>
+                <events-to-fire-on>EXPIRED</events-to-fire-on>
+                <events-to-fire-on>EVICTED</events-to-fire-on>
+                <events-to-fire-on>REMOVED</events-to-fire-on>
+            </listener>
+        </listeners>
+        <resources>
+            <heap>20</heap>
+        </resources>
+    </cache>
 </config>

website/package.json

@@ -6,7 +6,7 @@
     "repository": "https://github.com/eclipse/open-vsx.org",
     "license": "EPL-2.0",
     "dependencies": {
-        "openvsx-webui": "0.13.0"
+        "openvsx-webui": "0.13.1-next.dee19c0f"
     },
     "peerDependencies": {
         "@babel/core": "^7.0.0"

website/src/menu-content.tsx

@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
 
-import React, { FunctionComponent, PropsWithChildren, useState, useRef } from 'react';
-import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary } from '@mui/material';
+import React, { FunctionComponent, useState, useRef, useContext } from 'react';
+import { Theme, Typography, Menu, MenuItem, Link, Button, Accordion, AccordionDetails, AccordionSummary, IconButton } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { Link as RouteLink } from 'react-router-dom';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
@@ -22,33 +22,41 @@ import PublishIcon from '@mui/icons-material/Publish';
 import GroupWorkIcon from '@mui/icons-material/GroupWork';
 import PeopleAltIcon from '@mui/icons-material/PeopleAlt';
 import HubIcon from '@mui/icons-material/Hub';
+import AccountBoxIcon from '@mui/icons-material/AccountBox';
 import { UserSettingsRoutes } from 'openvsx-webui';
+import { MainContext } from 'openvsx-webui/lib/context';
+import { MobileMenuItem, itemIcon, MobileMenuItemText, MobileUserAvatar, headerItem, MenuLink, MenuRouteLink } from 'openvsx-webui/lib/default/menu-content'
+import { UserAvatar } from 'openvsx-webui/lib/pages/user/avatar';
 
 //-------------------- Mobile View --------------------//
 
-const MobileMenuItem = styled(MenuItem)({
-    cursor: 'auto',
-    '&>a': {
-        textDecoration: 'none'
-    }
-});
-
-const itemIcon = {
-    mr: 1,
-    width: '16px',
-    height: '16px',
-};
-
-const MobileMenuItemText: FunctionComponent<PropsWithChildren> = ({ children }) => {
-    return (
-        <Typography variant='body2' sx={{ color: 'text.primary', display: 'flex', alignItems: 'center' }}>
-            {children}
-        </Typography>
-    );
-};
-
 export const MobileMenuContent: FunctionComponent = () => {
+    const {service, user} = useContext(MainContext)
     return <>
+        {
+            user
+                ? <MobileUserAvatar/>
+                : <MobileMenuItem>
+                    <Link href={service.getLoginUrl()}>
+                        <MobileMenuItemText>
+                            <AccountBoxIcon sx={itemIcon} />
+                            Log In
+                        </MobileMenuItemText>
+                    </Link>
+                </MobileMenuItem>
+        }
+        {
+            !location.pathname.startsWith(UserSettingsRoutes.ROOT)
+            ? <MobileMenuItem>
+                <RouteLink to='/user-settings/extensions'>
+                    <MobileMenuItemText>
+                        <PublishIcon sx={itemIcon} />
+                        Publish Extension
+                    </MobileMenuItemText>
+                </RouteLink>
+            </MobileMenuItem>
+            : null
+        }
         <MobileMenuItem>
             <Link target='_blank' href='https://github.com/eclipse/openvsx'>
                 <MobileMenuItemText>
@@ -119,45 +127,17 @@ export const MobileMenuContent: FunctionComponent = () => {
                 </MobileMenuItemText>
             </RouteLink>
         </MobileMenuItem>
-        {
-            !location.pathname.startsWith(UserSettingsRoutes.ROOT)
-            ? <MobileMenuItem>
-                <RouteLink to='/user-settings/extensions'>
-                    <MobileMenuItemText>
-                        <PublishIcon sx={itemIcon} />
-                        Publish Extension
-                    </MobileMenuItemText>
-                </RouteLink>
-            </MobileMenuItem>
-            : null
-        }
     </>;
 }
 
 
 //-------------------- Default View --------------------//
 
-const headerItem = ({ theme }: { theme: Theme }) => ({
-    margin: theme.spacing(2.5),
-    color: theme.palette.text.primary,
-    textDecoration: 'none',
-    fontSize: '1.1rem',
-    fontFamily: theme.typography.fontFamily,
-    fontWeight: theme.typography.fontWeightLight,
-    letterSpacing: 1,
-    '&:hover': {
-        color: theme.palette.secondary.main,
-        textDecoration: 'none'
-    }
-});
-
 const headerTypography = ({ theme }: { theme: Theme }) => ({
     ...headerItem({theme}),
     cursor: 'pointer'
 });
 
-const MenuLink = styled(Link)(headerItem);
-const MenuRouteLink = styled(RouteLink)(headerItem);
 const MenuTypography = styled(Typography)(headerTypography);
 
 const subMenuItem = ({ theme }: { theme: Theme }) => ({
@@ -176,13 +156,14 @@ const SubMenuLink = styled(Link)(subMenuLink);
 
 
 export const DefaultMenuContent: FunctionComponent = () => {
+    const {service, user} = useContext(MainContext)
     const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
     const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
     const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
     const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false);
 
     return <>
-        <MenuLink href='https://github.com/eclipse/openvsx/wiki'>
+        <MenuLink href='https://github.com/EclipseFdn/open-vsx.org/wiki'>
             Documentation
         </MenuLink>
         <MenuLink href='https://status.open-vsx.org/'>
@@ -210,5 +191,16 @@ export const DefaultMenuContent: FunctionComponent = () => {
         <Button variant='contained' color='secondary' href='/user-settings/extensions' sx={{ mx: 2.5 }}>
             Publish
         </Button>
+        {
+            user ?
+                <UserAvatar />
+                :
+                <IconButton
+                    href={service.getLoginUrl()}
+                    title='Log In'
+                    aria-label='Log In' >
+                    <AccountBoxIcon />
+                </IconButton>
+        }
     </>;
 }

website/yarn.lock

@@ -1407,13 +1407,13 @@ __metadata:
   linkType: hard
 
 "cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+  version: 7.0.6
+  resolution: "cross-spawn@npm:7.0.6"
   dependencies:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: 10/e1a13869d2f57d974de0d9ef7acbf69dc6937db20b918525a01dacb5032129bd552d290d886d981e99f1b624cb03657084cc87bd40f115c07ecf376821c729ce
+  checksum: 10/0d52657d7ae36eb130999dffff1168ec348687b48dd38e2ff59992ed916c88d328cf1d07ff4a4a10bc78de5e1c23f04b306d569e42f7a2293915c081e4dfee86
   languageName: node
   linkType: hard
 
@@ -2399,7 +2399,7 @@ __metadata:
     "@types/react-router-dom": "npm:^5.3.3"
     css-loader: "npm:^6.8.1"
     express: "npm:^4.21.1"
-    openvsx-webui: "npm:0.13.0"
+    openvsx-webui: "npm:0.13.1-next.dee19c0f"
     source-map-loader: "npm:^4.0.1"
     style-loader: "npm:^3.3.3"
     typescript: "npm:~5.1.6"
@@ -2420,9 +2420,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openvsx-webui@npm:0.13.0":
-  version: 0.13.0
-  resolution: "openvsx-webui@npm:0.13.0"
+"openvsx-webui@npm:0.13.1-next.dee19c0f":
+  version: 0.13.1-next.dee19c0f
+  resolution: "openvsx-webui@npm:0.13.1-next.dee19c0f"
   dependencies:
     "@emotion/react": "npm:^11.11.1"
     "@emotion/styled": "npm:^11.11.0"
@@ -2448,7 +2448,7 @@ __metadata:
     react-router-dom: "npm:^6.14.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/b0245fd107f2b88d86cf7fea5a9ded80ad9084a13fdff16904614f5bdeb9f750b916feb976748eee9da0e230065b0d9fc06f789f74153f21005d16eef57c1f07
+  checksum: 10/9875a6154d8d23e6aa8251af83fe0f48a080c8aeff661876a1472c6489e2b5723a33a59db8161341629017681b4a1baf0b0b44f4f808c1dfb28baa591c11cae5
   languageName: node
   linkType: hard