Merge pull request #3063 from EclipseFdn/main

Release v0.18.0
EclipseFdn · Oct 28, 2024 · 23d9fae · 23d9fae
2 parents 6d7bddd + fdca676
commit 23d9fae
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 201 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,27 +1,25 @@
-ARG SERVER_VERSION=v0.17.0
+ARG SERVER_VERSION=v0.18.0
 
 # Builder image to compile the website
-FROM ubuntu as builder
+FROM ubuntu AS builder
 
 WORKDIR /workdir
 
+# See https://github.com/nodesource/distributions for Node.js package
 RUN apt-get update \
   && apt-get install --no-install-recommends -y \
     bash \
     ca-certificates \
     curl \
+  && rm -rf /var/lib/apt/lists/* \
+  && curl -sSL https://deb.nodesource.com/setup_20.x | bash - \
+  && apt-get install -y nodejs \
   && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# See https://github.com/nodesource/distributions/blob/main/README.md#debinstall
-RUN curl -sSL https://deb.nodesource.com/setup_20.x | bash - \
-  && apt-get install -y nodejs
-
-RUN corepack enable
-RUN corepack prepare yarn@stable --activate
+  && corepack enable \
+  && corepack prepare yarn@stable --activate
 
 # bump to update website
-ENV WEBSITE_VERSION 0.12.0
+ENV WEBSITE_VERSION 0.13.0
 COPY . /workdir
 
 RUN /usr/bin/yarn --cwd website \

diff --git a/website/dev/mock-service.ts b/website/dev/mock-service.ts
@@ -19,9 +19,7 @@ const avatarUrl = 'https://upload.wikimedia.org/wikipedia/commons/9/99/Avatar_cu
 export class MockRegistryService extends ExtensionRegistryService {
 
     constructor() {
-        // FIXME cannot reference `this` in super constructor call
-        super('', new MockAdminService(undefined!));
-        (this.admin.registry as any) = this;
+        super('', MockAdminService);
     }
 
     search(abortController: AbortController, filter?: ExtensionFilter): Promise<Readonly<SearchResult | ErrorResult>> {
@@ -152,7 +150,9 @@ export class MockRegistryService extends ExtensionRegistryService {
     }
 }
 
-export class MockAdminService extends AdminService {
+export class MockAdminService implements AdminService {
+
+    constructor(readonly registry: ExtensionRegistryService) {}
 
     getExtension(abortController: AbortController, namespace: string, extension: string): Promise<Readonly<Extension>> {
         return this.registry.getExtensionDetail(abortController, '') as Promise<Extension>;
@@ -187,4 +187,8 @@ export class MockAdminService extends AdminService {
     async revokePublisherContributions(abortController: AbortController, provider: string, login: string): Promise<Readonly<SuccessResult | ErrorResult>> {
         return Promise.resolve({ success: 'ok' });
     }
+
+    changeNamespace(abortController: AbortController, req: {oldNamespace: string, newNamespace: string, removeOldNamespace: boolean, mergeIfNewNamespaceAlreadyExists: boolean}): Promise<Readonly<SuccessResult | ErrorResult>> {
+        return Promise.resolve({ success: 'ok' });
+    }
 }
diff --git a/website/package.json b/website/package.json
@@ -6,7 +6,7 @@
     "repository": "https://github.com/eclipse/open-vsx.org",
     "license": "EPL-2.0",
     "dependencies": {
-        "openvsx-webui": "0.12.0"
+        "openvsx-webui": "0.13.0"
     },
     "peerDependencies": {
         "@babel/core": "^7.0.0"

diff --git a/website/src/footer-content.tsx b/website/src/footer-content.tsx
@@ -43,56 +43,59 @@ const LegalLink = styled(RouteLink)(({ theme }: { theme: Theme }) => ({
     fontWeight: theme.typography.fontWeightLight
 }));
 
-
+interface MainFooterProps {
+    isSmallDisplay: boolean
+    isLargeDisplay: boolean
+}
+
+const MainFooter = ({isSmallDisplay, isLargeDisplay}: MainFooterProps) => {
+    const itemSpacing = 2.5;
+    return <Box display='flex' justifyContent='space-between' alignItems='center'>
+        {isSmallDisplay ? null : repositoryLink()}
+        {
+            isLargeDisplay ?
+            <Box display='flex'>
+                <Box>
+                    {privacyPolicy()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {termsOfUse()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {publisherAgreement()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {copyrightAgent()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {legalResources()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {manageCookies()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {copyrightText()}
+                </Box>
+                <Box ml={itemSpacing}>
+                    {rightsReservedText()}
+                </Box>
+            </Box>
+            :
+            <>
+                {copyrightText()}
+                <Box display='flex' alignItems='center'>
+                    <ExpandLessIcon /> Legal
+                </Box>
+            </>
+        }
+    </Box>;
+}
 
 const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) => {
     const theme = useTheme();
     const isSmallDisplay = useMediaQuery(theme.breakpoints.down('sm'));
     const isLargeDisplay = useMediaQuery(theme.breakpoints.up('xl'));
 
-    const MainFooter = () => {
-        const itemSpacing = 2.5;
-        return <Box display='flex' justifyContent='space-between' alignItems='center'>
-            {isSmallDisplay ? null : repositoryLink()}
-            {
-                isLargeDisplay ?
-                <Box display='flex'>
-                    <Box>
-                        {privacyPolicy()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {termsOfUse()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {publisherAgreement()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {copyrightAgent()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {legalResources()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {manageCookies()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {copyrightText()}
-                    </Box>
-                    <Box ml={itemSpacing}>
-                        {rightsReservedText()}
-                    </Box>
-                </Box>
-                :
-                <>
-                    {copyrightText()}
-                    <Box display='flex' alignItems='center'>
-                        <ExpandLessIcon /> Legal
-                    </Box>
-                </>
-            }
-        </Box>;
-    }
-
     if (expanded && !isLargeDisplay) {
         const itemSpacing = 1;
         return <Box display='flex' flexDirection='column' alignItems='stretch'>
@@ -116,10 +119,10 @@ const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) =
                     {manageCookies()}
                 </Box>
             </Box>
-            <MainFooter />
+            <MainFooter isSmallDisplay={isSmallDisplay} isLargeDisplay={isLargeDisplay}/>
         </Box>;
     } else {
-        return <MainFooter />;
+        return <MainFooter isSmallDisplay={isSmallDisplay} isLargeDisplay={isLargeDisplay}/>;
     }
 };
 

diff --git a/website/src/members.tsx b/website/src/members.tsx
@@ -32,13 +32,20 @@ const Members = () => {
                 VSX Registry at open-vsx.org.
             </Typography>
 
-            <Box my={4} textAlign='center'>
+            <Box display="flex" gap={1} my={4} justifyContent="center" textAlign="center" >
               <Button 
                   variant='contained' 
                   color='secondary' 
-                  href='https://membership.eclipse.org/application'
+                  href='https://www.eclipse.org/membership/join-us/'
               >
-                Become a Member
+                Contact Us About Membership
+              </Button>
+              <Button 
+                  variant='contained' 
+                  color='secondary' 
+                  href='https://membership.eclipse.org/application/ready-to-join'
+              >
+                My Organisation Is Ready to Join Now
               </Button>
             </Box>
 

diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx
@@ -176,10 +176,10 @@ const SubMenuLink = styled(Link)(subMenuLink);
 
 
 export const DefaultMenuContent: FunctionComponent = () => {
-    const [workingGroupMenuOpen, setWorkingGroupOpen] = useState(false);
+    const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false);
     const workingGroupMenuEl = useRef<HTMLButtonElement | null>(null);
-    const toggleWorkingGroupMenu = () => setWorkingGroupOpen(!workingGroupMenuOpen);
-    const closeWorkingGroupMenu = () => setWorkingGroupOpen(false);
+    const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen);
+    const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false);
 
     return <>
         <MenuLink href='https://github.com/eclipse/openvsx/wiki'>