Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show error page if embed version out of supported range #335

Merged
merged 3 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core-cairo/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export { OptionsError } from './error';
export type { Kind } from './kind';
export { sanitizeKind } from './kind';

export { contractsVersion, contractsVersionTag } from './utils/version';
export { contractsVersion, contractsVersionTag, compatibleContractsSemver } from './utils/version';

export { erc20, erc721, custom } from './api';
4 changes: 3 additions & 1 deletion packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ export { OptionsError } from './error';
export type { Kind } from './kind';
export { sanitizeKind } from './kind';

export { erc20, erc721, erc1155, governor, custom } from './api';
export { erc20, erc721, erc1155, governor, custom } from './api';

export { compatibleContractsSemver } from './utils/version';
4 changes: 3 additions & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@types/resize-observer-browser": "^0.1.5",
"@types/uuid": "^9.0.0",
"@types/node": "^18.0.0",
"@types/semver": "^7.5.7",
"autoprefixer": "^10.4.2",
"path-browserify": "^1.0.1",
"postcss": "^8.2.8",
Expand All @@ -43,6 +44,7 @@
"sirv-cli": "^2.0.0",
"tippy.js": "^6.3.1",
"util": "^0.12.4",
"uuid": "^9.0.0"
"uuid": "^9.0.0",
"semver": "^7.6.0"
}
}
39 changes: 39 additions & 0 deletions packages/ui/src/UnsupportedVersion.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<script lang="ts">
export let requestedVersion: string;
export let compatibleVersionSemver: string;
</script>

<div class="container flex flex-col gap-4 p-4">
<div class="header flex justify-between items-center">
<h1 class="text-lg font-bold">Unsupported Version</h1>
</div>

<div class="controls p-4">
<p>
Version <strong>{requestedVersion}</strong> is not supported by the Wizard.
</p>
<p>
Select a version that is compatible with the version range: <strong>{compatibleVersionSemver}</strong>.
</p>
</div>
</div>

<style lang="postcss">
.container {
background-color: var(--gray-1);
border: 1px solid var(--gray-2);
border-radius: 10px;
min-width: 32rem;
}

.header {
font-size: var(--text-small);
}

.controls {
background-color: white;
padding: var(--size-4);
border-radius: 5px;
box-shadow: var(--shadow);
}
</style>
20 changes: 16 additions & 4 deletions packages/ui/src/embed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,22 @@ const currentScript = new URL(document.currentScript.src);

const iframes = new WeakMap<MessageEventSource, HTMLIFrameElement>();

let unsupportedVersion: boolean = false;
const unsupportedVersionFrameHeight = 'auto';

window.addEventListener('message', function (e: MessageEvent<Message>) {
if (e.source && e.data.kind === 'oz-wizard-resize') {
const iframe = iframes.get(e.source);
if (iframe) {
iframe.style.height = 'calc(100vh - 158px)';
if (e.source) {
if (e.data.kind === 'oz-wizard-unsupported-version') {
unsupportedVersion = true;
const iframe = iframes.get(e.source);
if (iframe) {
iframe.style.height = unsupportedVersionFrameHeight;
}
} else if (e.data.kind === 'oz-wizard-resize') {
const iframe = iframes.get(e.source);
if (iframe) {
iframe.style.height = unsupportedVersion ? unsupportedVersionFrameHeight : 'calc(100vh - 158px)';
}
}
}
});
Expand All @@ -27,6 +38,7 @@ onDOMContentLoaded(function () {

setSearchParam(w, src.searchParams, 'data-lang', 'lang');
setSearchParam(w, src.searchParams, 'data-tab', 'tab');
setSearchParam(w, src.searchParams, 'version', 'version');
const sync = w.getAttribute('data-sync-url');

if (sync === 'fragment') {
Expand Down
14 changes: 12 additions & 2 deletions packages/ui/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import type {} from 'svelte';
import App from './App.svelte';
import CairoApp from './cairo/App.svelte';
import { postMessage } from './post-message';
import UnsupportedVersion from './UnsupportedVersion.svelte';
import semver from 'semver';
import { compatibleContractsSemver as compatibleSolidityContractsSemver } from '@openzeppelin/wizard';
import { compatibleContractsSemver as compatibleCairoContractsSemver } from '@openzeppelin/wizard-cairo';

function postResize() {
const { height } = document.documentElement.getBoundingClientRect();
Expand All @@ -18,10 +22,16 @@ resizeObserver.observe(document.body);
const params = new URLSearchParams(window.location.search);

const initialTab = params.get('tab') ?? undefined;
const lang = params.get('lang');
const lang = params.get('lang') ?? undefined;
const requestedVersion = params.get('version') ?? undefined;

let compatibleVersionSemver = lang === 'cairo' ? compatibleCairoContractsSemver : compatibleSolidityContractsSemver;

let app;
if (lang === 'cairo') {
if (requestedVersion && !semver.satisfies(requestedVersion, compatibleVersionSemver)) {
postMessage({ kind: 'oz-wizard-unsupported-version' });
app = new UnsupportedVersion({ target: document.body, props: { requestedVersion, compatibleVersionSemver }});
} else if (lang === 'cairo') {
app = new CairoApp({ target: document.body, props: { initialTab } });
} else {
app = new App({ target: document.body, props: { initialTab } });
Expand Down
6 changes: 5 additions & 1 deletion packages/ui/src/post-message.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type Message = ResizeMessage | TabChangeMessage;
export type Message = ResizeMessage | TabChangeMessage | UnsupportedVersionMessage;

export interface ResizeMessage {
kind: 'oz-wizard-resize';
Expand All @@ -10,6 +10,10 @@ export interface TabChangeMessage {
tab: string;
}

export interface UnsupportedVersionMessage {
kind: 'oz-wizard-unsupported-version';
}

export function postMessage(msg: Message) {
if (parent) {
parent.postMessage(msg, '*');
Expand Down