Skip to content
Open
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
8 changes: 4 additions & 4 deletions example/ui/src/elements/wal-embed-debug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import '@shoelace-style/shoelace/dist/components/spinner/spinner.js';
import '@shoelace-style/shoelace/dist/components/tooltip/tooltip.js';
import { appletOrigin, getAppletInfoAndGroupsProfiles, urlFromAppletHash } from '@theweave/elements';
import { sharedStyles, wrapPathInSvg } from '@holochain-open-dev/elements';
import { DnaHash } from '@holochain/client';
import { DnaHash, encodeHashToBase64 } from '@holochain/client';
import { mdiOpenInNew } from '@mdi/js';
import { localized, msg } from '@lit/localize';

Expand Down Expand Up @@ -109,9 +109,9 @@ export class WalEmbed extends LitElement {
case 'loading':
return html` <sl-spinner></sl-spinner> `;
case 'success':
const queryString = `view=applet-view&view-type=asset&hrl=${stringifyHrl(this.wal!.hrl)}${
this.wal!.context ? `&context=${encodeContext(this.wal!.context)}` : ''
}`;
const contextParam = this.wal!.context? `&context=${encodeContext(this.wal!.context)}` : '';
const groupHashParam = this.appletInfo && this.appletInfo.groupsHashes.length > 0? `&group-hash=${encodeHashToBase64(this.appletInfo.groupsHashes[0])}` : ''; // TODO: get the correct group hash
const queryString = `view=applet-view&view-type=asset&hrl=${stringifyHrl(this.wal!.hrl)}${contextParam}${groupHashParam}`;
const iframeSrc = this.assetStatus.assetInfo.appletDevPort
? `http://localhost:${
this.assetStatus.assetInfo.appletDevPort
Expand Down
13 changes: 8 additions & 5 deletions libs/elements/src/elements/wal-embed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import '@shoelace-style/shoelace/dist/components/spinner/spinner.js';
import { iframeOrigin } from '../utils';
import { sharedStyles, wrapPathInSvg } from '@holochain-open-dev/elements';
import { DnaHash } from '@holochain/client';
import {DnaHash, encodeHashToBase64} from '@holochain/client';
import { mdiArrowCollapse, mdiArrowExpand, mdiClose, mdiOpenInNew } from '@mdi/js';
import { localized, msg } from '@lit/localize';
import { getAppletInfoAndGroupsProfiles } from '../utils';
Expand Down Expand Up @@ -251,11 +251,14 @@ export class WalEmbed extends LitElement {
case 'loading':
return html` <sl-spinner></sl-spinner> `;
case 'success':
if (!this.appletInfo) {
throw Error("Missing appletInfo in <wal-embed>");
}
const groupHash = this.appletInfo.groupsHashes[0]; // TODO get the correct group hash
const groupHashParam = `&group-hash=${encodeHashToBase64(groupHash)}`;
const queryString = `view=applet-view&view-type=asset&hrl=${stringifyHrl(this.wal!.hrl)}${
this.wal!.context ? `&context=${encodeContext(this.wal!.context)}` : ''
this.wal!.context? `&context=${encodeContext(this.wal!.context)}` : ''
}`;
if (!this.appletInfo) throw Error("Missing appletInfo in <wal-embed>");
const groupHash = this.appletInfo.groupsHashes[0];
const iframeKind: IframeKind = {
type: 'applet',
appletHash: this.assetStatus.assetInfo.appletHash,
Expand All @@ -266,7 +269,7 @@ export class WalEmbed extends LitElement {
? `http://localhost:${
this.assetStatus.assetInfo.appletDevPort
}?${queryString}#${fromUint8Array(encode(iframeKind))}`
: `${iframeOrigin(iframeKind)}?${queryString}`;
: `${iframeOrigin(iframeKind)}?${queryString}${groupHashParam}`;

