Merge branch 'release/23.07.0'

CenterForOpenScience · May 1, 2023 · eb27042 · eb27042
2 parents 01454f7 + faca7a0
commit eb27042
Show file tree

Hide file tree

Showing 104 changed files with 1,464 additions and 1,465 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -188,6 +188,7 @@ jobs:
         key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
         restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - run: yarn percy build:finalize
+      if: ${{ env.PERCY_TOKEN != 0 }}
       env:
           PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
           PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [23.07.0] - 2023-05-01
+### Changed
+- Fix some deprecations
+- Removed Bootstrap Grid
+
+
 ## [23.06.0] - 2023-03-27
 ### Changed
 - Removed Keen dependencies
@@ -1921,7 +1927,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[23.05.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
+[23.07.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.07.0
+[23.06.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.1
+[23.06.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
 [23.05.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.05.0
 [23.04.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.04.0
 [23.03.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.03.0

diff --git a/app/adapters/osf-adapter.ts b/app/adapters/osf-adapter.ts
@@ -158,9 +158,7 @@ export default class OsfAdapter extends JSONAPIAdapter {
     ajaxOptions(url: string, type: RequestType, options?: { isBulk?: boolean }): object {
         const hash: any = super.ajaxOptions(url, type, options);
 
-        hash.xhrFields = {
-            withCredentials: true,
-        };
+        hash.credentials = 'include';
 
         if (options && options.isBulk) {
             hash.contentType = 'application/vnd.api+json; ext=bulk';

diff --git a/app/guid-node/forks/styles.scss b/app/guid-node/forks/styles.scss
@@ -1,6 +1,7 @@
 .Forks {
     display: grid;
     grid-template-rows: auto;
+    width: 100%;
 }
 
 @media screen and (max-width: 500px) {

diff --git a/app/register/controller.ts b/app/register/controller.ts
@@ -1,3 +1,4 @@
+import Store from '@ember-data/store';
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
@@ -29,6 +30,7 @@ export const registerQueryParams = new QueryParams<RegisterQueryParams>({
 
 export default class Register extends Controller.extend(registerQueryParams.Mixin) {
     @service analytics!: Analytics;
+    @service store!: Store;
 
     signUpCampaign?: string;
 

diff --git a/app/settings/template.hbs b/app/settings/template.hbs
@@ -3,15 +3,15 @@
         <div class='col-xs-12'>
             <h2 class='page-header'>
                 {{t 'general.settings'}}
-                <BsButton
+                <Button
                    local-class='NavToggle'
                    aria-label={{t 'settings.toggleNav'}}
                    class='hidden-md hidden-lg'
-                   @type='link'
-                   @onClick={{action (mut this.navCollapsed) (not this.navCollapsed)}}
+                   @layout='fake-link'
+                   {{on 'click' (action (mut this.navCollapsed) (not this.navCollapsed))}}
                 >
                     <FaIcon @icon='bars' />
-                </BsButton>
+                </Button>
             </h2>
         </div>
     </div>
@@ -21,12 +21,12 @@
                 <div class='panel panel-default'>
                     <BsNav @type='pills' @stacked={{true}} as |nav|>
                         <nav.item>
-                            <nav.link-to
+                            <OsfLink
                                 data-analytics-name='Settings'
-                                @params={{array 'settings.profile'}}
+                                @route='settings.profile'
                             >
                                 {{t 'settings.profile.title'}}
-                            </nav.link-to>
+                            </OsfLink>
                             <BsNav
                                 data-analytics-scope='Profile Nav'
                                 local-class='ProfileNav'
@@ -35,46 +35,46 @@
                                 as |profileNav|
                             >
                                 <profileNav.item>
-                                    <profileNav.link-to
+                                    <OsfLink
                                         data-analytics-name='Name'
-                                        @params={{array 'settings.profile.name'}}
+                                        @route='settings.profile.name'
                                     >
                                         {{t 'settings.profile.name.title'}}
-                                    </profileNav.link-to>
+                                    </OsfLink>
                                 </profileNav.item>
                                 <profileNav.item>
-                                    <profileNav.link-to
+                                    <OsfLink
                                         data-analytics-name='Social'
-                                        @params={{array 'settings.profile.social'}}
+                                        @route='settings.profile.social'
                                     >
                                         {{t 'settings.profile.social.title'}}
-                                    </profileNav.link-to>
+                                    </OsfLink>
                                 </profileNav.item>
                                 <profileNav.item>
-                                    <profileNav.link-to
+                                    <OsfLink
                                         data-analytics-name='Education'
-                                        @params={{array 'settings.profile.education'}}
+                                        @route='settings.profile.education'
                                     >
                                         {{t 'settings.profile.education.title'}}
-                                    </profileNav.link-to>
+                                    </OsfLink>
                                 </profileNav.item>
                                 <profileNav.item>
-                                    <profileNav.link-to
+                                    <OsfLink
                                         data-analytics-name='Employment'
-                                        @params={{array 'settings.profile.employment'}}
+                                        @route='settings.profile.employment'
                                     >
                                         {{t 'settings.profile.employment.title'}}
-                                    </profileNav.link-to>
+                                    </OsfLink>
                                 </profileNav.item>
                             </BsNav>
                         </nav.item>
                         <nav.item>
-                            <nav.link-to
+                            <OsfLink
                                 data-analytics-name='Account'
-                                @params={{array 'settings.account'}}
+                                @route='settings.account'
                             >
                                 {{t 'settings.account.title'}}
-                            </nav.link-to>
+                            </OsfLink>
                         </nav.item>
                         <nav.item>
                             <OsfLink
@@ -93,20 +93,20 @@
                             </OsfLink>
                         </nav.item>
                         <nav.item>
-                            <nav.link-to
+                            <OsfLink
                                 data-analytics-name='Developer apps'
-                                @params={{array 'settings.developer-apps'}}
+                                @route='settings.developer-apps'
                             >
                                 {{t 'settings.developer-apps.title'}}
-                            </nav.link-to>
+                            </OsfLink>
                         </nav.item>
                         <nav.item>
-                            <nav.link-to
+                            <OsfLink
                                 data-analytics-name='Personal access tokens'
-                                @params={{array 'settings.tokens'}}
+                                @route='settings.tokens'
                             >
                                 {{t 'settings.tokens.title'}}
-                            </nav.link-to>
+                            </OsfLink>
                         </nav.item>
                     </BsNav>
                 </div>

diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
@@ -14,6 +14,7 @@ $sizes: ('xs', 'sm', 'md', 'lg', 'xl');
 $margins: (5, 10, 15, 25, 50);
 $spinner-size: (10, 20, 30, 50, 75);
 $weights: (200, 300, 400, 500, 600);
+$mobile-width: 768px;
 
 /* Defaults */
 $radius: 2px;

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -1,21 +1,17 @@
 self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
     workflow: [
-        { handler: 'silence', matchId: 'ember-inflector.globals' },
         { handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
         { handler: 'silence', matchId: 'this-property-fallback' },
-        { handler: 'silence', matchId: 'ember-glimmer.link-to.positional-arguments' },
-        { handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' },
         { handler: 'silence', matchId: 'ember-bootstrap.subclassing#Alert' },
         { handler: 'silence', matchId: 'routing.transition-methods' },
-        { handler: 'silence', matchId: 'autotracking.mutation-after-consumption' },
-        { handler: 'silence', matchId: 'computed-property.override' },
         { handler: 'silence', matchId: 'ember-utils.try-invoke' },
-        { handler: 'silence', matchId: 'ember-data:legacy-test-helper-support' },
         { handler: 'silence', matchId: 'has-block-and-has-block-params' },
         { handler: 'silence', matchId: 'ember-simple-auth.initializer.setup-session-restoration' },
         { handler: 'silence', matchId: 'ember-simple-auth.events.session-service' },
         { handler: 'silence', matchId: 'ember-cli-mirage.miragejs.import' },
         { handler: 'silence', matchId: 'ember-cli-mirage-config-routes-only-export' },
+        { handler: 'silence', matchId: 'ember-engines.deprecation-router-service-from-host'},
+        { handler: 'silence', matchId: 'ember-test-waiters-legacy-module-name'},
     ],
 };
diff --git a/config/optional-features.json b/config/optional-features.json
@@ -1,6 +1,6 @@
 {
   "application-template-wrapper": false,
   "default-async-observers": true,
-  "jquery-integration": true,
+  "jquery-integration": false,
   "template-only-glimmer-components": true
 }
diff --git a/handbook-docs/index/template.md b/handbook-docs/index/template.md
@@ -4,7 +4,7 @@ This handbook is a guide for developers contributing to
 [ember-osf-web](https://github.com/CenterForOpenScience/ember-osf-web).
 
 It is meant to be a living document, forever a work in progress.
-Feel free to {{#link-to 'docs.contributing'}}contribute{{/link-to}}
+Feel free to <LinkTo @route='docs.contributing'>contribute</LinkTo>
 if you notice any omissions, gaps, or inaccuracies.
 
 Go science!
diff --git a/handbook-docs/troubleshooting/template.md b/handbook-docs/troubleshooting/template.md
@@ -56,5 +56,5 @@ Then, either in `beforeEach` or in the particular problematic test:
 `this.owner.register('service:router', OsfLinkRouterStub);`
 
 ## Buttons in modals aren't tracking analytics events
-Check out the {{#link-to 'docs.analytics'}}analytics documentation{{/link-to}} scopes section
+Check out the <LinkTo @route='docs.analytics'>analytics documentation</LinkTo> scopes section
 for the answer to this.
diff --git a/lib/analytics-page/addon/application/template.hbs b/lib/analytics-page/addon/application/template.hbs
@@ -9,12 +9,12 @@
                     {{loading-indicator dark=true}}
                 {{else}}
                     <div local-class='Count'>{{this.forksCount}}</div>
-                    {{#link-to-external
-                        (if this.node.isProject 'nodeForks' 'registrationForks')
-                        this.node.id
-                    }}
+                    <LinkToExternal
+                        @route={{if this.node.isProject 'nodeForks' 'registrationForks'}}
+                        @models={{array this.node.id}}
+                    >
                         {{t 'analytics.viewForks'}}
-                    {{/link-to-external}}
+                    </LinkToExternal>
                 {{/if}}
             </div>
         </div>

diff --git a/lib/app-components/addon/components/branded-navbar/template.hbs b/lib/app-components/addon/components/branded-navbar/template.hbs
@@ -6,10 +6,14 @@
     >
         <div local-class='nav-wrapper'>
             <div class='navbar-header'>
-                {{#link-to @brandRoute provider=this.theme.provider class='navbar-brand'}}
+                <LinkTo 
+                    @route={{@brandRoute}}
+                    @provider={{this.theme.provider}}
+                    class='navbar-brand'
+                >
                     <span local-class='navbar-image' class='navbar-image'></span>
                     <span class='navbar-title'>{{this.brandTitle}}</span>
-                {{/link-to}}
+                </LinkTo>
 
                 {{! Navigation toggle - XS screen }}
                 <button
@@ -52,20 +56,25 @@
                         </a>
                     </li>
                     <li>
-                        {{#link-to
-                            'provider.submit'
-                            click=(action 'click' 'link' (concat 'Navbar - ' (t @addLinkKey) ' - ' this.theme.id) target=this.analytics)
-                        }}
+                        <LinkTo
+                            @route='provider.submit'
+                            onclick={{action
+                                'click'
+                                'link'
+                                (concat 'Navbar - ' (t @addLinkKey) ' - ' this.theme.id)
+                                target=this.analytics
+                            }}
+                        >
                             <span role='button'>{{t @addLinkKey}}</span>
-                        {{/link-to}}
+                        </LinkTo>
                     </li>
                     <li>
-                        {{#link-to
-                            'provider.discover'
-                            click=(action 'click' 'link' 'Navbar - Search' target=this.analytics)
-                        }}
+                        <LinkTo
+                            @route='provider.discover'
+                            onclick={{action 'click' 'link' 'Navbar - Search' target=this.analytics}}
+                        >
                             <span role='button'>{{t 'navbar.search'}}</span>
-                        {{/link-to}}
+                        </LinkTo>
                     </li>
                     <li>
                         <a

diff --git a/lib/app-components/addon/components/error-page/template.hbs b/lib/app-components/addon/components/error-page/template.hbs
@@ -28,9 +28,9 @@
                     }}
                 </a>
             {{else}}
-                {{#link-to-external 'home' class='btn btn-primary m-t-md'}}
+                <LinkToExternal @route='home' class='btn btn-primary m-t-md'>
                     {{t 'app_components.error_page.go_to' brand=(t 'general.OSF')}}
-                {{/link-to-external}}
+                </LinkToExternal>
             {{/if}}
         </div>
     </div>

diff --git a/lib/app-components/addon/components/provider-logo/template.hbs b/lib/app-components/addon/components/provider-logo/template.hbs
@@ -3,7 +3,7 @@
         <img local-class='provider-logo' src={{this.logoAsset}} alt={{@provider.name}}>
     </a>
 {{else}}
-    {{#link-to 'provider.discover' @provider.id}}
+    <LinkTo @route='provider.discover' @models={{array @provider.id}}>
         <img local-class='provider-logo' src={{this.logoAsset}} alt={{@provider.name}}>
-    {{/link-to}}
+    </LinkTo>
 {{/if}}
diff --git a/lib/collections/addon/index/template.hbs b/lib/collections/addon/index/template.hbs
@@ -62,13 +62,14 @@
                         </a>
                         <div class='m-t-md'>
                             {{!-- (route-prefix 'content') --}}
-                            {{#link-to
-                                'discover'
-                                (if this.theme.provider.example this.theme.provider.example 'khbvy')
-                                invokeAction=(action 'click' 'link' 'Index - See example')
-                            }}
+                            <LinkTo
+                                @route='discover'
+                                @models={{array
+                                    (if this.theme.provider.example this.theme.provider.example 'khbvy')
+                                }}
+                            >
                                 {{t 'index.header.example'}}
-                            {{/link-to}}
+                            </LinkTo>
                         </div>
                     </div>
                 </div>

diff --git a/lib/osf-components/addon/components/carousel/component.ts b/lib/osf-components/addon/components/carousel/component.ts
@@ -1,6 +1,6 @@
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 
 import { layout } from 'ember-osf-web/decorators/component';
 import CarouselItem from 'osf-components/components/carousel/x-item/component';
@@ -14,19 +14,15 @@ export default class Carousel extends Component {
     // Private properties
     carouselItems: CarouselItem[] = [];
 
-    @computed('carouselItems.{length,@each.isActive}')
-    get activeSlide() {
-        return this.carouselItems.findBy('isActive');
-    }
-
     @action
     register(item: CarouselItem) {
         this.carouselItems.pushObject(item);
+        this.carouselItems[0].set('isActive', true);
     }
 
     @action
     changeSlide(direction: string) {
-        const activeSlide = this.carouselItems.findBy('isActive');
+        const activeSlide = this.carouselItems.findBy('active');
         const activeIndex = activeSlide!.index;
         let newIndex = direction === 'previous' ? activeIndex - 1 : activeIndex + 1;
 
@@ -42,7 +38,7 @@ export default class Carousel extends Component {
 
     @action
     navClick(item: CarouselItem) {
-        const activeSlide = this.carouselItems.findBy('isActive');
+        const activeSlide = this.carouselItems.findBy('active');
         const activeIndex = activeSlide!.index;
         const newIndex = item.index;