[ENG-4005][ENG-4006][ENG-4014] ember-source.deprecation-without-for/since and Fontawesome (#1652)

brianjgeiger · web-flow · commit c867b98ad74b · 2022-09-12T10:32:15.000-04:00
- Tickets: - [ENG-4005] - [ENG-4006] - [ENG-4014] ## Purpose Turn off some deprecation warning silencing and fix the related deprecations. The two major deprecation warnings are `ember-source.deprecation-without-for` and `ember-source.deprecation-without-since`, which affect other deprecation warnings from addons. The addons affected were ember-fontawesome and ember-composable-helpers, so I've fixed those deprecations while I was here. This also fixes resolution of `@embroider/macros` to 1.0.0 because just about every addon we update wants to use a newer version of `ember-get-config` that updates `@embroider/macros` to a version that conflicts with engines. So far, fixing the resolution is working fine, so hopefully that trend will continue as we do more deprecation fixing. ## Summary of Changes 1. Turn on deprecation warnings for `ember-source.deprecation-without-for`, `ember-source.deprecation-without-since`, and `@fortawesome/ember-fontawesome.no-positional-params` 2. Fix problem icons 3. Use `includes` instead of `contains` 4. Upgrade Fontawesome 5. Fix resolution of `@embroider/macros` to 1.0.0 so it won't conflict with engines 6. Update caniuse-lite database ## Side Effects The FontAwesome upgrade will cause improperly called icons to not display. All of the normal invocations have been caught, but if you look at [lib/registries/addon/components/registries-navbar/template.hbs](https://github.com/CenterForOpenScience/ember-osf-web/compare/develop...brianjgeiger:feature/ember-source.deprecation-without-for?expand=1#diff-0ce0e492c8262f290e43171d03065b878c2d088fc69a8ea6525fcf57f462a02f) you'll see someone was getting clever with their invocation of FaIcon which made it hard to find. Hopefully there aren't any more of those, but if there are, you'll see a warning in the JS Console that the icon with name of `null` couldn't be found. ## QA Notes The biggest change was the icons, and hoooopefully Percy will pick up most of those.
diff --git a/app/guid-node/forks/template.hbs b/app/guid-node/forks/template.hbs
@@ -18,7 +18,7 @@
                 class='close'
                 @onClick={{action (mut this.newModal) false}}
             >
-                {{fa-icon 'times' size='sm'}}
+                <FaIcon @icon='times' @size='sm' />
             </BsButton>
             <h3>{{t 'forks.create_fork_modal'}}</h3>
         </modal.body>
@@ -56,7 +56,7 @@
             @route='guid-node.analytics'
             @models={{array this.model.guid}}
         >
-            {{fa-icon 'arrow-left'}} {{t 'forks.back'}}
+            <FaIcon @icon='arrow-left' /> {{t 'forks.back'}}
         </OsfLink>
         <p
             data-test-forks-info
diff --git a/app/guid-node/registrations/template.hbs b/app/guid-node/registrations/template.hbs
@@ -130,7 +130,7 @@
                                                 <div>
                                                     {{schema.name}}
                                                     <span>
-                                                        {{fa-icon 'info-circle'}}
+                                                        <FaIcon @icon='info-circle' />
                                                         <BsTooltip>
                                                             {{schema.schema.description}}
                                                         </BsTooltip>
diff --git a/app/guid-registration/forks/template.hbs b/app/guid-registration/forks/template.hbs
@@ -22,7 +22,7 @@
                 class='close'
                 @onClick={{action this.closeNewModal}}
             >
-                {{fa-icon 'times' size='sm'}}
+                <FaIcon @icon='times' @size='sm' />
             </BsButton>
             <h3>{{t 'forks.create_fork_modal'}}</h3>
         </modal.body>
@@ -61,7 +61,7 @@
             @route='guid-registration.analytics'
             @models={{array this.model.guid}}
         >
-            {{fa-icon 'arrow-left'}} {{t 'forks.back'}}
+            <FaIcon @icon='arrow-left' /> {{t 'forks.back'}}
         </OsfLink>
         <p
             data-test-forks-info
diff --git a/app/institutions/index/template.hbs b/app/institutions/index/template.hbs
@@ -104,7 +104,7 @@
                                         @type='link'
                                         @onClick={{action 'next'}}
                                     >
-                                        {{fa-icon 'chevron-down' class='Institutions__pagination'}}
+                                        <FaIcon @icon='chevron-down' class='Institutions__pagination' />
                                     </BsButton>
                                 {{/if}}
                             </div>
diff --git a/app/settings/developer-apps/-components/client-secret/template.hbs b/app/settings/developer-apps/-components/client-secret/template.hbs
@@ -15,10 +15,10 @@
         @onClick={{action this.toggleShowSecret}}
     >
         {{#if this.shouldShowSecret}}
-            {{fa-icon 'eye-slash'}}
+            <FaIcon @icon='eye-slash' />
             {{t 'settings.developer-apps.hideSecret'}}
         {{else}}
-            {{fa-icon 'eye'}}
+            <FaIcon @icon='eye' />
             {{t 'settings.developer-apps.showSecret'}}
         {{/if}}
     </BsButton>
diff --git a/app/settings/developer-apps/create/template.hbs b/app/settings/developer-apps/create/template.hbs
@@ -4,7 +4,7 @@
         data-analytics-name='Back to list'
         @route='settings.developer-apps'
     >
-        {{fa-icon 'arrow-left'}}
+        <FaIcon @icon='arrow-left' />
         {{t 'settings.developer-apps.backToList'}}
     </OsfLink>
 </div>
diff --git a/app/settings/developer-apps/edit/template.hbs b/app/settings/developer-apps/edit/template.hbs
@@ -4,7 +4,7 @@
         data-analytics-scope='Back to list'
         @route='settings.developer-apps'
     >
-        {{fa-icon 'arrow-left'}}
+        <FaIcon @icon='arrow-left' />
         {{t 'settings.developer-apps.backToList'}}
     </OsfLink>
 
diff --git a/app/settings/template.hbs b/app/settings/template.hbs
@@ -10,7 +10,7 @@
                    @type='link'
                    @onClick={{action (mut this.navCollapsed) (not this.navCollapsed)}}
                 >
-                    {{fa-icon 'bars'}}
+                    <FaIcon @icon='bars' />
                 </BsButton>
             </h2>
         </div>
diff --git a/app/settings/tokens/create/template.hbs b/app/settings/tokens/create/template.hbs
@@ -5,7 +5,7 @@
             data-analytics-name='Back to list'
             @route='settings.tokens'
         >
-            {{fa-icon 'arrow-left'}}
+            <FaIcon @icon='arrow-left' />
             {{t 'settings.tokens.backToList'}}
         </OsfLink>
     </div>
diff --git a/app/settings/tokens/edit/template.hbs b/app/settings/tokens/edit/template.hbs
@@ -5,7 +5,7 @@
             data-analytics-name='Back to list'
             @route='settings.tokens'
         >
-            {{fa-icon 'arrow-left'}}
+            <FaIcon @icon='arrow-left' />
             {{t 'settings.tokens.backToList'}}
         </OsfLink>
     </div>
diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -2,16 +2,13 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
     workflow: [
         { handler: 'silence', matchId: 'ember.globals-resolver' },
-        { handler: 'silence', matchId: 'ember-source.deprecation-without-for' },
-        { handler: 'silence', matchId: 'ember-source.deprecation-without-since' },
         { handler: 'silence', matchId: 'ember-inflector.globals' },
         { handler: 'silence', matchId: 'ember-metal.get-with-default' },
         { handler: 'silence', matchId: 'computed-property.volatile' },
         { handler: 'silence', matchId: 'deprecate-router-events' },
         { handler: 'silence', matchId: 'implicit-injections' },
         { handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
         { handler: 'silence', matchId: 'this-property-fallback' },
-        { handler: 'silence', matchId: '@fortawesome/ember-fontawesome.no-positional-params' },
         { handler: 'silence', matchId: 'ember-glimmer.link-to.positional-arguments' },
         { handler: 'silence', matchId: 'ember-views.curly-components.jquery-element' },
         { handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' },
diff --git a/lib/analytics-page/addon/application/template.hbs b/lib/analytics-page/addon/application/template.hbs
@@ -102,7 +102,7 @@
                         local-class='DateRangeButton'
                     >
                         {{t (concat 'analytics.dateRanges.' this.activeDateRange.key)}}
-                        {{fa-icon 'caret-down'}}
+                        <FaIcon @icon='caret-down' />
                     </dd.button>
                     <dd.menu
                         local-class='DateRangeMenu'
diff --git a/lib/collections/addon/components/collection-search-result/template.hbs b/lib/collections/addon/components/collection-search-result/template.hbs
@@ -28,7 +28,7 @@
             aria-label={{t (concat 'collections.collection_search_result.' (if this.showBody 'collapse' 'expand'))}}
             {{action 'toggleShowBody'}}
         >
-            {{fa-icon (concat 'caret-' (if this.showBody 'up' 'down'))}}
+            <FaIcon @icon={{concat 'caret-' (if this.showBody 'up' 'down')}} />
         </button>
     </div>
 {{/if}}
diff --git a/lib/osf-components/addon/components/bs-alert/template.hbs b/lib/osf-components/addon/components/bs-alert/template.hbs
@@ -6,7 +6,7 @@
             aria-label={{t 'general.close'}}
             {{on 'click' this.dismiss}}
         >
-            <span aria-hidden='true'>{{fa-icon 'times'}}</span>
+            <span aria-hidden='true'><FaIcon @icon='times' /></span>
         </button>
     {{/if}}
     {{yield}}
diff --git a/lib/osf-components/addon/components/contributors/user-search/card/template.hbs b/lib/osf-components/addon/components/contributors/user-search/card/template.hbs
@@ -64,7 +64,7 @@
                     @type='light'
                     {{on 'click' (fn @manager.addContributor @user this.permission this.isBibliographic)}}
                 >
-                    {{fa-icon 'plus'}}
+                    <FaIcon @icon='plus' />
                 </Button>
             </span>
         {{/if}}
diff --git a/lib/osf-components/addon/components/copyable-text/template.hbs b/lib/osf-components/addon/components/copyable-text/template.hbs
@@ -8,7 +8,7 @@
         local-class='CopyButton'
         aria-label={{t 'osf-components.copyable-text.copyToClipboard'}}
     >
-        {{fa-icon 'copy'}}
+        <FaIcon @icon='copy' />
         <BsTooltip
             @triggerEvents=''
             @visible={{this.showTooltip}}
diff --git a/lib/osf-components/addon/components/file-browser/file-item/template.hbs b/lib/osf-components/addon/components/file-browser/file-item/template.hbs
@@ -1,4 +1,4 @@
-{{#let (contains @item @manager.selectedFiles) as |isSelected|}}
+{{#let (includes @item @manager.selectedFiles) as |isSelected|}}
     <li
         data-test-file-list-item={{@item.id}}
         data-test-indented={{if @manager.parentFolder 'true' 'false'}}
diff --git a/lib/osf-components/addon/components/file-browser/folder-item/template.hbs b/lib/osf-components/addon/components/file-browser/folder-item/template.hbs
@@ -1,4 +1,4 @@
-{{#let (contains @item @manager.selectedFiles) as |isSelected|}}
+{{#let (includes @item @manager.selectedFiles) as |isSelected|}}
     <li
         data-test-file-list-item={{@item.id}}
         data-test-indented={{if @manager.parentFolder 'true' 'false'}}
diff --git a/lib/osf-components/addon/components/institution-select-list/template.hbs b/lib/osf-components/addon/components/institution-select-list/template.hbs
@@ -9,7 +9,7 @@
     <list.item as |institution|>
         {{#if institution}}
             <label data-test-institution={{institution.id}} local-class='label'>
-                {{#let (contains institution @manager.affiliatedList) as |isAffiliated|}}
+                {{#let (includes institution @manager.affiliatedList) as |isAffiliated|}}
                     <Input
                         data-test-institution-button={{concat (if isAffiliated 'remove' 'add') '-' institution.id}}
                         data-analytics-name={{if isAffiliated 'Remove' 'Add'}}
diff --git a/lib/osf-components/addon/components/join-osf-banner/template.hbs b/lib/osf-components/addon/components/join-osf-banner/template.hbs
@@ -43,7 +43,7 @@
                                 aria-label={{t 'general.close'}}
                                 @onClick={{action this.dismiss}}
                             >
-                                {{fa-icon 'times'}}
+                                <FaIcon @icon='times' />
                             </BsButton>
                         </div>
                     </div>
diff --git a/lib/osf-components/addon/components/new-project-modal/template.hbs b/lib/osf-components/addon/components/new-project-modal/template.hbs
@@ -97,7 +97,7 @@
                 @type='link'
                 @onClick={{action 'toggleMore'}}
             >
-                {{fa-icon (concat 'caret-' (if this.more 'down' 'right'))}} {{t 'new_project.more'}}
+                <FaIcon @icon={{concat 'caret-' (if this.more 'down' 'right')}} /> {{t 'new_project.more'}}
             </BsButton>
             {{#if this.more}}
                 <div class='form-group m-v-sm'>
diff --git a/lib/osf-components/addon/components/new-project-navigation-modal/template.hbs b/lib/osf-components/addon/components/new-project-navigation-modal/template.hbs
@@ -9,7 +9,7 @@
             class='close'
             @onClick={{action this.closeModal reload=true}}
         >
-            {{fa-icon 'times' size='sm'}}
+            <FaIcon @icon='times' @size='sm' />
         </BsButton>
         <h4 data-test-modal-message class='add-project-success text-success'>
             {{this.title}}
diff --git a/lib/osf-components/addon/components/node-card/node-icon/template.hbs b/lib/osf-components/addon/components/node-card/node-icon/template.hbs
@@ -1 +1 @@
-{{fa-icon this.iconType}}
+<FaIcon @icon={{this.iconType}} />
diff --git a/lib/osf-components/addon/components/node-card/template.hbs b/lib/osf-components/addon/components/node-card/template.hbs
@@ -12,7 +12,7 @@
                     {{#if @node}}
                         {{#unless @node.public}}
                             <span>
-                                {{fa-icon 'lock'}}
+                                <FaIcon @icon='lock' />
                                 <BsTooltip>{{t (concat 'node_card.' @node.nodeType '.private_tooltip')}}</BsTooltip>
                             </span> |
                         {{/unless}}
diff --git a/lib/osf-components/addon/components/node-navbar/template.hbs b/lib/osf-components/addon/components/node-navbar/template.hbs
@@ -25,7 +25,7 @@
                     <ul data-test-node-navbar-links class='nav navbar-nav'>
                         {{#if this.fakeParent}}
                             {{#node-navbar/link node=this.fakeParent useLinkTo=false}}
-                                {{fa-icon 'level-down-alt' rotate=180}}
+                                <FaIcon @icon='level-down-alt' @rotation={{180}} />
                             {{/node-navbar/link}}
                         {{/if}}
                         {{#node-navbar/link node=@node useLinkTo=false setActive=false extraClasses='project-title'}}
diff --git a/lib/osf-components/addon/components/osf-mode-footer/template.hbs b/lib/osf-components/addon/components/osf-mode-footer/template.hbs
@@ -8,7 +8,7 @@
                     @onClick={{dialog.open}}
                 >
                     {{#if this.showUrlInput}}
-                        {{fa-icon 'rocket'}}
+                        <FaIcon @icon='rocket' />
                     {{else}}
                         <strong>{{t 'general.warning'}}</strong>: {{t 'osf_mode_footer.dev_mode'}}
                     {{/if}}
diff --git a/lib/osf-components/addon/components/osf-navbar/template.hbs b/lib/osf-components/addon/components/osf-navbar/template.hbs
@@ -37,7 +37,7 @@
                         aria-label={{t 'navbar.other_views'}}
                         class={{concat 'btn-link ' (local-class 'PrimaryNav__toggle')}}
                     >
-                        {{fa-icon 'caret-down' size='2x'}}
+                        <FaIcon @icon='caret-down' @size='2x' />
                     </dd.toggle>
                     <dd.menu class='service-dropdown' as |ddm|>
                         {{#each this.services as |service|}}
diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/read-only/multi-select/template.hbs b/lib/osf-components/addon/components/registries/schema-block-renderer/read-only/multi-select/template.hbs
@@ -9,7 +9,7 @@
             local-class='List'
         >
             {{#each @optionBlocks as |optionBlock|}}
-                {{#if (contains optionBlock.displayText selectedOptions)}}
+                {{#if (includes optionBlock.displayText selectedOptions)}}
                     <li
                         data-test-read-only-multi-select-value={{optionBlock.displayText}}
                         local-class='ResponseValue'
diff --git a/lib/osf-components/addon/components/registries/update-dropdown/template.hbs b/lib/osf-components/addon/components/registries/update-dropdown/template.hbs
@@ -17,7 +17,7 @@
         {{else}}
             {{t 'registries.update_dropdown.dropdown_title'}}
         {{/if}}
-        {{fa-icon 'caret-down'}}
+        <FaIcon @icon='caret-down' />
     </dd.trigger>
     <dd.content
         data-test-update-content
diff --git a/lib/osf-components/addon/components/sort-button/template.hbs b/lib/osf-components/addon/components/sort-button/template.hbs
@@ -5,7 +5,7 @@
     title={{t 'general.sort_asc'}}
     @onClick={{action @sortAction this.sortBy}}
 >
-    {{fa-icon 'chevron-up'}}
+    <FaIcon @icon='chevron-up' />
 </BsButton>
 <BsButton
     data-test-descending-sort={{this.sortBy}}
@@ -14,5 +14,5 @@
     title={{t 'general.sort_desc'}}
     @onClick={{action @sortAction this.sortByDesc}}
 >
-    {{fa-icon 'chevron-down'}}
+    <FaIcon @icon='chevron-down' />
 </BsButton>
diff --git a/lib/registries/addon/components/comment-card/template.hbs b/lib/registries/addon/components/comment-card/template.hbs
@@ -41,7 +41,7 @@
                             {{#bs-tooltip local-class='Tooltip' placement='left' viewportSelector=(concat '#' this.elementId)}}
                                 {{t 'registries.overview.comments.modified'}}{{this.dateModified}}
                             {{/bs-tooltip}}
-                            <sup>{{fa-icon 'asterisk'}}</sup>
+                            <sup><FaIcon @icon='asterisk' /></sup>
                         </span>
                     {{/if}}
                     <span local-class='dateCreated'>
@@ -115,7 +115,7 @@
                                 @onClick={{action this.toggleReplies}}
                             >
                                 {{t (concat 'registries.overview.comments' (if this.showReplies '.hide_replies' '.see_replies'))}}
-                                {{fa-icon (if this.showReplies 'caret-up' 'caret-down')}}
+                                <FaIcon @icon={{if this.showReplies 'caret-up' 'caret-down'}} />
                             </BsButton>
                         {{/if}}
                     </div>
diff --git a/lib/registries/addon/components/registries-discover-search/x-sidebar/template.hbs b/lib/registries/addon/components/registries-discover-search/x-sidebar/template.hbs
@@ -14,7 +14,7 @@
                 aria-label={{t 'registries.discover.sidebar.remove_filter_label' filterName=filter.display}}
                 {{on 'click' (fn this.removeFilter filter.filter)}}
             >
-                {{fa-icon 'times'}}
+                <FaIcon @icon='times' />
             </Button>
         </div>
     {{/each}}
diff --git a/lib/registries/addon/components/registries-header/template.hbs b/lib/registries/addon/components/registries-header/template.hbs
@@ -47,7 +47,7 @@
                         @layout='fake-link'
                         {{on 'click' this.toggleHelp}}
                     >
-                        {{fa-icon 'question'}}
+                        <FaIcon @icon='question' />
                     </Button>
                 {{/if}}
             </form>
diff --git a/lib/registries/addon/components/registries-navbar/template.hbs b/lib/registries/addon/components/registries-navbar/template.hbs
@@ -32,7 +32,7 @@
                 >
                     <span local-class='HideOnMobile HideOnTablet'>{{t 'general.OSF'}}</span>
                     <strong local-class='HideOnMobile HideOnTablet'>{{t 'general.services.registries'}}</strong>
-                    {{nav.icon (if dropdown.isOpen 'caret-up' 'caret-down')}}
+                    <nav.icon @icon={{if dropdown.isOpen 'caret-up' 'caret-down'}} />
                 </dropdown.toggle>
 
                 <dropdown.menu
@@ -177,13 +177,13 @@
                             src='{{this.currentUser.user.profileImage}}&s=30'
                             alt={{t 'auth_dropdown.user_gravatar'}}
                         >
-                        {{nav.icon (if dropdown.isOpen 'caret-up' 'caret-down')}}
+                        <nav.icon @icon={{if dropdown.isOpen 'caret-up' 'caret-down'}} />
                     {{else}}
                         <BsButton
                             data-test-toggle-navbar
                             local-class='OnlyOnMobile'
                         >
-                            {{nav.icon (if dropdown.isOpen 'times' 'bars')}}
+                            <nav.icon @icon={{if dropdown.isOpen 'times' 'bars'}} />
                         </BsButton>
                     {{/if}}
                 </dropdown.toggle>
diff --git a/lib/registries/addon/drafts/draft/metadata/template.hbs b/lib/registries/addon/drafts/draft/metadata/template.hbs
@@ -52,7 +52,7 @@
                                     @type='danger'
                                     @onClick={{action this.toggleAddContributorWidget}}
                                 >
-                                    {{fa-icon 'times'}}
+                                    <FaIcon @icon='times' />
                                 </BsButton>
                             {{else}}
                                 <BsButton
@@ -61,7 +61,7 @@
                                     @type='primary'
                                     @onClick={{action this.toggleAddContributorWidget}}
                                 >
-                                    {{fa-icon 'plus'}}
+                                    <FaIcon @icon='plus' />
                                 </BsButton>
                             {{/if}}
                         </div>
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@`
`104`	`104`	`@type='link'`
`105`	`105`	`@onClick={{action 'next'}}`
`106`	`106`	`>`
`107`		`- {{fa-icon 'chevron-down' class='Institutions__pagination'}}`
	`107`	`+ <FaIcon @icon='chevron-down' class='Institutions__pagination' />`
`108`	`108`	`</BsButton>`
`109`	`109`	`{{/if}}`
`110`	`110`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`data-analytics-name='Back to list'`
`5`	`5`	`@route='settings.developer-apps'`
`6`	`6`	`>`
`7`		`- {{fa-icon 'arrow-left'}}`
	`7`	`+ <FaIcon @icon='arrow-left' />`
`8`	`8`	`{{t 'settings.developer-apps.backToList'}}`
`9`	`9`	`</OsfLink>`
`10`	`10`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`data-analytics-scope='Back to list'`
`5`	`5`	`@route='settings.developer-apps'`
`6`	`6`	`>`
`7`		`- {{fa-icon 'arrow-left'}}`
	`7`	`+ <FaIcon @icon='arrow-left' />`
`8`	`8`	`{{t 'settings.developer-apps.backToList'}}`
`9`	`9`	`</OsfLink>`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`@type='link'`
`11`	`11`	`@onClick={{action (mut this.navCollapsed) (not this.navCollapsed)}}`
`12`	`12`	`>`
`13`		`- {{fa-icon 'bars'}}`
	`13`	`+ <FaIcon @icon='bars' />`
`14`	`14`	`</BsButton>`
`15`	`15`	`</h2>`
`16`	`16`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`data-analytics-name='Back to list'`
`6`	`6`	`@route='settings.tokens'`
`7`	`7`	`>`
`8`		`- {{fa-icon 'arrow-left'}}`
	`8`	`+ <FaIcon @icon='arrow-left' />`
`9`	`9`	`{{t 'settings.tokens.backToList'}}`
`10`	`10`	`</OsfLink>`
`11`	`11`	`</div>`