return html`<iframe
id="${this.iframeId}"
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/src/groups/elements/create-custom-group-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { consume } from '@lit/context';
import { localized, msg } from '@lit/localize';
import { css, html, LitElement } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import { EntryHash } from '@holochain/client';
import {encodeHashToBase64, EntryHash} from '@holochain/client';
import { sharedStyles } from '@holochain-open-dev/elements';
import { BlockType } from '@theweave/api';
import { BlockProperties } from 'grapesjs';
Expand Down Expand Up @@ -43,8 +43,8 @@ export class CreateCustomGroupView extends LitElement {
blocksByApplet: ReadonlyMap<EntryHash, Record<string, BlockType>>,
applets: ReadonlyMap<EntryHash, Applet | undefined>,
) {
const groupHashParam = `&group-hash=${encodeHashToBase64(this.groupStore.groupDnaHash)}`;
const blocks: Array<BlockProperties> = [];

for (const [appletHash, blockTypes] of Array.from(blocksByApplet.entries())) {
for (const [blockName, block] of Object.entries(blockTypes)) {
blocks.push({
Expand All @@ -53,7 +53,7 @@ export class CreateCustomGroupView extends LitElement {
category: applets.get(appletHash)?.custom_name,
content: `<iframe src="${iframeOrigin({ type: 'applet', appletHash, groupHash: this.groupStore.groupDnaHash, subType: 'block' })}?view=${
block.view
}&view-type=block&block=${blockName}" style="width: 100%"></iframe>`,
}&view-type=block&block=${blockName}${groupHashParam}" style="width: 100%"></iframe>`,
});
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/renderer/src/groups/elements/edit-custom-group-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { consume } from '@lit/context';
import { localized, msg } from '@lit/localize';
import { css, html, LitElement } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { ActionHash, EntryHash } from '@holochain/client';
import {ActionHash, encodeHashToBase64, EntryHash} from '@holochain/client';
import { hashProperty, sharedStyles } from '@holochain-open-dev/elements';
import {BlockType} from '@theweave/api';
import { BlockProperties } from 'grapesjs';
Expand Down Expand Up @@ -66,16 +66,19 @@ export class EditCustomGroupView extends LitElement {
blocksByApplet: ReadonlyMap<EntryHash, Record<string, BlockType>>,
applets: ReadonlyMap<EntryHash, Applet | undefined>,
) {
const groupHash = this.groupStore.groupDnaHash;
const groupHashParam = `&group-hash=${encodeHashToBase64(groupHash)}`;
const blocks: Array<BlockProperties> = [];
for (const [appletHash, blockTypes] of Array.from(blocksByApplet.entries())) {
for (const [blockName, block] of Object.entries(blockTypes)) {
blocks.push({
label: block.label,
media: block.icon_src,
category: applets.get(appletHash)?.custom_name,
content: `<iframe src="${iframeOrigin({ type: 'applet', appletHash, groupHash: this.groupStore.groupDnaHash, subType: 'block' })}?view=${
content: `<iframe style="width: 100%"
src="${iframeOrigin({ type: 'applet', appletHash, groupHash, subType: 'block' })}?view=${
block.view
}&view-type=block&block=${blockName}" style="width: 100%"></iframe>`,
}&view-type=block&block=${blockName}${groupHashParam}"></iframe>`,
});
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/renderer/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,7 @@ export async function openWalInWindow(wal: WAL, mossStore: MossStore) {
throw new Error('No groups found for applet.');
}
const groupHash = groups[0];
const queryString = renderViewToQueryString(renderView) + `&group-hash=${encodeHashToBase64(groupHash)}`;
if (mossStore.isAppletDev) {
const appId = appIdFromAppletId(appletId);
const appletDevPort = await getAppletDevPort(appId);
Expand All @@ -1059,13 +1060,11 @@ export async function openWalInWindow(wal: WAL, mossStore: MossStore) {
groupHash,
subType: 'asset',
};
const iframeSrc = `http://localhost:${appletDevPort}?${renderViewToQueryString(
renderView,
)}#${fromUint8Array(encode(iframeKind))}`;
const iframeSrc = `http://localhost:${appletDevPort}?${queryString}#${fromUint8Array(encode(iframeKind))}`;
return window.electronAPI.openWalWindow(iframeSrc, appletId, encodeHashToBase64(groupHash), wal);
}
}
const iframeSrc = `${iframeOrigin({ type: 'applet', appletHash, groupHash, subType: 'asset' })}?${renderViewToQueryString(renderView)}`;
const iframeSrc = `${iframeOrigin({ type: 'applet', appletHash, groupHash, subType: 'asset' })}?${queryString}`;
return window.electronAPI.openWalWindow(iframeSrc, appletId, encodeHashToBase64(groupHash), wal);
}

Expand Down
Loading