@matdata/yasgui 5.4.0 → 5.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@matdata/yasgui",
   "description": "Yet Another SPARQL GUI",
-  "version": "5.4.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());
@@ -359,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
@@ -413,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);
@@ -464,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
@@ -524,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,

package/src/TabSettingsModal.scss

@@ -104,36 +104,49 @@
 
 .modalBody {
   flex: 1;
-  overflow-y: auto;
-  padding: 20px;
+  display: flex;
+  overflow: hidden;
 }
 
-.modalTabs {
+.modalSidebar {
+  width: 200px;
+  min-width: 200px;
+  border-right: 1px solid var(--yasgui-border-color, #e0e0e0);
+  background: var(--yasgui-bg-secondary, #f8f9fa);
   display: flex;
-  gap: 10px;
-  margin-bottom: 20px;
-  border-bottom: 2px solid var(--yasgui-border-color, #e0e0e0);
+  flex-direction: column;
+  overflow-y: auto;
+}
+
+.modalContentArea {
+  flex: 1;
+  overflow-y: auto;
+  padding: 20px;
 }
 
-.modalTabButton {
+.modalNavButton {
   background: none;
   border: none;
-  padding: 10px 20px;
+  padding: 12px 20px;
   font-size: 14px;
-  font-weight: 600;
+  font-weight: 500;
   cursor: pointer;
   color: var(--yasgui-text-secondary, #666);
-  border-bottom: 3px solid transparent;
-  margin-bottom: -2px;
+  text-align: left;
+  border-left: 3px solid transparent;
   transition: all 0.2s;
+  white-space: nowrap;
 
   &:hover {
+    background: var(--yasgui-bg-primary, white);
     color: var(--yasgui-accent-color, #337ab7);
   }
 
   &.active {
     color: var(--yasgui-accent-color, #337ab7);
-    border-bottom-color: var(--yasgui-accent-color, #337ab7);
+    background: var(--yasgui-bg-primary, white);
+    border-left-color: var(--yasgui-accent-color, #337ab7);
+    font-weight: 600;
   }
 }
 
@@ -185,8 +198,7 @@
   padding: 10px;
   border: 1px solid var(--yasgui-input-border, #ccc);
   border-radius: 4px;
-  font-family:
-    "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   font-size: 13px;
   resize: vertical;
   box-sizing: border-box;
@@ -222,6 +234,60 @@
   }
 }
 
+.settingsInput {
+  width: 100%;
+  padding: 8px 12px;
+  border: 1px solid var(--yasgui-input-border, #ccc);
+  border-radius: 4px;
+  font-size: 14px;
+  background-color: var(--yasgui-bg-secondary, white);
+  color: var(--yasgui-text-primary, #000);
+  box-sizing: border-box;
+
+  &:focus {
+    outline: none;
+    border-color: var(--yasgui-input-focus, #337ab7);
+    box-shadow: 0 0 0 2px rgba(51, 122, 183, 0.1);
+  }
+
+  &:disabled {
+    background-color: var(--yasgui-bg-tertiary, #f5f5f5);
+    color: var(--yasgui-text-muted, #999);
+    cursor: not-allowed;
+  }
+
+  &::placeholder {
+    color: var(--yasgui-text-muted, #999);
+  }
+}
+
+.settingsSection.disabled {
+  opacity: 0.6;
+  pointer-events: none;
+}
+
+.securityNotice {
+  background: var(--yasgui-warning-bg, #fff3cd);
+  color: var(--yasgui-warning-text, #856404);
+  padding: 12px;
+  border-radius: 4px;
+  border: 1px solid var(--yasgui-warning-border, #ffeaa7);
+
+  strong {
+    display: block;
+    margin-bottom: 8px;
+  }
+
+  ul {
+    margin: 8px 0 0 20px;
+    padding: 0;
+  }
+
+  li {
+    margin: 4px 0;
+  }
+}
+
 .modalFooter {
   padding: 15px 20px;
   border-top: 1px solid var(--yasgui-border-color, #e0e0e0);
@@ -496,8 +562,7 @@
     display: inline-block;
     padding: 4px 8px;
     font-size: 12px;
-    font-family:
-      SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
     line-height: 1.4;
     color: var(--yasgui-text-primary, #333);
     background-color: var(--yasgui-bg-secondary, #f7f7f7);
@@ -618,3 +683,307 @@
     }
   }
 }
+
+// Endpoints table styling
+.endpointsTable {
+  margin-top: 20px;
+}
+
+.endpointsTableElement {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 14px;
+
+  th,
+  td {
+    padding: 10px;
+    text-align: left;
+    border-bottom: 1px solid var(--yasgui-border-color, #e0e0e0);
+  }
+
+  th {
+    font-weight: 600;
+    color: var(--yasgui-text-primary, #000);
+    background: var(--yasgui-bg-secondary, #f9f9f9);
+  }
+
+  td {
+    color: var(--yasgui-text-primary, #333);
+  }
+
+  .endpointCell {
+    max-width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .centerCell {
+    text-align: center;
+  }
+
+  .endpointLabelInput {
+    width: 100%;
+    padding: 6px 8px;
+    border: 1px solid var(--yasgui-input-border, #ddd);
+    border-radius: 4px;
+    background: var(--yasgui-bg-primary, white);
+    color: var(--yasgui-text-primary, #333);
+    font-size: 14px;
+
+    &:focus {
+      outline: none;
+      border-color: var(--yasgui-accent-color, #337ab7);
+    }
+  }
+
+  .configureAuthButton {
+    padding: 6px 12px;
+    border: 1px solid var(--yasgui-border-color, #ddd);
+    border-radius: 4px;
+    background: var(--yasgui-bg-primary, white);
+    color: var(--yasgui-text-primary, #333);
+    font-size: 13px;
+    cursor: pointer;
+    transition: all 0.2s;
+
+    &:hover {
+      background: var(--yasgui-bg-secondary, #f5f5f5);
+    }
+
+    &.authenticated {
+      background: var(--yasgui-success-bg, #d4edda);
+      color: var(--yasgui-success-text, #155724);
+      border-color: var(--yasgui-success-border, #c3e6cb);
+    }
+  }
+
+  .deleteEndpointButton {
+    padding: 6px 12px;
+    border: 1px solid var(--yasgui-error-border, #f5c6cb);
+    border-radius: 4px;
+    background: var(--yasgui-error-bg, #f8d7da);
+    color: var(--yasgui-error-text, #721c24);
+    font-size: 13px;
+    cursor: pointer;
+    transition: all 0.2s;
+
+    &:hover {
+      background: var(--yasgui-error-hover, #f1b0b7);
+    }
+  }
+}
+
+// Authentication modal styling
+.authModalOverlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 10001;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.authModal {
+  background: var(--yasgui-bg-primary, white);
+  border-radius: 8px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+  max-width: 500px;
+  width: 90%;
+  max-height: 90vh;
+  overflow: auto;
+}
+
+.authModalHeader {
+  padding: 20px;
+  border-bottom: 1px solid var(--yasgui-border-color, #e0e0e0);
+
+  h3 {
+    margin: 0 0 8px 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: var(--yasgui-text-primary, #000);
+  }
+}
+
+.authModalSubtitle {
+  font-size: 13px;
+  color: var(--yasgui-text-secondary, #666);
+  word-break: break-all;
+}
+
+.authModalBody {
+  padding: 20px;
+}
+
+.authModalSection {
+  margin-bottom: 20px;
+
+  label {
+    display: block;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--yasgui-text-primary, #333);
+    margin-bottom: 8px;
+  }
+
+  input,
+  select {
+    width: 90%;
+    padding: 8px 10px;
+    border: 1px solid var(--yasgui-input-border, #ddd);
+    border-radius: 4px;
+    background: var(--yasgui-bg-primary, white);
+    color: var(--yasgui-text-primary, #333);
+    font-size: 14px;
+
+    &:focus {
+      outline: none;
+      border-color: var(--yasgui-accent-color, #337ab7);
+      box-shadow: 0 0 0 3px var(--yasgui-accent-light, rgba(51, 122, 183, 0.1));
+    }
+  }
+}
+
+.authSecurityNotice {
+  padding: 12px;
+  background: var(--yasgui-warning-bg, #fff3cd);
+  border: 1px solid var(--yasgui-warning-border, #ffeaa7);
+  border-radius: 4px;
+  font-size: 13px;
+  color: var(--yasgui-warning-text, #856404);
+
+  strong {
+    display: block;
+    margin-bottom: 8px;
+  }
+
+  ul {
+    margin: 0;
+    padding-left: 20px;
+
+    li {
+      margin: 4px 0;
+    }
+  }
+}
+
+.authModalFooter {
+  display: flex;
+  gap: 10px;
+  padding: 20px;
+  border-top: 1px solid var(--yasgui-border-color, #e0e0e0);
+  justify-content: flex-end;
+
+  button {
+    padding: 8px 16px;
+    border-radius: 4px;
+    font-size: 14px;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s;
+    border: none;
+
+    &.authRemoveButton {
+      background: transparent;
+      color: var(--yasgui-error-text, #dc3545);
+      border: 1px solid var(--yasgui-error-border, #dc3545);
+      margin-right: auto;
+
+      &:hover:not(:disabled) {
+        background: var(--yasgui-error-bg, #f8d7da);
+      }
+
+      &:disabled {
+        opacity: 0.4;
+        cursor: not-allowed;
+      }
+    }
+
+    &.authCancelButton {
+      background: var(--yasgui-bg-secondary, #f5f5f5);
+      color: var(--yasgui-text-primary, #333);
+      border: 1px solid var(--yasgui-border-color, #ddd);
+
+      &:hover {
+        background: var(--yasgui-bg-tertiary, #e0e0e0);
+      }
+    }
+
+    &.authSaveButton {
+      background: var(--yasgui-accent-color, #337ab7);
+      color: white;
+
+      &:hover {
+        background: var(--yasgui-accent-dark, #2563a1);
+      }
+    }
+  }
+}
+
+// Add endpoint form styling
+.addEndpointForm {
+  margin-top: 20px;
+  padding: 20px;
+  background: var(--yasgui-bg-secondary, #f9f9f9);
+  border-radius: 4px;
+  border: 1px solid var(--yasgui-border-color, #e0e0e0);
+}
+
+.addFormTitle {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--yasgui-text-primary, #333);
+  margin-bottom: 12px;
+}
+
+.addFormInputs {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+}
+
+.addEndpointInput {
+  flex: 1;
+  padding: 8px 12px;
+  border: 1px solid var(--yasgui-input-border, #ddd);
+  border-radius: 4px;
+  background: var(--yasgui-bg-primary, white);
+  color: var(--yasgui-text-primary, #333);
+  font-size: 14px;
+
+  &:focus {
+    outline: none;
+    border-color: var(--yasgui-accent-color, #337ab7);
+    box-shadow: 0 0 0 3px var(--yasgui-accent-light, rgba(51, 122, 183, 0.1));
+  }
+
+  &::placeholder {
+    color: var(--yasgui-text-secondary, #999);
+  }
+}
+
+.addEndpointButton {
+  padding: 8px 16px;
+  border: none;
+  border-radius: 4px;
+  background: var(--yasgui-accent-color, #337ab7);
+  color: white;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+  white-space: nowrap;
+
+  &:hover {
+    background: var(--yasgui-accent-dark, #2563a1);
+  }
+
+  &:active {
+    transform: translateY(1px);
+  }
+}