Merge branch 'release/18.1.0'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,28 @@ 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).
 
+## [18.1.0] - 2018-10-30
+### Added
+- Components:
+    - `panel` - a general-use abstraction of bootstrap panels
+- Tests:
+    - `panel` component integration test
+- Handbook:
+    - `panel` component
+### Changed
+- Components:
+    - `loading-indicator` - added inline option
+- Utilities:
+    - `fix-special-chars` - made case-insensitive
+- Tests:
+    - `loading-indicator` - added tests for inline
+- Handbook:
+    - `loading-indicator` - added examples for inline
+### Removed
+- Flags:
+    - `ember_project_forks_page` - `guid-node.forks` and `guid-registration.forks` now always on
+    - `ember_project_analytics_page` - `guid-node.analytics` and `guid-registration.analytics` now always on
+
 ## [18.0.0] - 2018-10-24
 ### Added
 - Models:

app/models/token.ts

@@ -6,7 +6,7 @@ import OsfModel from './osf-model';
 const Validations = buildValidations({
     name: [
         validator('presence', true),
-        validator('length', { min: 1, max: 200 }),
+        validator('length', { min: 1, max: 100 }),
     ],
     scopes: [
         validator('collection', true),

app/services/theme.ts

@@ -114,7 +114,10 @@ export default class Theme extends Service {
     }
 
     reset(this: Theme) {
-        this.set('id', defaultProvider);
+        this.setProperties({
+            id: defaultProvider,
+            providerType: undefined,
+        });
     }
 
     prefixRoute(route: string): string {

app/settings/tokens/x-token-form/styles.scss

@@ -3,6 +3,7 @@
 
     input {
         margin-right: 10px;
+        flex-shrink: 0;
     }
 }
 

app/utils/fix-special-char.ts

@@ -5,7 +5,7 @@
  */
 export default function fixSpecialChar(inputString: string = ''): string {
     return inputString
-        .replace(/&/g, '&')
-        .replace(/&lt;/g, '<')
-        .replace(/&gt;/g, '>');
+        .replace(/&amp;/gi, '&')
+        .replace(/&lt;/gi, '<')
+        .replace(/&gt;/gi, '>');
 }

config/environment.js

@@ -214,10 +214,6 @@ module.exports = function(environment) {
         },
         featureFlagNames: {
             routes: {
-                'guid-node.forks': 'ember_project_forks_page',
-                'guid-registration.forks': 'ember_project_forks_page',
-                'guid-node.analytics.index': 'ember_project_analytics_page',
-                'guid-registration.analytics.index': 'ember_project_analytics_page',
                 'guid-node.registrations': 'ember_project_registrations_page',
                 'settings.tokens': 'ember_user_settings_tokens_page',
                 'settings.tokens.index': 'ember_user_settings_tokens_page',

lib/app-components/addon/components/branded-navbar/styles.scss

@@ -6,6 +6,10 @@
     height: 50px;
     border-radius: 0 !important;
     margin-bottom: 0 !important;
+
+    :global(.container) {
+        height: 50px;
+    }
 }
 
 .navbar-content {

lib/app-components/addon/components/error-page/template.hbs

@@ -17,15 +17,21 @@
                     </a>
                 </span>
             </p>
-            <a
-                class="btn btn-primary m-t-md"
-                href={{theme.pathPrefix}}
-                onclick={{action 'click' 'link' (concat label ' - Go to Index') target=analytics}}
-            >
-                {{t 'app_components.error_page.go_to'
-                    brand=(t @brandKey name=(if theme.isProvider theme.provider.name 'general.osf'))
-                }}
-            </a>
+            {{#if theme.isProvider}}
+                <a
+                    class="btn btn-primary m-t-md"
+                    href={{theme.pathPrefix}}
+                    onclick={{action 'click' 'link' (concat label ' - Go to Index') target=analytics}}
+                >
+                    {{t 'app_components.error_page.go_to'
+                        brand=(t @brandKey name=theme.provider.name)
+                    }}
+                </a>
+            {{else}}
+                {{#link-to-external 'home' class="btn btn-primary m-t-md"}}
+                    {{t 'app_components.error_page.go_to' brand=(t 'general.OSF')}}
+                {{/link-to-external}}
+            {{/if}}
         </div>
     </div>
 </div>

lib/app-components/addon/helpers/sort.ts

@@ -0,0 +1,7 @@
+import Helper from '@ember/component/helper';
+
+export default class Sort extends Helper {
+    compute<T>([arr]: [T[]]) {
+        return arr.sort();
+    }
+}

lib/app-components/app/helpers/sort.js

@@ -0,0 +1 @@
+export { default } from 'app-components/helpers/sort';