hopefully more consistency in encodeURIComponent usage

Holusion · Dec 11, 2024 · 53190c1 · 53190c1
1 parent a987490
commit 53190c1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/source/ui/composants/HistoryAggregation.ts b/source/ui/composants/HistoryAggregation.ts
@@ -97,7 +97,7 @@ export class HistoryEntryAggregate extends i18n(LitElement){
     this.#c.abort();
     this.#c = new AbortController();
     console.log("Fetch entry : ", this.scene, this.entries[0]);
-    fetch(`/history/${encodeURIComponent(this.scene)}/${this.entries[0].id.toString()}/diff`, {
+    fetch(`/history/${this.scene}/${this.entries[0].id.toString()}/diff`, {
       signal: this.#c.signal,
       headers: {"Accept": "application/json"},
     }).then(async (r)=>{

diff --git a/source/ui/composants/SceneCard.ts b/source/ui/composants/SceneCard.ts
@@ -57,8 +57,8 @@ import { AccessType, AccessTypes, Scene } from "../state/withScenes";
     }
 
     protected render() :TemplateResult {
-      let explorer = `/ui/scenes/${encodeURIComponent(this.name)}/view`;
-      let story = `/ui/scenes/${encodeURIComponent(this.name)}/edit`;
+      let explorer = `/ui/scenes/${this.name}/view`;
+      let story = `/ui/scenes/${this.name}/edit`;
       return html`
         <div class="scene-card-inner ${this.cardStyle == "list" ? "scene-card-inner-list": ""}">
             <div style="display:flex; flex:auto; align-items:center;">

diff --git a/source/ui/composants/TagList.ts b/source/ui/composants/TagList.ts
@@ -1,4 +1,5 @@
 import { LitElement, css, customElement, html, property } from "lit-element";
+import { navigate } from "../state/router";
 
 
 
@@ -27,13 +28,17 @@ export default class TagList extends LitElement{
 
 
   private onRemove = (e:Event)=>{
+    e.preventDefault();
+    e.stopPropagation();
     this.dispatchEvent(new CustomEvent("remove", {detail:(e.target as HTMLButtonElement).name}));
   }
 
   private onClick = (index :number, ev :Event)=>{
     ev.preventDefault();
     ev.stopPropagation();
-    this.dispatchEvent(new CustomEvent("click", {detail: {name: this.tags[index], index}}));
+    if(this.dispatchEvent(new CustomEvent("click", {detail: {name: this.tags[index], index}}))){
+      navigate(this, `/ui/tags/${this.tags[index]}`);
+    }
   }
 
   render(){

diff --git a/source/ui/composants/UserLogin.ts b/source/ui/composants/UserLogin.ts
@@ -51,7 +51,7 @@ import Notification from "./Notification";
       ev.preventDefault();
       const username = ev.target["username"].value;
       this.active = true;
-      fetch(`/auth/login/${username}/link`, {
+      fetch(`/auth/login/${encodeURIComponent(username)}/link`, {
         method: "POST",
       }).then(async (r)=>{
         if(!r.ok){

diff --git a/source/ui/screens/Admin/AdminArchives.ts b/source/ui/screens/Admin/AdminArchives.ts
@@ -61,7 +61,7 @@ interface User {
 
     onDeleteScene = (ev :MouseEvent, s :Scene)=>{
         ev.preventDefault();
-        fetch(`/scenes/${s.name}?archive=false`, {
+        fetch(`/scenes/${encodeURIComponent(s.name)}?archive=false`, {
             headers: {"Content-Type": "application/json"},
             method: "DELETE"
         }).then(HttpError.okOrThrow)

diff --git a/source/ui/screens/Admin/UsersList.ts b/source/ui/screens/Admin/UsersList.ts
@@ -180,7 +180,7 @@ interface User {
         </div>`;
     }
     createLoginLink(u :User){
-        fetch(`/auth/login/${u.username}/link`, {
+        fetch(`/auth/login/${encodeURIComponent(u.username)}/link`, {
             method: "GET",
             headers: {
                 "Content-Type": "text/plain"

diff --git a/source/ui/screens/SceneHistory.ts b/source/ui/screens/SceneHistory.ts
@@ -126,7 +126,7 @@ interface AccessRights{
           </div>`;
         }
 
-        let scene = encodeURIComponent(this.name);
+        let scene = this.name;
         return html`<div>
           <h1 style="color:white">${this.name}</h1>
 
@@ -142,7 +142,7 @@ interface AccessRights{
                   <ui-icon name="edit"></ui-icon>  ${this.t("ui.editScene")}
                 </a>`:null}
                 <a class="btn btn-main" style="margin-top:10px" href=${`/ui/scenes/${scene}/view`}><ui-icon name="eye"></ui-icon>  ${this.t("ui.viewScene")}</a>
-                <a class="btn btn-main" style="margin-top:10px" download href="/scenes/${scene}?format=zip"><ui-icon name="save"></ui-icon> ${this.t("ui.downloadScene")}</a>
+                <a class="btn btn-main" style="margin-top:10px" download="${scene}.zip" href="/scenes/${scene}?format=zip"><ui-icon name="save"></ui-icon> ${this.t("ui.downloadScene")}</a>
               </div>
             </div>
 
@@ -358,7 +358,7 @@ interface AccessRights{
         }).then((r)=>{
           if(r.ok){
             Notification.show("Renamed "+this.name+" to "+name, "info", 1600);
-            navigate(this, `/ui/scenes/${encodeURIComponent(name)}/`);
+            navigate(this, `/ui/scenes/${name}/`);
           }else{
             throw new Error(`[${r.status}] ${r.statusText}`);
           }

diff --git a/source/ui/screens/Tags/index.ts b/source/ui/screens/Tags/index.ts
@@ -69,15 +69,15 @@ export default class TagsScreen extends router(withUser(LitElement)){
 
 
   handleTagClick = (e:CustomEvent<{name:string, index:number}>)=>{
-    navigate(this, `${this.path}${encodeURIComponent(this.tags[e.detail.index].name)}`);
+    navigate(this, `${this.path}${this.tags[e.detail.index].name}`);
   }
 
   formatTag({name, size}:Tag){
     return `${name} (${size})`;
   }
 
   render(){
-    const selection = this.tags.findIndex((t)=>this.isActive(`${encodeURIComponent(t.name)}`))
+    const selection = this.tags.findIndex((t)=>this.isActive(`${t.name}`))
     return html`
       <h2>Tags</h2>
       <div class="section">