@matdata/yasgui 5.3.0 → 5.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@matdata/yasgui",
   "description": "Yet Another SPARQL GUI",
-  "version": "5.3.0",
+  "version": "5.5.0",
   "main": "build/yasgui.min.js",
   "types": "build/ts/src/index.d.ts",
   "license": "MIT",

package/src/ConfigExportImport.ts

@@ -304,6 +304,7 @@ export function parseFromTurtle(turtle: string): Partial<PersistedJson> {
             headers: {},
             withCredentials: false,
             adjustQueryBeforeRequest: false,
+            basicAuth: undefined,
           },
           yasr: {
             settings: {},

package/src/PersistentConfig.ts

@@ -1,5 +1,5 @@
 import { Storage as YStorage } from "@matdata/yasgui-utils";
-import Yasgui, { EndpointButton } from "./";
+import Yasgui, { EndpointButton, EndpointConfig } from "./";
 import * as Tab from "./Tab";
 export var storageNamespace = "triply";
 export interface PersistedJson {
@@ -10,7 +10,8 @@ export interface PersistedJson {
   lastClosedTab: { index: number; tab: Tab.PersistedJson } | undefined;
   prefixes?: string;
   autoCaptureEnabled?: boolean;
-  customEndpointButtons?: EndpointButton[];
+  customEndpointButtons?: EndpointButton[]; // Legacy, kept for backwards compatibility
+  endpointConfigs?: EndpointConfig[]; // New endpoint-based storage with auth
   theme?: "light" | "dark";
   orientation?: "vertical" | "horizontal";
 }
@@ -24,6 +25,7 @@ function getDefaults(): PersistedJson {
     prefixes: "",
     autoCaptureEnabled: true,
     customEndpointButtons: [],
+    endpointConfigs: [],
   };
 }
 
@@ -163,6 +165,46 @@ export default class PersistentConfig {
     this.persistedJson.customEndpointButtons = buttons;
     this.toStorage();
   }
+
+  // New endpoint configuration methods
+  public getEndpointConfigs(): EndpointConfig[] {
+    return this.persistedJson.endpointConfigs || [];
+  }
+
+  public setEndpointConfigs(configs: EndpointConfig[]) {
+    this.persistedJson.endpointConfigs = configs;
+    this.toStorage();
+  }
+
+  public addOrUpdateEndpoint(endpoint: string, updates: Partial<Omit<EndpointConfig, "endpoint">>) {
+    const configs = this.getEndpointConfigs();
+    const existingIndex = configs.findIndex((c) => c.endpoint === endpoint);
+
+    if (existingIndex >= 0) {
+      // Update existing endpoint
+      const merged = { ...configs[existingIndex], ...updates };
+      if ("authentication" in updates && updates.authentication === undefined) {
+        delete merged.authentication;
+      }
+      configs[existingIndex] = merged;
+    } else {
+      // Add new endpoint
+      configs.push({ endpoint, ...updates });
+    }
+
+    this.setEndpointConfigs(configs);
+  }
+
+  public getEndpointConfig(endpoint: string): EndpointConfig | undefined {
+    const configs = this.getEndpointConfigs();
+    return configs.find((c) => c.endpoint === endpoint);
+  }
+
+  public deleteEndpointConfig(endpoint: string) {
+    const configs = this.getEndpointConfigs();
+    const filtered = configs.filter((c) => c.endpoint !== endpoint);
+    this.setEndpointConfigs(filtered);
+  }
   public static clear() {
     const storage = new YStorage(storageNamespace);
     storage.removeNamespace();

package/src/Tab.ts

@@ -241,8 +241,8 @@ export class Tab extends EventEmitter {
     return this.persistentJson.requestConfig;
   }
   private initControlbar() {
-    this.initEndpointSelectField();
     this.initOrientationToggle();
+    this.initEndpointSelectField();
     this.initEndpointButtons();
     if (this.yasgui.config.endpointInfo && this.controlBarEl) {
       this.controlBarEl.appendChild(this.yasgui.config.endpointInfo());
@@ -266,7 +266,7 @@ export class Tab extends EventEmitter {
     this.controlBarEl.appendChild(this.orientationToggleButton);
   }
 
-  private updateOrientationToggleIcon() {
+  public updateOrientationToggleIcon() {
     if (!this.orientationToggleButton) return;
 
     // Show the icon for the layout we'll switch TO (not the current layout)
@@ -279,24 +279,38 @@ export class Tab extends EventEmitter {
   public toggleOrientation() {
     if (!this.rootEl) return;
 
-    // Remove old orientation class
-    removeClass(this.rootEl, `orientation-${this.currentOrientation}`);
-
     // Toggle orientation
-    this.currentOrientation = this.currentOrientation === "vertical" ? "horizontal" : "vertical";
+    const newOrientation = this.currentOrientation === "vertical" ? "horizontal" : "vertical";
 
-    // Add new orientation class
-    addClass(this.rootEl, `orientation-${this.currentOrientation}`);
+    // Update global config
+    this.yasgui.config.orientation = newOrientation;
 
-    // Update button icon
-    this.updateOrientationToggleIcon();
+    // Apply to all tabs
+    for (const tabId in this.yasgui._tabs) {
+      const tab = this.yasgui._tabs[tabId];
+      if (tab && tab.rootEl) {
+        // Remove old orientation class
+        removeClass(tab.rootEl, `orientation-${tab.currentOrientation}`);
 
-    // Refresh components to adjust to new layout
-    if (this.yasqe) {
-      this.yasqe.refresh();
-    }
-    if (this.yasr) {
-      this.yasr.refresh();
+        // Update tab's orientation
+        tab.currentOrientation = newOrientation;
+
+        // Add new orientation class
+        addClass(tab.rootEl, `orientation-${newOrientation}`);
+
+        // Update button icon if it exists
+        if (tab.orientationToggleButton) {
+          tab.updateOrientationToggleIcon();
+        }
+
+        // Refresh components to adjust to new layout
+        if (tab.yasqe) {
+          tab.yasqe.refresh();
+        }
+        if (tab.yasr) {
+          tab.yasr.refresh();
+        }
+      }
     }
   }
   public getYasqe() {
@@ -345,10 +359,19 @@ export class Tab extends EventEmitter {
     // Clear existing buttons
     this.endpointButtonsContainer.innerHTML = "";
 
-    // Merge config buttons with custom user buttons
+    // Get config buttons (for backwards compatibility)
     const configButtons = this.yasgui.config.endpointButtons || [];
+
+    // Get endpoint configs where showAsButton is true
+    const endpointConfigs = this.yasgui.persistentConfig.getEndpointConfigs();
+    const endpointButtons = endpointConfigs
+      .filter((config) => config.showAsButton && config.label)
+      .map((config) => ({ endpoint: config.endpoint, label: config.label! }));
+
+    // Also include legacy custom buttons for backwards compatibility
     const customButtons = this.yasgui.persistentConfig.getCustomEndpointButtons();
-    const allButtons = [...configButtons, ...customButtons];
+
+    const allButtons = [...configButtons, ...endpointButtons, ...customButtons];
 
     if (allButtons.length === 0) {
       // Hide container if no buttons
@@ -399,6 +422,11 @@ export class Tab extends EventEmitter {
       this.persistentJson.requestConfig.endpoint = endpoint;
       this.emit("change", this, this.persistentJson);
       this.emit("endpointChange", this, endpoint);
+
+      // Auto-track this endpoint in endpoint configs (if not already present)
+      if (endpoint && !this.yasgui.persistentConfig.getEndpointConfig(endpoint)) {
+        this.yasgui.persistentConfig.addOrUpdateEndpoint(endpoint, {});
+      }
     }
     if (this.endpointSelect instanceof EndpointSelect) {
       this.endpointSelect.setEndpoint(endpoint, endpointHistory);
@@ -450,6 +478,28 @@ export class Tab extends EventEmitter {
     this.emit("change", this, this.persistentJson);
   }
 
+  /**
+   * Get authentication configuration for the current endpoint
+   * This retrieves auth from the endpoint-based storage
+   */
+  private getAuthForCurrentEndpoint() {
+    const endpoint = this.getEndpoint();
+    if (!endpoint) return undefined;
+
+    const endpointConfig = this.yasgui.persistentConfig.getEndpointConfig(endpoint);
+    if (!endpointConfig || !endpointConfig.authentication) return undefined;
+
+    // Convert endpoint auth to requestConfig format
+    if (endpointConfig.authentication.type === "basic") {
+      return {
+        username: endpointConfig.authentication.username,
+        password: endpointConfig.authentication.password,
+      };
+    }
+
+    return undefined;
+  }
+
   /**
    * The Yasgui configuration object may contain a custom request config
    * This request config object can contain getter functions, or plain json
@@ -510,6 +560,14 @@ export class Tab extends EventEmitter {
           //The adjustQueryBeforeRequest is meant to be a function though, so let's copy that as is
           adjustQueryBeforeRequest: this.yasgui.config.requestConfig.adjustQueryBeforeRequest,
         };
+
+        // Inject authentication from endpoint-based storage
+        // Only inject endpoint-based auth if basicAuth is not already set
+        const endpointAuth = this.getAuthForCurrentEndpoint();
+        if (endpointAuth && typeof processedReqConfig.basicAuth === "undefined") {
+          processedReqConfig.basicAuth = endpointAuth;
+        }
+
         if (this.yasgui.config.corsProxy && !Yasgui.corsEnabled[this.getEndpoint()]) {
           return {
             ...processedReqConfig,