Merge pull request #9040 from stopfstedt/6781_translate_ics_instructions

use translatable text for ICS copy button

Author: dartajax

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/copy-button.js

@@ -1,7 +1,8 @@
-import { create } from 'ember-cli-page-object';
+import { attribute, create } from 'ember-cli-page-object';
 
 const definition = {
   scope: '[data-test-copy-button]',
+  ariaLabel: attribute('aria-label'),
 };
 
 export default definition;

packages/ilios-common/addon-test-support/ilios-common/page-objects/components/dashboard/navigation.js

@@ -1,4 +1,5 @@
 import { attribute, create, hasClass } from 'ember-cli-page-object';
+import icsFeed from './../ics-feed';
 
 const definition = {
   scope: '[data-test-dashboard-navigation]',
@@ -17,6 +18,7 @@ const definition = {
     linkTarget: attribute('href'),
     isActive: hasClass('active'),
   },
+  icsFeed,
 };
 
 export default definition;

packages/ilios-common/addon/components/dashboard/navigation.gjs

@@ -9,6 +9,7 @@ import IcsFeed from 'ilios-common/components/ics-feed';
 export default class NavigationComponent extends Component {
   @service currentUser;
   @service iliosConfig;
+  @service intl;
 
   @tracked icsFeedUrl;
   @tracked icsInstructions;
@@ -25,7 +26,6 @@ export default class NavigationComponent extends Component {
     const loc = window.location.protocol + '//' + window.location.hostname;
     const server = apiHost ? apiHost : loc;
     this.icsFeedUrl = server + '/ics/' + icsFeedKey;
-    this.icsInstructions = 'Copy My ICS Link';
   });
   <template>
     <nav
@@ -64,7 +64,7 @@ export default class NavigationComponent extends Component {
           >
             {{t "general.calendar"}}
           </LinkTo>
-          <IcsFeed @url={{this.icsFeedUrl}} @instructions={{this.icsInstructions}} />
+          <IcsFeed @url={{this.icsFeedUrl}} />
         </li>
       </ul>
     </nav>

packages/ilios-common/addon/components/ics-feed.gjs

@@ -45,7 +45,7 @@ export default class IcsFeedComponent extends Component {
       <CopyButton
         @getClipboardText={{this.getIcsFeedUrl}}
         @success={{perform this.textCopied}}
-        aria-label={{if @instructions @instructions (t "general.copyIcsFeedUrl")}}
+        aria-label={{t "general.copyIcsFeedUrl"}}
         class="link-button highlight"
         id={{this.copyButtonId}}
         {{mouseHoverToggle (set this "showTooltip")}}

…tion/components/dashboard/navigation.gjs …components/dashboard/navigation-test.gjspackages/test-app/tests/integration/components/dashboard/navigation.gjs renamed to packages/test-app/tests/integration/components/dashboard/navigation-test.gjs packages/test-app/tests/integration/components/dashboard/navigation.gjs renamed to packages/test-app/tests/integration/components/dashboard/navigation-test.gjs

@@ -1,12 +1,31 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'test-app/tests/helpers';
+import { setupMirage } from 'test-app/tests/test-support/mirage';
 import { render } from '@ember/test-helpers';
 import { component } from 'ilios-common/page-objects/components/dashboard/navigation';
 import { a11yAudit } from 'ember-a11y-testing/test-support';
 import Navigation from 'ilios-common/components/dashboard/navigation';
+import Service from '@ember/service';
 
 module('Integration | Component | dashboard/navigation', function (hooks) {
   setupRenderingTest(hooks);
+  setupMirage(hooks);
+
+  hooks.beforeEach(async function () {
+    const user = this.server.create('user', {
+      id: 13,
+      icsFeedKey: 'testkey',
+    });
+    const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
+
+    class CurrentUserMock extends Service {
+      async getModel() {
+        return userModel;
+      }
+    }
+
+    this.owner.register('service:current-user', CurrentUserMock);
+  });
 
   test('it renders and is accessible', async function (assert) {
     await render(<template><Navigation /></template>);
@@ -16,6 +35,7 @@ module('Integration | Component | dashboard/navigation', function (hooks) {
     assert.strictEqual(component.materials.linkTarget, '/dashboard/materials');
     assert.strictEqual(component.week.text, 'Week at a Glance');
     assert.strictEqual(component.week.linkTarget, '/dashboard/week');
+    assert.strictEqual(component.icsFeed.copy.ariaLabel, 'Copy My ICS Link');
     await a11yAudit(this.element);
     assert.ok(true, 'no a11y errors found!');
   });