TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 09:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Removed usage of old publish menu for contributors

Browse Source 
no issue

- updated `<PublishManagement>` and sub-components to handle contributors by replacing publish button with save button in main view and in preview
- removed feature flag gating and usage of `<GhPublishmenu>` in editor template
- updated tests that indirectly used the old publish menu so they work with the new design/behaviour
- skipped editor tests that used the old publish menu
This commit is contained in:
Kevin Ansfield 2022-05-16 14:15:02 +01:00
parent 032f4d2ced
commit 3b088cbd77
8 changed files with 114 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/.lint-todo
View File

@ -1177,3 +1177,5 @@ remove|ember-template-lint|no-action|78|55|78|55|856c8ab1d5835ec424c83eb6b73888b
remove|ember-template-lint|no-action|82|59|82|59|e8badded2afd5d0c8426b85b6d0e7ac0bef55efb|1652054400000|1662422400000|1665014400000|app/templates/settings/integrations/slack.hbs
remove|ember-template-lint|no-passed-in-event-handlers|52|48|52|48|a893d9d149388aa9da024f59db6522bb9335bf8a|1652054400000|1662422400000|1665014400000|app/templates/settings/integrations/slack.hbs
remove|ember-template-lint|no-passed-in-event-handlers|78|48|78|48|1ab458a0888727af2b3a7a661a1e7d5f00ac0ad5|1652054400000|1662422400000|1665014400000|app/templates/settings/integrations/slack.hbs
remove|ember-template-lint|no-action|59|49|59|49|caf96338bbfda1006cc9251eacd9d9eee883df44|1652054400000|1662422400000|1665014400000|app/templates/editor.hbs
remove|ember-template-lint|no-action|60|44|60|44|1731ed4d2ac62556bb83fbc378686e26ca605687|1652054400000|1662422400000|1665014400000|app/templates/editor.hbs

41
ghost/admin/app/components/editor-labs/modals/preview.hbs
View File

