Add browser history

Signed-off-by: Phillip Kruger <[email protected]>
phillip-kruger · Feb 7, 2024 · 265d7ff · 265d7ff
1 parent 44d917b
commit 265d7ff
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/.locker/pom.xml b/.locker/pom.xml
@@ -5,7 +5,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.mvnpm</groupId>
-  <version>3.0.17-SNAPSHOT</version>
+  <version>3.0.18-SNAPSHOT</version>
   <artifactId>mvnpm-locker</artifactId>
   <packaging>pom</packaging>
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.mvnpm</groupId>
   <artifactId>mvnpm</artifactId>
-  <version>3.0.17-SNAPSHOT</version>
+  <version>3.0.18-SNAPSHOT</version>
   <name>mvnpm</name>
   <description>Maven on NPM</description>
   <url>https://mvnpm.org/</url>

diff --git a/src/main/resources/web/app/mvnpm-event-log.ts b/src/main/resources/web/app/mvnpm-event-log.ts
@@ -104,9 +104,9 @@ export class MvnpmEventLog extends LitElement {
 
     private _addMultipleToLog(queue: any[] | null, items: any[]) {
         if (queue && queue.length > 0) {
-            return [...items.reverse(), ...queue];
+            return [...items, ...queue];
         } else {
-            return items.reverse();
+            return items;
         }
     }
 

diff --git a/src/main/resources/web/app/mvnpm-home.ts b/src/main/resources/web/app/mvnpm-home.ts
@@ -242,6 +242,12 @@ export class MvnpmHome extends LitElement {
         this._codeViewSelection = ".pom";
         this._centralSyncItem = null;
         this._gavEventLog = null;
+
+        var currentPath = window.location.pathname;
+        if(currentPath.startsWith("/package/")){
+            this._coordinates.name = currentPath.substring(9);
+            this._showGA(this._coordinates.name);
+        }
     }
 
     render() {
@@ -399,6 +405,7 @@ export class MvnpmHome extends LitElement {
         const gav = dependency.split(":");
         this._clearCoordinates()
         this._coordinates.name = gav[0]+":"+gav[1];
+        window.history.pushState({/* State */},"", "/package/" + this._coordinates.name);
         this._showGA(this._coordinates.name);
     }
 
@@ -509,8 +516,8 @@ export class MvnpmHome extends LitElement {
 
     _findVersionsAndShowLatest(e){    
         const name = this._coordinates.name.trim();
-
         if ((e.which == 13 || e.which == 0)){
+            window.history.pushState({/* State */},"", "/package/" + name);
             this._showGA(name);    
         }
     }

diff --git a/src/main/resources/web/app/mvnpm-nav.ts b/src/main/resources/web/app/mvnpm-nav.ts
@@ -14,6 +14,7 @@ if (indicator.length > 0) {
 const router = new Router(document.getElementById('outlet'));
 router.setRoutes([
     {path: '/', component: 'mvnpm-home', name: 'Home'},
+    {path: '/package/:package', component: 'mvnpm-home', name: 'Home'},
     {path: '/releases', component: 'mvnpm-releases', name: 'Releases'},
     {path: '/live', component: 'mvnpm-live', name: 'Live'},
     {path: '/about', component: 'mvnpm-about', name: 'About'},
@@ -40,7 +41,6 @@ export class MvnpmNav extends LitElement {
           } else {
             MvnpmNav.syncServerUri = "ws:";
           }
-          var currentPath = window.location.pathname;
           MvnpmNav.syncServerUri += "//" + window.location.host + "/api/queue/";
           MvnpmNav.connectSync();
       }
@@ -50,7 +50,6 @@ export class MvnpmNav extends LitElement {
           } else {
             MvnpmNav.logServerUri = "ws:";
           }
-          var currentPath = window.location.pathname;
           MvnpmNav.logServerUri += "//" + window.location.host + "/api/stream/eventlog";
           MvnpmNav.connectLog();
       }
@@ -59,13 +58,16 @@ export class MvnpmNav extends LitElement {
     render() {
         const routes = router.getRoutes();
         return html`<vaadin-tabs> 
-                        ${routes.map((r) =>
-                            html`<vaadin-tab>
-                                  <a href="${r.path}">
-                                    <span>${r.name}</span>
-                                  </a>
-                                </vaadin-tab>`
-                        )}
+                        ${routes.map((r) => {
+                            let ignore = r.path.includes(":");
+                            if(!ignore){
+                                return html`<vaadin-tab>
+                                        <a href="${r.path}">
+                                            <span>${r.name}</span>
+                                        </a>
+                                    </vaadin-tab>`;
+                            }
+                        })}
                         <vaadin-tab>
                           <a href="https://github.com/mvnpm/mvnpm" target="_blank" vaadin-router-ignore><span>Source</span></a>
                         </vaadin-tab>