Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = {
'ember/no-attrs-in-components': 'error',
'ember/no-old-shims': 'error',
'import/prefer-default-export': 'off',
'no-restricted-globals': 'off',
},
overrides: [
{
Expand All @@ -56,7 +57,6 @@ module.exports = {
{
files: ['**/*.d.ts'],
rules: {
'no-restricted-globals': 'off',
'no-useless-constructor': 'off',
'space-infix-ops': 'off',
},
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `token`
- `scope`
- Components:
- `search-help-modal` - you know, the search help modal but as it's own component
- `draft-registration-card` - summary card for draft registrations
- `node-list` - produce a paginated list of nodes from a relationship
- `copyable-text` - display some read-only text with a button to copy it
Expand Down Expand Up @@ -45,6 +46,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `tags-widget` - added to the handbook
- Utils:
- `param` - drop-in replacement for jQuery.param
- Helpers:
- `math` - A helper to render TeX statements using KaTeX

### Changed
- Models:
Expand Down Expand Up @@ -143,6 +146,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `metaschema` (including related adapter & serializer)
- Services:
- `file-manager` (including skipped tests and one unused reference)
- Components:
- `search-dropdown` (Unused)

## [0.7.0] - 2018-08-07
### Added
Expand Down
14 changes: 4 additions & 10 deletions app/locales/en/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,6 @@ export default {
user_gravatar: 'User gravatar',
toggle_auth_dropdown: 'Toggle auth dropdown',
},
search_help_modal: {
close: 'Close',
search_help: 'Search help',
queries: 'Queries',
paragraph: 'Search uses the <a href={{link}}>Lucene search syntax</a>. This gives you many options, but can be very simple as well. Examples of valid searches include:',
},
support: {
title: 'Support',
faq_title: 'Frequently asked questions',
Expand Down Expand Up @@ -782,7 +776,7 @@ export default {
close: 'Close',
title: 'Search help',
queries: 'Queries',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>.',
helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:',
},
search_paginator: {
Expand Down Expand Up @@ -960,11 +954,11 @@ export default {
},
sidebar: {
refine_your_search: 'Refine your search by',
clear_filters: 'Clear Filters',
active_filters: 'Active Filters',
clear_filters: 'Clear filters',
active_filters: 'Active filters',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we were moving to sentence case for most things?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that not sentence case?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol, don't mind me...

},
search_result: {
last_edited: 'Last Edited: {{date}}',
last_edited: 'Last edited: {{date}}',
withdrawn: 'Withdrawn',
},
pagination: {
Expand Down
13 changes: 3 additions & 10 deletions app/locales/ja/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ export default {
close: 'Close',
title: 'Search help',
queries: 'Queries',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>.',
helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:',
},
search_paginator: {
Expand Down Expand Up @@ -961,10 +961,10 @@ export default {
sidebar: {
refine_your_search: 'Refine your search by',
clear_filters: 'Clear Filters',
active_filters: 'Active Filters',
active_filters: 'Active filters',
},
search_result: {
last_edited: 'Last Edited: {{date}}',
last_edited: 'Last edited: {{date}}',
withdrawn: 'Withdrawn',
},
pagination: {
Expand Down Expand Up @@ -1167,11 +1167,4 @@ export default {
},
},
},
searchHelp: {
close: 'Close',
title: 'Search help',
helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:',
queries: 'Queries',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>',
},
};
19 changes: 3 additions & 16 deletions app/locales/zh/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,6 @@ export default {
user_gravatar: 'User gravatar',
toggle_auth_dropdown: 'Toggle auth dropdown',
},
search_help_modal: {
close: 'Close',
search_help: 'Search help',
queries: 'Queries',
paragraph: 'Search uses the <a href={{link}}>Lucene search syntax</a>. This gives you many options, but can be very simple as well. Examples of valid searches include:',
},
support: {
title: 'Support',
faq_title: 'Frequently asked questions',
Expand Down Expand Up @@ -782,7 +776,7 @@ export default {
close: 'Close',
title: 'Search help',
queries: 'Queries',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>.',
helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:',
},
search_paginator: {
Expand Down Expand Up @@ -961,10 +955,10 @@ export default {
sidebar: {
refine_your_search: 'Refine your search by',
clear_filters: 'Clear Filters',
active_filters: 'Active Filters',
active_filters: 'Active filters',
},
search_result: {
last_edited: 'Last Edited: {{date}}',
last_edited: 'Last edited: {{date}}',
withdrawn: 'Withdrawn',
},
pagination: {
Expand Down Expand Up @@ -1167,11 +1161,4 @@ export default {
},
},
},
searchHelp: {
close: 'Close',
title: 'Search help',
helpDescription: 'This gives you many options, but can be very simple as well. Examples of valid searches include:',
queries: 'Queries',
searchSyntax: 'Search uses the <a href="http://extensions.xwiki.org/xwiki/bin/view/Extension/Search+Application+Query+Syntax">Lucene search syntax</a>',
},
};
2 changes: 1 addition & 1 deletion app/models/banner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import OsfModel from './osf-model';
export default class BannerModel extends OsfModel {
@attr('date') startDate!: Date;
@attr('date') endDate!: Date;
@attr('string') name!: string; // eslint-disable-line no-restricted-globals
@attr('string') name!: string;
@attr('string') link!: string;
@attr('string') mobileAltText!: string;
@attr('string') defaultAltText!: string;
Expand Down
2 changes: 1 addition & 1 deletion app/models/collected-metadatum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class CollectedMetadatum extends OsfModel.extend(Validations) {
@attr('string') collectedType?: string;
@attr('string') issue?: string;
@attr('string') programArea?: string;
@attr('string') status?: string; // eslint-disable-line no-restricted-globals
@attr('string') status?: string;
@attr('subjects') subjects!: SubjectRef[][];
@attr('string') volume?: string;

Expand Down
2 changes: 1 addition & 1 deletion app/models/file-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Node from './node';
* @class FileProvider
*/
export default class FileProvider extends BaseFileItem {
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('string') path!: string;
@attr('fixstring') provider!: string;
@hasMany('file') files!: DS.PromiseManyArray<File>;
Expand Down
2 changes: 1 addition & 1 deletion app/models/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import User from './user';
* @class File
*/
export default class File extends BaseFileItem {
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('fixstring') guid!: string;
@attr('string') path!: string;
@attr('number') size!: number;
Expand Down
2 changes: 1 addition & 1 deletion app/models/institution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import User from './user';
* @class Institution
*/
export default class Institution extends OsfModel {
@attr('string') name!: string; // eslint-disable-line no-restricted-globals
@attr('string') name!: string;
@attr('fixstring') description!: string;
@attr('string') logoPath!: string;
@attr('string') authUrl!: string;
Expand Down
2 changes: 1 addition & 1 deletion app/models/license.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Deserialized } from 'ember-osf-web/transforms/node-license';
import OsfModel from './osf-model';

export default class License extends OsfModel {
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('fixstring') text!: string;
@attr('array') requiredFields!: Array<keyof Deserialized>;
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export default class Node extends BaseFileItem.extend(Validations, CollectableVa
contributors!: DS.PromiseManyArray<Contributor>;

@belongsTo('node', { inverse: 'children' })
parent!: DS.PromiseObject<Node> & Node; // eslint-disable-line no-restricted-globals
parent!: DS.PromiseObject<Node> & Node;

@belongsTo('region') region!: Region;

Expand Down
2 changes: 1 addition & 1 deletion app/models/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface Assets {
/* eslint-enable camelcase */

export default abstract class Provider extends OsfModel {
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('fixstring') description!: string;
@attr('string') advisoryBoard!: string;
@attr('fixstring') example!: string;
Expand Down
2 changes: 1 addition & 1 deletion app/models/region.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { attr } from '@ember-decorators/data';
import OsfModel from './osf-model';

export default class RegionModel extends OsfModel {
@attr('string') name!: string; // eslint-disable-line no-restricted-globals
@attr('string') name!: string;
}

declare module 'ember-data' {
Expand Down
4 changes: 2 additions & 2 deletions app/models/registration-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export interface Page {
}

export interface Schema {
name: string; // eslint-disable-line no-restricted-globals
name: string;
title: string;
version: number;
active: boolean;
Expand Down Expand Up @@ -63,7 +63,7 @@ export interface RegistrationMetadata {
*/
export default class RegistrationSchema extends OsfModel {
@attr('boolean') active!: boolean;
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('number') schemaVersion!: number;
@attr('object') schema!: Schema;
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/taxonomy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default class Taxonomy extends OsfModel {
@attr('string') shareTitle!: string;
@attr('string') path!: string;
@attr('number') childCount!: number;
@attr('object') parent!: SubjectRef; // eslint-disable-line no-restricted-globals
@attr('object') parent!: SubjectRef;
}

declare module 'ember-data' {
Expand Down
2 changes: 1 addition & 1 deletion app/models/token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Validations = buildValidations({
});

export default class TokenModel extends OsfModel.extend(Validations) {
@attr('fixstring') name!: string; // eslint-disable-line no-restricted-globals
@attr('fixstring') name!: string;
@attr('fixstring') tokenValue?: string; // Exposed only in response to token creation

@hasMany('scope') scopes!: string[];
Expand Down
2 changes: 1 addition & 1 deletion app/models/wiki.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import OsfModel from './osf-model';

export default class Wiki extends OsfModel {
@attr('string') kind!: string;
@attr('string') name!: string; // eslint-disable-line no-restricted-globals
@attr('string') name!: string;
@attr('date') dateModified!: Date;

@attr('object') extra!: any;
Expand Down
2 changes: 1 addition & 1 deletion app/services/meta-tags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export interface MetaTagsDefs {
}

export interface NameMetaTagAttrs {
name: string; // eslint-disable-line no-restricted-globals
name: string;
content: Content;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { service } from '@ember-decorators/service';
import { getOwner } from '@ember/application';
import Component from '@ember/component';
import { Registry as Services } from '@ember/service';
import RouterService from '@ember/routing/router-service';
import defaultTo from 'ember-osf-web/utils/default-to';
import styles from './styles';
import layout from './template';
Expand All @@ -19,7 +19,7 @@ export default class SearchHelpModal extends Component {
layout = layout;
styles = styles;

@service router!: Services['router'];
@service router!: RouterService;

isOpen: boolean = defaultTo(this.isOpen, false);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.ul {
list-style: none;
padding-left: 0;
}

.li {
display: inline;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul>
<ul local-class="ul">
{{#each items as |item|}}
<li local-class="li">
<button local-class="{{if (eq current item.text) 'active'}}"
Expand All @@ -9,4 +9,4 @@
</button>
</li>
{{/each}}
</ul>
</ul>
Loading