Merge pull request #224 from labmlai/custom-metrics

fix back button issues

Author: lakshith-403

app/ui/src/components/buttons.ts

@@ -72,7 +72,13 @@ export class BackButton extends Button {
         this.currentPath = window.location.pathname
         this.navigatePath = null
 
-        if (/\/run\/.+\/.+/.test(this.currentPath)) {
+        if (/\/run\/.+_\d+/.test(this.currentPath)) {
+            this.navigatePath = this.currentPath.replace(/(\/run\/.+?)_\d+/, '$1');
+            this.text = "Run"
+        } else if (/\/run\/.+\/metrics\/.+/.test(this.currentPath)) {
+            this.text = 'Run'
+            this.navigatePath = this.currentPath.replace(/\/run\/(.+)\/metrics\/.+/, '/run/$1');
+        } else if (/\/run\/.+\/.+/.test(this.currentPath)) {
             this.text = 'Run'
             this.navigatePath = this.currentPath.replace(/\/run\/(.+)\/.+/, '/run/$1')
         } else if (/\/session\/.+\/.+/.test(this.currentPath)) {
@@ -97,7 +103,7 @@ export class BackButton extends Button {
     }
 
     onClick = () => {
-        if (ROUTER.canBack() && this.navigatePath == null) {
+        if (ROUTER.canBack()) {
             ROUTER.back()
             return
         }

app/ui/src/views/run_view.ts

@@ -45,10 +45,10 @@ class RunView extends ScreenView {
     private processContainer: WeyaElement
     private customMetrics: CustomMetricList
 
-    constructor(uuid: string, rank?: string) {
+    constructor(uuid: string) {
         super()
-        this.uuid = uuid + (rank ? '_' + rank : '')
-        this.rank = rank
+        this.uuid = uuid
+        this.rank = uuid.split('_')[1]
         this.runCache = CACHE.getRun(this.uuid)
         this.statusCache = CACHE.getRunStatus(this.uuid)
         this.userCache = CACHE.getUser()
@@ -325,7 +325,7 @@ class RunView extends ScreenView {
             this.rankElems = $('div', '.hidden.list.runs-list.list-group', $ => {
                 for (const [rank, run_uuid] of Object.entries(this.run.other_rank_run_uuids)) {
                     $('a', '.list-item.list-group-item.list-group-item-action',
-                        {href: `/run/${this.uuid}/${rank}`, target: "_blank"},
+                        {href: `/run/${this.uuid}_${rank}`, target: "_blank"},
                         $ => {
                             $('div', $ => {
                                 $('h6', `Rank ${+rank + 1}`)
@@ -340,11 +340,6 @@ class RunView extends ScreenView {
 export class RunHandler {
     constructor() {
         ROUTER.route('run/:uuid', [this.handleRun])
-        ROUTER.route('run/:uuid/:rank', [this.handleDistributedRun])
-    }
-
-    handleDistributedRun = (uuid: string, rank: string) => {
-        SCREEN.setView(new RunView(uuid, rank))
     }
 
     handleRun = (uuid: string) => {