Merge branch 'release/23.05.0'

CenterForOpenScience · Mar 16, 2023 · 6ac8ecc · 6ac8ecc
2 parents 52bcb16 + fa6d4bf
commit 6ac8ecc
Show file tree

Hide file tree

Showing 25 changed files with 687 additions and 215 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -11,7 +11,7 @@ on:
 env:
   CI: true
   PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
-  PERCY_PARALLEL_TOTAL: 4
+  PERCY_PARALLEL_TOTAL: -1 
 
 jobs:
   fetch-dependencies:
@@ -77,9 +77,8 @@ jobs:
         path: ./node_modules
         key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
         restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-    - uses: percy/exec-action@v0.3.1
-      with:
-        custom-command: yarn test:ember --path ./dist --partition 1
+    - name: Run tests with percy snapshots
+      run: yarn percy exec --debug --parallel --verbose yarn test:ember --path ./dist --partition 1
       env:
         PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
         PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
@@ -102,9 +101,8 @@ jobs:
         path: ./node_modules
         key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
         restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-    - uses: percy/exec-action@v0.3.1
-      with:
-        custom-command: yarn test:ember --path ./dist --partition 2
+    - name: Run tests with percy snapshots
+      run: yarn percy exec --debug --parallel --verbose yarn test:ember --path ./dist --partition 2
       env:
         PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
         PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
@@ -127,9 +125,8 @@ jobs:
         path: ./node_modules
         key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
         restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-    - uses: percy/exec-action@v0.3.1
-      with:
-        custom-command: yarn test:ember --path ./dist --partition 3
+    - name: Run tests with percy snapshots
+      run: yarn percy exec --debug --parallel --verbose yarn test:ember --path ./dist --partition 3
       env:
         PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
         PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
@@ -152,9 +149,8 @@ jobs:
         path: ./node_modules
         key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
         restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
-    - uses: percy/exec-action@v0.3.1
-      with:
-        custom-command: yarn test:ember --path ./dist --partition 4
+    - name: Run tests with percy snapshots
+      run: yarn percy exec --debug --parallel --verbose yarn test:ember --path ./dist --partition 4
       env:
         PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
         PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
@@ -177,4 +173,22 @@ jobs:
     - name: Send coverage report to coveralls
       uses: coverallsapp/github-action@master
       with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  finalize-percy:
+    needs: [test-partition-1, test-partition-2, test-partition-3, test-partition-4]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: volta-cli/action@v1
+    - id: cache-node-modules
+      uses: actions/cache@v2
+      with:
+        path: ./node_modules
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
+    - run: yarn percy build:finalize
+      env:
+          PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
+          PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
+          PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
diff --git a/.percy.yml b/.percy.yml
@@ -0,0 +1,15 @@
+version: 2
+snapshot:
+  widths:
+    - 375
+    - 1280
+  minHeight: 1024
+  percyCSS: ""
+discovery:
+  allowedHostnames: []
+  disallowedHostnames: []
+  networkIdleTimeout: 100
+upload:
+  files: ""
+  ignore: ""
+  stripExtensions: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ 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.05.0] - 2023-03-16
+### Changed
+- Fixed `ember-classic` deprecation
+- Fixed `ember-views.curly-components.jquery-element` deprecation
+- Misc bug fixes and improvements
+### Added
+- Added unit tests for file detail page
+
 ## [23.04.0] - 2023-02-06
 ### Changed
 - Fixed `computed-property.volatile` deprecation
