From e0f7c23c8b6e0c4f28b7958e2516b5966e4f0717 Mon Sep 17 00:00:00 2001
From: futa-ikeda <futa.ikeda@gmail.com>
Date: Fri, 15 Nov 2024 17:09:18 -0500
Subject: [PATCH 1/2] Scroll tabs in mobile view

---
 .../-components/institutional-dashboard-wrapper/styles.scss   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-dashboard-wrapper/styles.scss b/app/institutions/dashboard/-components/institutional-dashboard-wrapper/styles.scss
index 08a87d59c7..4e024d7996 100644
--- a/app/institutions/dashboard/-components/institutional-dashboard-wrapper/styles.scss
+++ b/app/institutions/dashboard/-components/institutional-dashboard-wrapper/styles.scss
@@ -29,9 +29,9 @@
     @include tab-list;
     white-space: nowrap;
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     position: relative;
-    overflow: visible;
+    overflow-x: auto;
     margin-bottom: 0;
     border-bottom: 0;
 

From 0363ae0f3e64475baa52b6feb7055c195d2b8bd0 Mon Sep 17 00:00:00 2001
From: futa-ikeda <futa.ikeda@gmail.com>
Date: Fri, 15 Nov 2024 17:10:15 -0500
Subject: [PATCH 2/2] Group users tab top bar controls for mobile view

---
 .../institutional-users-list/styles.scss      |  15 ++
 .../institutional-users-list/template.hbs     | 184 +++++++++---------
 2 files changed, 110 insertions(+), 89 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/styles.scss b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
index 08e3b9219f..a3c1de0d03 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/styles.scss
+++ b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
@@ -292,3 +292,18 @@ input:checked + .slider::before {
     }
 }
 
+.flex {
+    display: flex;
+    align-items: center;
+}
+
+.top-wrapper {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+}
+
+.right-button-group {
+    justify-content: flex-end;
+    margin-right: 15px;
+}
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 27fb78b049..9dc6871c85 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -8,97 +8,103 @@
             </span>
             {{t 'institutions.dashboard.users_list.total_users'}}
         </div>