@ -10,7 +10,7 @@
<button type="button" class="gh-btn {{if (eq this.tab "browser") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "browser")}}><span>{{svg-jar "desktop"}}</span></button>
<button type="button" class="gh-btn {{if (eq this.tab "mobile") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "mobile")}}><span>{{svg-jar "mobile-phone"}}</span></button>
{{#if (and (not-eq this.settings.membersSignupAccess "none") (not-eq this.settings.editorDefaultEmailRecipients "disabled"))}}
{{#if @data.post.isPost}}
{{#if (and @data.publishOptions.post.isPost (not @data.publishOptions.user.isContributor))}}
<button type="button" class="gh-btn {{if (eq this.tab "email") "gh-btn-group-selected"}} gh-post-preview-mode" {{on "click" (fn this.changeTab "email")}}><span>{{svg-jar "email-unread"}}</span></button>
{{/if}}
{{/if}}
@ -25,13 +25,24 @@
>
<span>Preview</span>
</button>
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" @data.togglePreviewPublish}}
>
<span>Publish</span>
</button>
{{#if @data.publishOptions.user.isContributor}}
<GhTaskButton
@buttonText="Save"
@task={{@data.saveTask}}
@runningText="Saving"
@class="gh-btn gh-btn-icon gh-btn-editor contributor-save-button"
data-test-preview-contributor-save />
{{else}}
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" @data.togglePreviewPublish}}
>
<span>Publish</span>
</button>
{{/if}}
<div class="settings-menu-toggle-spacer"></div>
</div>
</header>
@ -40,19 +51,21 @@
<GhLoadingSpinner />
{{else}}
{{#if (eq this.tab "browser")}}
<EditorLabs::Modals::Preview::Browser @post={{@data.post}} />
<EditorLabs::Modals::Preview::Browser @post={{@data.publishOptions.post}} />
{{/if}}
{{#if (and (eq this.tab "mobile"))}}
<EditorLabs::Modals::Preview::Mobile @post={{@data.post}} />
<EditorLabs::Modals::Preview::Mobile @post={{@data.publishOptions.post}} />
{{/if}}
{{#if (and (eq this.tab "email") @data.post.isPost)}}
<EditorLabs::Modals::Preview::Email @post={{@data.post}} @newsletter={{@data.newsletter}} />
{{/if}}
{{#unless @data.publishOptions.user.isContributor}}
{{#if (and (eq this.tab "email") @data.publishOptions.post.isPost)}}
<EditorLabs::Modals::Preview::Email @post={{@data.publishOptions.post}} @newsletter={{@data.publishOptions.newsletter}} />
{{/if}}
{{/unless}}
{{#if (eq this.tab "social")}}
<EditorLabs::Modals::Preview::Social @post={{@data.post}} />
<EditorLabs::Modals::Preview::Social @post={{@data.publishOptions.post}} />
{{/if}}
{{/if}}
</div>

4
ghost/admin/app/components/editor-labs/modals/preview.js
View File

@ -29,13 +29,13 @@ export default class EditorPostPreviewModal extends Component {
@task
*saveFirstTask() {
const {saveTask, post, hasDirtyAttributes} = this.args.data;
const {saveTask, publishOptions, hasDirtyAttributes} = this.args.data;
if (saveTask.isRunning) {
return yield saveTask.last;
}
if (post.isDraft && hasDirtyAttributes) {
if (publishOptions.post.isDraft && hasDirtyAttributes) {
yield saveTask.perform();
}
}

104
ghost/admin/app/components/editor-labs/publish-management.hbs
View File

@ -1,41 +1,69 @@
{{#if @post.isDraft}}
<div {{on-key "cmd+p" this.togglePreview}}>
<button type="button" class="gh-btn gh-btn-editor gh-editor-preview-trigger" {{on "click" this.openPreview}}>
<span>Preview</span>
</button>
</div>
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" this.openPublishFlow}}
{{on-key "cmd+shift+p"}}
disabled={{this.publishOptions.isLoading}}
data-test-button="publish-flow"
>
<span>Publish</span>
</button>
{{else}}
{{#if (or @hasUnsavedChanges this.saveButtonTaskGroup.isRunning)}}
<GhTaskButton
@task={{this.saveTask}}
@runningText="Saving..."
@class="gh-btn gh-btn-editor gh-publish-trigger"
@idleClass="green"
@runningClass="midlightgrey"
@successClass="midlightgrey"
@failureClass="red"
@showIcon={{false}}
@autoReset={{false}}
/>
{{#if this.publishOptions.user.isContributor}}
{{#if @post.isDraft}}
<div {{on-key "cmd+p" this.togglePreview}}>
<button
type="button"
class="gh-btn gh-btn-editor gh-editor-preview-trigger"
{{on "click" this.openPreview}}
data-test-button="contributor-preview"
>
<span>Preview</span>
</button>
</div>
{{/if}}
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" this.openUpdateFlow}}
data-test-button="update-flow"
>
<span>Update</span>
</button>
<GhTaskButton
@buttonText="Save"
@task={{this.saveTask}}
@runningText="Saving"
@class="gh-btn gh-btn-icon gh-btn-editor contributor-save-button"
data-test-button="contributor-save" />
{{else}}
{{#if @post.isDraft}}
<div {{on-key "cmd+p" this.togglePreview}}>
<button
type="button"
class="gh-btn gh-editor-preview-trigger"
{{on "click" this.openPreview}}
data-test-button="publish-preview"
>
<span>Preview</span>
</button>
</div>
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" this.openPublishFlow}}
{{on-key "cmd+shift+p"}}
disabled={{this.publishOptions.isLoading}}
data-test-button="publish-flow"
>
<span>Publish</span>
</button>
{{else}}
{{#if (or @hasUnsavedChanges this.saveButtonTaskGroup.isRunning)}}
<GhTaskButton
@task={{this.saveTask}}
@runningText="Saving..."
@class="gh-btn gh-btn-editor gh-publish-trigger"
@idleClass="green"
@runningClass="midlightgrey"
@successClass="midlightgrey"
@failureClass="red"
@showIcon={{false}}
@autoReset={{false}}
data-test-button="publish-save"
/>
{{/if}}
<button
type="button"
class="gh-btn gh-btn-editor darkgrey gh-publish-trigger"
{{on "click" this.openUpdateFlow}}
data-test-button="update-flow"
>
<span>Update</span>
</button>
{{/if}}
{{/if}}

3
ghost/admin/app/components/editor-labs/publish-management.js
View File

@ -88,8 +88,7 @@ export default class PublishManagement extends Component {
// without restarting the flow or causing flicker
this.previewModal = this.modals.open(PreviewModal, {
newsletter: this.publishOptions.newsletter,
post: this.publishOptions.post,
publishOptions: this.publishOptions,
hasDirtyAttributes: this.args.hasUnsavedChanges,
saveTask: this.saveTask,
togglePreviewPublish: this.togglePreviewPublish,

39
ghost/admin/app/templates/editor.hbs
View File

@ -28,38 +28,13 @@
<section class="flex" style="pointer-events: auto">
{{#unless this.post.isNew}}
{{#if this.session.user.isContributor}}
{{#if this.post.isDraft}}
<div {{on-key "cmd+p" this.openPostPreview}}>
<button type="button" class="gh-btn gh-btn-editor gh-editor-preview-trigger" {{on "click" this.openPostPreviewModal}}>
<span>Preview</span>
</button>
</div>
{{/if}}
<GhTaskButton @buttonText="Save"
@task={{this.save}}
@runningText="Saving"
@class="gh-btn gh-btn-icon gh-btn-editor contributor-save-button"
data-test-contributor-save />
{{else}}
{{#if (feature "publishingFlow")}}
<EditorLabs::PublishManagement
@post={{this.post}}
@hasUnsavedChanges={{this.hasDirtyAttributes}}
@beforePublish={{perform this.beforeSaveTask}}
@afterPublish={{this.afterSave}}
@saveTask={{this.saveTask}}
/>
{{else}}
<GhPublishmenu
@post={{this.post}}
@postStatus={{this.post.status}}
@saveTask={{this.saveTask}}
@setSaveType={{action "setSaveType"}}
@onOpen={{action "cancelAutosave"}} />
{{/if}}
{{/if}}
<EditorLabs::PublishManagement
@post={{this.post}}
@hasUnsavedChanges={{this.hasDirtyAttributes}}
@beforePublish={{perform this.beforeSaveTask}}
@afterPublish={{this.afterSave}}
@saveTask={{this.saveTask}}
/>
{{#unless this.showSettingsMenu}}
<div class="settings-menu-toggle-spacer"></div>

11
ghost/admin/tests/acceptance/editor-test.js
View File

@ -436,7 +436,7 @@ describe('Acceptance: Editor', function () {
).to.not.exist;
});
it('handles validation errors when scheduling', async function () {
it.skip('handles validation errors when scheduling', async function () {
this.server.put('/posts/:id/', function () {
return new Response(422, {}, {
errors: [{
@ -470,7 +470,7 @@ describe('Acceptance: Editor', function () {
).to.match(/Error test/);
});
it('handles title validation errors correctly', async function () {
it.skip('handles title validation errors correctly', async function () {
this.server.create('post', {authors: [author]});
// post id 1 is a draft, checking for draft behaviour now
@ -553,9 +553,6 @@ describe('Acceptance: Editor', function () {
.to.equal(compareDateString);
expect(find('[data-test-date-time-picker-time-input]').value, 'scheduled time')
.to.equal(compareTimeString);
// Dropdown menu should be 'Update Post' and 'Unschedule'
expect(find('[data-test-publishmenu-trigger]').textContent.trim(), 'text in save button for scheduled post')
.to.equal('Scheduled');
// expect countdown to show warning, that post is scheduled to be published
await triggerEvent('[data-test-editor-post-status]', 'mouseover');
expect(find('[data-test-schedule-countdown]').textContent.trim(), 'notification countdown')
@ -856,7 +853,7 @@ describe('Acceptance: Editor', function () {
// closing prevents scheduling with a "Must be in the past" error
// when re-opening the menu
// https://github.com/TryGhost/Team/issues/1399
it('can close publish menu after selecting schedule then re-open, schedule, and publish without error', async function () {
it.skip('can close publish menu after selecting schedule then re-open, schedule, and publish without error', async function () {
const post = this.server.create('post', {status: 'draft', authors: [user]});
await visit(`/editor/post/${post.id}`);
@ -872,7 +869,7 @@ describe('Acceptance: Editor', function () {
// BUG: re-scheduling a send-only post unexpectedly switched to publish+send
// https://github.com/TryGhost/Ghost/issues/14354
it('can re-schedule an email-only post', async function () {
it.skip('can re-schedule an email-only post', async function () {
// Enable newsletters (extra confirmation step)
enableMailgun(this.server);
enableNewsletters(this.server, true);

10
ghost/admin/tests/acceptance/error-handling-test.js
View File

@ -1,7 +1,7 @@
import {Response} from 'miragejs';
import {authenticateSession} from 'ember-simple-auth/test-support';
import {beforeEach, describe, it} from 'mocha';
import {click, currentRouteName, fillIn, find, findAll, visit} from '@ember/test-helpers';
import {blur, click, currentRouteName, fillIn, find, findAll, visit} from '@ember/test-helpers';
import {expect} from 'chai';
import {setupApplicationTest} from 'ember-mocha';
import {setupMirage} from 'ember-cli-mirage/test-support';
@ -36,8 +36,8 @@ describe('Acceptance: Error Handling', function () {
await visit('/posts');
await click('.posts-list li:nth-of-type(2) a'); // select second post
await click('[data-test-publishmenu-trigger]');
await click('[data-test-publishmenu-save]');
await fillIn('[data-test-editor-title-input]', 'Updated post');
await blur('[data-test-editor-title-input]');
// has the refresh to update alert
expect(findAll('.gh-alert').length).to.equal(1);
@ -97,8 +97,8 @@ describe('Acceptance: Error Handling', function () {
this.server.create('post');
await visit('/editor/post/1');
await click('[data-test-publishmenu-trigger]');
await click('[data-test-publishmenu-save]');
await fillIn('[data-test-editor-title-input]', 'Updated post');
await blur('[data-test-editor-title-input]');
expect(findAll('.gh-alert').length).to.equal(1);
expect(find('.gh-alert').textContent).to.not.match(/html>/);