@@ -1909,6 +1917,7 @@ 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.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
 [23.02.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.02.1

diff --git a/app/dashboard/template.hbs b/app/dashboard/template.hbs
@@ -157,7 +157,7 @@
                                                     <iframe
                                                         data-test-osf-video
                                                         local-class='osf-video'
-                                                        src='https://www.youtube.com/embed/iebMBpi0prc' 
+                                                        src='https://www.youtube.com/embed/X07mBq2tnMg'
                                                         title={{t 'dashboard.osf_video'}}
                                                         alt='OSF 101 Video'
                                                         aria-hidden='true'

diff --git a/app/home/-components/support-section/template.hbs b/app/home/-components/support-section/template.hbs
@@ -12,7 +12,7 @@
             <iframe
                 data-test-osf-video
                 local-class='osf-video'
-                src='https://www.youtube.com/embed/iebMBpi0prc' 
+                src='https://www.youtube.com/embed/X07mBq2tnMg'
                 title={{t 'new-home.support-section.osf_video'}}
                 alt='OSF 101 Video'
                 aria-hidden='true'

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -5,7 +5,6 @@ self.deprecationWorkflow.config = {
         { 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-views.curly-components.jquery-element' },
         { handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' },
         { handler: 'silence', matchId: 'ember-bootstrap.subclassing#Alert' },
         { handler: 'silence', matchId: 'routing.transition-methods' },

diff --git a/config/optional-features.json b/config/optional-features.json
@@ -1,4 +1,6 @@
 {
+  "application-template-wrapper": false,
+  "default-async-observers": true,
   "jquery-integration": true,
   "template-only-glimmer-components": true
 }
diff --git a/lib/collections/addon/components/discover-page/component.ts b/lib/collections/addon/components/discover-page/component.ts
@@ -308,7 +308,7 @@ export default class DiscoverPage extends Component {
 
     scrollToResults() {
         // Scrolls to top of search results
-        this.$('html, body').scrollTop(this.$('.results-top').position().top);
+        document.querySelector('.results-top')?.scrollIntoView({ behavior: 'smooth' });
     }
 
     search(): void {

diff --git a/lib/collections/addon/components/discover-page/template.hbs b/lib/collections/addon/components/discover-page/template.hbs
@@ -109,7 +109,7 @@
                 <BsDropdown class='dropdown pull-right' as |dd|>
                     <dd.button
                         data-test-sort-by-button
-                        class='btn btn-default'
+                        class='btn btn-default results-top'
                     >
                         {{t 'collections.discover_page.sortBy'}}:
                         {{this.sortDisplay}}
@@ -183,7 +183,7 @@
                 {{else}}
                     {{#if this.numberOfResults}}
                         {{!RESULTS FOUND}}
-                        <div class='results-top'>
+                        <div>
                             {{#each this.results as |result|}}
                                 {{component
                                     this.searchResultComponent

diff --git a/lib/osf-components/addon/components/delete-node-modal/template.hbs b/lib/osf-components/addon/components/delete-node-modal/template.hbs
@@ -1,5 +1,5 @@
 <BsModal
-    @open={{@openModal}}
+    @open={{if @openModal true false}}
     @onSubmit={{action @delete}}
     @onHidden={{action @closeModal}}
     as |modal|

diff --git a/lib/osf-components/addon/components/file-metadata-manager/component.ts b/lib/osf-components/addon/components/file-metadata-manager/component.ts
@@ -181,14 +181,20 @@ export default class FileMetadataManagerComponent extends Component<Args> {
         this.inEditMode = true;
     }
 
+    @action
+    rollback() {
+        this.changeset.rollback();
+    }
+
     @task
     @waitFor
     async cancel(){
         if (this.saveErrored){
             await this.metadataRecord.reload();
+            this.metadataRecord.rollbackAttributes();
             this.saveErrored = false;
         }
-        this.changeset.rollback();
+        this.rollback();
         this.changeset.languageObject = {
             code: this.metadataRecord.language,
             name: this.languageFromCode,

diff --git a/lib/osf-components/addon/components/node-card/styles.scss b/lib/osf-components/addon/components/node-card/styles.scss
@@ -1,8 +1,8 @@
-.NodeCard {
+.node-card {
     margin: 10px 0;
 }
 
-.NodeCard__heading {
+.heading {
     :global(.ember-content-placeholders-heading__title) {
         height: 1em;
         margin-top: 5px;
@@ -26,41 +26,42 @@
     }
 }
 
-.NodeCard__body {
+.body {
     :global(.ember-content-placeholders-text__line) {
         height: 1em;
         margin-bottom: 5px;
     }
-}
 
-.NodeCard__body dt,
-.NodeCard__body dd {
-    display: inline-block;
-    max-width: 80%;
-    margin-right: 5px;
-}
+    dt,
+    dd {
+        display: inline-block;
+        max-width: 80%;
+        margin-right: 5px;
+    }
 
-.NodeCard__body dl {
-    margin-bottom: 10px;
-}
+    dl {
+        margin-bottom: 10px;
+
+        div {
+            display: flex;
+        }
+    }
 
-.NodeCard__body > dl > div {
-    display: flex;
 }
 
-.NodeCard__dropdown {
+.dropdown {
     padding-left: 5px;
 
-    .NodeCard__dropdown-button {
+    .dropdown-button {
         padding: 4px 12px;
         line-height: 0;
     }
 
-    .NodeCard__dropdown-list {
+    .dropdown-list {
         background-color: $color-bg-gray-light;
         min-width: 180px;
 
-        .NodeCard__dropdown-link {
+        .dropdown-link {
             color: $color-link-black;
             border-color: transparent;
             background-color: $color-bg-gray-light;
@@ -69,26 +70,26 @@
             padding: 3px 20px;
         }
 
-        .NodeCard__dropdown-link:hover,
-        .NodeCard__dropdown-link:focus {
+        .dropdown-link:hover,
+        .dropdown-link:focus {
             cursor: pointer;
             background-image: none;
             background-color: $color-bg-gray-dark;
         }
     }
 }
 
-.NodeCard__tags {
+.tags {
     margin-top: 2px;
 }
 
-.NodeCard__description {
+.description {
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
 }
 
-.NodeCard__link {
+.link {
     composes: Button from '../button/styles.scss';
     composes: SecondaryButton from '../button/styles.scss';
     composes: MediumButton from '../button/styles.scss';
@@ -98,28 +99,28 @@
     }
 }
 
-.CardContents {
+.card-contents {
     display: flex;
     flex-direction: row;
 }
 
-.CardBody {
+.card-body {
     width: 80%;
-}
 
-.CardBody__mobile {
-    width: 90%;
+    &.mobile {
+        width: 90%;
+    }
 }
 
-.OpenBadges {
+.open-badges {
     width: 20%;
     border-left-width: thin;
     border-left-color: $color-bg-gray-light;
     border-left-style: solid;
     padding-left: 10px;
-}
 
-.OpenBadges__mobile {
-    width: 10%;
-    padding-left: 0;
+    &.mobile {
+        width: 10%;
+        padding-left: 0;
+    }
 }