discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Use angle bracket syntax (#460) 

- Use angle bracket syntax (updated via https://github.com/ember-codemods/ember-angle-brackets-codemod)
- Update deprecated options being passed to components (eg. @input -> on "input")
This commit is contained in:
Isaac Janzen 2023-04-26 15:30:50 -05:00 committed by GitHub
parent 4d1b55c5e5
commit a655a009fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 127 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs
View File

@ -1,15 +1,15 @@
<div class="reviewable-filter discourse-assign-assign-to-filter"> <div class="reviewable-filter discourse-assign-assign-to-filter">
<label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label> <label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
{{email-group-user-chooser <EmailGroupUserChooser
value=additionalFilters.assigned_to @value={{additionalFilters.assigned_to}}
onChange=(action "updateAssignedTo") @onChange={{action "updateAssignedTo"}}
autocomplete="off" autocomplete="off"
options=(hash @options={{hash
maximum=1 maximum=1
fullWidthWrap=true fullWidthWrap=true
filterPlaceholder=placeholderKey filterPlaceholder=placeholderKey
includeGroups=false includeGroups=false
groupMembersOf=allowedGroups groupMembersOf=allowedGroups
) }}
}} />
</div> </div>

12
assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs
View File

@ -3,15 +3,15 @@
"search.advanced.assigned.label" "search.advanced.assigned.label"
}}</label> }}</label>
<div class="controls"> <div class="controls">
{{email-group-user-chooser <EmailGroupUserChooser
value=searchedTerms.assigned @value={{searchedTerms.assigned}}
onChange=(action "onChangeAssigned") @onChange={{action "onChangeAssigned"}}
options=(hash @options={{hash
maximum=1 maximum=1
excludeCurrentUser=false excludeCurrentUser=false
includeGroups=true includeGroups=true
customSearchOptions=(hash assignableGroups=true) customSearchOptions=(hash assignableGroups=true)
) }}
}} />
</div> </div>
</div> </div>

10
assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs
View File

@ -2,11 +2,11 @@
<section class="field"> <section class="field">
<div class="enable-accepted-answer"> <div class="enable-accepted-answer">
<label class="checkbox-label"> <label class="checkbox-label">
{{input <Input
type="checkbox" @type="checkbox"
checked=(readonly category.enable_unassigned_filter) @checked={{readonly category.enable_unassigned_filter}}
change=(action "onChangeSetting" value="target.checked") {{on "change" (action "onChangeSetting" value="target.checked")}}
}} />
{{i18n "discourse_assign.add_unassigned_filter"}} {{i18n "discourse_assign.add_unassigned_filter"}}
</label> </label>
</div> </div>

16
assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
View File

@ -6,12 +6,12 @@
"discourse_assign.admin.groups.manage.interaction.assignable_levels.title" "discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
}}</label> }}</label>
{{combo-box <ComboBox
name="alias" @name="alias"
valueProperty="value" @valueProperty="value"
value=assignableLevel @value={{assignableLevel}}
content=assignableLevelOptions @content={{assignableLevelOptions}}
class="groups-form-assignable-level" @class="groups-form-assignable-level"
onChange=(action (mut model.assignable_level)) @onChange={{action (mut model.assignable_level)}}
}} />
</div> </div>

4
assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs
View File

