Merge branch 'release/24.10.0'

CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+## [24.10.0] - 2024-12-11
+### Added
+- Institutional Dashboard Improvements B&I Release
+
 ## [24.09.0] - 2024-11-21
 ### Added
 - Institutional Dashboard Improvements Project - FE Release
@@ -2006,6 +2010,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[24.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.10.0
 [24.09.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.09.1
 [24.09.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.09.0
 [24.08.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.08.0

app/config/environment.d.ts

@@ -196,6 +196,7 @@ declare const config: {
         registrationFilesPage: string;
         verifyEmailModals: string;
         egapAdmins: string;
+        shareDownload: string;
     };
     gReCaptcha: {
         siteKey: string;

app/institutions/dashboard/-components/chart-kpi-wrapper/component-test.ts

@@ -113,7 +113,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper
             .doesNotExist();
     });
 
-    test('it calculates the Public vs Private Registration data correctly', async function(assert) {
+    test('it calculates the Public vs Embargoed Registration data correctly', async function(assert) {
         // Given the component is rendered
         await render(hbs`
 <Institutions::Dashboard::-Components::ChartKpiWrapper
@@ -127,7 +127,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper
 
         // And the title is verified
         assert.dom(`${parentDom} [data-test-chart-title]`)
-            .hasText('Public vs Private Registrations');
+            .hasText('Public vs Embargoed Registrations');
 
         // And the expanded data position 0 name is verified
         assert.dom(`${parentDom} [data-test-expanded-name="0"]`)
@@ -139,7 +139,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper
 
         // And the expanded data position 1 name is verified
         assert.dom(`${parentDom} [data-test-expanded-name="1"]`)
-            .hasText('Private Registrations');
+            .hasText('Embargoed Registrations');
 
         // And the expanded data position 1 total is verified
         assert.dom(`${parentDom} [data-test-expanded-total="1"]`)
@@ -200,7 +200,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper
 
         // And the expanded data position 4 name is verified
         assert.dom(`${parentDom} [data-test-expanded-name="4"]`)
-            .hasText('Private Registrations');
+            .hasText('Embargoed Registrations');
 
         // And the expanded data position 4 total is verified
         assert.dom(`${parentDom} [data-test-expanded-total="4"]`)

app/institutions/dashboard/-components/chart-kpi-wrapper/component.ts

@@ -71,7 +71,7 @@ export default class ChartKpiWrapperComponent extends Component<TotalCountChartW
                 chartType: 'doughnut',
             },
             {
-                title: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.title'),
+                title: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.title'),
                 chartData: this.calculateRegistrations(metrics.summaryMetrics),
                 chartType: 'doughnut',
             },
@@ -133,11 +133,11 @@ export default class ChartKpiWrapperComponent extends Component<TotalCountChartW
     private calculateRegistrations(summaryMetrics: InstitutionSummaryMetricModel): ChartDataModel[] {
         return [
             {
-                label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.public'),
+                label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.public'),
                 total: summaryMetrics.publicRegistrationCount,
             } as ChartDataModel,
             {
-                label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.private'),
+                label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.embargoed'),
                 total: summaryMetrics.embargoedRegistrationCount,
             } as ChartDataModel,
         ];

app/institutions/dashboard/-components/institutional-users-list/component.ts

@@ -9,6 +9,7 @@ import Intl from 'ember-intl/services/intl';
 import InstitutionModel from 'ember-osf-web/models/institution';
 import InstitutionDepartmentsModel from 'ember-osf-web/models/institution-department';
 import Analytics from 'ember-osf-web/services/analytics';
+import { RelationshipWithLinks } from 'osf-api';
 
 interface Column {
     key: string;
@@ -90,7 +91,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         {
             key: 'embargoedRegistrationCount',
             sort_key: 'embargoed_registration_count',
-            label: this.intl.t('institutions.dashboard.users_list.private_registration_count'),
+            label: this.intl.t('institutions.dashboard.users_list.embargoed_registration_count'),
             selected: true,
             type: 'string',
         },
@@ -184,6 +185,30 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         return query;
     }
 
+    downloadUrl(format: string) {
+        const institutionRelationships = this.args.institution.links.relationships;
+        const usersLink = (institutionRelationships!.user_metrics as RelationshipWithLinks).links.related.href;
+        const userURL = new URL(usersLink!);
+        userURL.searchParams.set('format', format);
+        userURL.searchParams.set('page[size]', '10000');
+        Object.entries(this.queryUsers).forEach(([key, value]) => {
+            userURL.searchParams.set(key, value);
+        });
+        return userURL.toString();
+    }
+
+    get downloadCsvUrl() {
+        return this.downloadUrl('csv');
+    }
+
+    get downloadTsvUrl() {
+        return this.downloadUrl('tsv');
+    }
+
+    get downloadJsonUrl() {
+        return this.downloadUrl('json_report');
+    }
+
     @restartableTask
     @waitFor
     async searchDepartment(name: string) {
@@ -237,5 +262,4 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     clickToggleOrcidFilter(hasOrcid: boolean) {
         this.hasOrcid = !hasOrcid;
     }
-
 }

app/institutions/dashboard/-components/institutional-users-list/styles.scss

@@ -6,6 +6,18 @@
     color: $color-select;
 }
 
+.download-dropdown-content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    border: 1px solid $color-border-gray;
+    width: max-content;
+}
+
+.downlaod-link {
+    padding: 4px 8px;
+}
+
 .table {
     margin-bottom: 45px;
 
@@ -282,15 +294,16 @@ input:checked + .slider::before {
     padding-left: 10px;
     align-content: center;
 
-    div {
-        color: #2d6a9f;
-    }
 
     .download-dropdown {
         margin-left: 3px;
     }
 }
 
+.download-dropdown-trigger {
+    color: $color-link-dark;
+}
+
 .flex {
     display: flex;
     align-items: center;

app/institutions/dashboard/-components/institutional-users-list/template.hbs

@@ -88,24 +88,43 @@
                         <ResponsiveDropdown @renderInPlace={{true}} @buttonStyling={{true}} as |dd| >
                             <dd.trigger
                                 data-test-download-dropdown
+                                data-analytics-name='Download Dropdown'
                                 aria-label={{t 'institutions.dashboard.download_dropdown_label'}}
                                 local-class='download-dropdown-trigger'
                             >
                                 <FaIcon @icon='download' />
                             </dd.trigger>
                             <dd.content local-class='download-dropdown-content'>
-                                <Button local-class='download-option' {{on 'click' (queue this.downloadCsv dd.close)}}>
+                                <OsfLink
+                                    data-test-csv-download-button
+                                    data-analytics-name='Download CSV'
+                                    local-class='downlaod-link'
+                                    {{on 'click' dd.close}}
+                                    @target='_blank'
+                                    @href={{this.downloadCsvUrl}}
+                                >
                                     {{t 'institutions.dashboard.format_labels.csv'}}
-                                </Button>
-                                <Button local-class='download-option' {{on 'click' (queue this.downloadTsv dd.close)}}>
+                                </OsfLink>
+                                <OsfLink
+                                    data-test-tsv-download-button
+                                    data-analytics-name='Download TSV'
+                                    local-class='downlaod-link'
+                                    {{on 'click' dd.close}}
+                                    @target='_blank'
+                                    @href={{this.downloadTsvUrl}}
+                                >
                                     {{t 'institutions.dashboard.format_labels.tsv'}}
-                                </Button>
-                                <Button local-class='download-option' {{on 'click' (queue this.downloadJsonTable dd.close)}}>
-                                    {{t 'institutions.dashboard.format_labels.json_table'}}
-                                </Button>
-                                <Button local-class='download-option' {{on 'click' (queue this.downloadJsonDirect dd.close)}}>
-                                    {{t 'institutions.dashboard.format_labels.json_direct'}}
-                                </Button>
+                                </OsfLink>
+                                <OsfLink
+                                    data-test-json-download-button
+                                    data-analytics-name='Download JSON'
+                                    local-class='downlaod-link'
+                                    {{on 'click' dd.close}}
+                                    @target='_blank'
+                                    @href={{this.downloadJsonUrl}}
+                                >
+                                    {{t 'institutions.dashboard.format_labels.json'}}
+                                </OsfLink>
                             </dd.content>
                         </ResponsiveDropdown>
                     </div>

app/institutions/dashboard/-components/object-list/component-test.ts

@@ -5,6 +5,10 @@ import { setupIntl } from 'ember-intl/test-support';
 import { setupRenderingTest } from 'ember-qunit';
 import { TestContext } from 'ember-test-helpers';
 import { module, test } from 'qunit';
+import Service from '@ember/service';
+const featuresStub = Service.extend({
+    isEnabled: () => true,
+});
 
 import { OsfLinkRouterStub } from 'ember-osf-web/tests/integration/helpers/osf-link-router-stub';
 
@@ -14,6 +18,7 @@ module('Integration | institutions | dashboard | -components | object-list', hoo
     setupIntl(hooks);
 
     hooks.beforeEach(function(this: TestContext) {
+        this.owner.register('service:features', featuresStub);
         this.owner.unregister('service:router');
         this.owner.register('service:router', OsfLinkRouterStub);
         const columns = [
@@ -81,6 +86,12 @@ module('Integration | institutions | dashboard | -components | object-list', hoo
 
         // The table data is not blatantly incorrect
         assert.dom('[data-test-object-table-body-row]').exists({ count: 10 }, 'There are 10 rows');
+
+        // Download buttons are present
+        await click('[data-test-download-dropdown]');
+        assert.dom('[data-test-download-csv-link]').exists('CSV download link exists');
+        assert.dom('[data-test-download-tsv-link]').exists('TSV download link exists');
+        assert.dom('[data-test-download-json-link]').exists('JSON download link exists');
     });
 
     test('the table supports filtering', async function(assert) {

app/institutions/dashboard/-components/object-list/component.ts

@@ -1,11 +1,17 @@
 import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import Features from 'ember-feature-flags/services/features';
 
+import IndexCardSearchModel from 'ember-osf-web/models/index-card-search';
 import InstitutionModel from 'ember-osf-web/models/institution';
 import { SuggestedFilterOperators } from 'ember-osf-web/models/related-property-path';
 import SearchResultModel from 'ember-osf-web/models/search-result';
 import { Filter } from 'osf-components/components/search-page/component';
+import config from 'ember-osf-web/config/environment';
+
+const shareDownloadFlag = config.featureFlagNames.shareDownload;
 
 interface Column {
     name: string;
@@ -36,6 +42,7 @@ interface InstitutionalObjectListArgs {
 }
 
 export default class InstitutionalObjectList extends Component<InstitutionalObjectListArgs> {
+    @service features!: Features;
     @tracked activeFilters: Filter[] = [];
     @tracked page = '';
     @tracked sort = '-dateModified';
@@ -73,6 +80,33 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
         };
     }
 
+    get showDownloadButtons() {
+        return this.features.isEnabled(shareDownloadFlag);
+    }
+
+    downloadUrl(cardSearch: IndexCardSearchModel, format: string) {
+        if (!cardSearch.links.self) {
+            return '';
+        }
+        const cardSearchUrl = new URL((cardSearch.links.self as string));
+        cardSearchUrl.searchParams.set('page[size]', '10000');
+        cardSearchUrl.searchParams.set('acceptMediatype', format);
+        cardSearchUrl.searchParams.set('withFileName', `${this.args.objectType}-search-results`);
+        return cardSearchUrl.toString();
+    }
+
+    downloadCsvUrl(cardSearch: IndexCardSearchModel) {
+        return this.downloadUrl(cardSearch, 'text/csv');
+    }
+
+    downloadTsvUrl(cardSearch: IndexCardSearchModel) {
+        return this.downloadUrl(cardSearch, 'text/tab-separated-values');
+    }
+
+    downloadJsonUrl(cardSearch: IndexCardSearchModel) {
+        return this.downloadUrl(cardSearch, 'application/json');
+    }
+
     @action
     updateVisibleColumns() {
         this.visibleColumns = [...this.dirtyVisibleColumns];

app/institutions/dashboard/-components/object-list/styles.scss

@@ -128,3 +128,15 @@
     display: inline-flex;
     padding-left: 10px;
 }
+
+.download-dropdown-content {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    border: 1px solid $color-border-gray;
+    width: max-content;
+}
+
+.download-link {
+    padding: 4px 8px;
+}