Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
cdcb313
Don't use nested template literals.
Feb 14, 2025
d966df3
Merge pull request #3457 from amvanbaren/nested-template-literals
amvanbaren Feb 14, 2025
cf6367b
Publisher statistics demo
Feb 14, 2025
aab5e2b
Merge pull request #3458 from amvanbaren/publisher-stats-demo
amvanbaren Feb 14, 2025
ce2509c
Publisher statistics demo
Feb 14, 2025
9da6115
Merge pull request #3459 from amvanbaren/publisher-stats-demo2
amvanbaren Feb 14, 2025
f1d9352
Publisher statistics demo
Feb 14, 2025
b5a4782
Merge pull request #3460 from amvanbaren/publisher-stats-demo3
amvanbaren Feb 14, 2025
d1635ec
Debug Azure userAgentHeader
Feb 20, 2025
beb382c
Merge pull request #3492 from amvanbaren/debug-user-agent
amvanbaren Feb 20, 2025
97d43bb
Bump dompurify from 3.1.6 to 3.2.4 in /website
dependabot[bot] Feb 20, 2025
a191511
Merge pull request #3493 from EclipseFdn/dependabot/npm_and_yarn/webs…
amvanbaren Feb 20, 2025
71690a1
Decrease tracing probability to 0.03
Feb 27, 2025
2658543
Increase files.extension tti to 2 hours
Feb 27, 2025
ca416d0
Merge pull request #3515 from amvanbaren/decrease-tracing
amvanbaren Feb 27, 2025
af742d0
Merge pull request #3516 from amvanbaren/files-extension-tti
amvanbaren Feb 27, 2025
9976b3e
Test v0.23.0-rc.1
Mar 10, 2025
3af83cc
Merge pull request #3561 from amvanbaren/v0.23.0-rc.1
amvanbaren Mar 10, 2025
3566104
Revert database migration v1.51
Mar 10, 2025
dee72b2
Merge pull request #3564 from amvanbaren/test-859be34e
amvanbaren Mar 10, 2025
63354bd
Redeploy v0.23.0-rc.1
Mar 10, 2025
e7d914e
Merge pull request #3565 from amvanbaren/retry-v0.23.0-rc.1
amvanbaren Mar 10, 2025
68479de
Add server url
Mar 11, 2025
71e13cc
Merge pull request #3571 from amvanbaren/login-server-url
amvanbaren Mar 11, 2025
f875dd8
Release v0.23.0
Mar 11, 2025
fccd3d9
Merge pull request #3573 from amvanbaren/release-v0.23.0
amvanbaren Mar 11, 2025
286ae67
Change to Eclipse staging API
Mar 12, 2025
3dd3b27
Merge pull request #3582 from amvanbaren/eclipse-staging-api
amvanbaren Mar 12, 2025
1831a2c
Test release v0.23.1
Mar 17, 2025
ca728ab
Merge pull request #3606 from amvanbaren/test-v0.23.1
amvanbaren Mar 17, 2025
e50da0b
Release v0.23.1
Mar 17, 2025
131aab5
Merge pull request #3607 from amvanbaren/release-v0.23.1
amvanbaren Mar 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVER_VERSION=v0.22.1
ARG SERVER_VERSION=v0.23.1

# Builder image to compile the website
FROM ubuntu AS builder
Expand All @@ -19,7 +19,7 @@ RUN apt-get update \
&& corepack prepare yarn@stable --activate

# bump to update website
ENV WEBSITE_VERSION 0.15.0
ENV WEBSITE_VERSION 0.16.0
COPY . /workdir