@ -1,6 +1,6 @@
{{#if currentUser.can_assign}} {{#if currentUser.can_assign}}
{{#link-to "userActivity.assigned"}} <LinkTo @route="userActivity.assigned">
{{d-icon "user-plus"}} {{d-icon "user-plus"}}
{{i18n "discourse_assign.assigned"}} {{i18n "discourse_assign.assigned"}}
{{/link-to}} </LinkTo>
{{/if}} {{/if}}

4
assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs
View File

@ -1,4 +1,4 @@
{{#link-to "userPrivateMessages.assigned" model}} <LinkTo @route="userPrivateMessages.assigned" @model={{model}}>
{{d-icon "user-plus" class="glyph"}} {{d-icon "user-plus" class="glyph"}}
{{i18n "discourse_assign.assigned"}} {{i18n "discourse_assign.assigned"}}
{{/link-to}} </LinkTo>

10
assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs
View File

@ -1,8 +1,12 @@
{{#conditional-loading-spinner condition=loading}} <ConditionalLoadingSpinner @condition={{loading}}>
{{#if hasIncoming}} {{#if hasIncoming}}
<div class="show-mores"> <div class="show-mores">
<a href class="alert alert-info clickable" {{action showInserted}}> <a href class="alert alert-info clickable" {{action showInserted}}>
{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}} <CountI18n
@key="topic_count_"
@suffix="latest"
@count={{incomingCount}}
/>
</a> </a>
</div> </div>
{{/if}} {{/if}}
@ -33,4 +37,4 @@
</div> </div>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
{{/conditional-loading-spinner}} </ConditionalLoadingSpinner>

36
assets/javascripts/discourse/templates/components/group-assigned-filter.hbs
View File

@ -1,9 +1,9 @@
{{#if showAvatar}} {{#if showAvatar}}
{{#link-to <LinkTo
"group.assigned.show" @route="group.assigned.show"
filter.username_lower @model={{filter.username_lower}}
(query-params order=order ascending=ascending search=search) @query={{hash order=order ascending=ascending search=search}}
}} >
<div class="assign-image"> <div class="assign-image">
<a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar <a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar
filter filter
@ -19,13 +19,13 @@
<div class="assign-count"> <div class="assign-count">
{{filter.assignments_count}} {{filter.assignments_count}}
</div> </div>
{{/link-to}} </LinkTo>
{{else if groupName}} {{else if groupName}}
{{#link-to <LinkTo
"group.assigned.show" @route="group.assigned.show"
filter @model={{filter}}
(query-params order=order ascending=ascending search=search) @query={{hash order=order ascending=ascending search=search}}
}} >
<div class="assign-image"> <div class="assign-image">
{{d-icon "group-plus"}} {{d-icon "group-plus"}}
</div> </div>
@ -36,18 +36,18 @@
<div class="assign-count"> <div class="assign-count">
{{assignmentCount}} {{assignmentCount}}
</div> </div>
{{/link-to}} </LinkTo>
{{else}} {{else}}
{{#link-to <LinkTo
"group.assigned.show" @route="group.assigned.show"
filter @model={{filter}}
(query-params order=order ascending=ascending search=search) @query={{hash order=order ascending=ascending search=search}}
}} >
<div class="assign-everyone"> <div class="assign-everyone">
{{i18n "discourse_assign.group_everyone"}} {{i18n "discourse_assign.group_everyone"}}
</div> </div>
<div class="assign-count"> <div class="assign-count">
{{assignmentCount}} {{assignmentCount}}
</div> </div>
{{/link-to}} </LinkTo>
{{/if}} {{/if}}

4
assets/javascripts/discourse/templates/components/group-assigned-menu-item.hbs
View File

@ -1,4 +1,4 @@
{{#link-to "group.assigned"}} <LinkTo @route="group.assigned">
{{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}} {{d-icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}
({{group.assignment_count}}) ({{group.assignment_count}})
{{/link-to}} </LinkTo>

14
assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
View File

@ -1,12 +1,12 @@
{{#if siteSettings.assign_enabled}} {{#if siteSettings.assign_enabled}}
<div class="controls controls-dropdown"> <div class="controls controls-dropdown">
<label>{{i18n "discourse_assign.reminders_frequency.description"}}</label> <label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
{{combo-box <ComboBox
id="remind-assigns-frequency" @id="remind-assigns-frequency"
valueProperty="value" @valueProperty="value"
content=availableFrequencies @content={{availableFrequencies}}
value=selectedFrequency @value={{selectedFrequency}}
onChange=(action (mut user.custom_fields.remind_assigns_frequency)) @onChange={{action (mut user.custom_fields.remind_assigns_frequency)}}
}} />
</div> </div>
{{/if}} {{/if}}

26
assets/javascripts/discourse/templates/group-topics-list.hbs
View File

@ -1,20 +1,20 @@
<div class="topic-search-div"> <div class="topic-search-div">
<div class="inline-form full-width"> <div class="inline-form full-width">
{{input <Input
class="no-blur" class="no-blur"
value=(readonly search) @value={{readonly search}}
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
input=(action "onChangeFilter" value="target.value")
autocomplete="off" autocomplete="off"
type="search" @type="search"
}} {{on "input" (action "onChangeFilter" value="target.value")}}
/>
</div> </div>
</div> </div>
{{#load-more <LoadMore
class="paginated-topics-list" @class="paginated-topics-list"
selector=".paginated-topics-list .topic-list tr" @selector=".paginated-topics-list .topic-list tr"
action=(action "loadMore") @action={{action "loadMore"}}
}} >
{{basic-assigned-topic-list {{basic-assigned-topic-list
topicList=model topicList=model
@ -36,5 +36,5 @@
scrollOnLoad=true scrollOnLoad=true
}} }}
{{conditional-loading-spinner condition=model.loadingMore}} <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
{{/load-more}} </LoadMore>

30
assets/javascripts/discourse/templates/group/assigned.hbs
View File

@ -1,20 +1,22 @@
<section class="user-secondary-navigation group-assignments"> <section class="user-secondary-navigation group-assignments">
{{#mobile-nav <MobileNav
class="activity-nav" @class="activity-nav"
desktopClass="action-list activity-list nav-stacked" @desktopClass="action-list activity-list nav-stacked"
}} >
{{#if isDesktop}} {{#if isDesktop}}
<div class="search-div"> <div class="search-div">
{{input <Input
type="text" @type="text"
placeholder=(i18n "discourse_assign.sidebar_name_filter_placeholder") placeholder={{i18n
value=(readonly filterName) "discourse_assign.sidebar_name_filter_placeholder"
}}
@value={{readonly filterName}}
class="search" class="search"
input=(action "onChangeFilterName" value="target.value") {{on "input" (action "onChangeFilterName" value="target.value")}}
}} />
</div> </div>
{{/if}} {{/if}}
{{#load-more selector=".activity-nav li" action=(action "loadMore")}} <LoadMore @selector=".activity-nav li" @action={{action "loadMore"}}>
{{group-assigned-filter {{group-assigned-filter
showAvatar=false showAvatar=false
filter="everyone" filter="everyone"
@ -44,9 +46,9 @@
order=order order=order
}} }}
{{/each}} {{/each}}
{{conditional-loading-spinner condition=loading}} <ConditionalLoadingSpinner @condition={{loading}} />
{{/load-more}} </LoadMore>
{{/mobile-nav}} </MobileNav>
</section> </section>
<section class="user-content"> <section class="user-content">
{{outlet}} {{outlet}}

2
assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs
View File

@ -1,6 +1,6 @@
<td class="topic-list-data"> <td class="topic-list-data">
<div class="main-link"> <div class="main-link">
{{topic-status topic=topic}} <TopicStatus @topic={{topic}} />
{{~#if isPrivateMessage}} {{~#if isPrivateMessage}}
{{~d-icon "envelope" class="private-message-icon"}} {{~d-icon "envelope" class="private-message-icon"}}
{{~/if}} {{~/if}}

10
assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs
View File

@ -1,8 +1,12 @@
{{#conditional-loading-spinner condition=loading}} <ConditionalLoadingSpinner @condition={{loading}}>
{{#if hasIncoming}} {{#if hasIncoming}}
<div class="show-mores"> <div class="show-mores">
<a href class="alert alert-info clickable" {{action showInserted}}> <a href class="alert alert-info clickable" {{action showInserted}}>
{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}} <CountI18n
@key="topic_count_"
@suffix="latest"
@count={{incomingCount}}
/>
</a> </a>
</div> </div>
{{/if}} {{/if}}
@ -29,4 +33,4 @@
{{i18n "choose_topic.none_found"}} {{i18n "choose_topic.none_found"}}
</div> </div>
{{/if}} {{/if}}
{{/conditional-loading-spinner}} </ConditionalLoadingSpinner>

27
assets/javascripts/discourse/templates/modal/assign-user.hbs
View File

@ -1,4 +1,4 @@
{{#d-modal-body class="assign"}} <DModalBody @class="assign">
<div> <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> <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
@ -34,12 +34,12 @@
{{#if this.statusEnabled}} {{#if this.statusEnabled}}
<div class="control-group assign-status"> <div class="control-group assign-status">
<label>{{i18n "discourse_assign.assign_modal.status_label"}}</label> <label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
{{combo-box <ComboBox
id="assign-status" @id="assign-status"
content=availableStatuses @content={{availableStatuses}}
value=status @value={{status}}
onChange=(action (mut model.status)) @onChange={{action (mut model.status)}}
}} />
</div> </div>
{{/if}} {{/if}}
@ -49,14 +49,15 @@
class="label-optional" class="label-optional"
>{{i18n "discourse_assign.assign_modal.optional_label"}}</span> >{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
</label> </label>
{{textarea <Textarea
id="assign-modal-note" id={{"assign-modal-note"}}
value=model.note @value={{model.note}}
key-down=(action "handleTextAreaKeydown") {{! template-lint-disable no-down-event-binding }}
}} {{on "keydown" (action "handleTextAreaKeydown")}}
/>
</div> </div>
</div> </div>
{{/d-modal-body}} </DModalBody>
<div class="modal-footer"> <div class="modal-footer">
{{d-button {{d-button

26
assets/javascripts/discourse/templates/user-assigned-topics.hbs
View File

@ -6,22 +6,22 @@
{{else}} {{else}}
<div class="topic-search-div"> <div class="topic-search-div">
<div class="inline-form full-width"> <div class="inline-form full-width">
{{input <Input
class="no-blur" class="no-blur"
value=(readonly search) @value={{readonly search}}
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
input=(action "onChangeFilter" value="target.value")
autocomplete="off" autocomplete="off"
type="search" @type="search"
}} {{on "input" (action "onChangeFilter" value="target.value")}}
/>
</div> </div>
</div> </div>
{{#load-more <LoadMore
class="paginated-topics-list" @class="paginated-topics-list"
selector=".paginated-topics-list .topic-list tr" @selector=".paginated-topics-list .topic-list tr"
action=(action "loadMore") @action={{action "loadMore"}}
}} >
{{basic-assigned-topic-list {{basic-assigned-topic-list
topicList=model topicList=model
hideCategory=hideCategory hideCategory=hideCategory
@ -39,6 +39,6 @@
scrollOnLoad=true scrollOnLoad=true
}} }}
{{conditional-loading-spinner condition=model.loadingMore}} <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
{{/load-more}} </LoadMore>
{{/if}} {{/if}}