From: Chocobozzz <me@florianbigard.com>
Date: Wed, 10 Feb 2021 08:19:36 +0000 (+0100)
Subject: Add fragment support in admin conf page
X-Git-Tag: v3.1.0-rc.1~167
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=53e4e201797aa1b581209ffd775bf05197efa78f;p=github%2FChocobozzz%2FPeerTube.git

Add fragment support in admin conf page
---

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 637203b96..135276192 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -1,7 +1,7 @@
 <h1 class="sr-only" i18n>Configuration</h1>
 <form role="form" [formGroup]="form">
 
-  <div ngbNav #nav="ngbNav" class="nav-tabs">
+  <div ngbNav #nav="ngbNav" [activeId]="activeNav" (activeIdChange)="onNavChange($event)" class="nav-tabs">
 
     <ng-container ngbNavItem="instance-information">
       <a ngbNavLink i18n>Instance information</a>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 56be97e84..29524fdd8 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -1,7 +1,9 @@
 import { forkJoin } from 'rxjs'
 import { pairwise } from 'rxjs/operators'
+import { SelectOptionsItem } from 'src/types/select-options-item.model'
 import { ViewportScroller } from '@angular/common'
 import { AfterViewChecked, Component, OnInit, ViewChild } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
 import { ConfigService } from '@app/+admin/config/shared/config.service'
 import { Notifier } from '@app/core'
 import { ServerService } from '@app/core/server/server.service'
@@ -22,7 +24,6 @@ import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@a
 import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { NgbNav } from '@ng-bootstrap/ng-bootstrap'
 import { CustomConfig, ServerConfig } from '@shared/models'
-import { SelectOptionsItem } from 'src/types/select-options-item.model'
 
 @Component({
   selector: 'my-edit-custom-config',
@@ -30,7 +31,6 @@ import { SelectOptionsItem } from 'src/types/select-options-item.model'
   styleUrls: [ './edit-custom-config.component.scss' ]
 })
 export class EditCustomConfigComponent extends FormReactive implements OnInit, AfterViewChecked {
-  // FIXME: use built-in router
   @ViewChild('nav') nav: NgbNav
 
   initDone = false
@@ -47,9 +47,13 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
 
   signupAlertMessage: string
 
+  activeNav: string
+
   private serverConfig: ServerConfig
 
   constructor (
+    private router: Router,
+    private route: ActivatedRoute,
     private viewportScroller: ViewportScroller,
     protected formValidatorService: FormValidatorService,
     private notifier: Notifier,
@@ -352,6 +356,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
       formGroupData.live.transcoding.resolutions[resolution.id] = null
     }
 
+    if (this.route.snapshot.fragment) {
+      this.onNavChange(this.route.snapshot.fragment)
+    }
+
     this.buildForm(formGroupData)
     this.loadForm()
 
@@ -440,6 +448,12 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
     return true
   }
 
+  onNavChange (newActiveNav: string) {
+    this.activeNav = newActiveNav
+
+    this.router.navigate([], { fragment: this.activeNav })
+  }
+
   private updateForm () {
     this.form.patchValue(this.customConfig)
   }