DEV: Update eslint-config-discourse, use prettier for hbs (#414)
This commit is contained in:
David Taylor
GitHub
parent
4fe2ded608
commit
4070985316
|
|
@ -41,8 +41,8 @@ jobs:
|
|||
shell: bash
|
||||
run: |
|
||||
yarn prettier -v
|
||||
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
||||
yarn prettier --list-different "assets/**/*.{scss,js,es6}"
|
||||
if [ 0 -lt $(find assets admin/assets -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" -or -name "*.hbs" \) 2> /dev/null | wc -l) ]; then
|
||||
yarn prettier --list-different "assets/**/*.{scss,js,es6,hbs}"
|
||||
fi
|
||||
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
|
||||
yarn prettier --list-different "test/**/*.{js,es6}"
|
||||
|
|
@ -50,7 +50,12 @@ jobs:
|
|||
|
||||
- name: Ember template lint
|
||||
if: ${{ !cancelled() }}
|
||||
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts admin/assets/javascripts
|
||||
run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts
|
||||
|
||||
# Separated due to https://github.com/ember-template-lint/ember-template-lint/issues/2758
|
||||
- name: Ember template lint (admin)
|
||||
if: ${{ !cancelled() }}
|
||||
run: yarn ember-template-lint --no-error-on-unmatched-pattern admin/assets/javascripts
|
||||
|
||||
- name: Rubocop
|
||||
if: ${{ !cancelled() }}
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
groupMembersOf=allowedGroups
|
||||
)
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label" for="search-assigned-to">{{i18n "search.advanced.assigned.label"}}</label>
|
||||
<label class="control-label" for="search-assigned-to">{{i18n
|
||||
"search.advanced.assigned.label"
|
||||
}}</label>
|
||||
<div class="controls">
|
||||
{{email-group-user-chooser
|
||||
value=searchedTerms.assigned
|
||||
|
|
@ -12,4 +14,4 @@
|
|||
)
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -10,4 +10,4 @@
|
|||
{{i18n "discourse_assign.add_unassigned_filter"}}
|
||||
</label>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
@ -1 +1 @@
|
|||
{{group-assigned-menu-item group=group}}
|
||||
{{group-assigned-menu-item group=group}}
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label">{{i18n "discourse_assign.admin.groups.manage.interaction.assign"}}</label>
|
||||
<label for="visiblity">{{i18n "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"}}</label>
|
||||
<label class="control-label">{{i18n
|
||||
"discourse_assign.admin.groups.manage.interaction.assign"
|
||||
}}</label>
|
||||
<label for="visiblity">{{i18n
|
||||
"discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
|
||||
}}</label>
|
||||
|
||||
{{combo-box
|
||||
name="alias"
|
||||
|
|
@ -10,4 +14,4 @@
|
|||
class="groups-form-assignable-level"
|
||||
onChange=(action (mut model.assignable_level))
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
{{#if currentUser.can_assign}}
|
||||
{{#link-to "userActivity.assigned"}}
|
||||
{{d-icon "user-plus"}} {{i18n "discourse_assign.assigned"}}
|
||||
{{d-icon "user-plus"}}
|
||||
{{i18n "discourse_assign.assigned"}}
|
||||
{{/link-to}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{{#link-to "userPrivateMessages.assigned" model}}
|
||||
{{d-icon "user-plus" class="glyph"}}
|
||||
{{i18n "discourse_assign.assigned"}}
|
||||
{{/link-to}}
|
||||
{{/link-to}}
|
||||
|
|
@ -1 +1 @@
|
|||
{{remind-assigns-frequency user=model}}
|
||||
{{remind-assigns-frequency user=model}}
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
<span class="assigned-username">
|
||||
{{user.username}}
|
||||
</span>
|
||||
{{yield}}
|
||||
{{yield}}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{{!--
|
||||
{{!
|
||||
The `~` syntax strip spaces between the elements, making it produce
|
||||
`<a class=topic-post-badges>Some text</a><span class=topic-post-badges>`,
|
||||
with no space between them.
|
||||
This causes the topic-post-badge to be considered the same word as "text"
|
||||
at the end of the link, preventing it from line wrapping onto its own line.
|
||||
--}}
|
||||
}}
|
||||
{{#if bulkSelectEnabled}}
|
||||
<td class="bulk-select topic-list-data">
|
||||
<input type="checkbox" class="bulk-select">
|
||||
<input type="checkbox" class="bulk-select" />
|
||||
</td>
|
||||
{{/if}}
|
||||
<td class="main-link clearfix topic-list-data" colspan="1">
|
||||
|
|
@ -21,7 +21,13 @@
|
|||
{{~topic-featured-link topic}}
|
||||
{{~/if}}
|
||||
{{~#if showTopicPostBadges}}
|
||||
{{~raw "topic-post-badges" unread=topic.unread unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
|
||||
{{~raw
|
||||
"topic-post-badges"
|
||||
unread=topic.unread
|
||||
unseen=topic.unseen
|
||||
url=topic.lastUnreadUrl
|
||||
newDotText=newDotText
|
||||
}}
|
||||
{{~/if}}
|
||||
</span>
|
||||
<div class="link-bottom-line">
|
||||
|
|
@ -31,7 +37,13 @@
|
|||
{{/unless}}
|
||||
{{/unless}}
|
||||
{{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
|
||||
{{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
|
||||
{{raw
|
||||
"list/action-list"
|
||||
topic=topic
|
||||
postNumbers=topic.liked_post_numbers
|
||||
className="likes"
|
||||
icon="heart"
|
||||
}}
|
||||
</div>
|
||||
{{#if expandPinned}}
|
||||
{{raw "list/topic-excerpt" topic=topic}}
|
||||
|
|
@ -44,8 +56,16 @@
|
|||
|
||||
{{raw "list/posts-count-column" topic=topic}}
|
||||
|
||||
<td class="num views {{topic.viewsHeat}} topic-list-data">{{number topic.views numberKey="views_long"}}</td>
|
||||
{{raw "list/activity-column" topic=topic class="num topic-list-data" tagName="td"}}
|
||||
<td class="num views {{topic.viewsHeat}} topic-list-data">{{number
|
||||
topic.views
|
||||
numberKey="views_long"
|
||||
}}</td>
|
||||
{{raw
|
||||
"list/activity-column"
|
||||
topic=topic
|
||||
class="num topic-list-data"
|
||||
tagName="td"
|
||||
}}
|
||||
<td class="topic-list-data">
|
||||
{{#if topic.assigned_to_user}}
|
||||
{{assign-actions-dropdown
|
||||
|
|
@ -63,9 +83,6 @@
|
|||
reassign=reassign
|
||||
}}
|
||||
{{else}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
unassign=unassign
|
||||
}}
|
||||
{{assign-actions-dropdown topic=topic unassign=unassign}}
|
||||
{{/if}}
|
||||
</td>
|
||||
</td>
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{{#unless skipHeader}}
|
||||
<thead class="topic-list-header assigned-topic-list-header">
|
||||
{{raw "topic-list-header"
|
||||
{{raw
|
||||
"topic-list-header"
|
||||
canBulkSelect=canBulkSelect
|
||||
canDoBulkActions=canDoBulkActions
|
||||
toggleInTitle=toggleInTitle
|
||||
|
|
@ -38,4 +39,4 @@
|
|||
|
||||
{{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
|
||||
{{/each}}
|
||||
</tbody>
|
||||
</tbody>
|
||||
|
|
@ -33,4 +33,4 @@
|
|||
</div>
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
{{/conditional-loading-spinner}}
|
||||
{{/conditional-loading-spinner}}
|
||||
|
|
@ -1,7 +1,14 @@
|
|||
{{#if showAvatar}}
|
||||
{{#link-to "group.assigned.show" filter.username_lower (query-params order=order ascending=ascending search=search)}}
|
||||
{{#link-to
|
||||
"group.assigned.show"
|
||||
filter.username_lower
|
||||
(query-params order=order ascending=ascending search=search)
|
||||
}}
|
||||
<div class="assign-image">
|
||||
<a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar filter imageSize="large"}}</a>
|
||||
<a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar
|
||||
filter
|
||||
imageSize="large"
|
||||
}}</a>
|
||||
</div>
|
||||
|
||||
<div class="assign-names">
|
||||
|
|
@ -14,7 +21,11 @@
|
|||
</div>
|
||||
{{/link-to}}
|
||||
{{else if groupName}}
|
||||
{{#link-to "group.assigned.show" filter (query-params order=order ascending=ascending search=search)}}
|
||||
{{#link-to
|
||||
"group.assigned.show"
|
||||
filter
|
||||
(query-params order=order ascending=ascending search=search)
|
||||
}}
|
||||
<div class="assign-image">
|
||||
{{d-icon "group-plus"}}
|
||||
</div>
|
||||
|
|
@ -27,7 +38,11 @@
|
|||
</div>
|
||||
{{/link-to}}
|
||||
{{else}}
|
||||
{{#link-to "group.assigned.show" filter (query-params order=order ascending=ascending search=search)}}
|
||||
{{#link-to
|
||||
"group.assigned.show"
|
||||
filter
|
||||
(query-params order=order ascending=ascending search=search)
|
||||
}}
|
||||
<div class="assign-everyone">
|
||||
{{i18n "discourse_assign.group_everyone"}}
|
||||
</div>
|
||||
|
|
@ -35,4 +50,4 @@
|
|||
{{assignmentCount}}
|
||||
</div>
|
||||
{{/link-to}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
{{#link-to "group.assigned"}}
|
||||
{{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}} ({{group.assignment_count}})
|
||||
{{/link-to}}
|
||||
{{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
|
||||
({{group.assignment_count}})
|
||||
{{/link-to}}
|
||||
|
|
@ -9,4 +9,4 @@
|
|||
onChange=(action (mut user.custom_fields.remind_assigns_frequency))
|
||||
}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
@ -4,11 +4,13 @@
|
|||
</span>
|
||||
<div class="empty-state-body">
|
||||
<p>
|
||||
{{html-safe (i18n
|
||||
"user.no_assignments_body"
|
||||
icon=(d-icon "user-plus")
|
||||
preferencesUrl=(get-url "/my/preferences/notifications")
|
||||
)}}
|
||||
{{html-safe
|
||||
(i18n
|
||||
"user.no_assignments_body"
|
||||
icon=(d-icon "user-plus")
|
||||
preferencesUrl=(get-url "/my/preferences/notifications")
|
||||
)
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -10,7 +10,11 @@
|
|||
}}
|
||||
</div>
|
||||
</div>
|
||||
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
|
||||
{{#load-more
|
||||
class="paginated-topics-list"
|
||||
selector=".paginated-topics-list .topic-list tr"
|
||||
action=(action "loadMore")
|
||||
}}
|
||||
|
||||
{{basic-assigned-topic-list
|
||||
topicList=model
|
||||
|
|
@ -33,4 +37,4 @@
|
|||
}}
|
||||
|
||||
{{conditional-loading-spinner condition=model.loadingMore}}
|
||||
{{/load-more}}
|
||||
{{/load-more}}
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
<section class="user-secondary-navigation group-assignments">
|
||||
{{#mobile-nav class="activity-nav" desktopClass="action-list activity-list nav-stacked"}}
|
||||
{{#mobile-nav
|
||||
class="activity-nav"
|
||||
desktopClass="action-list activity-list nav-stacked"
|
||||
}}
|
||||
{{#if isDesktop}}
|
||||
<div class="search-div">
|
||||
{{input
|
||||
|
|
@ -47,4 +50,4 @@
|
|||
</section>
|
||||
<section class="user-content">
|
||||
{{outlet}}
|
||||
</section>
|
||||
</section>
|
||||
|
|
@ -12,10 +12,16 @@
|
|||
<div class="topic-excerpt">
|
||||
{{html-safe topic.excerpt}}
|
||||
{{#if topic.excerptTruncated}}
|
||||
{{#unless topic.canClearPin}}<a href={{topic.url}}>{{i18n "read_more"}}</a>{{/unless}}
|
||||
{{#unless topic.canClearPin}}<a href={{topic.url}}>{{i18n
|
||||
"read_more"
|
||||
}}</a>{{/unless}}
|
||||
{{/if}}
|
||||
{{#if topic.canClearPin}}
|
||||
<a href {{action "clearPin" topic}} title={{i18n "topic.clear_pin.help"}}>{{i18n "topic.clear_pin.title"}}</a>
|
||||
<a
|
||||
href
|
||||
{{action "clearPin" topic}}
|
||||
title={{i18n "topic.clear_pin.help"}}
|
||||
>{{i18n "topic.clear_pin.title"}}</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
@ -37,18 +43,23 @@
|
|||
reassign=reassign
|
||||
}}
|
||||
{{else}}
|
||||
{{assign-actions-dropdown
|
||||
topic=topic
|
||||
unassign=unassign
|
||||
}}
|
||||
{{assign-actions-dropdown topic=topic unassign=unassign}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="clearfix"></div>
|
||||
<div class="topic-item-stats clearfix">
|
||||
{{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
|
||||
<div class="pull-right topic-list-num">
|
||||
{{raw "list/activity-column" topic=topic tagName="div" class="num activity last"}}
|
||||
<a href={{topic.lastPostUrl}} title="{{i18n "last_post"}}: {{html-safe raw-date topic.bumped_at}}">{{topic.last_poster_username}}</a>
|
||||
{{raw
|
||||
"list/activity-column"
|
||||
topic=topic
|
||||
tagName="div"
|
||||
class="num activity last"
|
||||
}}
|
||||
<a
|
||||
href={{topic.lastPostUrl}}
|
||||
title="{{i18n 'last_post'}}: {{html-safe raw-date topic.bumped_at}}"
|
||||
>{{topic.last_poster_username}}</a>
|
||||
</div>
|
||||
{{#unless hideCategory}}
|
||||
<div class="category">
|
||||
|
|
@ -57,4 +68,4 @@
|
|||
{{/unless}}
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</td>
|
||||
</td>
|
||||
|
|
@ -29,4 +29,4 @@
|
|||
{{i18n "choose_topic.none_found"}}
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/conditional-loading-spinner}}
|
||||
{{/conditional-loading-spinner}}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{{#d-modal-body class="assign"}}
|
||||
<div>
|
||||
<div class="control-group {{if this.assigneeError "assignee-error"}}">
|
||||
<div class="control-group {{if this.assigneeError 'assignee-error'}}">
|
||||
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
|
||||
{{email-group-user-chooser
|
||||
autocomplete="off"
|
||||
|
|
@ -13,7 +13,9 @@
|
|||
mobilePlacementStrategy="absolute"
|
||||
filterPlaceholder=placeholderKey
|
||||
includeGroups=true
|
||||
customSearchOptions=(hash assignableGroups=true defaultSearchResults=this.assignSuggestions)
|
||||
customSearchOptions=(hash
|
||||
assignableGroups=true defaultSearchResults=this.assignSuggestions
|
||||
)
|
||||
groupMembersOf=allowedGroups
|
||||
maximum=1
|
||||
autofocus=autofocus
|
||||
|
|
@ -22,7 +24,8 @@
|
|||
}}
|
||||
{{#if this.assigneeError}}
|
||||
<span class="error-label">
|
||||
{{d-icon "exclamation-triangle"}} {{i18n "discourse_assign.assign_modal.choose_assignee"}}
|
||||
{{d-icon "exclamation-triangle"}}
|
||||
{{i18n "discourse_assign.assign_modal.choose_assignee"}}
|
||||
</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
@ -41,20 +44,30 @@
|
|||
|
||||
<div class="control-group assign-status">
|
||||
<label>
|
||||
{{i18n "discourse_assign.assign_modal.note_label"}} <span class="label-optional">{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
|
||||
{{i18n "discourse_assign.assign_modal.note_label"}} <span
|
||||
class="label-optional"
|
||||
>{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
|
||||
</label>
|
||||
{{textarea id="assign-modal-note" value=model.note key-down=(action "handleTextAreaKeydown")}}
|
||||
{{textarea
|
||||
id="assign-modal-note"
|
||||
value=model.note
|
||||
key-down=(action "handleTextAreaKeydown")
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
{{/d-modal-body}}
|
||||
|
||||
<div class="modal-footer">
|
||||
{{d-button
|
||||
label= (if model.reassign "discourse_assign.reassign.title" "discourse_assign.assign_modal.assign")
|
||||
label=(if
|
||||
model.reassign
|
||||
"discourse_assign.reassign.title"
|
||||
"discourse_assign.assign_modal.assign"
|
||||
)
|
||||
icon=inviteIcon
|
||||
action=(action "assign")
|
||||
class="btn-primary"
|
||||
disabled=disabled
|
||||
}}
|
||||
<DModalCancel @close={{route-action "closeModal"}} />
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1 +1 @@
|
|||
{{outlet}}
|
||||
{{outlet}}
|
||||
|
|
@ -17,7 +17,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
|
||||
{{#load-more
|
||||
class="paginated-topics-list"
|
||||
selector=".paginated-topics-list .topic-list tr"
|
||||
action=(action "loadMore")
|
||||
}}
|
||||
{{basic-assigned-topic-list
|
||||
topicList=model
|
||||
hideCategory=hideCategory
|
||||
|
|
@ -37,4 +41,4 @@
|
|||
|
||||
{{conditional-loading-spinner condition=model.loadingMore}}
|
||||
{{/load-more}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
</li>
|
||||
</UserNav::MessagesSecondaryNav>
|
||||
|
||||
{{outlet}}
|
||||
{{outlet}}
|
||||
Loading…
Reference in New Issue