@matdata/yasgui 5.10.1 → 5.12.0

package/build/ts/src/PersistentConfig.d.ts

@@ -1,5 +1,6 @@
 import Yasgui, { EndpointButton, EndpointConfig } from "./";
 import * as Tab from "./Tab";
+import type { WorkspaceConfig } from "./queryManagement/types";
 export declare var storageNamespace: string;
 export interface PersistedJson {
     endpointHistory: string[];
@@ -16,10 +17,14 @@ export interface PersistedJson {
     autoCaptureEnabled?: boolean;
     customEndpointButtons?: EndpointButton[];
     endpointConfigs?: EndpointConfig[];
+    workspaces?: WorkspaceConfig[];
+    activeWorkspaceId?: string;
     theme?: "light" | "dark";
     orientation?: "vertical" | "horizontal";
     showSnippetsBar?: boolean;
     disabledDevButtons?: string[];
+    codeMirrorThemeLight?: string;
+    codeMirrorThemeDark?: string;
 }
 export default class PersistentConfig {
     private persistedJson;
@@ -55,11 +60,20 @@ export default class PersistentConfig {
     setCustomEndpointButtons(buttons: EndpointButton[]): void;
     getShowSnippetsBar(): boolean | undefined;
     setShowSnippetsBar(show: boolean): void;
+    getCodeMirrorTheme(mode: "light" | "dark"): string | undefined;
+    setCodeMirrorTheme(mode: "light" | "dark", theme: string): void;
     getEndpointConfigs(): EndpointConfig[];
     setEndpointConfigs(configs: EndpointConfig[]): void;
     addOrUpdateEndpoint(endpoint: string, updates: Partial<Omit<EndpointConfig, "endpoint">>): void;
     getEndpointConfig(endpoint: string): EndpointConfig | undefined;
     deleteEndpointConfig(endpoint: string): void;
+    getWorkspaces(): WorkspaceConfig[];
+    getWorkspace(workspaceId: string): WorkspaceConfig | undefined;
+    setWorkspaces(workspaces: WorkspaceConfig[]): void;
+    addOrUpdateWorkspace(workspace: WorkspaceConfig): void;
+    deleteWorkspace(workspaceId: string): void;
+    getActiveWorkspaceId(): string | undefined;
+    setActiveWorkspaceId(workspaceId: string | undefined): void;
     static clear(): void;
     getPersistedConfig(): PersistedJson;
     updatePersistedConfig(config: Partial<PersistedJson>): void;

package/build/ts/src/PersistentConfig.js

@@ -11,6 +11,8 @@ function getDefaults() {
         autoCaptureEnabled: true,
         customEndpointButtons: [],
         endpointConfigs: [],
+        workspaces: [],
+        activeWorkspaceId: undefined,
     };
 }
 export default class PersistentConfig {
@@ -135,6 +137,18 @@ export default class PersistentConfig {
         this.persistedJson.showSnippetsBar = show;
         this.toStorage();
     }
+    getCodeMirrorTheme(mode) {
+        return mode === "dark" ? this.persistedJson.codeMirrorThemeDark : this.persistedJson.codeMirrorThemeLight;
+    }
+    setCodeMirrorTheme(mode, theme) {
+        if (mode === "dark") {
+            this.persistedJson.codeMirrorThemeDark = theme;
+        }
+        else {
+            this.persistedJson.codeMirrorThemeLight = theme;
+        }
+        this.toStorage();
+    }
     getEndpointConfigs() {
         return this.persistedJson.endpointConfigs || [];
     }
@@ -166,6 +180,44 @@ export default class PersistentConfig {
         const filtered = configs.filter((c) => c.endpoint !== endpoint);
         this.setEndpointConfigs(filtered);
     }
+    getWorkspaces() {
+        return this.persistedJson.workspaces || [];
+    }
+    getWorkspace(workspaceId) {
+        return this.getWorkspaces().find((w) => w.id === workspaceId);
+    }
+    setWorkspaces(workspaces) {
+        this.persistedJson.workspaces = workspaces;
+        this.toStorage();
+    }
+    addOrUpdateWorkspace(workspace) {
+        const workspaces = this.getWorkspaces();
+        const existingIndex = workspaces.findIndex((w) => w.id === workspace.id);
+        const now = new Date().toISOString();
+        if (existingIndex >= 0) {
+            const existing = workspaces[existingIndex];
+            workspaces[existingIndex] = Object.assign(Object.assign(Object.assign({}, existing), workspace), { createdAt: existing.createdAt || workspace.createdAt || now, updatedAt: now });
+        }
+        else {
+            workspaces.push(Object.assign(Object.assign({}, workspace), { createdAt: workspace.createdAt || now, updatedAt: now }));
+        }
+        this.setWorkspaces(workspaces);
+    }
+    deleteWorkspace(workspaceId) {
+        const workspaces = this.getWorkspaces();
+        const filtered = workspaces.filter((w) => w.id !== workspaceId);
+        this.setWorkspaces(filtered);
+        if (this.getActiveWorkspaceId() === workspaceId) {
+            this.setActiveWorkspaceId(undefined);
+        }
+    }
+    getActiveWorkspaceId() {
+        return this.persistedJson.activeWorkspaceId;
+    }
+    setActiveWorkspaceId(workspaceId) {
+        this.persistedJson.activeWorkspaceId = workspaceId;
+        this.toStorage();
+    }
     static clear() {
         const storage = new YStorage(storageNamespace);
         storage.removeNamespace();

package/build/ts/src/PersistentConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"PersistentConfig.js","sourceRoot":"","sources":["../../../../../packages/yasgui/src/PersistentConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PersistentConfig.js","sourceRoot":"","sources":["../../../../../packages/yasgui/src/PersistentConfig.ts"],"names":[],"mappings":"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"}

package/build/ts/src/Tab.d.ts

@@ -4,6 +4,7 @@ import { default as Yasr, Parser, PersistentConfig as YasrPersistentConfig } fro
 import * as shareLink from "./linkUtils";
 import "./tab.scss";
 import { default as Yasgui, YasguiRequestConfig } from "./";
+import type { ManagedTabMetadata } from "./queryManagement/types";
 export interface PersistedJsonYasr extends YasrPersistentConfig {
     responseSummary: Parser.ResponseSummary;
 }
@@ -20,6 +21,7 @@ export interface PersistedJson {
     };
     requestConfig: YasguiRequestConfig;
     orientation?: "vertical" | "horizontal";
+    managedQuery?: ManagedTabMetadata;
 }
 export interface Tab {
     on(event: string | symbol, listener: (...args: any[]) => void): this;
@@ -66,6 +68,16 @@ export declare class Tab extends EventEmitter {
     name(): string;
     getPersistedJson(): PersistedJson;
     getId(): string;
+    getManagedQueryMetadata(): ManagedTabMetadata | undefined;
+    setManagedQueryMetadata(metadata: ManagedTabMetadata | undefined): void;
+    isManagedQueryTab(): boolean;
+    hasUnsavedManagedChanges(): boolean;
+    private getDefaultSaveModalValues;
+    private getManagedQueryIdFromMetadata;
+    private versionRefFromVersionTag;
+    private getQueryTextForSave;
+    saveManagedQueryOrSaveAsManagedQuery(): Promise<void>;
+    saveAsManagedQuery(): Promise<void>;
     private draw;
     hide(): void;
     show(): void;
@@ -74,6 +86,7 @@ export declare class Tab extends EventEmitter {
     private detachKeyboardListeners;
     select(): void;
     close(): void;
+    private closeNow;
     getQuery(): any;
     setQuery(query: string): this;
     getRequestConfig(): YasguiRequestConfig;
@@ -101,6 +114,8 @@ export declare class Tab extends EventEmitter {
     getShareObject(): shareLink.ShareConfigObject;
     private getTabListEl;
     setName(newName: string): this;
+    private suggestManagedFilenameFromName;
+    renameTab(newName: string): Promise<void>;
     hasResults(): boolean;
     getName(): string;
     query(): Promise<any>;
@@ -109,6 +124,8 @@ export declare class Tab extends EventEmitter {
     private ensureOAuth2TokenValid;
     private getStaticRequestConfig;
     private initYasqe;
+    private updateSaveButtonVisibility;
+    private initSaveManagedQueryIcon;
     private destroyYasqe;
     handleYasqeBlur: (yasqe: Yasqe) => void;
     handleYasqeQuery: (yasqe: Yasqe) => void;

package/build/ts/src/Tab.js

@@ -18,25 +18,29 @@ import EndpointSelect from "./endpointSelect";
 import "./tab.scss";
 import { getRandomId, default as Yasgui } from "./";
 import * as OAuth2Utils from "./OAuth2Utils";
-const HORIZONTAL_LAYOUT_ICON = `<svg viewBox="0 0 24 24">
-  <rect x="2" y="4" width="9" height="16" stroke="currentColor" stroke-width="2" fill="none"/>
-  <rect x="13" y="4" width="9" height="16" stroke="currentColor" stroke-width="2" fill="none"/>
-</svg>`;
-const VERTICAL_LAYOUT_ICON = `<svg viewBox="0 0 24 24">
-  <rect x="2" y="2" width="20" height="8" stroke="currentColor" stroke-width="2" fill="none"/>
-  <rect x="2" y="12" width="20" height="10" stroke="currentColor" stroke-width="2" fill="none"/>
-</svg>`;
-const OVERFLOW_ICON = `<svg viewBox="0 0 24 24" fill="currentColor">
-  <circle cx="5" cy="12" r="2"/>
-  <circle cx="12" cy="12" r="2"/>
-  <circle cx="19" cy="12" r="2"/>
-</svg>`;
+import { hashQueryText } from "./queryManagement/textHash";
+import SaveManagedQueryModal from "./queryManagement/SaveManagedQueryModal";
+import { saveManagedQuery } from "./queryManagement/saveManagedQuery";
+import { getWorkspaceBackend } from "./queryManagement/backends/getWorkspaceBackend";
+import { asWorkspaceBackendError } from "./queryManagement/backends/errors";
+import { normalizeQueryFilename } from "./queryManagement/normalizeQueryFilename";
 export class Tab extends EventEmitter {
     constructor(yasgui, conf) {
         super();
         this.endpointButtonConfigs = [];
         this.handleKeyDown = (event) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            if (event.defaultPrevented)
+                return;
+            const saveModalOpen = !!document.querySelector(".saveManagedQueryModalOverlay.open");
+            if (!saveModalOpen) {
+                const isSaveShortcut = (event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey && event.key.toLowerCase() === "s";
+                if (isSaveShortcut) {
+                    event.preventDefault();
+                    void this.saveManagedQueryOrSaveAsManagedQuery();
+                    return;
+                }
+            }
             if (event.key === "F11") {
                 event.preventDefault();
                 if (this.yasqe) {
@@ -220,6 +224,205 @@ WHERE {
     getId() {
         return this.persistentJson.id;
     }
+    getManagedQueryMetadata() {
+        return this.persistentJson.managedQuery;
+    }
+    setManagedQueryMetadata(metadata) {
+        if (metadata) {
+            this.persistentJson.managedQuery = metadata;
+        }
+        else {
+            delete this.persistentJson.managedQuery;
+        }
+        this.emit("change", this, this.persistentJson);
+    }
+    isManagedQueryTab() {
+        return !!this.persistentJson.managedQuery;
+    }
+    hasUnsavedManagedChanges() {
+        const meta = this.getManagedQueryMetadata();
+        if (!meta)
+            return false;
+        if (!meta.lastSavedTextHash)
+            return false;
+        try {
+            const current = this.yasqe ? this.yasqe.getValue() : this.persistentJson.yasqe.value;
+            const currentHash = hashQueryText(current);
+            return currentHash !== meta.lastSavedTextHash;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    getDefaultSaveModalValues() {
+        var _a;
+        const meta = this.getManagedQueryMetadata();
+        if (!meta)
+            return { name: this.name() };
+        if (meta.backendType !== "git")
+            return { workspaceId: meta.workspaceId };
+        const path = (_a = meta.queryRef) === null || _a === void 0 ? void 0 : _a.path;
+        if (!path)
+            return { workspaceId: meta.workspaceId };
+        const parts = path.split("/");
+        const filename = parts.pop();
+        const folderPath = parts.join("/");
+        return {
+            workspaceId: meta.workspaceId,
+            folderPath,
+            filename,
+            name: this.name(),
+        };
+    }
+    getManagedQueryIdFromMetadata(meta) {
+        var _a, _b;
+        if (meta.backendType === "git")
+            return (_a = meta.queryRef) === null || _a === void 0 ? void 0 : _a.path;
+        return (_b = meta.queryRef) === null || _b === void 0 ? void 0 : _b.managedQueryIri;
+    }
+    versionRefFromVersionTag(backendType, versionTag) {
+        if (!versionTag)
+            return undefined;
+        if (backendType === "git")
+            return { commitSha: versionTag };
+        return { managedQueryVersionIri: versionTag };
+    }
+    getQueryTextForSave() {
+        try {
+            if (this.yasqe)
+                return this.yasqe.getValue();
+        }
+        catch (_a) {
+        }
+        return this.persistentJson.yasqe.value;
+    }
+    saveManagedQueryOrSaveAsManagedQuery() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const meta = this.getManagedQueryMetadata();
+            if (!meta) {
+                yield this.saveAsManagedQuery();
+                return;
+            }
+            const queryId = this.getManagedQueryIdFromMetadata(meta);
+            if (!queryId) {
+                yield this.saveAsManagedQuery();
+                return;
+            }
+            const workspace = this.yasgui.persistentConfig.getWorkspace(meta.workspaceId);
+            if (!workspace) {
+                window.alert("Selected workspace no longer exists");
+                return;
+            }
+            const backend = getWorkspaceBackend(workspace, { persistentConfig: this.yasgui.persistentConfig });
+            const expectedVersionTag = (() => {
+                var _a, _b;
+                if (!(meta === null || meta === void 0 ? void 0 : meta.lastSavedVersionRef))
+                    return undefined;
+                if (meta.backendType === "git")
+                    return (_a = meta.lastSavedVersionRef) === null || _a === void 0 ? void 0 : _a.commitSha;
+                return (_b = meta.lastSavedVersionRef) === null || _b === void 0 ? void 0 : _b.managedQueryVersionIri;
+            })();
+            try {
+                yield backend.writeQuery(queryId, this.getQueryTextForSave(), { expectedVersionTag });
+            }
+            catch (e) {
+                const err = asWorkspaceBackendError(e);
+                if (err.code === "CONFLICT") {
+                    if (meta.backendType === "git") {
+                        try {
+                            const latest = yield backend.readQuery(queryId);
+                            const latestHash = hashQueryText(latest.queryText);
+                            if (meta.lastSavedTextHash && meta.lastSavedTextHash === latestHash && latest.versionTag) {
+                                yield backend.writeQuery(queryId, this.getQueryTextForSave(), { expectedVersionTag: latest.versionTag });
+                            }
+                            else {
+                                window.alert("Save conflict. Resolve the conflict externally (e.g., pull/rebase/merge) and then try saving again.");
+                                return;
+                            }
+                        }
+                        catch (_a) {
+                            window.alert("Save conflict. Resolve the conflict externally (e.g., pull/rebase/merge) and then try saving again.");
+                            return;
+                        }
+                    }
+                    else {
+                        window.alert("Save conflict. Refresh the query and try again.");
+                        return;
+                    }
+                }
+                window.alert(err.message);
+                return;
+            }
+            const read = yield backend.readQuery(queryId);
+            const lastSavedTextHash = hashQueryText(read.queryText);
+            const lastSavedVersionRef = this.versionRefFromVersionTag(meta.backendType, read.versionTag);
+            this.setManagedQueryMetadata(Object.assign(Object.assign({}, meta), { lastSavedTextHash,
+                lastSavedVersionRef }));
+            this.yasgui.queryBrowser.invalidateAndRefresh(meta.workspaceId);
+        });
+    }
+    saveAsManagedQuery() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const modal = new SaveManagedQueryModal(this.yasgui);
+            const defaults = this.getDefaultSaveModalValues();
+            let result;
+            try {
+                const modalDefaults = {
+                    workspaceId: defaults.workspaceId,
+                    folderPath: defaults.folderPath || "",
+                    name: defaults.name || this.name(),
+                };
+                if (defaults.filename)
+                    modalDefaults.filename = defaults.filename;
+                result = yield modal.show(modalDefaults);
+            }
+            catch (_a) {
+                return;
+            }
+            const workspace = this.yasgui.persistentConfig.getWorkspace(result.workspaceId);
+            if (!workspace) {
+                window.alert("Selected workspace no longer exists");
+                return;
+            }
+            const backend = getWorkspaceBackend(workspace, { persistentConfig: this.yasgui.persistentConfig });
+            const meta = this.getManagedQueryMetadata();
+            const expectedVersionTag = (() => {
+                var _a, _b;
+                if (!(meta === null || meta === void 0 ? void 0 : meta.lastSavedVersionRef))
+                    return undefined;
+                if (meta.backendType === "git")
+                    return (_a = meta.lastSavedVersionRef) === null || _a === void 0 ? void 0 : _a.commitSha;
+                return (_b = meta.lastSavedVersionRef) === null || _b === void 0 ? void 0 : _b.managedQueryVersionIri;
+            })();
+            try {
+                modal.notifySaveInProgress();
+                const { managedMetadata } = yield saveManagedQuery({
+                    backend,
+                    backendType: workspace.type,
+                    workspaceId: workspace.id,
+                    workspaceIri: workspace.type === "sparql" ? workspace.workspaceIri : undefined,
+                    folderPath: result.folderPath,
+                    name: result.name,
+                    filename: result.filename,
+                    queryText: this.getQueryTextForSave(),
+                    associatedEndpoint: workspace.type === "sparql" ? this.getEndpoint() : undefined,
+                    message: result.message,
+                    expectedVersionTag,
+                });
+                modal.notifySaveComplete();
+                this.setManagedQueryMetadata(managedMetadata);
+                if (result.name && result.name.trim()) {
+                    this.setName(result.name.trim());
+                }
+                this.yasgui.queryBrowser.invalidateAndRefresh(workspace.id);
+            }
+            catch (e) {
+                modal.notifySaveComplete();
+                const err = asWorkspaceBackendError(e);
+                window.alert(err.message);
+            }
+        });
+    }
     draw() {
         if (this.rootEl)
             return;
@@ -281,6 +484,23 @@ WHERE {
         this.yasgui.selectTabId(this.persistentJson.id);
     }
     close() {
+        if (this.isManagedQueryTab() && this.hasUnsavedManagedChanges()) {
+            const wantsSave = window.confirm("This managed query has unsaved changes. Save before closing?");
+            if (wantsSave) {
+                void this.saveManagedQueryOrSaveAsManagedQuery().then(() => {
+                    if (!this.hasUnsavedManagedChanges()) {
+                        this.closeNow();
+                    }
+                });
+                return;
+            }
+            const discard = window.confirm("Discard changes and close the tab?");
+            if (!discard)
+                return;
+        }
+        this.closeNow();
+    }
+    closeNow() {
         this.detachKeyboardListeners();
         if (this.yasqe)
             this.yasqe.abortQuery();
@@ -342,7 +562,9 @@ WHERE {
         if (!this.orientationToggleButton)
             return;
         this.orientationToggleButton.innerHTML =
-            this.currentOrientation === "vertical" ? HORIZONTAL_LAYOUT_ICON : VERTICAL_LAYOUT_ICON;
+            this.currentOrientation === "vertical"
+                ? '<i class="fas fa-grip-lines-vertical"></i>'
+                : '<i class="fas fa-grip-lines"></i>';
         this.orientationToggleButton.title =
             this.currentOrientation === "vertical" ? "Switch to horizontal layout" : "Switch to vertical layout";
     }
@@ -465,7 +687,7 @@ WHERE {
         if (!this.endpointOverflowButton) {
             this.endpointOverflowButton = document.createElement("button");
             addClass(this.endpointOverflowButton, "endpointOverflowBtn");
-            this.endpointOverflowButton.innerHTML = OVERFLOW_ICON;
+            this.endpointOverflowButton.innerHTML = '<i class="fas fa-ellipsis-vertical"></i>';
             this.endpointOverflowButton.title = "More endpoints";
             this.endpointOverflowButton.setAttribute("aria-label", "More endpoint options");
             this.endpointOverflowButton.setAttribute("aria-haspopup", "true");
@@ -615,6 +837,95 @@ WHERE {
         this.emit("change", this, this.persistentJson);
         return this;
     }
+    suggestManagedFilenameFromName(name) {
+        const trimmed = name.trim();
+        const safe = trimmed.replace(/[\\/]/g, "-");
+        return normalizeQueryFilename(safe);
+    }
+    renameTab(newName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const nextName = newName.trim();
+            if (!nextName)
+                return;
+            if (nextName === this.name())
+                return;
+            const meta = this.getManagedQueryMetadata();
+            if (!meta) {
+                this.setName(nextName);
+                return;
+            }
+            const workspace = this.yasgui.persistentConfig.getWorkspace(meta.workspaceId);
+            if (!workspace) {
+                window.alert("Selected workspace no longer exists");
+                return;
+            }
+            const backend = getWorkspaceBackend(workspace, { persistentConfig: this.yasgui.persistentConfig });
+            if (meta.backendType === "sparql") {
+                const queryId = this.getManagedQueryIdFromMetadata(meta);
+                if (!queryId)
+                    return;
+                if (!backend.renameQuery) {
+                    window.alert("This workspace does not support renaming queries");
+                    return;
+                }
+                try {
+                    this.getTabListEl().setAsRenaming(true);
+                    yield backend.renameQuery(queryId, nextName);
+                    this.setName(nextName);
+                    this.yasgui.queryBrowser.invalidateAndRefresh(meta.workspaceId);
+                }
+                catch (e) {
+                    const err = asWorkspaceBackendError(e);
+                    window.alert(err.message);
+                }
+                finally {
+                    this.getTabListEl().setAsRenaming(false);
+                }
+                return;
+            }
+            const oldPath = (_a = meta.queryRef) === null || _a === void 0 ? void 0 : _a.path;
+            if (!oldPath) {
+                this.setName(nextName);
+                return;
+            }
+            const parts = oldPath.split("/").filter(Boolean);
+            const oldFilename = parts.pop() || oldPath;
+            const folderPrefix = parts.join("/");
+            const newFilename = this.suggestManagedFilenameFromName(nextName);
+            const newPath = folderPrefix ? `${folderPrefix}/${newFilename}` : newFilename;
+            if (newPath === oldPath) {
+                this.setName(nextName);
+                return;
+            }
+            try {
+                this.getTabListEl().setAsRenaming(true);
+                yield backend.writeQuery(newPath, this.getQueryTextForSave(), {
+                    message: `Rename ${oldFilename} to ${newFilename}`,
+                });
+                if (!backend.deleteQuery) {
+                    window.alert("This workspace does not support deleting queries, so the old file could not be removed.");
+                }
+                else {
+                    yield backend.deleteQuery(oldPath);
+                }
+                const read = yield backend.readQuery(newPath);
+                const lastSavedTextHash = hashQueryText(read.queryText);
+                const lastSavedVersionRef = this.versionRefFromVersionTag("git", read.versionTag);
+                this.setManagedQueryMetadata(Object.assign(Object.assign({}, meta), { queryRef: Object.assign(Object.assign({}, meta.queryRef), { path: newPath }), lastSavedTextHash,
+                    lastSavedVersionRef }));
+                this.setName(nextName);
+                this.yasgui.queryBrowser.invalidateAndRefresh(meta.workspaceId);
+            }
+            catch (e) {
+                const err = asWorkspaceBackendError(e);
+                window.alert(err.message);
+            }
+            finally {
+                this.getTabListEl().setAsRenaming(false);
+            }
+        });
+    }
     hasResults() {
         var _a;
         return !!((_a = this.yasr) === null || _a === void 0 ? void 0 : _a.results);
@@ -737,7 +1048,8 @@ WHERE {
     }
     initYasqe() {
         const currentTheme = this.yasgui.getTheme();
-        const cmTheme = currentTheme === "dark" ? "material-palenight" : "default";
+        const storedCmTheme = this.yasgui.persistentConfig.getCodeMirrorTheme(currentTheme);
+        const cmTheme = storedCmTheme || (currentTheme === "dark" ? "github-dark" : "default");
         const yasqeConf = Object.assign(Object.assign({}, this.yasgui.config.yasqe), { theme: cmTheme, value: this.persistentJson.yasqe.value, editorHeight: this.persistentJson.yasqe.editorHeight ? this.persistentJson.yasqe.editorHeight : undefined, persistenceId: null, consumeShareLink: null, createShareableLink: () => this.getShareableLink(), showSnippetsBar: this.yasgui.config.showSnippetsBar !== false, requestConfig: () => {
                 const processedReqConfig = Object.assign(Object.assign({ acceptHeaderGraph: "text/turtle", acceptHeaderSelect: "application/sparql-results+json" }, mergeWith({}, this.persistentJson.requestConfig, this.getStaticRequestConfig(), function customizer(objValue, srcValue) {
                     if (Array.isArray(objValue) || Array.isArray(srcValue)) {
@@ -761,6 +1073,16 @@ WHERE {
                 }
                 return processedReqConfig;
             } });
+        const existingExtraKeys = yasqeConf.extraKeys;
+        const mergedExtraKeys = existingExtraKeys && typeof existingExtraKeys === "object" ? Object.assign({}, existingExtraKeys) : {};
+        mergedExtraKeys["Ctrl-S"] = () => {
+            const saveModalOpen = !!document.querySelector(".saveManagedQueryModalOverlay.open");
+            if (saveModalOpen)
+                return;
+            void this.saveManagedQueryOrSaveAsManagedQuery();
+        };
+        mergedExtraKeys["Cmd-S"] = mergedExtraKeys["Ctrl-S"];
+        yasqeConf.extraKeys = mergedExtraKeys;
         if (!yasqeConf.hintConfig) {
             yasqeConf.hintConfig = {};
         }
@@ -771,6 +1093,10 @@ WHERE {
             throw new Error("Expected a wrapper element before instantiating yasqe");
         }
         this.yasqe = new Yasqe(this.yasqeWrapperEl, yasqeConf);
+        this.yasqe.on("saveManagedQuery", () => {
+            void this.saveManagedQueryOrSaveAsManagedQuery();
+        });
+        this.updateSaveButtonVisibility();
         this.yasqe.on("blur", this.handleYasqeBlur);
         this.yasqe.on("query", this.handleYasqeQuery);
         this.yasqe.on("queryBefore", this.handleYasqeQueryBefore);
@@ -781,6 +1107,38 @@ WHERE {
         this.yasqe.on("queryResponse", this.handleQueryResponse);
         this.attachYasqeMouseHandler();
     }
+    updateSaveButtonVisibility() {
+        if (!this.yasqe)
+            return;
+        const workspaces = this.yasgui.persistentConfig.getWorkspaces();
+        const hasWorkspaces = workspaces && workspaces.length > 0;
+        this.yasqe.setSaveButtonVisible(hasWorkspaces);
+    }
+    initSaveManagedQueryIcon() {
+        if (!this.yasqe)
+            return;
+        const wrapper = this.yasqe.getWrapperElement();
+        const buttons = wrapper === null || wrapper === void 0 ? void 0 : wrapper.querySelector(".yasqe_buttons");
+        if (!buttons)
+            return;
+        if (buttons.querySelector(".yasqe_saveManagedQueryButton"))
+            return;
+        const queryBtn = buttons.querySelector(".yasqe_queryButton");
+        if (!queryBtn)
+            return;
+        const saveBtn = document.createElement("button");
+        saveBtn.type = "button";
+        saveBtn.className = "yasqe_saveManagedQueryButton";
+        saveBtn.title = "Save managed query";
+        saveBtn.setAttribute("aria-label", "Save managed query");
+        saveBtn.innerHTML = '<i class="fas fa-save" aria-hidden="true"></i>';
+        saveBtn.addEventListener("click", (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            void this.saveManagedQueryOrSaveAsManagedQuery();
+        });
+        buttons.insertBefore(saveBtn, queryBtn);
+    }
     destroyYasqe() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         (_a = this.yasqe) === null || _a === void 0 ? void 0 : _a.off("blur", this.handleYasqeBlur);