Adds project save/load functionality to :play #37
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,23 +6,31 @@ import { | |
| type TemplateResult | ||
| } from 'lit' | ||
| import {customElement, property, query} from 'lit/decorators.js' | ||
| import {ifDefined} from 'lit/directives/if-defined.js' | ||
| import {ProjectManager} from '../storage/project-manager.js' | ||
| import {defaultSettings} from '../storage/settings-save.js' | ||
| import {Bubble} from '../utils/bubble.js' | ||
| import {cssReset} from '../utils/css-reset.js' | ||
| import {openURL} from '../utils/open-url.js' | ||
| import {type AssetsState, emptyAssetsState} from './play-assets/play-assets.js' | ||
| import type {PlayAssetsDialog} from './play-assets-dialog.js' | ||
| import type {PlayExportDialog} from './play-export-dialog.js' | ||
| import type {PlayProjectSaveDialog} from './play-project-save-dialog.js' | ||
| import type {PlaySettingsDialog} from './play-settings-dialog.js' | ||
| import type {PlayToast} from './play-toast.js' | ||
| import type {PlayProjectLoadDialog} from './play-project-load-dialog.js' | ||
|
|
||
| import './play-assets-dialog.js' | ||
| import './play-button.js' | ||
| import './play-export-dialog.js' | ||
| import './play-icon/play-icon.js' | ||
| import './play-logo/play-logo.js' | ||
| import './play-new-pen-button.js' | ||
| import './play-project-button.js' | ||
| import './play-project-load-dialog.js' | ||
| import './play-project-save-dialog.js' | ||
| import './play-resizable-text-input.js' | ||
| import './play-settings-dialog.js' | ||
|
|
||
| declare global { | ||
| interface HTMLElementEventMap { | ||
|
|
@@ -97,6 +105,9 @@ export class PlayPenHeader extends LitElement { | |
| @property({attribute: 'sandbox-app', type: Boolean}) | ||
| sandboxApp: boolean = false | ||
|
|
||
| @property() | ||
| src: string = '' | ||
|
|
||
| @property() | ||
| url: string = '' | ||
|
|
||
|
|
@@ -121,8 +132,49 @@ export class PlayPenHeader extends LitElement { | |
| @query('play-export-dialog') | ||
| private _export!: PlayExportDialog | ||
|
|
||
| @query('play-project-save-dialog') | ||
| private _saveDialog!: PlayProjectSaveDialog | ||
|
|
||
| @query('play-project-load-dialog') | ||
| private _loadDialog!: PlayProjectLoadDialog | ||
|
|
||
| @query('play-settings-dialog') | ||
| private _settingsDialog!: PlaySettingsDialog | ||
|
|
||
| @query('play-toast') | ||
| private _toast!: PlayToast | ||
|
|
||
| @query('.toast-content') | ||
| private _toastContent!: HTMLDivElement | ||
|
|
||
| @property({attribute: 'project-manager', type: ProjectManager}) | ||
|
There was a problem hiding this comment. I don't think this type works? suggest attribute: false. |
||
| projectManager!: ProjectManager | ||
|
Comment on lines
+150
to
+151
There was a problem hiding this comment. would you mind moving this near the other publics properties at the top? also, can we make it optional? here's the thinking: it's ok to assert what we do inside the class but safer not to assert what's done outside. |
||
|
|
||
| private openSaveDialog(): void { | ||
|
There was a problem hiding this comment. the current repo convention is to use ES private fields like #openSaveDialog() where possible. it's not possible on decorators. |
||
| let projectName = this.name | ||
| if (this.projectManager.getCurrentProject() === undefined) { | ||
| this._saveDialog.open(this.name) | ||
| return | ||
| } | ||
| this.saveProject(projectName) | ||
|
|
||
| } | ||
|
|
||
| private async saveProject(projectName: string): Promise<void> { | ||
| this._saveDialog.close() | ||
| try { | ||
|
There was a problem hiding this comment. would you mind shrinking the try block to just what is expected to throw? |
||
| await this.projectManager.saveProject(projectName, this.src) | ||
| this._toastContent.textContent = 'Project saved' | ||
| this._toast.open() | ||
| this.dispatchEvent(Bubble<string>('edit-name', projectName)) | ||
| } catch (e) { | ||
|
There was a problem hiding this comment. 🔕 suggest |
||
| this._toastContent.textContent = `Error: ${e}` | ||
|
There was a problem hiding this comment. I think this will likely print Error twice. you can check with: |
||
| this._toast.open() | ||
| } | ||
| } | ||
|
|
||
| private loadProject(): void { | ||
| this._loadDialog.open() | ||
| } | ||
|
|
||
| protected override render(): TemplateResult { | ||
| return html` | ||
|
|
@@ -140,6 +192,7 @@ export class PlayPenHeader extends LitElement { | |
| <play-new-pen-button | ||
| size="small" | ||
| .srcByLabel=${this.srcByLabel} | ||
| @new-project=${() => this.projectManager.clearCurrentProject()} | ||
| ></play-new-pen-button | ||
| ><play-button | ||
| appearance="bordered" | ||
|
|
@@ -149,14 +202,14 @@ export class PlayPenHeader extends LitElement { | |
| label="Docs" | ||
| @click=${() => openURL('https://developers.reddit.com/docs')} | ||
| ></play-button | ||
| ><play-project-button | ||
| size="small" | ||
| .srcByLabel=${this.srcByLabel} | ||
| @open-export-dialog=${() => this._export.open()} | ||
| @save-project=${() => this.openSaveDialog()} | ||
|
There was a problem hiding this comment. 🔕 fat arrow is optional here due to automatic this binding. |
||
| @load-project=${() => this.loadProject()} | ||
| ></play-project-button | ||
| ></play-button | ||
| ><play-button | ||
| appearance="bordered" | ||
| size="small" | ||
|
|
@@ -170,7 +223,7 @@ export class PlayPenHeader extends LitElement { | |
| size="small" | ||
| title=":play Settings" | ||
| label="Settings" | ||
| @click=${() => this._settingsDialog.open()} | ||
| ></play-button | ||
| ><play-button | ||
| appearance="orangered" | ||
|
|
@@ -180,14 +233,19 @@ export class PlayPenHeader extends LitElement { | |
| label="Share" | ||
| @click=${() => | ||
| this.dispatchEvent(Bubble<undefined>('share', undefined))} | ||
| ></play-button | ||
| ><slot name="account-button"></slot> | ||
| </div> | ||
| </header> | ||
| <play-assets-dialog | ||
| .assetsState=${this.assetsState} | ||
| ?enable-local-assets=${this.enableLocalAssets} | ||
| ></play-assets-dialog> | ||
| <play-export-dialog url=${this.url}></play-export-dialog> | ||
| <play-project-save-dialog | ||
| src=${ifDefined(this.src)} | ||
| @save-dialog-submit=${(ev: CustomEvent<string>) => this.saveProject(ev.detail)}></play-project-save-dialog> | ||
| <play-project-load-dialog .projectManager=${this.projectManager}></play-project-load-dialog> | ||
| <play-settings-dialog | ||
| ?allow-storage=${this.allowStorage} | ||
| remote-runtime-origin=${this.remoteRuntimeOrigin} | ||
|
|
@@ -200,6 +258,7 @@ export class PlayPenHeader extends LitElement { | |
| ?use-remote-runtime=${this.useRemoteRuntime} | ||
| ?enable-local-assets=${this.enableLocalAssets} | ||
| ></play-settings-dialog> | ||
| <play-toast><div class="toast-content"></div></play-toast> | ||
| ` | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import {assert} from '@esm-bundle/chai' | ||
| import {PlayProjectButton} from './play-project-button.js' | ||
|
|
||
| test('tag is defined', () => { | ||
| const el = document.createElement('play-project-button') | ||
| assert.instanceOf(el, PlayProjectButton) | ||
| }) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a pretty big bump. does this PR really add 200 KB?