mirror of
https://github.com/compiler-explorer/compiler-explorer.git
synced 2025-12-27 10:33:59 -05:00
## Summary This PR makes URL serialization logic available to Node.js contexts (like Cypress tests) and replaces a hard-coded 4812-character base64 URL in tests with programmatically generated state. This builds on the shared utilities refactoring from #8246. ### Changes #### 1. Extract URL Serialization to Shared Module **Problem:** URL serialization code depended on GoldenLayout's browser-only ConfigMinifier, preventing Cypress spec files from importing it (they load in Node.js before running in browser). **Solution:** Created `shared/url-serialization.ts` with a Node-compatible ConfigMinifier reimplementation. **Technical Details:** - Reimplemented GoldenLayout's ConfigMinifier without browser dependencies - Moved serialization functions (`serialiseState`, `deserialiseState`, `risonify`, `unrisonify`) to shared module - Moved minification functions (`minifyConfig`, `unminifyConfig`) to shared module - Updated `static/url.ts` to use shared module instead of GoldenLayout - Added comprehensive test coverage in `test/url-serialization.ts` **Files:** - **New:** `shared/url-serialization.ts` (~279 lines) - **Modified:** `static/url.ts` (removed ~30 lines, eliminated GoldenLayout dependency) - **New:** `test/url-serialization.ts` (~96 lines) #### 2. Replace Hard-coded Cypress URL with Programmatic State **Before:** A hard-coded 4812-character base64 URL containing state for all panes ```typescript cy.visit('http://localhost:10240/#z:OYLghAFBqd5TB8IAsQGMD2ATApgUWwEsAXTAJwBoiQIAzIgG...'); ``` **After:** Programmatically generated state using `buildKnownGoodState()` function ```typescript const state = buildKnownGoodState(); const hash = serialiseState(state); cy.visit(`http://localhost:10240/#${hash}`, {...}); ``` **Benefits:** - Human-readable, maintainable test state - Programmatic generation from `PANE_DATA_MAP` keys - Layout optimized with 8 panes per row - Produces identical compressed URL format - Much easier to add/modify panes in the future #### 3. PANE_DATA_MAP Consistency Improvements Updated `PANE_DATA_MAP` to use component names exactly as registered with GoldenLayout: **Key renames:** - `preprocessor` → `pp` - `llvmir` → `ir` - `pipeline` → `llvmOptPipelineView` - `mir` → `rustmir` - `hir` → `rusthir` - `macro` → `rustmacroexp` - `core` → `haskellCore` - `stg` → `haskellStg` - `cmm` → `haskellCmm` - `dump` → `gccdump` - `tree` → `gnatdebugtree` - `debug` → `gnatdebug` **Added panes:** `codeEditor`, `compiler`, `conformance`, `output` (were missing from map) **Re-enabled tests:** - `yul` pane test (was commented out, now fixed) - `clojuremacroexp` pane test (was commented out, now fixed) - `cfg` pane test (had TODO, now removed) **Why this matters:** The `buildKnownGoodState()` function uses `Object.keys(PANE_DATA_MAP)` as the `componentName` property, so keys must match the actual registered component names for GoldenLayout to find them. ## Test Plan - [x] All Cypress tests pass (confirmed by @mattgodbolt) - [x] TypeScript compilation passes (`npm run ts-check`) - [x] Linting passes (`npm run lint`) - [x] URL serialization tests pass (3/3 tests) - [x] Pre-commit hooks pass - [x] Related vitest tests pass ## Dependencies - Builds on #8246 (shared utilities refactoring - already merged) 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude <noreply@anthropic.com>
184 lines
8.0 KiB
TypeScript
184 lines
8.0 KiB
TypeScript
// Copyright (c) 2022, Compiler Explorer Authors
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright
|
|
// notice, this list of conditions and the following disclaimer in the
|
|
// documentation and/or other materials provided with the distribution.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
// POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
import GoldenLayout from 'golden-layout';
|
|
import $ from 'jquery';
|
|
import {assert, unwrap, unwrapString} from '../../shared/assert.js';
|
|
import {escapeHTML} from '../../shared/common-utils.js';
|
|
import {serialiseState} from '../../shared/url-serialization.js';
|
|
import {SiteTemplateConfiguration, UserSiteTemplate} from '../../types/features/site-templates.interfaces.js';
|
|
import * as BootstrapUtils from '../bootstrap-utils.js';
|
|
import {localStorage} from '../local.js';
|
|
import {Settings} from '../settings.js';
|
|
import {getStaticImage} from '../utils';
|
|
import {Alert} from './alert.js';
|
|
|
|
class SiteTemplatesWidget {
|
|
private readonly modal: JQuery;
|
|
private readonly img: HTMLImageElement;
|
|
private readonly alertSystem: Alert;
|
|
private templatesConfig: null | SiteTemplateConfiguration = null;
|
|
private populated = false;
|
|
constructor(private readonly layout: GoldenLayout) {
|
|
this.modal = $('#site-template-loader');
|
|
const siteTemplatePreview = document.getElementById('site-template-preview');
|
|
if (siteTemplatePreview === null) {
|
|
// This can happen in embed mode
|
|
return;
|
|
}
|
|
assert(siteTemplatePreview instanceof HTMLImageElement);
|
|
this.img = siteTemplatePreview;
|
|
this.alertSystem = new Alert();
|
|
this.modal.find('#add-user-template').on('click', this.saveCurrentAsTemplate.bind(this));
|
|
}
|
|
saveCurrentAsTemplate() {
|
|
const config = this.layout.toConfig();
|
|
const data = serialiseState(config);
|
|
this.alertSystem.enterSomething('Template Name', '', '', {
|
|
yes: name => {
|
|
const userTemplates: Record<string, UserSiteTemplate> = JSON.parse(
|
|
localStorage.get('userSiteTemplates', '{}'),
|
|
);
|
|
let timestamp = Date.now();
|
|
while (`t${timestamp}` in userTemplates) timestamp++;
|
|
userTemplates[`t${timestamp}`] = {
|
|
title: unwrapString(name),
|
|
data,
|
|
};
|
|
localStorage.set('userSiteTemplates', JSON.stringify(userTemplates));
|
|
this.populateUserTemplates();
|
|
},
|
|
});
|
|
}
|
|
async getTemplates() {
|
|
if (this.templatesConfig === null) {
|
|
this.templatesConfig = await new Promise<SiteTemplateConfiguration>((resolve, reject) => {
|
|
$.getJSON(window.location.origin + window.httpRoot + 'api/siteTemplates', resolve);
|
|
});
|
|
}
|
|
return this.templatesConfig;
|
|
}
|
|
getCurrentTheme() {
|
|
const theme = Settings.getStoredSettings()['theme'];
|
|
if (!theme) {
|
|
// apparently this can happen
|
|
return 'default';
|
|
}
|
|
if (theme === 'system') {
|
|
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
|
|
return 'dark';
|
|
}
|
|
return 'default';
|
|
}
|
|
return theme;
|
|
}
|
|
getAsset(name: string) {
|
|
return getStaticImage(`${name}.${this.getCurrentTheme()}.png`, 'template_screenshots');
|
|
}
|
|
getDefaultAsset() {
|
|
return 'https://placehold.jp/30/4b4b4b/ffffff/1000x800.png?text=we%27ll+support+screenshot+generation+for+user+templates+some+day';
|
|
}
|
|
async setDefaultPreview() {
|
|
const templatesConfig = await this.getTemplates(); // by the time this is called it will be cached
|
|
const first = templatesConfig.templates[0].id; // preview the first entry
|
|
this.img.src = this.getAsset(first) ?? this.getDefaultAsset();
|
|
}
|
|
populateUserTemplates() {
|
|
const userTemplates: Record<string, UserSiteTemplate> = JSON.parse(localStorage.get('userSiteTemplates', '{}'));
|
|
const userTemplatesList = $('#site-user-templates-list');
|
|
userTemplatesList.empty();
|
|
if (Object.entries(userTemplates).length === 0) {
|
|
userTemplatesList.append('<span>Nothing here yet</span>');
|
|
} else {
|
|
for (const [id, {title, data}] of Object.entries(userTemplates)) {
|
|
const li = $('<li></li>');
|
|
$(`<div class="title">${escapeHTML(title)}</div>`)
|
|
.attr('data-data', data)
|
|
.appendTo(li);
|
|
$(`<div class="delete" data-id="${id}"><i class="fa-solid fa-trash"></i></div>`).appendTo(li);
|
|
li.appendTo(userTemplatesList);
|
|
}
|
|
userTemplatesList.find('li .delete').on('click', e => {
|
|
const userTemplates: Record<string, UserSiteTemplate> = JSON.parse(
|
|
localStorage.get('userSiteTemplates', '{}'),
|
|
);
|
|
delete userTemplates[unwrap($(e.target).parent('.delete').attr('data-id'))];
|
|
localStorage.set('userSiteTemplates', JSON.stringify(userTemplates));
|
|
this.populate();
|
|
});
|
|
}
|
|
}
|
|
async populateSiteTemplates() {
|
|
const templatesConfig = await this.getTemplates();
|
|
const siteTemplatesList = $('#site-templates-list');
|
|
siteTemplatesList.empty();
|
|
for (const {name, id, reference} of templatesConfig.templates) {
|
|
// Note: Trusting the server-provided data attribute
|
|
siteTemplatesList.append(
|
|
'<li>' +
|
|
`<div class="title" data-id="${id}" data-data="${reference}" data-name="${name}">${escapeHTML(name)}</div>` +
|
|
'</li>',
|
|
);
|
|
}
|
|
for (const titleDiv of $('#site-user-templates-list li .title, #site-templates-list li .title')) {
|
|
const titleDivCopy = titleDiv;
|
|
titleDiv.addEventListener(
|
|
'mouseover',
|
|
() => {
|
|
const id = titleDivCopy.getAttribute('data-id');
|
|
this.img.src = id !== null ? (this.getAsset(id) ?? this.getDefaultAsset()) : this.getDefaultAsset();
|
|
},
|
|
false,
|
|
);
|
|
titleDiv.addEventListener(
|
|
'click',
|
|
() => {
|
|
window.location.href =
|
|
window.location.origin + window.httpRoot + '#' + titleDivCopy.getAttribute('data-data');
|
|
},
|
|
false,
|
|
);
|
|
}
|
|
}
|
|
async populate() {
|
|
this.populateUserTemplates();
|
|
await this.populateSiteTemplates();
|
|
this.populated = true;
|
|
}
|
|
show() {
|
|
BootstrapUtils.showModal(this.modal);
|
|
if (!this.populated) {
|
|
this.populate();
|
|
}
|
|
this.setDefaultPreview();
|
|
}
|
|
}
|
|
|
|
export function setupSiteTemplateWidgetButton(layout: GoldenLayout) {
|
|
const siteTemplateModal = new SiteTemplatesWidget(layout);
|
|
$('#loadSiteTemplate').on('click', () => {
|
|
siteTemplateModal.show();
|
|
});
|
|
}
|