diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss index ee6d4f67c99..4bf6af1cb6a 100644 --- a/app/styles/_variables.scss +++ b/app/styles/_variables.scss @@ -31,7 +31,7 @@ $brand-warning: #f0ad4e !default; $brand-danger: #d9534f; /* overrides with darkened colors for a11y contrast */ -$brand-success: darken($brand-success, 10%); +$brand-success: darken($brand-success, 20%); $brand-info: darken($brand-info, 15%); // no override needed for brand-warning (will use dark text instead) $brand-danger: darken($brand-danger, 15%); diff --git a/lib/osf-components/addon/components/delete-button/template.hbs b/lib/osf-components/addon/components/delete-button/template.hbs index d40871a28ce..cddbf645e07 100644 --- a/lib/osf-components/addon/components/delete-button/template.hbs +++ b/lib/osf-components/addon/components/delete-button/template.hbs @@ -43,11 +43,11 @@ @onHide={{action this._cancel}} as |modal| > - +

{{this.modalTitle}}

- + {{#if (has-block)}} {{yield}} {{else}} @@ -68,7 +68,7 @@ {{/if}} - + {{t 'node_card.registration.statuses.revision_in_progress'}} | {{else if (eq @node.revisionState 'pending_moderation')}} - {{#if (not-eq @node.reviewsState 'pending_moderation')}} + {{#if (not-eq @node.reviewsState 'pending')}} {{t 'node_card.registration.statuses.revision_pending_moderation'}} | {{/if}} {{/if}} diff --git a/lib/osf-components/addon/components/registries/update-dropdown/component.ts b/lib/osf-components/addon/components/registries/update-dropdown/component.ts index 3b4d03a7c45..b2bd21f0c49 100644 --- a/lib/osf-components/addon/components/registries/update-dropdown/component.ts +++ b/lib/osf-components/addon/components/registries/update-dropdown/component.ts @@ -93,6 +93,13 @@ export default class UpdateDropdown extends Component { this.showModal = false; } + @action + onRevisionSelect(callback: () => void) { + this.router.on('routeDidChange', () => { + callback(); + }); + } + @task @waitFor async getRevisionList() { diff --git a/lib/osf-components/addon/components/registries/update-dropdown/list-item/template.hbs b/lib/osf-components/addon/components/registries/update-dropdown/list-item/template.hbs index 49e24b7378c..953e750c0e0 100644 --- a/lib/osf-components/addon/components/registries/update-dropdown/list-item/template.hbs +++ b/lib/osf-components/addon/components/registries/update-dropdown/list-item/template.hbs @@ -1,7 +1,12 @@ {{#if this.shouldShow}}
{{!-- Using LinkTo instead of OsfLink due to how queryParams are buggy for setting active state --}} - + { + setupRenderingTest(hooks); + + test('it renders', async function(assert) { + await render(hbs` + + `); + assert.dom('[data-test-delete-button]').hasText('Button here!'); + await click('[data-test-delete-button]'); + assert.dom('[data-test-delete-modal-header]').containsText('Head'); + assert.dom('[data-test-delete-modal-body]').hasText('Shoulders'); + assert.dom('[data-test-cancel-delete]').hasText('Knees'); + assert.dom('[data-test-confirm-delete]').hasText('Toes'); + await click('[data-test-confirm-delete]'); + }); +}); diff --git a/translations/en-us.yml b/translations/en-us.yml index e85d784de25..d474ce76353 100644 --- a/translations/en-us.yml +++ b/translations/en-us.yml @@ -581,7 +581,7 @@ node_card: statuses: revision_pending_moderation: 'Update pending moderation' revision_in_progress: 'Update in progress' - revision_unapproved: 'Update pending unapproved' + revision_unapproved: 'Update pending approval' pending_registration_approval: 'Pending registration approval' pending_embargo_approval: 'Pending embargo' pending: 'Pending moderation' @@ -601,7 +601,7 @@ node_card: options: Options view_button: 'View' update_button: 'Update' - view_changes_button: 'View changes' + view_changes_button: 'Continue update' schema_response_error: 'Updates irretreivable.' forks: @@ -1608,7 +1608,7 @@ registries: modalBodyFirst: 'Updates to registration responses can be updated by clicking “Next”.
Edits to metadata including Description, Category, License, Publication DOI, and Tags are done on the registration by clicking the ' modalBodySecond: ' icon.' modalBodyNoUpdates: 'The {registryName} does not allow updates for this registration template.
Contact their registy if you have any questions.' - learnMore: 'Click here to learn more' + learnMore: 'Click here to learn more.' next: Next cancel_update: 'Cancel update' meetings: