From c091f466bac9cad7e4ac07dbb9dff8fb8f786e94 Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Fri, 19 Jun 2026 17:02:40 +0530 Subject: [PATCH 01/11] Fixed accessibility issues --- app/components/cc-license.hbs | 20 +- app/components/doi-list.hbs | 138 +++++++------- app/components/model-search.hbs | 1 + app/components/organization-list.hbs | 45 ++--- app/components/provider-list.hbs | 75 ++++---- app/components/repository-list.hbs | 55 +++--- app/styles/local.css | 175 +++++++++++++++++- app/templates/contacts/index.hbs | 5 +- app/templates/prefixes/index.hbs | 41 ++-- .../providers/show/contacts/index.hbs | 2 + .../providers/show/prefixes/index.hbs | 18 +- .../datacite-styles/doi/globals/_colors.scss | 2 +- 12 files changed, 406 insertions(+), 171 deletions(-) diff --git a/app/components/cc-license.hbs b/app/components/cc-license.hbs index 55bb4475c..246bf6cd3 100644 --- a/app/components/cc-license.hbs +++ b/app/components/cc-license.hbs @@ -1,9 +1,23 @@ - + {{#each this.licenseLogo as |license|}} {{#if license.class}} - {{license.tooltip.text}} + {{else}} {{license.logo}} {{/if}} {{/each}} - + \ No newline at end of file diff --git a/app/components/doi-list.hbs b/app/components/doi-list.hbs index 4dec54076..c4360d0b6 100644 --- a/app/components/doi-list.hbs +++ b/app/components/doi-list.hbs @@ -115,12 +115,12 @@ {{#each this.model.meta.states as |state|}}
  • {{#if this.model.query.state}} - - + + {{else}} - - + + {{/if}}
    @@ -134,8 +134,8 @@ {{/each}} {{else}}
  • - - + +
    {{titleize this.model.query.state}} @@ -161,15 +161,16 @@ {{#each this.model.meta.resourceTypes as |resourceType|}}
  • {{#if this.model.query.resource-type-id}} - - + + {{else}} - + {{/if}}
    @@ -183,8 +184,8 @@ {{/each}} {{else}}
  • - - + +
    {{humanize (underscore this.model.query.resource-type-id)}} @@ -211,12 +212,12 @@ {{#each this.model.meta.published as |year|}}
  • {{#if this.model.query.published}} - - + + {{else}} - - + + {{/if}}
    @@ -230,8 +231,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.published}} @@ -257,12 +258,12 @@ {{#each this.model.meta.created as |year|}}
  • {{#if this.model.query.created}} - - + + {{else}} - - + + {{/if}}
    @@ -276,8 +277,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.created}} @@ -307,12 +308,12 @@ {{#each this.model.meta.registered as |year|}}
  • {{#if this.model.query.registered}} - - + + {{else}} - - + + {{/if}}
    @@ -326,8 +327,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.registered}} @@ -362,12 +363,12 @@ {{#each this.model.meta.clients as |client|}}
  • {{#if this.model.query.client-id}} - - + + {{else}} - - + + {{/if}}
    @@ -381,8 +382,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.client-id}} @@ -414,15 +415,16 @@ {{#if (not-eq affiliation.id affiliation.title)}}
  • {{#if this.model.query.affiliation-id}} - - + + {{else}} - + {{/if}}
    @@ -437,8 +439,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.affiliation-id}} @@ -465,12 +467,12 @@ {{#each this.model.meta.prefixes as |prefix|}}
  • {{#if this.model.query.prefix}} - - + + {{else}} - - + + {{/if}}
    @@ -484,8 +486,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.prefix}} @@ -512,15 +514,16 @@ {{#each this.model.meta.certificates as |certificate|}}
  • {{#if this.model.query.certificate}} - - + + {{else}} - + {{/if}}
    @@ -534,8 +537,8 @@ {{/each}} {{else}}
  • - - + +
    {{titleize this.model.query.certificate}} @@ -562,15 +565,16 @@ {{#each this.model.meta.schemaVersions as |schemaVersion|}}
  • {{#if this.model.query.schema-version}} - - + + {{else}} - + {{/if}}
    @@ -584,8 +588,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.schema-version}} @@ -614,12 +618,12 @@ {{#each this.model.meta.sources as |source|}}
  • {{#if this.model.query.source}} - - + + {{else}} - - + + {{/if}}
    @@ -633,8 +637,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.source}} @@ -668,15 +672,17 @@ - + {{else}} - + {{/if}}
    @@ -690,8 +696,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.link-check-status}} diff --git a/app/components/model-search.hbs b/app/components/model-search.hbs index 314e8edb8..eb8cad6e6 100644 --- a/app/components/model-search.hbs +++ b/app/components/model-search.hbs @@ -5,6 +5,7 @@ @value={{this.query}} class="form-control" placeholder={{if this.placeholder this.placeholder "Type to search..."}} + aria-label={{if this.ariaLabel this.ariaLabel "Search"}} @escape-press={{action 'clear'}} @enter={{action 'doSearch'}} /> diff --git a/app/components/organization-list.hbs b/app/components/organization-list.hbs index 5515e0d69..bacf3156b 100644 --- a/app/components/organization-list.hbs +++ b/app/components/organization-list.hbs @@ -37,12 +37,12 @@ {{#each this.model.organizations.meta.years as |year|}}
  • {{#if this.model.organizations.query.year}} - - + + {{else}} - - + + {{/if}}
    @@ -56,8 +56,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.year}} @@ -83,12 +83,12 @@ {{#each this.model.organizations.meta.regions as |region|}}
  • {{#if this.model.organizations.query.region}} - - + + {{else}} - - + + {{/if}}
    @@ -102,8 +102,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.region}} @@ -140,15 +140,17 @@ - + {{else}} - + {{/if}}
    @@ -162,8 +164,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.organization-type}} @@ -193,15 +195,16 @@ {{#each this.model.organizations.meta.focusAreas as |focusArea|}}
  • {{#if this.model.organizations.query.focus-area}} - - + + {{else}} - + {{/if}}
    @@ -215,8 +218,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.organizations.query.focus-area}} diff --git a/app/components/provider-list.hbs b/app/components/provider-list.hbs index 214e700cb..6fe338b03 100644 --- a/app/components/provider-list.hbs +++ b/app/components/provider-list.hbs @@ -34,12 +34,12 @@ {{#each this.model.meta.years as |year|}}
  • {{#if this.model.query.year}} - - + + {{else}} - - + + {{/if}}
    @@ -53,8 +53,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.year}} @@ -80,12 +80,12 @@ {{#each this.model.meta.regions as |region|}}
  • {{#if this.model.query.region}} - - + + {{else}} - - + + {{/if}}
    @@ -99,8 +99,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.region}} @@ -127,15 +127,16 @@ {{#each this.model.meta.memberTypes as |memberType|}}
  • {{#if this.model.query.member-type}} - - + + {{else}} - + {{/if}}
    @@ -149,8 +150,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.member-type}} @@ -179,15 +180,17 @@ - + {{else}} - + {{/if}}
    @@ -201,8 +204,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.non-profit-status}} @@ -231,15 +234,17 @@ - + {{else}} - + {{/if}}
    @@ -253,8 +258,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.organization-type}} @@ -280,15 +285,16 @@ {{#each this.model.meta.focusAreas as |focusArea|}}
  • {{#if this.model.query.focus-area}} - - + + {{else}} - + {{/if}}
    @@ -302,8 +308,8 @@ {{/each}} {{else}}
  • - - + +
    {{this.model.query.focus-area}} @@ -333,16 +339,18 @@ - + {{else}} - + {{/if}}
    @@ -359,8 +367,9 @@ - +
    {{this.model.query.has-required-contacts}} diff --git a/app/components/repository-list.hbs b/app/components/repository-list.hbs index eacd75cec..752ba52c3 100644 --- a/app/components/repository-list.hbs +++ b/app/components/repository-list.hbs @@ -111,12 +111,12 @@ {{#each this.model.repositories.meta.years as |year|}}
  • {{#if this.model.repositories.query.year}} - - + + {{else}} - - + + {{/if}}
    @@ -131,7 +131,7 @@ {{else}}
  • - +
    {{this.model.repositories.query.year}} @@ -164,15 +164,16 @@ {{#each this.model.repositories.meta.providers as |provider|}}
  • {{#if this.model.repositories.query.provider-id}} - - + + {{else}} - + {{/if}}
    @@ -187,7 +188,7 @@ {{else}}
  • - +
    {{titleize this.model.repositories.query.provider}} @@ -217,15 +218,16 @@ {{#each this.model.repositories.meta.clientTypes as |clientType|}}
  • {{#if this.model.repositories.query.client-type}} - - + + {{else}} - + {{/if}}
    @@ -240,7 +242,7 @@ {{else}}
  • - +
    {{titleize this.model.repositories.query.client-type}} @@ -273,15 +275,16 @@ }}
  • {{#if this.model.repositories.query.repository-type}} - - + + {{else}} - + {{/if}}
    @@ -296,7 +299,7 @@ {{else}}
  • - +
    {{this.model.repositories.query.repository-type}} @@ -327,15 +330,16 @@ {{#each this.model.repositories.meta.certificates as |certificate|}}
  • {{#if this.model.repositories.query.certificate}} - - + + {{else}} - + {{/if}}
    @@ -350,7 +354,7 @@ {{else}}
  • - +
    {{this.model.repositories.query.certificate}} @@ -378,15 +382,16 @@ {{#each this.model.repositories.meta.software as |software|}}
  • {{#if this.model.repositories.query.software}} - - + + {{else}} - + {{/if}}
    @@ -401,7 +406,7 @@ {{else}}
  • - +
    {{this.model.repositories.query.software}} diff --git a/app/styles/local.css b/app/styles/local.css index e82041644..9dc3f1a3c 100755 --- a/app/styles/local.css +++ b/app/styles/local.css @@ -657,8 +657,8 @@ main a:not(.btn):not(.navbar-brand):not(.nav-link):focus, .landing-nav-link.btn, .navbar .navbar-nav > li > a.landing-nav-link.btn { - color: #fff !important; - border-color: #fff !important; + color: #243b54 !important; + border-color: #243b54 !important; } /* Landing page icon */ @@ -686,3 +686,174 @@ main a:not(.btn):not(.navbar-brand):not(.nav-link):focus, .landing-feature-title { font-size: 24px; } + +/* Accessibility: warning action buttons + sidebar facet contrast */ + +/* Match Commons/Akita hover/focus behavior for warning buttons */ +.btn.btn-warning, +.btn-group-vertical .btn.btn-warning, +.btn-group .btn.btn-warning { + transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease, box-shadow 0.15s ease; +} + +.btn.btn-warning:hover, +.btn.btn-warning:active, +.btn-group-vertical .btn.btn-warning:hover, +.btn-group-vertical .btn.btn-warning:active, +.btn-group .btn.btn-warning:hover, +.btn-group .btn.btn-warning:active { + background-color: var(--datacite-color-primary, #00B1E2); + border-color: var(--datacite-color-primary, #00B1E2); + color: #fff; +} + +.btn.btn-warning:hover i, +.btn.btn-warning:active i, +.btn-group-vertical .btn.btn-warning:hover i, +.btn-group-vertical .btn.btn-warning:active i, +.btn-group .btn.btn-warning:hover i, +.btn-group .btn.btn-warning:active i { + color: #fff; +} + +.btn.btn-warning:focus, +.btn.btn-warning:focus-visible, +.btn-group-vertical .btn.btn-warning:focus, +.btn-group-vertical .btn.btn-warning:focus-visible, +.btn-group .btn.btn-warning:focus, +.btn-group .btn.btn-warning:focus-visible { + background-color: var(--datacite-color-primary, #00B1E2); + border-color: var(--datacite-color-primary, #00B1E2); + color: #fff; + outline: 2px solid transparent; + box-shadow: 0 0 0 3px rgba(0, 177, 226, 0.35); +} + +.btn.btn-warning:focus i, +.btn.btn-warning:focus-visible i, +.btn-group-vertical .btn.btn-warning:focus i, +.btn-group-vertical .btn.btn-warning:focus-visible i, +.btn-group .btn.btn-warning:focus i, +.btn-group .btn.btn-warning:focus-visible i { + color: #fff; +} + +/* Keep filled submit buttons keyboard-visible */ +.btn.btn-fill:focus, +.btn.btn-fill:focus-visible { + outline: 2px solid transparent; + box-shadow: 0 0 0 3px rgba(0, 177, 226, 0.35); +} + +/* Fix low-contrast facet labels and counts */ +.panel.facets .facet-title, +.panel.facets .number, +.panel.facets .number.pull-right { + color: #50595E; +} + +.panel-body .small, +.panel-body small { + color: #50595E; +} + +.panel-body.metadata { + color: #50595E; +} + +/* Accessibility: inline warning/missing-information text */ +.icon-warning, +.small.icon-warning { + color: #7C410E; +} + +.alert-warning, .label-warning-inv { + background-color: #fff; + color: #7C410E; + border: 2px solid #7C410E; +} + +/* Accessibility: Provider page facet filter links */ +.panel.facets a, +.panel.facets a:visited { + color: #308276; +} +h2.repository, h2.work { + font-weight: 600; + color: #308276; +} +.nav-tabs-member .nav-tabs .active>a, .nav-tabs-member .nav-tabs .active>a:focus, .nav-tabs-member .nav-tabs>li>a:focus, .nav-tabs-member .nav-tabs a:focus { + color: #308276; +} + +#account_menu_link { + color: #243b54; +} + +#account_menu_link:hover, +#account_menu_link:focus { + color: #243b54; +} + +/* Consistent hover color across Bracco */ +/* Action buttons */ +.btn.btn-warning, +.btn-group-vertical .btn.btn-warning { + color: #243B54 !important; +} + +/* Hover/focus */ +.btn.btn-warning:hover, +.btn.btn-warning:focus, +.btn.btn-warning:active, +.btn-group-vertical .btn.btn-warning:hover, +.btn-group-vertical .btn.btn-warning:focus, +.btn-group-vertical .btn.btn-warning:active { + background-color: #e67e22 !important; + border-color: #e67e22 !important; + color: #FFFFFF !important; +} + +/* Accessibility: facet section headers */ +.panel.facets h4, +.facets h4 { + color: #308276 !important; +} + +/* 2. Summary count headings like “573 Members” */ +h3.member-results, +h3.provider-results, +h3.repository-results, +h3.doi-results, +h3.work-results { + color: #308276; +} + +/* 3. Facet section headings like Year joined, Region, Member Type */ +.facets h4 { + color: #308276; +} +.pagination > li:not(.active) > a, +.pagination > li:not(.active) > span { + color: #006B8F; +} + +.label-primary-inv { + color: #308276; + background-color: #fff; + border: 2px solid #308276; +} + +.panel-body h3.member { + margin-bottom: 0; + color: #308276; +} + +/* Dois info */ +.panel-transparent .panel-footer { + color: #50595E; +} + +.text-registered { color: #165783; } +.text-findable { color: #308276; } +.text-draft { color: #7C410E; } \ No newline at end of file diff --git a/app/templates/contacts/index.hbs b/app/templates/contacts/index.hbs index 40d31c205..c9dde5635 100644 --- a/app/templates/contacts/index.hbs +++ b/app/templates/contacts/index.hbs @@ -28,13 +28,14 @@ {{#each this.model.contacts.meta.roles as |role|}}
  • {{#if (eq this.model.contacts.query.role-name role.id)}} - - + + {{else}} diff --git a/app/templates/prefixes/index.hbs b/app/templates/prefixes/index.hbs index 417e29783..33e5cd86e 100644 --- a/app/templates/prefixes/index.hbs +++ b/app/templates/prefixes/index.hbs @@ -52,16 +52,21 @@ {{#each this.model.meta.states as |state|}}
  • {{#if this.model.query.state}} - - + + {{else}} - + {{/if}}
    @@ -87,12 +92,20 @@ {{#each this.model.meta.years as |year|}}
  • {{#if this.model.query.year}} - - + + {{else}} - - + + {{/if}}
    @@ -118,15 +131,20 @@ {{#each this.model.meta.providers as |provider|}}
  • {{#if this.model.query.provider-id}} - - + + {{else}} - + {{/if}}
    @@ -158,8 +176,7 @@ {{prefix.id}}
    - {{pluralize prefix.providers.length 'Member' without-count=true - }} + {{pluralize prefix.providers.length 'Member' without-count=true}}
    {{#if prefix.providers}} {{#each prefix.providers as |provider|}} diff --git a/app/templates/providers/show/contacts/index.hbs b/app/templates/providers/show/contacts/index.hbs index 38f056422..db9ef3993 100644 --- a/app/templates/providers/show/contacts/index.hbs +++ b/app/templates/providers/show/contacts/index.hbs @@ -38,6 +38,7 @@ @route="providers.show.contacts" @model={{this.model.provider.id}} @query={{hash role-name=null}} + aria-label="Clear Role filter" > @@ -47,6 +48,7 @@ @model={{this.model.provider.id}} id="role-name-{{role.id}}" @query={{hash role-name=role.id}} + aria-label="Filter contacts by Role {{role.title}}" > diff --git a/app/templates/providers/show/prefixes/index.hbs b/app/templates/providers/show/prefixes/index.hbs index 3a26771e1..ebd09eeaa 100644 --- a/app/templates/providers/show/prefixes/index.hbs +++ b/app/templates/providers/show/prefixes/index.hbs @@ -65,15 +65,17 @@ - + {{else}} - + {{/if}}
    @@ -102,15 +104,17 @@ - + {{else}} - + {{/if}}
    @@ -139,8 +143,9 @@ - + {{else}} - + {{/if}}
    diff --git a/vendor/datacite-styles/doi/globals/_colors.scss b/vendor/datacite-styles/doi/globals/_colors.scss index 65de25f34..fe32f912e 100644 --- a/vendor/datacite-styles/doi/globals/_colors.scss +++ b/vendor/datacite-styles/doi/globals/_colors.scss @@ -102,7 +102,7 @@ category: Globals */ -$turquoise: #1abc9c; +$turquoise: #308276; $emerald: #2ecc71; $peter-river: #3498db; $amethyst: #9b59b6; From 0cd7842c5425413314531b8c585b6cd56fa81f74 Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Mon, 27 Jul 2026 12:19:03 +0530 Subject: [PATCH 02/11] Fix accessibility issues --- app/components/doi-list.hbs | 2 +- app/routes/change.js | 3 +++ app/routes/edit.js | 3 +++ app/templates/contacts/index.hbs | 4 ++-- cypress/e2e/organization_admin/repositories.test.ts | 4 +++- cypress/e2e/organization_admin/settings.test.ts | 4 +++- cypress/e2e/staff_admin/contact.test.ts | 4 +++- cypress/support/commands.js | 9 ++++++--- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/components/doi-list.hbs b/app/components/doi-list.hbs index c4360d0b6..cec826935 100644 --- a/app/components/doi-list.hbs +++ b/app/components/doi-list.hbs @@ -672,7 +672,7 @@ diff --git a/app/routes/change.js b/app/routes/change.js index 8f78846cb..66ad40fc9 100644 --- a/app/routes/change.js +++ b/app/routes/change.js @@ -10,6 +10,9 @@ export default class ChangeRoute extends Route { @service router; + @service + flashMessages; + @service store; diff --git a/app/routes/edit.js b/app/routes/edit.js index 06de24c3d..a9c03ce65 100644 --- a/app/routes/edit.js +++ b/app/routes/edit.js @@ -10,6 +10,9 @@ export default class EditRoute extends Route { @service router; + @service + flashMessages; + @service store; diff --git a/app/templates/contacts/index.hbs b/app/templates/contacts/index.hbs index c9dde5635..ad0101f02 100644 --- a/app/templates/contacts/index.hbs +++ b/app/templates/contacts/index.hbs @@ -28,7 +28,7 @@ {{#each this.model.contacts.meta.roles as |role|}}
  • {{#if (eq this.model.contacts.query.role-name role.id)}} - + {{else}} @@ -38,7 +38,7 @@ aria-label="Filter contacts by role {{role.title}}" id="role-name-{{role.id}}" > - + {{/if}}
    diff --git a/cypress/e2e/organization_admin/repositories.test.ts b/cypress/e2e/organization_admin/repositories.test.ts index fd406d333..747d14e0b 100644 --- a/cypress/e2e/organization_admin/repositories.test.ts +++ b/cypress/e2e/organization_admin/repositories.test.ts @@ -41,7 +41,9 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | REPOSITORIES', () => { after(() => { cy.getCookie('_jwt').then((cookie) => { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + if (cookie) { + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + } }) cy.clearAllSessionStorage() }) diff --git a/cypress/e2e/organization_admin/settings.test.ts b/cypress/e2e/organization_admin/settings.test.ts index 805652d90..ad0eaa8a4 100644 --- a/cypress/e2e/organization_admin/settings.test.ts +++ b/cypress/e2e/organization_admin/settings.test.ts @@ -36,7 +36,9 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | SETTINGS', () => { after(() => { cy.getCookie('_jwt').then((cookie) => { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + if (cookie) { + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + } }) cy.clearAllSessionStorage() }) diff --git a/cypress/e2e/staff_admin/contact.test.ts b/cypress/e2e/staff_admin/contact.test.ts index c8a504fd1..549e89331 100644 --- a/cypress/e2e/staff_admin/contact.test.ts +++ b/cypress/e2e/staff_admin/contact.test.ts @@ -37,7 +37,9 @@ describe('ACCEPTANCE: STAFF_ADMIN | CONTACTS', () => { after(() => { cy.wait(waitTime3); cy.getCookie('_jwt').then((cookie) => { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + if (cookie) { + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) + } }) cy.clearAllSessionStorage() }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 0a4353b77..06a7ebb61 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -71,7 +71,7 @@ Cypress.Commands.add('login', (username, password) => { }); }, { - //cacheAcrossSpecs: true, + cacheAcrossSpecs: true, }); }); @@ -292,9 +292,12 @@ Cypress.Commands.add("deleteProviderTestContacts", (provider, test_contact_famil headers: { authorization: 'Bearer ' + jwt, }, - failOnStatusCode: true, + failOnStatusCode: false, }).then((response) => { - expect(response.status).to.eq(200) + if (response.status !== 200) { + cy.log('Could not fetch contacts for cleanup, status: ' + response.status); + return; + } const deleteContactsByIds = async (contact_ids) => { const requests = contact_ids.map(contact_id => From 1d74200c0eceaae982b664f88899263859e80732 Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Mon, 27 Jul 2026 12:50:30 +0530 Subject: [PATCH 03/11] removed cypress changes --- app/routes/change.js | 3 --- app/routes/edit.js | 3 --- cypress/e2e/organization_admin/repositories.test.ts | 4 +--- cypress/e2e/organization_admin/settings.test.ts | 4 +--- cypress/e2e/staff_admin/contact.test.ts | 4 +--- cypress/support/commands.js | 9 +++------ 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/app/routes/change.js b/app/routes/change.js index 66ad40fc9..8f78846cb 100644 --- a/app/routes/change.js +++ b/app/routes/change.js @@ -10,9 +10,6 @@ export default class ChangeRoute extends Route { @service router; - @service - flashMessages; - @service store; diff --git a/app/routes/edit.js b/app/routes/edit.js index a9c03ce65..06de24c3d 100644 --- a/app/routes/edit.js +++ b/app/routes/edit.js @@ -10,9 +10,6 @@ export default class EditRoute extends Route { @service router; - @service - flashMessages; - @service store; diff --git a/cypress/e2e/organization_admin/repositories.test.ts b/cypress/e2e/organization_admin/repositories.test.ts index 747d14e0b..fd406d333 100644 --- a/cypress/e2e/organization_admin/repositories.test.ts +++ b/cypress/e2e/organization_admin/repositories.test.ts @@ -41,9 +41,7 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | REPOSITORIES', () => { after(() => { cy.getCookie('_jwt').then((cookie) => { - if (cookie) { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) - } + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) }) cy.clearAllSessionStorage() }) diff --git a/cypress/e2e/organization_admin/settings.test.ts b/cypress/e2e/organization_admin/settings.test.ts index ad0eaa8a4..805652d90 100644 --- a/cypress/e2e/organization_admin/settings.test.ts +++ b/cypress/e2e/organization_admin/settings.test.ts @@ -36,9 +36,7 @@ describe('ACCEPTANCE: ORGANIZATION_ADMIN | SETTINGS', () => { after(() => { cy.getCookie('_jwt').then((cookie) => { - if (cookie) { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) - } + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) }) cy.clearAllSessionStorage() }) diff --git a/cypress/e2e/staff_admin/contact.test.ts b/cypress/e2e/staff_admin/contact.test.ts index 549e89331..c8a504fd1 100644 --- a/cypress/e2e/staff_admin/contact.test.ts +++ b/cypress/e2e/staff_admin/contact.test.ts @@ -37,9 +37,7 @@ describe('ACCEPTANCE: STAFF_ADMIN | CONTACTS', () => { after(() => { cy.wait(waitTime3); cy.getCookie('_jwt').then((cookie) => { - if (cookie) { - cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) - } + cy.deleteProviderTestContacts(provider_id, test_contact_family_name_prefix, Cypress.env('api_url'), cookie.value) }) cy.clearAllSessionStorage() }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 06a7ebb61..0a4353b77 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -71,7 +71,7 @@ Cypress.Commands.add('login', (username, password) => { }); }, { - cacheAcrossSpecs: true, + //cacheAcrossSpecs: true, }); }); @@ -292,12 +292,9 @@ Cypress.Commands.add("deleteProviderTestContacts", (provider, test_contact_famil headers: { authorization: 'Bearer ' + jwt, }, - failOnStatusCode: false, + failOnStatusCode: true, }).then((response) => { - if (response.status !== 200) { - cy.log('Could not fetch contacts for cleanup, status: ' + response.status); - return; - } + expect(response.status).to.eq(200) const deleteContactsByIds = async (contact_ids) => { const requests = contact_ids.map(contact_id => From 9cf59a1cec098a715696e144a740f5f922d4f7f7 Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Thu, 30 Jul 2026 20:04:56 +0530 Subject: [PATCH 04/11] Fixed the review comments in the Vercel --- app/components/doi-list.hbs | 2 + app/components/repository-dois-transfer.hbs | 2 +- app/components/repository-list.hbs | 2 +- app/styles/local.css | 131 ++++++++++++------ app/templates/dois/show/edit.hbs | 24 ++-- app/templates/repositories/show/index.hbs | 2 +- .../repositories/show/prefixes/index.hbs | 2 +- app/templates/repositories/show/settings.hbs | 2 +- 8 files changed, 108 insertions(+), 59 deletions(-) diff --git a/app/components/doi-list.hbs b/app/components/doi-list.hbs index cec826935..50d2374bd 100644 --- a/app/components/doi-list.hbs +++ b/app/components/doi-list.hbs @@ -1,3 +1,4 @@ +
    {{#unless (and (can 'create doi' this.model) (can 'upload doi' this.model))}}
    @@ -750,4 +751,5 @@ No DOIs found. {{/if}} +
    \ No newline at end of file diff --git a/app/components/repository-dois-transfer.hbs b/app/components/repository-dois-transfer.hbs index 3638e8156..c689b6048 100644 --- a/app/components/repository-dois-transfer.hbs +++ b/app/components/repository-dois-transfer.hbs @@ -1,6 +1,6 @@
    -

    Transfer DOIs

    +

    Transfer DOIs

    diff --git a/app/components/repository-list.hbs b/app/components/repository-list.hbs index 752ba52c3..402030eed 100644 --- a/app/components/repository-list.hbs +++ b/app/components/repository-list.hbs @@ -1,4 +1,4 @@ -
    +
    {{#if diff --git a/app/styles/local.css b/app/styles/local.css index 9dc3f1a3c..30e73bbbc 100755 --- a/app/styles/local.css +++ b/app/styles/local.css @@ -19,7 +19,7 @@ z-index: 10000; .create-doi-button .dropdown-menu.show a { display: block; - color: #88939a !important; + color: #50595E !important; width: 100%; font-size: 16px !important; padding: 6px 15px; @@ -187,17 +187,17 @@ div[doi-format].power-select-fragment .ember-basic-dropdown-trigger div.ember-vi } .form-group .help-block.success { - color: #2ecc71; + color: #308276; } .form-group input.is-valid, .form-group select.is-valid { - color: #2ecc71; - border-color: #2ecc71; + color: #308276; + border-color: #308276; } /* Fragile - next sibiling */ .form-group input.is-valid + div.form-text{ - color: #2ecc71; + color: #308276; } #doi-edit-form div#doi, #doi-modify-form-file-upload div#doi { @@ -222,29 +222,29 @@ div[doi-format].power-select-fragment .ember-basic-dropdown-trigger div.ember-vi .form-group.has-success.has-feedback .form-text { - color: #2ecc71; + color: #308276; } .form-group.has-success.has-feedback .ember-basic-dropdown-trigger { - color: #2ecc71; - border-color: #2ecc71; + color: #308276; + border-color: #308276; } lock { - color: #2ecc71; + color: #308276; } /* Resource type general validation */ .is-valid .ember-basic-dropdown-trigger { - color: #2ecc71; - border-color: #2ecc71; + color: #308276; + border-color: #308276; } .is-valid .form-text { - color: #2ecc71; - border-color: #2ecc71; + color: #308276; + border-color: #308276; } /* Fix a slight spacing problem - text inputs - doi forms - version. */ @@ -275,13 +275,13 @@ lock { } .form-control.is-valid { - border-color: #2ecc71; - color: #2ecc71; + border-color: #308276; + color: #308276; } .form-control.is-valid ~ .form-text { - border-color: #2ecc71; - color: #2ecc71; + border-color: #308276; + color: #308276; } .form-control.is-invalid { @@ -554,15 +554,15 @@ div[doi-publisher] > div { } .form-group input.is-valid + div.form-text { - color: #2ecc71; + color: #308276; } /* VALIDATION - text areas (Mostly in doi form upload.) */ .form-group.has-feedback textarea.form-control { - color: #2ecc71; - border-color: #2ecc71; + color: #308276; + border-color: #308276; } .form-group.has-error textarea.form-control @@ -599,15 +599,11 @@ div[doi-publisher] > div { /* Accessible inline links in content only */ main a:not(.btn):not(.navbar-brand):not(.nav-link), .wrapper a:not(.btn):not(.navbar-brand):not(.nav-link) { - color: #006b8f; - text-underline-offset: 0.1em; + color: #243b54; } -main a:not(.btn):not(.navbar-brand):not(.nav-link):hover, -main a:not(.btn):not(.navbar-brand):not(.nav-link):focus, -.wrapper a:not(.btn):not(.navbar-brand):not(.nav-link):hover, -.wrapper a:not(.btn):not(.navbar-brand):not(.nav-link):focus { - color: #004766; +.sidebar-list-page a:not(.btn):not(.navbar-brand):not(.nav-link) { + color: #50595E; } .about-title { @@ -687,7 +683,7 @@ main a:not(.btn):not(.navbar-brand):not(.nav-link):focus, font-size: 24px; } -/* Accessibility: warning action buttons + sidebar facet contrast */ +/* Accessibility */ /* Match Commons/Akita hover/focus behavior for warning buttons */ .btn.btn-warning, @@ -774,10 +770,7 @@ main a:not(.btn):not(.navbar-brand):not(.nav-link):focus, } /* Accessibility: Provider page facet filter links */ -.panel.facets a, -.panel.facets a:visited { - color: #308276; -} + h2.repository, h2.work { font-weight: 600; color: #308276; @@ -795,13 +788,6 @@ h2.repository, h2.work { color: #243b54; } -/* Consistent hover color across Bracco */ -/* Action buttons */ -.btn.btn-warning, -.btn-group-vertical .btn.btn-warning { - color: #243B54 !important; -} - /* Hover/focus */ .btn.btn-warning:hover, .btn.btn-warning:focus, @@ -809,8 +795,8 @@ h2.repository, h2.work { .btn-group-vertical .btn.btn-warning:hover, .btn-group-vertical .btn.btn-warning:focus, .btn-group-vertical .btn.btn-warning:active { - background-color: #e67e22 !important; - border-color: #e67e22 !important; + background-color: #85460F !important; + border-color: #85460F !important; color: #FFFFFF !important; } @@ -856,4 +842,65 @@ h3.work-results { .text-registered { color: #165783; } .text-findable { color: #308276; } -.text-draft { color: #7C410E; } \ No newline at end of file +.text-draft { color: #7C410E; } + +.panel-body h3.help-header, .panel-body h3.edit, .panel-body h3.edit { + color: #308276 !important; +} + +.btn-warning, .navbar .navbar-nav>li>a.btn-warning { + border-color: #85460F; + color: #85460F; +} + +.btn-warning .caret, .navbar .navbar-nav>li>a.btn-warning .caret{ border-top-color: #85460F;} + +.transfer-dois-heading { + color: #308276; +} + +.label-vertical { + color: #50595E; +} + +/* Search button only */ +#search .btn-primary { + border-color: #308276; + color: #308276; +} + +/* Hover, focus, active */ +#search .btn-primary:hover, +#search .btn-primary:focus, +#search .btn-primary:active, +#search .btn-primary.active { + background-color: #308276; + border-color: #308276; + color: #fff; +} + +.alert-danger { + background-color: #fff; + color: #A82315; + border: 2px solid #A82315; +} +/* Accessibility: Improve contrast of Registered DOI state badge */ +.metadata .state .label-info { + background-color: #185D8B; + border-color: #185D8B; + color: #fff; +} + +/* Accessibility: Improve contrast of Draft DOI state badge */ +.metadata .state .label-warning { + background-color: #85460F; + border-color: #85460F; + color: #fff; +} + +/* Accessibility: Improve contrast of Findable DOI state badge */ +.metadata .state .label-primary { + background-color: #308276; + border-color: #308276; + color: #fff; +} \ No newline at end of file diff --git a/app/templates/dois/show/edit.hbs b/app/templates/dois/show/edit.hbs index a1428daf6..c76cb2add 100644 --- a/app/templates/dois/show/edit.hbs +++ b/app/templates/dois/show/edit.hbs @@ -15,11 +15,11 @@

    Required Properties

    - +
    The globally unique string that identifies the resource and can't be changed.
    - - + +
    @@ -27,11 +27,11 @@
    - +
    The location of the landing page with more information about the resource.
    - - + +
    Should be a https URL — within the allowed domain(s) of your repository if domain restrictions are enabled in the repository settings. Http and ftp are also supported. For example http://example.org
    @@ -42,11 +42,11 @@
    - +
    The year when the resource was or will be made publicly available.
    - - + +
    Must be a year between 1000 and {{current-year this.model.maxMintFutureOffset}}.
    @@ -74,11 +74,11 @@
    - +
    The version number of the resource.
    - - + +
    diff --git a/app/templates/repositories/show/index.hbs b/app/templates/repositories/show/index.hbs index 7017f9fae..e26ae1527 100644 --- a/app/templates/repositories/show/index.hbs +++ b/app/templates/repositories/show/index.hbs @@ -1,4 +1,4 @@ -
    +
    {{#if (and this.model.isActive (can 'update repository' this.model) (or (can 'create doi' this.model) (can 'upload doi' this.model)) (not (gt this.model.meta.prefixCount 0)))}}
    diff --git a/app/templates/repositories/show/prefixes/index.hbs b/app/templates/repositories/show/prefixes/index.hbs index e978a8462..c27b89c4f 100644 --- a/app/templates/repositories/show/prefixes/index.hbs +++ b/app/templates/repositories/show/prefixes/index.hbs @@ -1,4 +1,4 @@ -
    +
    {{#if (and this.model.repository.isActive (or (can 'create doi' this.model) (can 'upload doi' this.model)) (not (gt this.model.repository-prefixes.length 0)))}}
    diff --git a/app/templates/repositories/show/settings.hbs b/app/templates/repositories/show/settings.hbs index ddedd16bb..0f1bc1cb7 100644 --- a/app/templates/repositories/show/settings.hbs +++ b/app/templates/repositories/show/settings.hbs @@ -1,4 +1,4 @@ -
    +
    {{#if (not (can 'update repository' this.model))}} {{#if (and this.model.isActive (or (can 'create doi' this.model) (can 'upload doi' this.model)))}} From 0f6052a0f5e9d50c098f1b608b1991ccfe75b93c Mon Sep 17 00:00:00 2001 From: Ashwini Sukale Date: Thu, 30 Jul 2026 20:25:18 +0530 Subject: [PATCH 05/11] Pagination bar color and DOI title color and side bar color fixed --- app/styles/local.css | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/app/styles/local.css b/app/styles/local.css index 30e73bbbc..8b831eb5a 100755 --- a/app/styles/local.css +++ b/app/styles/local.css @@ -599,11 +599,17 @@ div[doi-publisher] > div { /* Accessible inline links in content only */ main a:not(.btn):not(.navbar-brand):not(.nav-link), .wrapper a:not(.btn):not(.navbar-brand):not(.nav-link) { - color: #243b54; + color: #006B8F; } -.sidebar-list-page a:not(.btn):not(.navbar-brand):not(.nav-link) { - color: #50595E; +main a:not(.btn):not(.navbar-brand):not(.nav-link), +.wrapper a:not(.btn):not(.navbar-brand):not(.nav-link) { + color: #006B8F; +} + +.sidebar-list-page .facets a:not(.btn):not(.navbar-brand):not(.nav-link), +.sidebar-list-page .help-block a:not(.btn):not(.navbar-brand):not(.nav-link) { + color: #50595E; } .about-title { @@ -903,4 +909,19 @@ h3.work-results { background-color: #308276; border-color: #308276; color: #fff; -} \ No newline at end of file +} + +/* Accessibility: Improve contrast for pagination controls */ +.pagination > li.active > a, +.pagination > li.active > a:focus, +.pagination > li.active > a:hover, +.pagination > li.active > span, +.pagination > li.active > span:focus, +.pagination > li.active > span:hover, +.pagination > li > a:hover, +.pagination > li > a:focus { + background-color: #85460F; + border-color: #85460F; + color: #fff !important; +} + From b0555cb39606162de9d33ee6f91e612ddc53d367 Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Wed, 24 Jun 2026 10:46:53 -0400 Subject: [PATCH 06/11] Add consortium admin to abilities calculation for 'create' --- app/abilities/provider.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/abilities/provider.js b/app/abilities/provider.js index 55e1e3a47..8388de642 100644 --- a/app/abilities/provider.js +++ b/app/abilities/provider.js @@ -13,6 +13,11 @@ export default class Provider extends Ability { switch (this.get('currentUser.role_id')) { case 'staff_admin': return true; + case 'consortium_admin': + return ( + this.get('currentUser.provider_id') === + this.get('model.consortium.id') + ); default: return false; } From b368b18169689064102acfc877105b5094cd2640 Mon Sep 17 00:00:00 2001 From: Suzanne Vogt Date: Wed, 24 Jun 2026 16:45:45 -0400 Subject: [PATCH 07/11] Add tax status to edit form for consortium_admin. Remove abilities create/delete for consortium_admin. --- app/abilities/provider.js | 10 ---------- app/templates/providers/show/edit.hbs | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/abilities/provider.js b/app/abilities/provider.js index 8388de642..e2e1e716e 100644 --- a/app/abilities/provider.js +++ b/app/abilities/provider.js @@ -13,11 +13,6 @@ export default class Provider extends Ability { switch (this.get('currentUser.role_id')) { case 'staff_admin': return true; - case 'consortium_admin': - return ( - this.get('currentUser.provider_id') === - this.get('model.consortium.id') - ); default: return false; } @@ -28,11 +23,6 @@ export default class Provider extends Ability { switch (this.get('currentUser.role_id')) { case 'staff_admin': return true; - case 'consortium_admin': - return ( - this.get('currentUser.provider_id') === - this.get('model.consortium.id') - ); default: return false; } diff --git a/app/templates/providers/show/edit.hbs b/app/templates/providers/show/edit.hbs index df3143ada..d193430da 100644 --- a/app/templates/providers/show/edit.hbs +++ b/app/templates/providers/show/edit.hbs @@ -138,6 +138,27 @@ {{/if}} {{/if}} + {{#if (eq this.model.memberType 'consortium')}} + + + {{titleize item}} + + + {{/if}} Date: Thu, 25 Jun 2026 14:02:43 -0400 Subject: [PATCH 08/11] tax status field. --- app/abilities/provider.js | 2 ++ app/routes/providers/show/edit.js | 1 + app/templates/providers/show/edit.hbs | 37 ++++++++++++--------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/abilities/provider.js b/app/abilities/provider.js index e2e1e716e..7d1997a2e 100644 --- a/app/abilities/provider.js +++ b/app/abilities/provider.js @@ -13,6 +13,8 @@ export default class Provider extends Ability { switch (this.get('currentUser.role_id')) { case 'staff_admin': return true; + case 'consortium_admin': + return true; default: return false; } diff --git a/app/routes/providers/show/edit.js b/app/routes/providers/show/edit.js index 79c30e055..8a97c9bd4 100644 --- a/app/routes/providers/show/edit.js +++ b/app/routes/providers/show/edit.js @@ -22,6 +22,7 @@ export default class EditRoute extends Route { return contact.deleted === null; }) provider.set('filteredContacts', filteredContacts) + provider.set("consortium_id", this.modelFor('providers/show').get('consortium.id')); return provider; } diff --git a/app/templates/providers/show/edit.hbs b/app/templates/providers/show/edit.hbs index d193430da..fd5380eed 100644 --- a/app/templates/providers/show/edit.hbs +++ b/app/templates/providers/show/edit.hbs @@ -96,6 +96,19 @@ {{titleize (humanize item)}} + {{/if}} + {{#if (or + (can 'create provider') + (and + (or (eq this.model.memberType 'consortium') + (and + (eq this.model.memberType 'consortium_organization') + (eq this.model.consortium_id this.model.consortium.id) + ) + ) + ) + ) + }} + {{/if}} + {{#if (can 'create provider')}} {{#if (eq this.model.memberType 'consortium_organization')}} {{/if}} {{/if}} - {{#if (eq this.model.memberType 'consortium')}} - - - {{titleize item}} - - - {{/if}} + Date: Wed, 8 Jul 2026 15:58:36 -0400 Subject: [PATCH 09/11] Hide salesforce field from consortium admin on create/update organization. Move tax status field to below country field on create/update organization --- app/abilities/provider.js | 10 +++ app/templates/providers/show/edit.hbs | 66 +++++++++---------- .../providers/show/organizations/new.hbs | 44 ++++++------- 3 files changed, 65 insertions(+), 55 deletions(-) diff --git a/app/abilities/provider.js b/app/abilities/provider.js index 7d1997a2e..6f34ca5f9 100644 --- a/app/abilities/provider.js +++ b/app/abilities/provider.js @@ -20,6 +20,16 @@ export default class Provider extends Ability { } } + @computed('currentUser.role_id', 'model.{id,provider_id}') + get canEditSalesforceField() { + switch (this.get('currentUser.role_id')) { + case 'staff_admin': + return true; + default: + return false; + } + } + @computed('currentUser.{role_id,provider_id}', 'model.consortium.id') get canDelete() { switch (this.get('currentUser.role_id')) { diff --git a/app/templates/providers/show/edit.hbs b/app/templates/providers/show/edit.hbs index fd5380eed..45aff7055 100644 --- a/app/templates/providers/show/edit.hbs +++ b/app/templates/providers/show/edit.hbs @@ -55,7 +55,7 @@ {{if item.name item.name this.model.rorId}} - {{#if (can 'create provider')}} + {{#if (can 'editSalesforceField provider')}} {{/if}} - {{#if (or - (can 'create provider') - (and - (or (eq this.model.memberType 'consortium') - (and - (eq this.model.memberType 'consortium_organization') - (eq this.model.consortium_id this.model.consortium.id) - ) - ) - ) - ) - }} - - - {{titleize item}} - - - {{/if}} {{#if (can 'create provider')}} {{#if (eq this.model.memberType 'consortium_organization')}} + {{#if (or + (can 'create provider') + (and + (or (eq this.model.memberType 'consortium') + (and + (eq this.model.memberType 'consortium_organization') + (eq this.model.consortium_id this.model.consortium.id) + ) + ) + ) + ) + }} + + + {{titleize item}} + + + {{/if}} - {{#if (can 'create provider')}} + {{#if (can 'editSalesforceField provider')}} {{/if}} - {{#if (can 'create provider')}} - - - {{titleize item}} - - - {{/if}} + {{#if (can 'create provider')}} + + + {{titleize item}} + + + {{/if}} Date: Wed, 8 Jul 2026 16:53:33 -0400 Subject: [PATCH 10/11] Fix tax status to be below country for admin. --- app/templates/providers/new.hbs | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/templates/providers/new.hbs b/app/templates/providers/new.hbs index 506f11c4e..567b4b37f 100644 --- a/app/templates/providers/new.hbs +++ b/app/templates/providers/new.hbs @@ -109,25 +109,6 @@ {{titleize (humanize item)}} - - - {{titleize item}} - - {{#if (eq this.model.memberType 'consortium_organization')}} + + + {{titleize item}} + + Date: Thu, 9 Jul 2026 11:13:15 -0400 Subject: [PATCH 11/11] Fix consortium type and member fields to not show up in consortium forms. --- app/abilities/provider.js | 52 +++++++++++++++++++++------ app/templates/providers/show/edit.hbs | 7 ++-- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/abilities/provider.js b/app/abilities/provider.js index 6f34ca5f9..d986fda9c 100644 --- a/app/abilities/provider.js +++ b/app/abilities/provider.js @@ -20,16 +20,6 @@ export default class Provider extends Ability { } } - @computed('currentUser.role_id', 'model.{id,provider_id}') - get canEditSalesforceField() { - switch (this.get('currentUser.role_id')) { - case 'staff_admin': - return true; - default: - return false; - } - } - @computed('currentUser.{role_id,provider_id}', 'model.consortium.id') get canDelete() { switch (this.get('currentUser.role_id')) { @@ -90,4 +80,44 @@ export default class Provider extends Ability { return false; } } -} + + @computed('currentUser.role_id', 'model.{id,provider_id}') + get canEditSalesforceField() { + switch (this.get('currentUser.role_id')) { + case 'staff_admin': + return true; + default: + return false; + } + } + + @computed('currentUser.role_id', 'model.{id,provider_id}') + get canEditMemberTypeField() { + switch (this.get('currentUser.role_id')) { + case 'staff_admin': + return true; + default: + return false; + } + } + + @computed('currentUser.role_id', 'model.{id,provider_id}') + get canEditConsortiumField() { + switch (this.get('currentUser.role_id')) { + case 'staff_admin': + return true; + default: + return false; + } + } + + @computed('currentUser.role_id', 'model.{id,provider_id}') + get canEditActiveField() { + switch (this.get('currentUser.role_id')) { + case 'staff_admin': + return true; + default: + return false; + } + } +} \ No newline at end of file diff --git a/app/templates/providers/show/edit.hbs b/app/templates/providers/show/edit.hbs index 45aff7055..571139c8b 100644 --- a/app/templates/providers/show/edit.hbs +++ b/app/templates/providers/show/edit.hbs @@ -75,7 +75,7 @@ @helpText="The Globus UUID used for token authentication." /> {{/if}} - {{#if (can 'create provider')}} + {{#if (can 'editMemberTypeField provider')}} {{/if}} - {{#if (can 'create provider')}} + {{#if (can 'editConsortiumField provider')}} {{#if (eq this.model.memberType 'consortium_organization')}} {{/if}} {{/if}} - {{/if}} {{/if}} - {{#if (can 'create provider')}} + {{#if (can 'editActiveField provider')}}