Merge pull request #886 from amvanbaren/admin-version-targetplatforms-order

Display ordered list of extension versions in admin dashboard

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/admin/AdminAPI.java

@@ -189,7 +189,7 @@ public ResponseEntity<ExtensionJson> getExtension(@PathVariable String namespace
                 json.namespace = extension.getNamespace().getName();
                 json.name = extension.getName();
                 json.allVersions = Collections.emptyMap();
-                json.allTargetPlatformVersions = Collections.emptyMap();
+                json.allTargetPlatformVersions = Collections.emptyList();
             } else {
                 json = local.toExtensionVersionJson(latest, null, false);
                 json.allTargetPlatformVersions = repositories.findTargetPlatformsGroupedByVersion(extension);

server/src/main/java/org/eclipse/openvsx/json/ExtensionJson.java

@@ -177,7 +177,7 @@ public static ExtensionJson error(String message) {
     public Map<String, String> downloads;
 
     @Schema(description = "Map of target platforms by extension version")
-    public Map<String, List<String>> allTargetPlatformVersions;
+    public List<VersionTargetPlatformsJson> allTargetPlatformVersions;
 
     @Schema(description = "version metadata URL")
     public String url;

server/src/main/java/org/eclipse/openvsx/json/VersionTargetPlatformsJson.java

@@ -0,0 +1,14 @@
+/** ******************************************************************************
+ * Copyright (c) 2024 Precies. Software Ltd and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * ****************************************************************************** */
+package org.eclipse.openvsx.json;
+
+import java.util.List;
+
+public record VersionTargetPlatformsJson(String version, String[] targetPlatforms) {}

server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java

@@ -13,6 +13,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.openvsx.entities.*;
 import org.eclipse.openvsx.json.QueryRequest;
+import org.eclipse.openvsx.json.VersionTargetPlatformsJson;
 import org.eclipse.openvsx.util.TargetPlatform;
 import org.eclipse.openvsx.util.VersionAlias;
 import org.jooq.Record;
@@ -542,16 +543,41 @@ private List<String> toList(String raw, ListOfStringConverter converter) {
         return converter.convertToEntityAttribute(raw);
     }
 
-    public Map<String, List<String>> findTargetPlatformsGroupedByVersion(Extension extension) {
-        var TARGET_PLATFORMS = DSL.arrayAgg(EXTENSION_VERSION.TARGET_PLATFORM);
-        return dsl.select(EXTENSION_VERSION.VERSION, TARGET_PLATFORMS)
+    public List<VersionTargetPlatformsJson> findTargetPlatformsGroupedByVersion(Extension extension) {
+        var targetPlatforms = DSL.arrayAgg(EXTENSION_VERSION.TARGET_PLATFORM)
+                .orderBy(
+                        EXTENSION_VERSION.UNIVERSAL_TARGET_PLATFORM.desc(),
+                        EXTENSION_VERSION.TARGET_PLATFORM.asc()
+                );
+
+        return dsl.select(
+                    EXTENSION_VERSION.SEMVER_MAJOR,
+                    EXTENSION_VERSION.SEMVER_MINOR,
+                    EXTENSION_VERSION.SEMVER_PATCH,
+                    EXTENSION_VERSION.SEMVER_IS_PRE_RELEASE,
+                    EXTENSION_VERSION.VERSION,
+                    targetPlatforms
+                )
                 .from(EXTENSION_VERSION)
                 .where(EXTENSION_VERSION.EXTENSION_ID.eq(extension.getId()))
-                .groupBy(EXTENSION_VERSION.VERSION)
+                .groupBy(
+                        EXTENSION_VERSION.SEMVER_MAJOR,
+                        EXTENSION_VERSION.SEMVER_MINOR,
+                        EXTENSION_VERSION.SEMVER_PATCH,
+                        EXTENSION_VERSION.SEMVER_IS_PRE_RELEASE,
+                        EXTENSION_VERSION.VERSION
+                )
+                .orderBy(
+                        EXTENSION_VERSION.SEMVER_MAJOR.desc(),
+                        EXTENSION_VERSION.SEMVER_MINOR.desc(),
+                        EXTENSION_VERSION.SEMVER_PATCH.desc(),
+                        EXTENSION_VERSION.SEMVER_IS_PRE_RELEASE.asc(),
+                        EXTENSION_VERSION.VERSION.asc()
+                )
                 .fetch()
-                .collect(Collectors.toMap(
-                        r -> r.get(EXTENSION_VERSION.VERSION),
-                        r -> List.of(r.get(TARGET_PLATFORMS))
+                .map(record -> new VersionTargetPlatformsJson(
+                        record.get(EXTENSION_VERSION.VERSION),
+                        record.get(targetPlatforms)
                 ));
     }
 

server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java

@@ -12,6 +12,7 @@
 import io.micrometer.observation.annotation.Observed;
 import org.eclipse.openvsx.entities.*;
 import org.eclipse.openvsx.json.QueryRequest;
+import org.eclipse.openvsx.json.VersionTargetPlatformsJson;
 import org.eclipse.openvsx.util.NamingUtil;
 import org.eclipse.openvsx.web.SitemapRow;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -528,7 +529,7 @@ public List<SitemapRow> fetchSitemapRows() {
         return extensionJooqRepo.fetchSitemapRows();
     }
 
-    public Map<String, List<String>> findTargetPlatformsGroupedByVersion(Extension extension) {
+    public List<VersionTargetPlatformsJson> findTargetPlatformsGroupedByVersion(Extension extension) {
         return extensionVersionJooqRepo.findTargetPlatformsGroupedByVersion(extension);
     }
 

webui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "openvsx-webui",
-    "version": "0.11.4",
+    "version": "0.11.5",
     "description": "User interface for Eclipse Open VSX",
     "keywords": [
         "react",

webui/src/extension-registry-types.ts

@@ -107,9 +107,7 @@ export interface Extension {
 
     // key: target platform, value: download link
     downloads: { [targetPlatform: string]: UrlString };
-
-    // key: version, value: target platforms
-    allTargetPlatformVersions: { [version: string]: string[] };
+    allTargetPlatformVersions?: VersionTargetPlatforms[];
 }
 
 export interface Badge {
@@ -124,6 +122,11 @@ export interface ExtensionReference {
     version?: string;
 }
 
+export interface VersionTargetPlatforms {
+    version: string;
+    targetPlatforms: string[];
+}
+
 export type StarRating = 1 | 2 | 3 | 4 | 5;
 export interface NewReview {
     rating: StarRating;

webui/src/pages/admin-dashboard/extension-version-container.tsx

@@ -23,13 +23,15 @@ export const ExtensionVersionContainer: FunctionComponent<ExtensionVersionContai
     const getTargetPlatformVersions = () => {
         const versionMap: TargetPlatformVersion[] = [];
         versionMap.push({ targetPlatform: WILDCARD, version: WILDCARD, checked: false });
-        Object.keys(extension.allTargetPlatformVersions)
-            .filter(version => VERSION_ALIASES.indexOf(version) < 0)
-            .forEach(version => {
-                versionMap.push({ targetPlatform: WILDCARD, version: version, checked: false });
-                const targetPlatforms = extension.allTargetPlatformVersions[version];
-                targetPlatforms.forEach(targetPlatform => versionMap.push({ targetPlatform: targetPlatform, version: version, checked: false }));
-            });
+        if (extension.allTargetPlatformVersions != null) {
+            extension.allTargetPlatformVersions
+                .filter(i => VERSION_ALIASES.indexOf(i.version) < 0)
+                .forEach(i => {
+                    const { version, targetPlatforms } = i;
+                    versionMap.push({ targetPlatform: WILDCARD, version, checked: false });
+                    targetPlatforms.forEach(targetPlatform => versionMap.push({ targetPlatform, version, checked: false }));
+                });
+        }
 
         return versionMap;
     };