-        <div local-class='orcid-switch'>
-            <label for='switches-container' local-class='orcid-toggle-label'>{{t 'institutions.dashboard.users_list.has_orcid'}}</label>
-            <label local-class='switch'>
-                <input id='switches-container' type='checkbox' checked={{this.hasOrcid}} {{on 'change' (fn this.toggleOrcidFilter (not this.hasOrcid))}}>
-                <span local-class='slider round'></span>
-            </label>
-        </div>
-        <PowerSelect
-            @options={{this.departments}}
-            @searchEnabled={{true}}
-            @selected={{this.department}}
-            @triggerClass={{local-class 'select'}}
-            @search={{perform this.searchDepartment}}
-            @onChange={{this.onSelectChange}}
-            as |department|
-        >
-            {{department}}
-        </PowerSelect>
-        <BasicDropdown
-            @renderInPlace={{true}}
-            @onClose={{this.onDropdownClose}}
-            @preventScroll={{true}}
-            @eventType='mousedown'
-            local-class='dropdown'
-            as |dd|
-        >
-            <Button local-class='dropdown-trigger' {{on 'click' dd.actions.toggle}}>
-                <FaIcon local-class='icon-columns' @icon='columns' />
-                {{t 'institutions.dashboard.users_list.select_columns'}}
-            </Button>
-            {{#if dd.isOpen}}
-                <div local-class='dropdown-panel {{if (is-mobile) 'mobile'}}'>
-                    <div local-class='dropdown-content'>
-                        {{#each this.columns as |column|}}
-                            <label>
-                                <input
-                                    type='checkbox'
-                                    value={{column.key}}
-                                    checked={{column.selected}}
-                                    {{on 'change' (fn this.toggleColumnSelection column.key)}}
-                                />
-                                {{column.label}}
-                            </label>
-                        {{/each}}
-                    </div>
-                    <div local-class='dropdown-actions'>
-                        <Button @type='secondary' {{on 'click' dd.actions.close}}>
-                            {{t 'general.cancel'}}
-                        </Button>
-                        <Button @type='primary' {{on 'click' this.applyColumnSelection}} {{on 'click' dd.actions.close}}>
-                            {{t 'general.apply'}}
-                        </Button>
-                    </div>
+        <div local-class='top-wrapper'>
+            <div local-class='flex'>
+                <div local-class='orcid-switch'>
+                    <label for='switches-container' local-class='orcid-toggle-label'>{{t 'institutions.dashboard.users_list.has_orcid'}}</label>
+                    <label local-class='switch'>
+                        <input id='switches-container' type='checkbox' checked={{this.hasOrcid}} {{on 'change' (fn this.toggleOrcidFilter (not this.hasOrcid))}}>
+                        <span local-class='slider round'></span>
+                    </label>
                 </div>
-            {{/if}}
-        </BasicDropdown>
-        <div local-class='download-button-group'>
-            {{#if @institution.linkToExternalReportsArchive}}
-                <OsfLink
-                    data-test-link-to-reports-archive
-                    data-analytics-name='Link to archived reports'
-                    @target='_blank'
-                    @fakeButton={{true}}
-                    @href={{@institution.linkToExternalReportsArchive}}
+                <PowerSelect
+                    @options={{this.departments}}
+                    @searchEnabled={{true}}
+                    @selected={{this.department}}
+                    @triggerClass={{local-class 'select'}}
+                    @search={{perform this.searchDepartment}}
+                    @onChange={{this.onSelectChange}}
+                    as |department|
                 >
-                    <EmberTooltip @side='bottom'>
-                        {{t 'institutions.dashboard.download_past_reports_label'}}
-                    </EmberTooltip>
-                    <FaIcon @icon='chart-pie'/>
-                </OsfLink>
-            {{/if}}
-            <div local-class='download-dropdown'>
-                <ResponsiveDropdown @renderInPlace={{true}} @buttonStyling={{true}} as |dd| >
-                    <dd.trigger data-test-download-dropdown 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)}}>
-                            {{t 'institutions.dashboard.format_labels.csv'}}
-                        </Button>
-                        <Button local-class='download-option' {{on 'click' (queue this.downloadTsv dd.close)}}>
-                            {{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>
-                    </dd.content>
-                </ResponsiveDropdown>
+                    {{department}}
+                </PowerSelect>
+            </div>
+            <div local-class='flex right-button-group'>
+                <BasicDropdown
+                    @renderInPlace={{true}}
+                    @onClose={{this.onDropdownClose}}
+                    @preventScroll={{true}}
+                    @eventType='mousedown'
+                    local-class='dropdown'
+                    as |dd|
+                >
+                    <Button local-class='dropdown-trigger' {{on 'click' dd.actions.toggle}}>
+                        <FaIcon local-class='icon-columns' @icon='columns' />
+                        {{t 'institutions.dashboard.users_list.select_columns'}}
+                    </Button>
+                    {{#if dd.isOpen}}
+                        <div local-class='dropdown-panel {{if (is-mobile) 'mobile'}}'>
+                            <div local-class='dropdown-content'>
+                                {{#each this.columns as |column|}}
+                                    <label>
+                                        <input
+                                            type='checkbox'
+                                            value={{column.key}}
+                                            checked={{column.selected}}
+                                            {{on 'change' (fn this.toggleColumnSelection column.key)}}
+                                        />
+                                        {{column.label}}
+                                    </label>
+                                {{/each}}
+                            </div>
+                            <div local-class='dropdown-actions'>
+                                <Button @type='secondary' {{on 'click' dd.actions.close}}>
+                                    {{t 'general.cancel'}}
+                                </Button>
+                                <Button @type='primary' {{on 'click' this.applyColumnSelection}} {{on 'click' dd.actions.close}}>
+                                    {{t 'general.apply'}}
+                                </Button>
+                            </div>
+                        </div>
+                    {{/if}}
+                </BasicDropdown>
+                <div local-class='download-button-group'>
+                    {{#if @institution.linkToExternalReportsArchive}}
+                        <OsfLink
+                            data-test-link-to-reports-archive
+                            data-analytics-name='Link to archived reports'
+                            @target='_blank'
+                            @fakeButton={{true}}
+                            @href={{@institution.linkToExternalReportsArchive}}
+                        >
+                            <EmberTooltip @side='bottom'>
+                                {{t 'institutions.dashboard.download_past_reports_label'}}
+                            </EmberTooltip>
+                            <FaIcon @icon='chart-pie'/>
+                        </OsfLink>
+                    {{/if}}
+                    <div local-class='download-dropdown'>
+                        <ResponsiveDropdown @renderInPlace={{true}} @buttonStyling={{true}} as |dd| >
+                            <dd.trigger data-test-download-dropdown 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)}}>
+                                    {{t 'institutions.dashboard.format_labels.csv'}}
+                                </Button>
+                                <Button local-class='download-option' {{on 'click' (queue this.downloadTsv dd.close)}}>
+                                    {{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>
+                            </dd.content>
+                        </ResponsiveDropdown>
+                    </div>
+                </div>
             </div>
         </div>
     </div>