diff --git a/web/app/components/document/sidebar.hbs b/web/app/components/document/sidebar.hbs index 285760087..0da01a799 100644 --- a/web/app/components/document/sidebar.hbs +++ b/web/app/components/document/sidebar.hbs @@ -44,7 +44,7 @@ }} " /> - {{#if this.isDraft}} + {{#if (and this.isDraft this.isOwner)}} {{/if}} - {{#if this.editingIsDisabled}} -

{{this.title}}

- {{else}} + {{#if this.isOwner}}
{{this.title}} {{else}}

Enter a title here.

+ > + Enter a title here. + {{/unless}} <:editing as |F|> @@ -132,6 +132,11 @@
+ {{else}} +

{{this.title}}

{{/if}} @@ -140,12 +145,9 @@ {{! Summary }}
- {{#if this.editingIsDisabled}} -

{{this.summary}}

- {{else}} + {{#if this.isOwner}} + {{else}} +

+ {{this.summary}} +

{{/if}}
@@ -188,9 +197,10 @@
- {{#if this.isDraft}} + {{#if (and this.isDraft this.isOwner)}}
{{else}} @@ -218,6 +229,7 @@ {{#if this.isOwner}} {{else}} - {{#if this.contributors.length}} -
    - {{#each this.contributors as |contributor|}} -
  1. - -
    2. - {{/each}} -
- {{else}} - No contributors - {{/if}} +
+ {{#if this.contributors.length}} +
    + {{#each this.contributors as |contributor|}} +
  1. + +
    2. + {{/each}} +
+ {{else}} + No contributors + {{/if}} +
{{/if}}
@@ -270,6 +284,7 @@ {{#if this.isOwner}} {{else}} - {{#if this.approvers.length}} -
    - {{#each this.approvers as |approver|}} -
  1. - -
    2. - {{/each}} -
- {{else}} - No approvers - {{/if}} +
+ {{#if this.approvers.length}} +
    + {{#each this.approvers as |approver|}} +
  1. + +
    2. + {{/each}} +
+ {{else}} + No approvers + {{/if}} +
{{/if}}
@@ -346,12 +363,7 @@ {{#each-in this.customEditableFields as |field attributes|}} - {{#if - (or - (and (not this.editingIsDisabled) (not this.docIsApproved)) - attributes.value - ) - }} + {{#if (or attributes.value this.isOwner)}}
{{/if}} @@ -370,7 +382,7 @@ - {{#if this.userHasEditPrivileges}} + {{#if this.isOwner}}
{{#if this.editingIsDisabled}}
diff --git a/web/app/components/document/sidebar.ts b/web/app/components/document/sidebar.ts index 97e587ca8..16ebf4251 100644 --- a/web/app/components/document/sidebar.ts +++ b/web/app/components/document/sidebar.ts @@ -327,36 +327,68 @@ export default class DocumentSidebarComponent extends Component +
{{#if this.products}} {{#if @formatIsBadge}} { + this.get("/people", (schema, request) => { + // This allows the test user to view docs they're an approver on. + if (request.queryParams.emails === "testuser@example.com") { + return new Response(200, {}, []); + } return schema.people.all(); }); diff --git a/web/tests/acceptance/authenticated/document-test.ts b/web/tests/acceptance/authenticated/document-test.ts index 07ca9a86a..a25b75b50 100644 --- a/web/tests/acceptance/authenticated/document-test.ts +++ b/web/tests/acceptance/authenticated/document-test.ts @@ -30,6 +30,38 @@ const DRAFT_VISIBILITY_TOGGLE_SELECTOR = "[data-test-draft-visibility-toggle]"; const COPY_URL_BUTTON_SELECTOR = "[data-test-sidebar-copy-url-button]"; const DRAFT_VISIBILITY_OPTION_SELECTOR = "[data-test-draft-visibility-option]"; const SECOND_DRAFT_VISIBILITY_LIST_ITEM_SELECTOR = `${DRAFT_VISIBILITY_DROPDOWN_SELECTOR} li:nth-child(2)`; +const EDITABLE_TITLE_SELECTOR = "[data-test-document-title-editable]"; +const EDITABLE_SUMMARY_SELECTOR = "[data-test-document-summary-editable]"; +const EDITABLE_PRODUCT_AREA_SELECTOR = + "[data-test-document-product-area-editable]"; +const EDITABLE_CONTRIBUTORS_SELECTOR = + "[data-test-document-contributors-editable]"; +const EDITABLE_APPROVERS_SELECTOR = "[data-test-document-approvers-editable]"; + +const READ_ONLY_TITLE_SELECTOR = "[data-test-document-title-read-only]"; +const READ_ONLY_SUMMARY_SELECTOR = "[data-test-document-summary-read-only]"; +const READ_ONLY_PRODUCT_AREA_SELECTOR = + "[data-test-document-product-area-read-only]"; +const READ_ONLY_CONTRIBUTORS_SELECTOR = + "[data-test-document-contributors-read-only]"; +const READ_ONLY_APPROVERS_SELECTOR = "[data-test-document-approvers-read-only]"; + +const assertEditingIsDisabled = (assert: Assert) => { + assert.dom(EDITABLE_TITLE_SELECTOR).doesNotExist(); + assert.dom(EDITABLE_SUMMARY_SELECTOR).doesNotExist(); + assert.dom(EDITABLE_PRODUCT_AREA_SELECTOR).doesNotExist(); + assert.dom(EDITABLE_CONTRIBUTORS_SELECTOR).doesNotExist(); + assert.dom(EDITABLE_APPROVERS_SELECTOR).doesNotExist(); + + assert.dom(DRAFT_VISIBILITY_TOGGLE_SELECTOR).doesNotExist(); + assert.dom(ADD_RELATED_RESOURCE_BUTTON_SELECTOR).doesNotExist(); + + assert.dom(READ_ONLY_TITLE_SELECTOR).exists(); + assert.dom(READ_ONLY_SUMMARY_SELECTOR).exists(); + assert.dom(READ_ONLY_PRODUCT_AREA_SELECTOR).exists(); + assert.dom(READ_ONLY_CONTRIBUTORS_SELECTOR).exists(); + assert.dom(READ_ONLY_APPROVERS_SELECTOR).exists(); +}; interface AuthenticatedDocumentRouteTestContext extends MirageTestContext {} @@ -287,4 +319,107 @@ module("Acceptance | authenticated/document", function (hooks) { .dom(COPY_URL_BUTTON_SELECTOR) .doesNotExist("copyURLButton is removed"); }); + + test("owners can edit a draft's document metadata", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: true, + }); + + await visit("/document/1?draft=true"); + + assert.dom(EDITABLE_TITLE_SELECTOR).exists(); + assert.dom(EDITABLE_SUMMARY_SELECTOR).exists(); + assert.dom(EDITABLE_PRODUCT_AREA_SELECTOR).exists(); + assert.dom(EDITABLE_CONTRIBUTORS_SELECTOR).exists(); + assert.dom(EDITABLE_APPROVERS_SELECTOR).exists(); + + assert.dom(DRAFT_VISIBILITY_TOGGLE_SELECTOR).exists(); + assert.dom(ADD_RELATED_RESOURCE_BUTTON_SELECTOR).exists(); + + assert.dom(READ_ONLY_TITLE_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_SUMMARY_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_PRODUCT_AREA_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_CONTRIBUTORS_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_APPROVERS_SELECTOR).doesNotExist(); + }); + + test("owners can edit everything but the product area of a published doc", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: false, + status: "In review", + }); + + await visit("/document/1"); + + assert.dom(EDITABLE_TITLE_SELECTOR).exists(); + assert.dom(EDITABLE_SUMMARY_SELECTOR).exists(); + assert.dom(EDITABLE_PRODUCT_AREA_SELECTOR).doesNotExist(); + assert.dom(EDITABLE_CONTRIBUTORS_SELECTOR).exists(); + assert.dom(EDITABLE_APPROVERS_SELECTOR).exists(); + + assert.dom(DRAFT_VISIBILITY_TOGGLE_SELECTOR).doesNotExist(); + assert.dom(ADD_RELATED_RESOURCE_BUTTON_SELECTOR).exists(); + + assert.dom(READ_ONLY_TITLE_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_SUMMARY_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_PRODUCT_AREA_SELECTOR).exists(); + assert.dom(READ_ONLY_CONTRIBUTORS_SELECTOR).doesNotExist(); + assert.dom(READ_ONLY_APPROVERS_SELECTOR).doesNotExist(); + }); + + test("collaborators cannot edit the metadata of a draft", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: true, + owners: ["foo@example.com"], + collaborators: ["testuser@example.com"], + }); + + await visit("/document/1?draft=true"); + + assertEditingIsDisabled(assert); + }); + + test("collaborators cannot edit the metadata of published docs", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: false, + status: "In review", + owners: ["foo@example.com"], + collaborators: ["testuser@example.com"], + }); + + await visit("/document/1"); + + assertEditingIsDisabled(assert); + }); + + test("approvers cannot edit the metadata of a published doc", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: false, + status: "In review", + owners: ["foo@example.com"], + approvers: ["testuser@example.com"], + }); + + await visit("/document/1"); + + assertEditingIsDisabled(assert); + }); + + test("non-owner viewers of shareable drafts cannot edit the metadata of a draft", async function (this: AuthenticatedDocumentRouteTestContext, assert) { + this.server.create("document", { + objectID: 1, + isDraft: true, + owners: ["foo@example.com"], + isShareable: true, + }); + + await visit("/document/1?draft=true"); + + assertEditingIsDisabled(assert); + }); });