RUN /usr/bin/yarn --cwd website \
Expand Down
2 changes: 1 addition & 1 deletion configuration/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ management:
- prometheus
tracing:
sampling:
probability: 0.05
probability: 0.03
springdoc:
model-and-view-allowed: true
swagger-ui:
Expand Down
2 changes: 1 addition & 1 deletion configuration/ehcache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</cache>
<cache alias="files.extension">
<expiry>
<tti unit="hours">1</tti>
<tti unit="hours">2</tti>
</expiry>
<listeners>
<listener>
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"repository": "https://github.com/eclipse/open-vsx.org",
"license": "EPL-2.0",
"dependencies": {
"openvsx-webui": "0.15.0"
"openvsx-webui": "0.16.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
Expand Down
3 changes: 2 additions & 1 deletion website/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { ThemeProvider } from '@mui/material/styles';
import { useMediaQuery } from '@mui/material';
import { Main, ExtensionRegistryService } from 'openvsx-webui';
import createDefaultTheme from 'openvsx-webui/lib/default/theme';
import {createAbsoluteURL} from 'openvsx-webui/lib/utils';
import createPageSettings from './page-settings';

const App: FunctionComponent = () => {
Expand All @@ -42,7 +43,7 @@ const App: FunctionComponent = () => {
<Main
service={service}
pageSettings={pageSettings}
canLogin
loginProviders={{github: createAbsoluteURL(['', 'oauth2', 'authorization', 'github'])}}
/>
</ThemeProvider>
</HelmetProvider>
Expand Down
85 changes: 56 additions & 29 deletions website/src/menu-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,43 @@ 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 { LoginComponent } from 'openvsx-webui/lib/default/login'
import { UserAvatar } from 'openvsx-webui/lib/pages/user/avatar';

//-------------------- Mobile View --------------------//

export const MobileMenuContent: FunctionComponent = () => {
const {service, user} = useContext(MainContext)
const {user, loginProviders} = useContext(MainContext)
return <>
{
user
? <MobileUserAvatar/>
: <MobileMenuItem>
<Link href={service.getLoginUrl()}>
<MobileMenuItemText>
<AccountBoxIcon sx={itemIcon} />
Log In
</MobileMenuItemText>
</Link>
{loginProviders && (
user ? (
<MobileUserAvatar />
) : (
<MobileMenuItem>
<LoginComponent
loginProviders={loginProviders}
renderButton={(href, onClick) => {
return (<Link href={href} onClick={onClick}>
<MobileMenuItemText>
<AccountBoxIcon sx={itemIcon} />
Log In
</MobileMenuItemText>
</Link>);
}}
/>
</MobileMenuItem>
}
{
!location.pathname.startsWith(UserSettingsRoutes.ROOT)
? <MobileMenuItem>
)
)}
{loginProviders && !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>
Expand Down Expand Up @@ -156,7 +162,7 @@ const SubMenuLink = styled(Link)(subMenuLink);


export const DefaultMenuContent: FunctionComponent = () => {
const {service, user} = useContext(MainContext)
const {loginProviders, user} = useContext(MainContext)
const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
Expand Down Expand Up @@ -191,16 +197,37 @@ 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>
}
{loginProviders && (
<>
<Button variant='contained' color='secondary' href='/user-settings/extensions' sx={{ mx: 2.5 }}>
Publish
</Button>
{
user ?
<UserAvatar />
:
<LoginComponent
loginProviders={loginProviders}
renderButton={(href, onClick) => {
if (href) {
return (<IconButton
href={href}
title='Log In'
aria-label='Log In' >
<AccountBoxIcon />
</IconButton>);
} else {
return (<IconButton
onClick={onClick}
title='Log In'
aria-label='Log In' >
<AccountBoxIcon />
</IconButton>);
}
}}
/>
}
</>
)}
</>;
}
3 changes: 2 additions & 1 deletion website/src/page-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,10 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea

//---------- CLAIM NAMESPACE LINK
const claimNamespace: FunctionComponent<{ extension: Extension, sx: SxProps<Theme> }> = ({ sx, extension }) => {
const title = `Claiming namespace \`${extension.namespace}\``;
const body = 'Briefly explain what makes you a legitimate owner of the namespace mentioned in the issue title.\nPlease ensure that you have logged in to https://open-vsx.org at least once, otherwise we cannot process your request.'
return <Link
href={`https://github.com/EclipseFdn/open-vsx.org/issues/new?labels=namespace&title=${encodeURIComponent(`Claiming namespace \`${extension.namespace}\``)}&body=${encodeURIComponent(body)}`}
href={`https://github.com/EclipseFdn/open-vsx.org/issues/new?labels=namespace&title=${encodeURIComponent(title)}&body=${encodeURIComponent(body)}`}
target='_blank' variant='body2' color='secondary' underline='hover' sx={sx} >
Claim Ownership
</Link>
Expand Down
28 changes: 20 additions & 8 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,13 @@ __metadata:
languageName: node
linkType: hard

"@types/trusted-types@npm:^2.0.7":
version: 2.0.7
resolution: "@types/trusted-types@npm:2.0.7"
checksum: 10/8e4202766a65877efcf5d5a41b7dd458480b36195e580a3b1085ad21e948bc417d55d6f8af1fd2a7ad008015d4117d5fdfe432731157da3c68678487174e4ba3
languageName: node
linkType: hard

"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
version: 1.12.1
resolution: "@webassemblyjs/ast@npm:1.12.1"
Expand Down Expand Up @@ -1515,9 +1522,14 @@ __metadata:
linkType: hard

"dompurify@npm:^3.0.4":
version: 3.1.6
resolution: "dompurify@npm:3.1.6"
checksum: 10/036844bc9b717b172ba27f5863b56f950289a05d8eebfb702d6953bbf80bd021e480ce4217bd084567186f2d0ada13358ce5556963492cfe402d774e8667f120
version: 3.2.4
resolution: "dompurify@npm:3.2.4"
dependencies:
"@types/trusted-types": "npm:^2.0.7"
dependenciesMeta:
"@types/trusted-types":
optional: true
checksum: 10/98570c53385518a2f9b617f796926338856acfdd3369c88b5905bddf96bd7d391bf8a5433127155e0046e6faa2bfb767185fcd571b865dfabe624c099e2537f5
languageName: node
linkType: hard

Expand Down Expand Up @@ -2399,7 +2411,7 @@ __metadata:
"@types/react-router-dom": "npm:^5.3.3"
css-loader: "npm:^6.8.1"
express: "npm:^4.21.2"
openvsx-webui: "npm:0.15.0"
openvsx-webui: "npm:0.16.0"
source-map-loader: "npm:^4.0.1"
style-loader: "npm:^3.3.3"
typescript: "npm:~5.1.6"
Expand All @@ -2420,9 +2432,9 @@ __metadata:
languageName: node
linkType: hard

"openvsx-webui@npm:0.15.0":
version: 0.15.0
resolution: "openvsx-webui@npm:0.15.0"
"openvsx-webui@npm:0.16.0":
version: 0.16.0
resolution: "openvsx-webui@npm:0.16.0"
dependencies:
"@emotion/react": "npm:^11.11.1"
"@emotion/styled": "npm:^11.11.0"
Expand All @@ -2448,7 +2460,7 @@ __metadata:
react-router-dom: "npm:^6.14.1"
peerDependencies:
"@babel/core": ^7.0.0
checksum: 10/c3cff9e5cf7043e889d82b6e3421237b9e9ea65773e0559eb5167713d67d47da5196eb9d726105a851171a9a811d91f5070b75cd25142ad07f7aea38c5e23996
checksum: 10/b6cd84b6efd4f7aeb3fd6571235bed58b53ac6a23bc1031bc83ee504a8ccdc996f97f178f3955005a8dd3504172822c5908360c466a44b04fe2fdc4f47d90d5b
languageName: node
linkType: hard

Expand Down
Loading