Develop 202608b

app/styles/_components.scss

@@ -799,11 +799,6 @@
                 font-size: 24px;
             }
         }
-
-        /* Decreases distance between "OSF" and current service "PREPRINTS", for example */
-        .current-service {
-            margin-left: -4px;
-        }
     }
 
     /* Overrides the color, relative position, and font size of dropdown menus (both service and auth) */
@@ -813,11 +808,15 @@
         &.service-dropdown {
             top: 17px;
             left: -120px;
-            width: 200px;
+            width: auto;
 
             li>a {
                 font-size: 18px;
             }
+
+            @media (max-width: 767px) {
+                left: -54px;
+            }
         }
 
         &.auth-dropdown {
@@ -849,6 +848,10 @@
             content: '';
             top: -8px;
             left: 126px;
+
+            @media (max-width: 767px) {
+                left: 61px;
+            }
         }
     }
 

config/environment.d.ts

@@ -74,6 +74,7 @@ declare const config: {
         backend: string;
         redirectUri?: string;
         url: string;
+        oasysUrl: string;
         webApiNamespace: string;
         apiUrl: string;
         apiVersion: string;

config/environment.js

@@ -43,6 +43,7 @@ const {
     OSF_STATUS_COOKIE: statusCookie = 'osf_status',
     OSF_COOKIE_DOMAIN: cookieDomain = 'localhost',
     OSF_URL: url = 'http://localhost:5000/',
+    OASYS_URL: oasysUrl = '',
     OSF_API_URL: apiUrl = 'http://localhost:8000',
     OSF_API_VERSION: apiVersion = '2.20',
     OSF_RENDER_URL: renderUrl = 'http://localhost:7778/render',
@@ -167,6 +168,7 @@ module.exports = function(environment) {
             backend,
             redirectUri,
             url,
+            oasysUrl,
             webApiNamespace: 'api/v1',
             apiUrl,
             apiVersion,

lib/osf-components/addon/components/osf-navbar/component.ts

@@ -12,35 +12,28 @@ import defaultTo from 'ember-osf-web/utils/default-to';
 import styles from './styles';
 import template from './template';
 
-const osfURL = config.OSF.url;
+const oasysURL = config.OSF.oasysUrl;
+const { pageName } = config.OSF;
 
 export enum OSFService {
     HOME = 'HOME',
-    PREPRINTS = 'PREPRINTS',
-    REGISTRIES = 'REGISTRIES',
-    MEETINGS = 'MEETINGS',
-    INSTITUTIONS = 'INSTITUTIONS',
+    JAIRO_CLOUD = 'JAIRO Cloud公開支援機能',
 }
 
 interface ServiceLink {
     name: string;
+    label: string;
     route?: string;
     href?: string;
     disabled?: boolean;
 }
 
 export const OSF_SERVICES: ServiceLink[] = [
-    { name: OSFService.HOME, route: 'home' },
-    { name: OSFService.PREPRINTS, href: `${osfURL}preprints/` },
-    { name: OSFService.REGISTRIES, route: 'registries', disabled: true },
-    { name: OSFService.MEETINGS, route: 'meetings' },
-    { name: OSFService.INSTITUTIONS, route: 'institutions' },
+    { name: OSFService.HOME, label: pageName, route: 'home' },
+    ...(oasysURL ? [{ name: OSFService.JAIRO_CLOUD, label: OSFService.JAIRO_CLOUD, href: oasysURL }] : []),
 ];
 
 const {
-    OSF: {
-        pageName,
-    },
     navbar: {
         useDropdown,
     },

lib/osf-components/addon/components/osf-navbar/template.hbs

@@ -21,9 +21,6 @@
                         @href={{this._activeService.href}}
                     >
                         <span class='hidden-xs'> {{t 'general.OSF' title=this.title}} </span>
-                        {{#if this.useNavDropdown}}
-                            <span class='current-service'><strong>{{this._activeService.name}}</strong></span>
-                        {{/if}}
                     </OsfLink>
                 </div>
 
@@ -50,7 +47,7 @@
                                         @route={{service.route}}
                                         @href={{service.href}}
                                     >
-                                        {{t 'general.OSF' title=this.title}}<b>{{service.name}}</b>
+                                        {{service.label}}
                                     </OsfLink>
                                 </ddm.item>
                             {{/each}}

tests/acceptance/dashboard-test.ts

@@ -45,7 +45,7 @@ module('Acceptance | dashboard', hooks => {
 
         assert.equal(currentURL(), '/dashboard', 'We stayed on the proper page');
         assert.dom('nav.navbar').exists();
-        assert.dom('nav.navbar .service-name').hasText('OSF HOME');
+        assert.dom('nav.navbar .service-name').hasText('OSF');
         assert.dom('nav.navbar .secondary-nav-dropdown .nav-profile-name')
             .hasText(currentUser.fullName, 'User\'s name is in navbar');
 

tests/acceptance/guid-user/quickfiles-test.ts

@@ -30,7 +30,7 @@ module('Acceptance | Guid User Quickfiles', hooks => {
             'Should have element after visit (guid routing / visit helper problem)',
         );
         assert.dom('nav.navbar').exists();
-        assert.dom('nav.navbar .service-name').hasText('OSF HOME');
+        assert.dom('nav.navbar .service-name').hasText('OSF');
         assert.dom('nav.navbar .secondary-nav-dropdown').doesNotExist('Should not have user menu if not logged in');
         const files = this.element.querySelectorAll('[data-test-file-item-link]');
         assert.equal(files.length, 5, `Check for proper number of files in list. Found ${files.length}`);
@@ -42,7 +42,7 @@ module('Acceptance | Guid User Quickfiles', hooks => {
         server.createList('file', 5, { user });
         await visit(`/--user/${user.id}/quickfiles`);
         assert.dom('nav.navbar').exists();
-        assert.dom('nav.navbar .service-name').hasText('OSF HOME');
+        assert.dom('nav.navbar .service-name').hasText('OSF');
         assert.dom('nav.navbar .secondary-nav-dropdown .nav-profile-name')
             .hasText(currentUser.fullName, 'User\'s name is in navbar');
         const files = this.element.querySelectorAll('[data-test-file-item-link]');

tests/integration/components/osf-navbar/component-test.ts

@@ -27,7 +27,7 @@ module('Integration | Component | osf-navbar', hooks => {
     test('it renders', async assert => {
         await render(hbs`{{osf-navbar}}`);
         assert.dom('.service-name').includesText('OSF');
-        assert.dom('.current-service').hasText('HOME');
+        assert.dom('.current-service').doesNotExist();
     });
 
     test('service-dropdown: logged in', async function(assert) {